From 159285c5aa24611ceee7e3847a87bf9ea5f7fb7a Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Fri, 18 Jul 2008 00:48:14 +0000
Subject: Import of client tree

---
 CMakeLists.txt                         |   2 +-
 ChangeLog                              |  64 ++-
 Makefile.am                            |   2 +-
 README                                 |  51 +-
 aclocal.m4                             | 868 ++++++++++++++++++++++++++++++
 autom4te.cache/traces.0                | 698 ++++++++++++++++++++++++
 configure.ac                           |   2 +-
 depcomp                                | 589 +++++++++++++++++++++
 docs/Makefile.am                       |   2 +-
 docs/tme.6                             |  97 ++++
 docs/tmw.6                             |  74 ---
 install-sh                             | 519 ++++++++++++++++++
 missing                                | 367 +++++++++++++
 src/.deps/tmw-action.Po                |   1 +
 src/.deps/tmw-ambientoverlay.Po        |   1 +
 src/.deps/tmw-animatedsprite.Po        |   1 +
 src/.deps/tmw-animation.Po             |   1 +
 src/.deps/tmw-animationparticle.Po     |   1 +
 src/.deps/tmw-base64.Po                |   1 +
 src/.deps/tmw-being.Po                 |   1 +
 src/.deps/tmw-beinghandler.Po          |   1 +
 src/.deps/tmw-beingmanager.Po          |   1 +
 src/.deps/tmw-box.Po                   |   1 +
 src/.deps/tmw-browserbox.Po            |   1 +
 src/.deps/tmw-buddylist.Po             |   1 +
 src/.deps/tmw-buddywindow.Po           |   1 +
 src/.deps/tmw-button.Po                |   1 +
 src/.deps/tmw-buy.Po                   |   1 +
 src/.deps/tmw-buysell.Po               |   1 +
 src/.deps/tmw-buysellhandler.Po        |   1 +
 src/.deps/tmw-char_select.Po           |   1 +
 src/.deps/tmw-char_server.Po           |   1 +
 src/.deps/tmw-chargedialog.Po          |   1 +
 src/.deps/tmw-charserverhandler.Po     |   1 +
 src/.deps/tmw-chat.Po                  |   1 +
 src/.deps/tmw-chathandler.Po           |   1 +
 src/.deps/tmw-chatinput.Po             |   1 +
 src/.deps/tmw-checkbox.Po              |   1 +
 src/.deps/tmw-configuration.Po         |   1 +
 src/.deps/tmw-confirm_dialog.Po        |   1 +
 src/.deps/tmw-connection.Po            |   1 +
 src/.deps/tmw-debugwindow.Po           |   1 +
 src/.deps/tmw-dropdown.Po              |   1 +
 src/.deps/tmw-dye.Po                   |   1 +
 src/.deps/tmw-engine.Po                |   1 +
 src/.deps/tmw-equipment.Po             |   1 +
 src/.deps/tmw-equipmenthandler.Po      |   1 +
 src/.deps/tmw-equipmentwindow.Po       |   1 +
 src/.deps/tmw-floor_item.Po            |   1 +
 src/.deps/tmw-flooritemmanager.Po      |   1 +
 src/.deps/tmw-focushandler.Po          |   1 +
 src/.deps/tmw-game.Po                  |   1 +
 src/.deps/tmw-gccontainer.Po           |   1 +
 src/.deps/tmw-graphics.Po              |   1 +
 src/.deps/tmw-gui.Po                   |   1 +
 src/.deps/tmw-hbox.Po                  |   1 +
 src/.deps/tmw-help.Po                  |   1 +
 src/.deps/tmw-image.Po                 |   1 +
 src/.deps/tmw-imageloader.Po           |   1 +
 src/.deps/tmw-imageparticle.Po         |   1 +
 src/.deps/tmw-imageset.Po              |   1 +
 src/.deps/tmw-imagewriter.Po           |   1 +
 src/.deps/tmw-inttextbox.Po            |   1 +
 src/.deps/tmw-inventory.Po             |   1 +
 src/.deps/tmw-inventoryhandler.Po      |   1 +
 src/.deps/tmw-inventorywindow.Po       |   1 +
 src/.deps/tmw-item.Po                  |   1 +
 src/.deps/tmw-item_amount.Po           |   1 +
 src/.deps/tmw-itemcontainer.Po         |   1 +
 src/.deps/tmw-itemdb.Po                |   1 +
 src/.deps/tmw-itemhandler.Po           |   1 +
 src/.deps/tmw-iteminfo.Po              |   1 +
 src/.deps/tmw-itemshortcut.Po          |   1 +
 src/.deps/tmw-itemshortcutcontainer.Po |   1 +
 src/.deps/tmw-itemshortcutwindow.Po    |   1 +
 src/.deps/tmw-joystick.Po              |   1 +
 src/.deps/tmw-keyboardconfig.Po        |   1 +
 src/.deps/tmw-listbox.Po               |   1 +
 src/.deps/tmw-localplayer.Po           |   1 +
 src/.deps/tmw-log.Po                   |   1 +
 src/.deps/tmw-login.Po                 |   1 +
 src/.deps/tmw-loginhandler.Po          |   1 +
 src/.deps/tmw-main.Po                  |   1 +
 src/.deps/tmw-map.Po                   |   1 +
 src/.deps/tmw-maploginhandler.Po       |   1 +
 src/.deps/tmw-mapreader.Po             |   1 +
 src/.deps/tmw-menuwindow.Po            |   1 +
 src/.deps/tmw-messagehandler.Po        |   1 +
 src/.deps/tmw-messagein.Po             |   1 +
 src/.deps/tmw-messageout.Po            |   1 +
 src/.deps/tmw-minimap.Po               |   1 +
 src/.deps/tmw-ministatus.Po            |   1 +
 src/.deps/tmw-monster.Po               |   1 +
 src/.deps/tmw-monsterdb.Po             |   1 +
 src/.deps/tmw-monsterinfo.Po           |   1 +
 src/.deps/tmw-music.Po                 |   1 +
 src/.deps/tmw-network.Po               |   1 +
 src/.deps/tmw-newskill.Po              |   1 +
 src/.deps/tmw-npc.Po                   |   1 +
 src/.deps/tmw-npc_text.Po              |   1 +
 src/.deps/tmw-npcdb.Po                 |   1 +
 src/.deps/tmw-npchandler.Po            |   1 +
 src/.deps/tmw-npclistdialog.Po         |   1 +
 src/.deps/tmw-ok_dialog.Po             |   1 +
 src/.deps/tmw-openglgraphics.Po        |   1 +
 src/.deps/tmw-particle.Po              |   1 +
 src/.deps/tmw-particleemitter.Po       |   1 +
 src/.deps/tmw-passwordfield.Po         |   1 +
 src/.deps/tmw-player.Po                |   1 +
 src/.deps/tmw-player_relations.Po      |   1 +
 src/.deps/tmw-playerbox.Po             |   1 +
 src/.deps/tmw-playerhandler.Po         |   1 +
 src/.deps/tmw-popupmenu.Po             |   1 +
 src/.deps/tmw-progressbar.Po           |   1 +
 src/.deps/tmw-protocol.Po              |   1 +
 src/.deps/tmw-radiobutton.Po           |   1 +
 src/.deps/tmw-register.Po              |   1 +
 src/.deps/tmw-resizegrip.Po            |   1 +
 src/.deps/tmw-resource.Po              |   1 +
 src/.deps/tmw-resourcemanager.Po       |   1 +
 src/.deps/tmw-scrollarea.Po            |   1 +
 src/.deps/tmw-sell.Po                  |   1 +
 src/.deps/tmw-setup.Po                 |   1 +
 src/.deps/tmw-setup_audio.Po           |   1 +
 src/.deps/tmw-setup_joystick.Po        |   1 +
 src/.deps/tmw-setup_keyboard.Po        |   1 +
 src/.deps/tmw-setup_players.Po         |   1 +
 src/.deps/tmw-setup_video.Po           |   1 +
 src/.deps/tmw-shop.Po                  |   1 +
 src/.deps/tmw-shoplistbox.Po           |   1 +
 src/.deps/tmw-simpleanimation.Po       |   1 +
 src/.deps/tmw-skill.Po                 |   1 +
 src/.deps/tmw-skillhandler.Po          |   1 +
 src/.deps/tmw-slider.Po                |   1 +
 src/.deps/tmw-sound.Po                 |   1 +
 src/.deps/tmw-soundeffect.Po           |   1 +
 src/.deps/tmw-spritedef.Po             |   1 +
 src/.deps/tmw-status.Po                |   1 +
 src/.deps/tmw-strprintf.Po             |   1 +
 src/.deps/tmw-tabbedcontainer.Po       |   1 +
 src/.deps/tmw-table.Po                 |   1 +
 src/.deps/tmw-table_model.Po           |   1 +
 src/.deps/tmw-textbox.Po               |   1 +
 src/.deps/tmw-textfield.Po             |   1 +
 src/.deps/tmw-textparticle.Po          |   1 +
 src/.deps/tmw-trade.Po                 |   1 +
 src/.deps/tmw-tradehandler.Po          |   1 +
 src/.deps/tmw-updatewindow.Po          |   1 +
 src/.deps/tmw-vbox.Po                  |   1 +
 src/.deps/tmw-viewport.Po              |   1 +
 src/.deps/tmw-window.Po                |   1 +
 src/.deps/tmw-windowcontainer.Po       |   1 +
 src/.deps/tmw-xml.Po                   |   1 +
 src/Makefile.am                        |  28 +-
 src/animatedsprite.cpp                 |   2 +-
 src/animatedsprite.h                   |   2 +-
 src/being.cpp                          |  55 +-
 src/being.h                            |  30 +-
 src/beingmanager.cpp                   |   2 +-
 src/beingmanager.h                     |   2 +-
 src/configlistener.h                   |   2 +-
 src/configuration.cpp                  |   2 +-
 src/configuration.h                    |   2 +-
 src/engine.cpp                         |   2 +-
 src/engine.h                           |   2 +-
 src/equipment.cpp                      |   2 +-
 src/equipment.h                        |   2 +-
 src/floor_item.cpp                     |   2 +-
 src/floor_item.h                       |   2 +-
 src/flooritemmanager.cpp               |   2 +-
 src/flooritemmanager.h                 |   2 +-
 src/game.cpp                           | 936 +++++++++++++++++----------------
 src/game.h                             |  50 +-
 src/graphics.cpp                       |   2 +-
 src/graphics.h                         |   2 +-
 src/gui/box.cpp                        |   2 +-
 src/gui/box.h                          |   2 +-
 src/gui/browserbox.cpp                 |   2 +-
 src/gui/browserbox.h                   |   2 +-
 src/gui/buddywindow.cpp                |  85 ---
 src/gui/buddywindow.h                  |  58 --
 src/gui/button.cpp                     |   2 +-
 src/gui/button.h                       |   2 +-
 src/gui/buttonbox.cpp                  |  47 ++
 src/gui/buttonbox.h                    |  70 +++
 src/gui/buy.cpp                        |   2 +-
 src/gui/buy.h                          |   2 +-
 src/gui/buysell.cpp                    |   2 +-
 src/gui/buysell.h                      |   2 +-
 src/gui/char_select.cpp                |   2 +-
 src/gui/char_select.h                  |   2 +-
 src/gui/char_server.cpp                |   7 +-
 src/gui/char_server.h                  |   2 +-
 src/gui/chat.cpp                       | 758 ++++++++++++++++++--------
 src/gui/chat.h                         | 270 +++++-----
 src/gui/chatinput.cpp                  |   2 +-
 src/gui/chatinput.h                    |   2 +-
 src/gui/checkbox.cpp                   |   2 +-
 src/gui/checkbox.h                     |   2 +-
 src/gui/confirm_dialog.cpp             |   2 +-
 src/gui/confirm_dialog.h               |   2 +-
 src/gui/connection.cpp                 |   2 +-
 src/gui/connection.h                   |   2 +-
 src/gui/debugwindow.cpp                |   2 +-
 src/gui/debugwindow.h                  |   2 +-
 src/gui/equipmentwindow.cpp            |   2 +-
 src/gui/equipmentwindow.h              |   2 +-
 src/gui/focushandler.cpp               |   2 +-
 src/gui/focushandler.h                 |   2 +-
 src/gui/gccontainer.cpp                |   2 +-
 src/gui/gccontainer.h                  |   2 +-
 src/gui/gui.cpp                        |   2 +-
 src/gui/gui.h                          |   2 +-
 src/gui/hbox.cpp                       |   2 +-
 src/gui/hbox.h                         |   2 +-
 src/gui/help.cpp                       |   2 +-
 src/gui/help.h                         |   2 +-
 src/gui/inttextbox.cpp                 |   2 +-
 src/gui/inttextbox.h                   |   2 +-
 src/gui/inventorywindow.cpp            |   2 +-
 src/gui/inventorywindow.h              |   2 +-
 src/gui/item_amount.cpp                |   2 +-
 src/gui/item_amount.h                  |   2 +-
 src/gui/itemcontainer.cpp              |   2 +-
 src/gui/itemcontainer.h                |   2 +-
 src/gui/itemshortcutcontainer.cpp      |   2 +-
 src/gui/itemshortcutcontainer.h        |   2 +-
 src/gui/itemshortcutwindow.cpp         |   2 +-
 src/gui/itemshortcutwindow.h           |   2 +-
 src/gui/linkhandler.h                  |   2 +-
 src/gui/listbox.cpp                    |   2 +-
 src/gui/listbox.h                      |   2 +-
 src/gui/login.cpp                      | 250 ++++++++-
 src/gui/login.h                        |  58 +-
 src/gui/menuwindow.cpp                 |   2 +-
 src/gui/menuwindow.h                   |   2 +-
 src/gui/minimap.cpp                    |   2 +-
 src/gui/minimap.h                      |   2 +-
 src/gui/ministatus.cpp                 |   2 +-
 src/gui/ministatus.h                   |   2 +-
 src/gui/newskill.cpp                   |   2 +-
 src/gui/newskill.h                     |   2 +-
 src/gui/npc_text.cpp                   |   2 +-
 src/gui/npc_text.h                     |   2 +-
 src/gui/npclistdialog.cpp              |   2 +-
 src/gui/npclistdialog.h                |   2 +-
 src/gui/ok_dialog.cpp                  |   2 +-
 src/gui/ok_dialog.h                    |   2 +-
 src/gui/passwordfield.cpp              |   2 +-
 src/gui/passwordfield.h                |   2 +-
 src/gui/playerbox.cpp                  |   2 +-
 src/gui/playerbox.h                    |   2 +-
 src/gui/popupmenu.cpp                  | 211 ++++----
 src/gui/popupmenu.h                    |   2 +-
 src/gui/progressbar.cpp                |   2 +-
 src/gui/progressbar.h                  |   2 +-
 src/gui/radiobutton.cpp                |   2 +-
 src/gui/radiobutton.h                  |   2 +-
 src/gui/register.cpp                   | 122 +++--
 src/gui/register.h                     |  23 +-
 src/gui/scrollarea.cpp                 |   2 +-
 src/gui/scrollarea.h                   |   2 +-
 src/gui/sell.cpp                       |   2 +-
 src/gui/sell.h                         |   2 +-
 src/gui/setup.cpp                      |   2 +-
 src/gui/setup.h                        |   2 +-
 src/gui/setup_audio.cpp                |   2 +-
 src/gui/setup_audio.h                  |   2 +-
 src/gui/setup_joystick.cpp             |   2 +-
 src/gui/setup_joystick.h               |   2 +-
 src/gui/setup_keyboard.cpp             |   2 +-
 src/gui/setup_keyboard.h               |   2 +-
 src/gui/setup_players.cpp              |   2 +-
 src/gui/setup_video.cpp                |   2 +-
 src/gui/setup_video.h                  |   2 +-
 src/gui/setuptab.h                     |   2 +-
 src/gui/shop.cpp                       |   2 +-
 src/gui/shop.h                         |   2 +-
 src/gui/skill.cpp                      |   2 +-
 src/gui/skill.h                        |   2 +-
 src/gui/slider.cpp                     |   2 +-
 src/gui/slider.h                       |   2 +-
 src/gui/status.cpp                     |   2 +-
 src/gui/status.h                       |   2 +-
 src/gui/tabbedcontainer.cpp            |   2 +-
 src/gui/tabbedcontainer.h              |   2 +-
 src/gui/textbox.cpp                    |   2 +-
 src/gui/textbox.h                      |   2 +-
 src/gui/textfield.cpp                  |   2 +-
 src/gui/textfield.h                    |   2 +-
 src/gui/updatewindow.cpp               |   2 +-
 src/gui/updatewindow.h                 |   2 +-
 src/gui/vbox.cpp                       |   2 +-
 src/gui/vbox.h                         |   2 +-
 src/gui/viewport.cpp                   |  30 +-
 src/gui/viewport.h                     |   2 +-
 src/gui/widgets/dropdown.cpp           | 169 ++++++
 src/gui/widgets/dropdown.h             |  85 +++
 src/gui/widgets/resizegrip.cpp         |   2 +-
 src/gui/widgets/resizegrip.h           |   2 +-
 src/gui/window.cpp                     |   2 +-
 src/gui/window.h                       |   2 +-
 src/gui/windowcontainer.cpp            |   2 +-
 src/gui/windowcontainer.h              |   2 +-
 src/guichanfwd.h                       |   2 +-
 src/imageparticle.cpp                  |   2 +-
 src/imageparticle.h                    |   2 +-
 src/inventory.cpp                      |   2 +-
 src/inventory.h                        |   2 +-
 src/item.cpp                           |   2 +-
 src/item.h                             |   2 +-
 src/itemshortcut.cpp                   |   2 +-
 src/itemshortcut.h                     |   2 +-
 src/joystick.cpp                       |   2 +-
 src/joystick.h                         |   2 +-
 src/keyboardconfig.cpp                 |   2 +-
 src/keyboardconfig.h                   |   2 +-
 src/localplayer.cpp                    |  30 +-
 src/localplayer.h                      |  13 +-
 src/lockedarray.h                      |   2 +-
 src/logindata.h                        |   3 +-
 src/main.cpp                           | 159 +++---
 src/main.h                             |   2 +-
 src/map.cpp                            |   2 +-
 src/map.h                              |   2 +-
 src/monster.cpp                        |  47 +-
 src/monster.h                          |  18 +-
 src/net/beinghandler.cpp               |  51 +-
 src/net/beinghandler.h                 |   2 +-
 src/net/buysellhandler.cpp             |   2 +-
 src/net/buysellhandler.h               |   2 +-
 src/net/charserverhandler.cpp          |   2 +-
 src/net/charserverhandler.h            |   2 +-
 src/net/chathandler.cpp                |   2 +-
 src/net/chathandler.h                  |   2 +-
 src/net/equipmenthandler.cpp           |   2 +-
 src/net/equipmenthandler.h             |   2 +-
 src/net/inventoryhandler.cpp           |   2 +-
 src/net/inventoryhandler.h             |   2 +-
 src/net/itemhandler.cpp                |   2 +-
 src/net/itemhandler.h                  |   2 +-
 src/net/loginhandler.cpp               |  16 +-
 src/net/loginhandler.h                 |   6 +-
 src/net/maploginhandler.cpp            |   2 +-
 src/net/maploginhandler.h              |   2 +-
 src/net/messagehandler.cpp             |   2 +-
 src/net/messagehandler.h               |   2 +-
 src/net/messagein.cpp                  |   2 +-
 src/net/messagein.h                    |   2 +-
 src/net/messageout.cpp                 |   2 +-
 src/net/messageout.h                   |   2 +-
 src/net/network.cpp                    |   4 +-
 src/net/network.h                      |   2 +-
 src/net/npchandler.cpp                 |   2 +-
 src/net/npchandler.h                   |   2 +-
 src/net/partyhandler.cpp               | 127 +++++
 src/net/partyhandler.h                 |  41 ++
 src/net/playerhandler.cpp              |  29 +-
 src/net/playerhandler.h                |   2 +-
 src/net/protocol.cpp                   |   2 +-
 src/net/protocol.h                     |  27 +-
 src/net/skillhandler.cpp               |   2 +-
 src/net/skillhandler.h                 |   2 +-
 src/net/tradehandler.cpp               |   2 +-
 src/net/tradehandler.h                 |   2 +-
 src/npc.cpp                            |  43 +-
 src/npc.h                              |  13 +-
 src/openglgraphics.cpp                 |   2 +-
 src/openglgraphics.h                   |   2 +-
 src/particle.cpp                       |   2 +-
 src/particle.h                         |   2 +-
 src/particleemitter.cpp                |   2 +-
 src/particleemitter.h                  |   2 +-
 src/party.cpp                          | 219 ++++++++
 src/party.h                            |  75 +++
 src/player.cpp                         |  67 +--
 src/player.h                           |  43 +-
 src/player_relations.cpp               |  28 +-
 src/properties.h                       |   2 +-
 src/recorder.cpp                       | 112 ++++
 src/recorder.h                         |  50 ++
 src/resources/action.cpp               |   2 +-
 src/resources/action.h                 |   2 +-
 src/resources/ambientoverlay.cpp       |   2 +-
 src/resources/ambientoverlay.h         |   2 +-
 src/resources/animation.cpp            |   2 +-
 src/resources/animation.h              |   2 +-
 src/resources/buddylist.cpp            |   2 +-
 src/resources/buddylist.h              |   2 +-
 src/resources/image.cpp                |   2 +-
 src/resources/image.h                  |   2 +-
 src/resources/imageset.cpp             |   2 +-
 src/resources/imageset.h               |   2 +-
 src/resources/imagewriter.cpp          |   2 +-
 src/resources/imagewriter.h            |   2 +-
 src/resources/itemdb.cpp               |   2 +-
 src/resources/itemdb.h                 |   2 +-
 src/resources/iteminfo.cpp             |   2 +-
 src/resources/iteminfo.h               |   2 +-
 src/resources/mapreader.cpp            |   2 +-
 src/resources/mapreader.h              |   2 +-
 src/resources/monsterdb.cpp            |   2 +-
 src/resources/monsterdb.h              |   2 +-
 src/resources/music.cpp                |   2 +-
 src/resources/music.h                  |   2 +-
 src/resources/npcdb.cpp                |   2 +-
 src/resources/npcdb.h                  |   2 +-
 src/resources/resource.cpp             |   2 +-
 src/resources/resource.h               |   2 +-
 src/resources/resourcemanager.cpp      |   2 +-
 src/resources/resourcemanager.h        |   2 +-
 src/resources/soundeffect.cpp          |   2 +-
 src/resources/soundeffect.h            |   2 +-
 src/resources/spritedef.cpp            |   2 +-
 src/resources/spritedef.h              |   2 +-
 src/serverinfo.h                       |   3 +-
 src/shopitem.cpp                       |   2 +-
 src/shopitem.h                         |   2 +-
 src/simpleanimation.cpp                |   2 +-
 src/simpleanimation.h                  |   2 +-
 src/sound.cpp                          |   2 +-
 src/sound.h                            |   2 +-
 src/sprite.h                           |   2 +-
 src/text.cpp                           | 102 ++++
 src/text.h                             |  93 ++++
 src/textmanager.cpp                    | 177 +++++++
 src/textmanager.h                      |  75 +++
 src/textparticle.cpp                   |   2 +-
 src/textparticle.h                     |   2 +-
 src/tileset.h                          |   2 +-
 src/utils/base64.cpp                   |   2 +-
 src/utils/base64.h                     |   2 +-
 src/utils/dtor.h                       |   2 +-
 src/utils/fastsqrt.h                   |   2 +-
 src/utils/minmax.h                     |   2 +-
 src/utils/tostring.h                   |   2 +-
 src/utils/trim.h                       |   2 +-
 src/utils/xml.cpp                      |   2 +-
 src/utils/xml.h                        |   2 +-
 src/vector.h                           |   2 +-
 stamp-h1                               |   1 +
 tme.desktop                            |  16 +
 tmw.cbp                                |   2 +-
 tmw.desktop                            |  16 -
 tools/adler32.c                        |   2 +-
 tools/tmxcopy/Makefile                 |  18 -
 tools/tmxcopy/base64.cpp               |   2 +-
 tools/tmxcopy/base64.h                 |   2 +-
 tools/tmxcopy/tostring.h               |   2 +-
 449 files changed, 7226 insertions(+), 1801 deletions(-)
 create mode 100644 aclocal.m4
 create mode 100644 autom4te.cache/traces.0
 create mode 100755 depcomp
 create mode 100644 docs/tme.6
 delete mode 100644 docs/tmw.6
 create mode 100755 install-sh
 create mode 100755 missing
 create mode 100644 src/.deps/tmw-action.Po
 create mode 100644 src/.deps/tmw-ambientoverlay.Po
 create mode 100644 src/.deps/tmw-animatedsprite.Po
 create mode 100644 src/.deps/tmw-animation.Po
 create mode 100644 src/.deps/tmw-animationparticle.Po
 create mode 100644 src/.deps/tmw-base64.Po
 create mode 100644 src/.deps/tmw-being.Po
 create mode 100644 src/.deps/tmw-beinghandler.Po
 create mode 100644 src/.deps/tmw-beingmanager.Po
 create mode 100644 src/.deps/tmw-box.Po
 create mode 100644 src/.deps/tmw-browserbox.Po
 create mode 100644 src/.deps/tmw-buddylist.Po
 create mode 100644 src/.deps/tmw-buddywindow.Po
 create mode 100644 src/.deps/tmw-button.Po
 create mode 100644 src/.deps/tmw-buy.Po
 create mode 100644 src/.deps/tmw-buysell.Po
 create mode 100644 src/.deps/tmw-buysellhandler.Po
 create mode 100644 src/.deps/tmw-char_select.Po
 create mode 100644 src/.deps/tmw-char_server.Po
 create mode 100644 src/.deps/tmw-chargedialog.Po
 create mode 100644 src/.deps/tmw-charserverhandler.Po
 create mode 100644 src/.deps/tmw-chat.Po
 create mode 100644 src/.deps/tmw-chathandler.Po
 create mode 100644 src/.deps/tmw-chatinput.Po
 create mode 100644 src/.deps/tmw-checkbox.Po
 create mode 100644 src/.deps/tmw-configuration.Po
 create mode 100644 src/.deps/tmw-confirm_dialog.Po
 create mode 100644 src/.deps/tmw-connection.Po
 create mode 100644 src/.deps/tmw-debugwindow.Po
 create mode 100644 src/.deps/tmw-dropdown.Po
 create mode 100644 src/.deps/tmw-dye.Po
 create mode 100644 src/.deps/tmw-engine.Po
 create mode 100644 src/.deps/tmw-equipment.Po
 create mode 100644 src/.deps/tmw-equipmenthandler.Po
 create mode 100644 src/.deps/tmw-equipmentwindow.Po
 create mode 100644 src/.deps/tmw-floor_item.Po
 create mode 100644 src/.deps/tmw-flooritemmanager.Po
 create mode 100644 src/.deps/tmw-focushandler.Po
 create mode 100644 src/.deps/tmw-game.Po
 create mode 100644 src/.deps/tmw-gccontainer.Po
 create mode 100644 src/.deps/tmw-graphics.Po
 create mode 100644 src/.deps/tmw-gui.Po
 create mode 100644 src/.deps/tmw-hbox.Po
 create mode 100644 src/.deps/tmw-help.Po
 create mode 100644 src/.deps/tmw-image.Po
 create mode 100644 src/.deps/tmw-imageloader.Po
 create mode 100644 src/.deps/tmw-imageparticle.Po
 create mode 100644 src/.deps/tmw-imageset.Po
 create mode 100644 src/.deps/tmw-imagewriter.Po
 create mode 100644 src/.deps/tmw-inttextbox.Po
 create mode 100644 src/.deps/tmw-inventory.Po
 create mode 100644 src/.deps/tmw-inventoryhandler.Po
 create mode 100644 src/.deps/tmw-inventorywindow.Po
 create mode 100644 src/.deps/tmw-item.Po
 create mode 100644 src/.deps/tmw-item_amount.Po
 create mode 100644 src/.deps/tmw-itemcontainer.Po
 create mode 100644 src/.deps/tmw-itemdb.Po
 create mode 100644 src/.deps/tmw-itemhandler.Po
 create mode 100644 src/.deps/tmw-iteminfo.Po
 create mode 100644 src/.deps/tmw-itemshortcut.Po
 create mode 100644 src/.deps/tmw-itemshortcutcontainer.Po
 create mode 100644 src/.deps/tmw-itemshortcutwindow.Po
 create mode 100644 src/.deps/tmw-joystick.Po
 create mode 100644 src/.deps/tmw-keyboardconfig.Po
 create mode 100644 src/.deps/tmw-listbox.Po
 create mode 100644 src/.deps/tmw-localplayer.Po
 create mode 100644 src/.deps/tmw-log.Po
 create mode 100644 src/.deps/tmw-login.Po
 create mode 100644 src/.deps/tmw-loginhandler.Po
 create mode 100644 src/.deps/tmw-main.Po
 create mode 100644 src/.deps/tmw-map.Po
 create mode 100644 src/.deps/tmw-maploginhandler.Po
 create mode 100644 src/.deps/tmw-mapreader.Po
 create mode 100644 src/.deps/tmw-menuwindow.Po
 create mode 100644 src/.deps/tmw-messagehandler.Po
 create mode 100644 src/.deps/tmw-messagein.Po
 create mode 100644 src/.deps/tmw-messageout.Po
 create mode 100644 src/.deps/tmw-minimap.Po
 create mode 100644 src/.deps/tmw-ministatus.Po
 create mode 100644 src/.deps/tmw-monster.Po
 create mode 100644 src/.deps/tmw-monsterdb.Po
 create mode 100644 src/.deps/tmw-monsterinfo.Po
 create mode 100644 src/.deps/tmw-music.Po
 create mode 100644 src/.deps/tmw-network.Po
 create mode 100644 src/.deps/tmw-newskill.Po
 create mode 100644 src/.deps/tmw-npc.Po
 create mode 100644 src/.deps/tmw-npc_text.Po
 create mode 100644 src/.deps/tmw-npcdb.Po
 create mode 100644 src/.deps/tmw-npchandler.Po
 create mode 100644 src/.deps/tmw-npclistdialog.Po
 create mode 100644 src/.deps/tmw-ok_dialog.Po
 create mode 100644 src/.deps/tmw-openglgraphics.Po
 create mode 100644 src/.deps/tmw-particle.Po
 create mode 100644 src/.deps/tmw-particleemitter.Po
 create mode 100644 src/.deps/tmw-passwordfield.Po
 create mode 100644 src/.deps/tmw-player.Po
 create mode 100644 src/.deps/tmw-player_relations.Po
 create mode 100644 src/.deps/tmw-playerbox.Po
 create mode 100644 src/.deps/tmw-playerhandler.Po
 create mode 100644 src/.deps/tmw-popupmenu.Po
 create mode 100644 src/.deps/tmw-progressbar.Po
 create mode 100644 src/.deps/tmw-protocol.Po
 create mode 100644 src/.deps/tmw-radiobutton.Po
 create mode 100644 src/.deps/tmw-register.Po
 create mode 100644 src/.deps/tmw-resizegrip.Po
 create mode 100644 src/.deps/tmw-resource.Po
 create mode 100644 src/.deps/tmw-resourcemanager.Po
 create mode 100644 src/.deps/tmw-scrollarea.Po
 create mode 100644 src/.deps/tmw-sell.Po
 create mode 100644 src/.deps/tmw-setup.Po
 create mode 100644 src/.deps/tmw-setup_audio.Po
 create mode 100644 src/.deps/tmw-setup_joystick.Po
 create mode 100644 src/.deps/tmw-setup_keyboard.Po
 create mode 100644 src/.deps/tmw-setup_players.Po
 create mode 100644 src/.deps/tmw-setup_video.Po
 create mode 100644 src/.deps/tmw-shop.Po
 create mode 100644 src/.deps/tmw-shoplistbox.Po
 create mode 100644 src/.deps/tmw-simpleanimation.Po
 create mode 100644 src/.deps/tmw-skill.Po
 create mode 100644 src/.deps/tmw-skillhandler.Po
 create mode 100644 src/.deps/tmw-slider.Po
 create mode 100644 src/.deps/tmw-sound.Po
 create mode 100644 src/.deps/tmw-soundeffect.Po
 create mode 100644 src/.deps/tmw-spritedef.Po
 create mode 100644 src/.deps/tmw-status.Po
 create mode 100644 src/.deps/tmw-strprintf.Po
 create mode 100644 src/.deps/tmw-tabbedcontainer.Po
 create mode 100644 src/.deps/tmw-table.Po
 create mode 100644 src/.deps/tmw-table_model.Po
 create mode 100644 src/.deps/tmw-textbox.Po
 create mode 100644 src/.deps/tmw-textfield.Po
 create mode 100644 src/.deps/tmw-textparticle.Po
 create mode 100644 src/.deps/tmw-trade.Po
 create mode 100644 src/.deps/tmw-tradehandler.Po
 create mode 100644 src/.deps/tmw-updatewindow.Po
 create mode 100644 src/.deps/tmw-vbox.Po
 create mode 100644 src/.deps/tmw-viewport.Po
 create mode 100644 src/.deps/tmw-window.Po
 create mode 100644 src/.deps/tmw-windowcontainer.Po
 create mode 100644 src/.deps/tmw-xml.Po
 delete mode 100644 src/gui/buddywindow.cpp
 delete mode 100644 src/gui/buddywindow.h
 create mode 100644 src/gui/buttonbox.cpp
 create mode 100644 src/gui/buttonbox.h
 create mode 100644 src/gui/widgets/dropdown.cpp
 create mode 100644 src/gui/widgets/dropdown.h
 create mode 100644 src/net/partyhandler.cpp
 create mode 100644 src/net/partyhandler.h
 create mode 100644 src/party.cpp
 create mode 100644 src/party.h
 create mode 100644 src/recorder.cpp
 create mode 100644 src/recorder.h
 create mode 100644 src/text.cpp
 create mode 100644 src/text.h
 create mode 100644 src/textmanager.cpp
 create mode 100644 src/textmanager.h
 create mode 100644 stamp-h1
 create mode 100644 tme.desktop
 delete mode 100644 tmw.desktop
 delete mode 100644 tools/tmxcopy/Makefile

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32bffc37..13399ef9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ IF (WIN32)
     SET(PKG_DATADIR ".")
     SET(PKG_BINDIR ".")
 ELSE (WIN32)
-    SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/tmw)
+    SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/tme)
     SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin)
 ENDIF (WIN32)
 
diff --git a/ChangeLog b/ChangeLog
index 160e3b58..83ab07d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,49 @@
+2008-07-11  Douglas Boffey  <DougABoffey@netscape.net>
+
+	* Added code to avoid collision between different displayed text.
+
+2008-07-08  Lloyd Bryant ("Sanga")	<lloyd_bryant@netzero.net>
+
+	* Added handling for a "Stop Walking" packet.  This will
+	  force the client back into sync during those "can't run
+	  away from a battle" sync error conditions.
+
+2008-07-07  Lloyd Bryant ("Sanga")	<lloyd_bryant@netzero.net>
+
+	* Added support for update host provided by login server
+	* Changed startup sequence to login first, then update
+
+2008-07-05  Lloyd Bryant ("Sanga")  <lloyd_bryant@netzero.net>
+
+	* Applied patch from kraant to convert into a TME branded client
+	* Removed redundant autoconf files
+
+2008-07-01  Douglas Boffey  <DougABoffey@netscape.net>
+
+	* Split ChatWindow into ChatWindow, Recorder and Party.
+	* Added /toggle command.
+
+2008-06-28  Kevin Day  <blame582@gmail.com>
+
+	* Updated configure and configure.ac to reflect tme version info.
+
+2008-06-25  Kevin Day  <blame582@gmail.com>
+
+	* Updated README added /commands and updated skill level listing.
+
+2008-06-25  Douglas Boffey  <DougABoffey@netscape.net>
+
+	* Added a command to display the characters present within hearing
+	distance (/help present for details).
+	* Removed the need to select the map server if only one available.
+	* Added a text entry for the port to the login dialog.
+	* Added the basis of the party subsystem. (/help party for details).
+	* Added the recording subsystem (/help record for details).
+	* Add a dropdown to the login dialog to make it easier to log in
+	on different servers.
+	* Made the chatlog entry sticky (Cancelled by a blank line) -
+	TODO Make an option.
+
 2008-06-24  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
@@ -17,7 +63,7 @@
 
 2008-06-17  Fate  <fate.tmw@googlemail.com>
 
-	* src/net/tradehandler.cpp: bug #333: Suppress `trade with X cancelled' 
+	* src/net/tradehandler.cpp: bug #333: Suppress `trade with X cancelled'
 	messages for ignored players.
 
 2008-06-16  Fate  <fate.tmw@googlemail.com>
@@ -291,7 +337,7 @@
 	* src/winver.h, README, configure.ac, data/help/changes.txt,
 	data/help/header.txt, NEWS, CMakeLists.txt: Updated version, release
 	date and changes.
-	
+
 2008-04-03  David Athay  <ko2fan@gmail.com>
 
 	* src/game.cpp: Tweaked disconnect dialog, hoping to fix a crash bug.
@@ -302,7 +348,7 @@
 	src/resources/npcdb.cpp, data/npcs.xml, src/Makefile.am, tmc.cbp:
 	Implemented NPC XML database which maps NPC IDs to one or more
 	animation files and thus enables animated NPCs.
-	
+
 2008-03-30  Dennis Friis  <peavey@placid.dk>
 
 	* configure.ac: Updated for tmwdata split.
@@ -536,7 +582,7 @@
 2007-12-28  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* data/maps/new_3-1.tmx: Some mapping errors fixed by Zipon.
-	* src/being.cpp, src/monster.cpp, src/resources/monsterinfo.cpp, 
+	* src/being.cpp, src/monster.cpp, src/resources/monsterinfo.cpp,
 	src/resources/monsterinfo.h: Added the possibility to assign particle
 	effects to monsters in the monster database.
 	* data/monsters.xml: Added flame particle effect to fire goblin as a
@@ -721,7 +767,7 @@
 	data/graphics/sprites/head-xmaself.png,
 	data/graphics/sprites/head-xmaself.xml: New versions of funky hat
 	and elf hat by QOAL.
-	
+
 2007-12-04  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* data/graphics/items/generic-santacookie.png,
@@ -984,7 +1030,7 @@
 
 	* src/player.cpp, data/graphics/sprites/hairstyle*:
 	Added support for different hairstyles for male and female characters
-	(current female hairstyles are copies of the male ones until the 
+	(current female hairstyles are copies of the male ones until the
 	real female ones are finished)
 
 2007-09-30  Philipp Sehmisch  <tmw@crushnet.org>
@@ -1376,15 +1422,15 @@
 	* src/particle.cpp, src/particleemitter.cpp: Corrected some perspective
 	issues of the particle engine and fixed a crash caused by particles
 	with child emitters that have an image than isn't used elsewhere.
-	* data/maps/new-3-1.tmx.gz: Added a particle effect at the spawn point 
+	* data/maps/new-3-1.tmx.gz: Added a particle effect at the spawn point
 	in Tulimshar.
 
 2007-06-21  Philipp Sehmisch  <tmw@crushnet.org>
 
-	* data/monsters.xml, data/graphics/sprites/monster-logmonster.png, 
+	* data/monsters.xml, data/graphics/sprites/monster-logmonster.png,
 	data/graphics/sprites/monster-logmonster.xml: Added logmonster by
 	Enigmatik (Monster ID is 23).
-	* data/items.xml, data/equipment.xml, 
+	* data/items.xml, data/equipment.xml,
 	data/graphics/items/armor-chest-lightplatemail.png,
 	data/graphics/sprites/chest-lightplatemail-male.xml,
 	data/graphics/sprites/chest-lightplatemail-male.png,
diff --git a/Makefile.am b/Makefile.am
index 7306c71f..c7f45241 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = data docs src
 
 desktopdir = $(datadir)/applications
 
-desktop_DATA = tmw.desktop
+desktop_DATA = tme.desktop
 
 # Extra files to include
 EXTRA_DIST = $(desktop_DATA)
diff --git a/README b/README
index 4d9fe6af..98772d58 100644
--- a/README
+++ b/README
@@ -52,6 +52,7 @@ Use arrow keys to move around. Other keys:
 - Alt + S            sit down / stand up
 - Alt + F            toggle debug pathfinding feature
 - Alt + P            take screenshot
+- Alt + T            turns on anti-trade function 
 - A                  target nearest monster
 - H                  hide all non-sticky windows
 - G or Z             pick up item
@@ -64,6 +65,38 @@ Left click to execute default action: walk, pick up an item, attack a monster
 and talk to NPCs (be sure to click on their feet). Right click to show up a
 context menu. Holding [Left Shift] prevents from walking when attacking.
 
+/Commands:
+
+- /help              Displays the list of commands
+- /announce          broadcasts a global msg(Gm Cammand only)
+- /clear             clears the chat window 
+- /who               shows how many players are online
+- /where             displays the map name your currently on 
+- /whisper           send a private msg to another player
+                        (format: /whisper <charname> <message>)
+                     If the <nick> has spaces in it, enclose it in double
+                        quotes
+- /record            Records the Chat output 
+                     (format: /record <filename to write to> starts the record
+                        session /record again 
+                      stops the session)
+- /party             <command> <params>: Party commands
+ - /party new         creates a new party /party new <party name>
+ - /party create      creates a new party /party create <party name>
+ - /party prefix      This commands sets the party prefix character
+                         /party prefix <prefix-char>
+                      "/party prefix" reports the current party prefix
+                         character
+ - /party leave       This command causes the player to leave the party.
+Type /help party <option> for further help.
+- /present           This command gets a list of players within hearing
+- /toggle            make the chatlog lose focus on a blank line or after
+                       message. (format: /toggle <option>, where option can be
+                       '1', 'y' or 't' to make the chatlog lose focus on a
+                       blank line, and '0', 'n' or 'f' to make the chatlog lose
+                       focus after every message.  /toggle displays the status)
+For more information, type /help <command>
+
 3. Skills
 ---------
 
@@ -72,10 +105,16 @@ point to spend on skills.
 
 BASIC SKILLS:
 
-Level 1: enables the ability to trade with others
-Level 2: enables the ability to express emotions
-Level 3: enables character to sit
-Other level not yet implemented.
+Level 1:  enables the ability to trade with others
+Level 2:  enables the ability to express emotions
+Level 3:  enables character to sit
+Level 4:  enables not used 
+level 5:  enables the ability to join a party 
+level 6:  enables not used 
+level 7:  enables the ability to create a party 
+level 8:  enables not used
+level 9:  enables not used
+level 10: enables not used
 
 4. Support
 ----------
@@ -83,9 +122,9 @@ Other level not yet implemented.
 If you're having troubles, please first of all read the FAQ.
 If you can't find a solution to your problem, feel free to check our
 Bugs/Support section of the forum:
-- http://themanaworld.org/phpBB2/viewforum.php?f=3
+- http://216.139.126.36/forums
 or come visit us on our IRC channel:
-- #themanaworld @ irc.freenode.net
+- #themanaexperiment @ irc.freenode.net
 
 Otherwise check the AUTHORS file to have a list of developers and how to
 contact them.
diff --git a/aclocal.m4 b/aclocal.m4
new file mode 100644
index 00000000..eb3b99a2
--- /dev/null
+++ b/aclocal.m4
@@ -0,0 +1,868 @@
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.10.1], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 8
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 9
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+#serial 3
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[for mf in $CONFIG_FILES; do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  # Check whether this is an Automake generated Makefile or not.
+  # We used to match only the files named `Makefile.in', but
+  # some people rename them; so instead we look at the file content.
+  # Grep'ing the first line is not enough: some people post-process
+  # each Makefile.in and add a new line on top of each file to say so.
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+    dirpart=`AS_DIRNAME("$mf")`
+  else
+    continue
+  fi
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n 's/^U = //p' < "$mf"`
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`AS_DIRNAME(["$file"])`
+    AS_MKDIR_P([$dirpart/$fdir])
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 13
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.60])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+	      		     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+                  [_AM_DEPENDENCIES(CC)],
+                  [define([AC_PROG_CC],
+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [_AM_DEPENDENCIES(CXX)],
+                  [define([AC_PROG_CXX],
+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 3
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 5
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 3
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0
new file mode 100644
index 00000000..ac0ed47f
--- /dev/null
+++ b/autom4te.cache/traces.0
@@ -0,0 +1,698 @@
+m4trace:/usr/share/aclocal-1.10/amversion.m4:14: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.10.1], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+m4trace:/usr/share/aclocal-1.10/amversion.m4:33: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+m4trace:/usr/share/aclocal-1.10/auxdir.m4:47: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+m4trace:/usr/share/aclocal-1.10/cond.m4:15: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+m4trace:/usr/share/aclocal-1.10/depend.m4:28: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+m4trace:/usr/share/aclocal-1.10/depend.m4:139: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+m4trace:/usr/share/aclocal-1.10/depend.m4:147: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+])
+m4trace:/usr/share/aclocal-1.10/depout.m4:14: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [for mf in $CONFIG_FILES; do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  # Check whether this is an Automake generated Makefile or not.
+  # We used to match only the files named `Makefile.in', but
+  # some people rename them; so instead we look at the file content.
+  # Grep'ing the first line is not enough: some people post-process
+  # each Makefile.in and add a new line on top of each file to say so.
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+    dirpart=`AS_DIRNAME("$mf")`
+  else
+    continue
+  fi
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n 's/^U = //p' < "$mf"`
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`AS_DIRNAME(["$file"])`
+    AS_MKDIR_P([$dirpart/$fdir])
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+])
+m4trace:/usr/share/aclocal-1.10/depout.m4:64: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+m4trace:/usr/share/aclocal-1.10/init.m4:26: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.60])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+	      		     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+                  [_AM_DEPENDENCIES(CC)],
+                  [define([AC_PROG_CC],
+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [_AM_DEPENDENCIES(CXX)],
+                  [define([AC_PROG_CXX],
+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+])
+m4trace:/usr/share/aclocal-1.10/init.m4:113: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+m4trace:/usr/share/aclocal-1.10/install-sh.m4:11: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+m4trace:/usr/share/aclocal-1.10/lead-dot.m4:12: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+m4trace:/usr/share/aclocal-1.10/make.m4:14: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+m4trace:/usr/share/aclocal-1.10/missing.m4:14: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+m4trace:/usr/share/aclocal-1.10/missing.m4:24: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+m4trace:/usr/share/aclocal-1.10/mkdirp.m4:11: -1- AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+m4trace:/usr/share/aclocal-1.10/options.m4:13: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+m4trace:/usr/share/aclocal-1.10/options.m4:19: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+m4trace:/usr/share/aclocal-1.10/options.m4:25: -1- AC_DEFUN([_AM_SET_OPTIONS], [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+m4trace:/usr/share/aclocal-1.10/options.m4:31: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+m4trace:/usr/share/aclocal-1.10/runlog.m4:12: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+m4trace:/usr/share/aclocal-1.10/sanity.m4:14: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+m4trace:/usr/share/aclocal-1.10/strip.m4:17: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+m4trace:/usr/share/aclocal-1.10/substnot.m4:12: -1- AC_DEFUN([_AM_SUBST_NOTMAKE])
+m4trace:/usr/share/aclocal-1.10/tar.m4:24: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+])
+m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?A[CHUM]_])
+m4trace:configure.ac:2: -1- m4_pattern_forbid([_AC_])
+m4trace:configure.ac:2: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^AS_FLAGS$])
+m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?m4_])
+m4trace:configure.ac:2: -1- m4_pattern_forbid([^dnl$])
+m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?AS_])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^SHELL$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^PATH_SEPARATOR$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_NAME$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_VERSION$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_STRING$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^exec_prefix$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^prefix$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^program_transform_name$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^bindir$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^sbindir$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^libexecdir$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^datarootdir$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^datadir$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^sysconfdir$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^sharedstatedir$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^localstatedir$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^includedir$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^oldincludedir$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^docdir$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^infodir$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^htmldir$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^dvidir$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^pdfdir$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^psdir$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^libdir$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^localedir$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^mandir$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_NAME$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_VERSION$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_STRING$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^DEFS$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^ECHO_C$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^ECHO_N$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^ECHO_T$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^build_alias$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^host_alias$])
+m4trace:configure.ac:2: -1- m4_pattern_allow([^target_alias$])
+m4trace:configure.ac:4: -1- _m4_warn([obsolete], [The macro `AC_LANG_CPLUSPLUS' is obsolete.
+You should run autoupdate.], [../../lib/autoconf/c.m4:105: AC_LANG_CPLUSPLUS is expanded from...
+configure.ac:4: the top level])
+m4trace:configure.ac:7: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:7: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:7: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:7: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:7: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:7: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:7: -1- m4_pattern_allow([^ac_ct_CXX$])
+m4trace:configure.ac:7: -1- m4_pattern_allow([^EXEEXT$])
+m4trace:configure.ac:7: -1- m4_pattern_allow([^OBJEXT$])
+m4trace:configure.ac:8: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.ac:8: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.ac:8: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.ac:9: -1- m4_pattern_allow([^SET_MAKE$])
+m4trace:configure.ac:12: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:12: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:12: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:12: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:12: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:12: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.ac:12: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.ac:12: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:12: -1- m4_pattern_allow([^HAVE__BOOL$])
+m4trace:configure.ac:12: -1- m4_pattern_allow([^HAVE_STDBOOL_H$])
+m4trace:configure.ac:13: -1- m4_pattern_allow([^const$])
+m4trace:configure.ac:14: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
+m4trace:configure.ac:15: -1- m4_pattern_allow([^volatile$])
+m4trace:configure.ac:18: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^HAVE_MALLOC$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^HAVE_MALLOC$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:19: -1- m4_pattern_allow([^malloc$])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_REALLOC$])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_REALLOC$])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:20: -1- m4_pattern_allow([^realloc$])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
+m4trace:configure.ac:21: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
+m4trace:configure.ac:22: -1- m4_pattern_allow([^HAVE_DOPRNT$])
+m4trace:configure.ac:26: -1- m4_pattern_allow([^HAVE_LIBPTHREAD$])
+m4trace:configure.ac:29: -1- m4_pattern_allow([^HAVE_LIBGUICHAN$])
+m4trace:configure.ac:35: -1- m4_pattern_allow([^HAVE_LIBZ$])
+m4trace:configure.ac:38: -1- m4_pattern_allow([^HAVE_LIBPHYSFS$])
+m4trace:configure.ac:41: -1- m4_pattern_allow([^HAVE_LIBCURL$])
+m4trace:configure.ac:45: -1- m4_pattern_allow([^CURL_LIBS$])
+m4trace:configure.ac:46: -1- m4_pattern_allow([^CURL_CFLAGS$])
+m4trace:configure.ac:48: -1- m4_pattern_allow([^HAVE_LIBXML2$])
+m4trace:configure.ac:51: -1- m4_pattern_allow([^HAVE_LIBPNG$])
+m4trace:configure.ac:54: -1- m4_pattern_allow([^HAVE_LIBSDL_IMAGE$])
+m4trace:configure.ac:58: -1- m4_pattern_allow([^HAVE_LIBSDL_MIXER$])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^HAVE_LIBSDL_NET$])
+m4trace:configure.ac:65: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:72: -1- AM_INIT_AUTOMAKE
+m4trace:configure.ac:72: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
+m4trace:configure.ac:72: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
+m4trace:configure.ac:72: -1- AM_AUTOMAKE_VERSION([1.10.1])
+m4trace:configure.ac:72: -1- _AM_AUTOCONF_VERSION([2.61])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^am__isrc$])
+m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([am__isrc])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^CYGPATH_W$])
+m4trace:configure.ac:72: -1- _AM_SET_OPTIONS([])
+m4trace:configure.ac:72: -1- _m4_warn([obsolete], [The macro `AC_FOREACH' is obsolete.
+You should run autoupdate.], [../../lib/autoconf/general.m4:196: AC_FOREACH is expanded from...
+/usr/share/aclocal-1.10/options.m4:25: _AM_SET_OPTIONS is expanded from...
+/usr/share/aclocal-1.10/init.m4:26: AM_INIT_AUTOMAKE is expanded from...
+configure.ac:72: the top level])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.ac:72: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
+m4trace:configure.ac:72: -2- _AM_MANGLE_OPTION([no-define])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.ac:72: -1- AM_SANITY_CHECK
+m4trace:configure.ac:72: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+m4trace:configure.ac:72: -1- AM_MISSING_HAS_RUN
+m4trace:configure.ac:72: -1- AM_AUX_DIR_EXPAND
+m4trace:configure.ac:72: -1- m4_pattern_allow([^ACLOCAL$])
+m4trace:configure.ac:72: -1- AM_MISSING_PROG([AUTOCONF], [autoconf])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^AUTOCONF$])
+m4trace:configure.ac:72: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^AUTOMAKE$])
+m4trace:configure.ac:72: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^AUTOHEADER$])
+m4trace:configure.ac:72: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^MAKEINFO$])
+m4trace:configure.ac:72: -1- AM_PROG_INSTALL_SH
+m4trace:configure.ac:72: -1- m4_pattern_allow([^install_sh$])
+m4trace:configure.ac:72: -1- AM_PROG_INSTALL_STRIP
+m4trace:configure.ac:72: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
+m4trace:configure.ac:72: -1- AM_PROG_MKDIR_P
+m4trace:configure.ac:72: -1- m4_pattern_allow([^mkdir_p$])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^AWK$])
+m4trace:configure.ac:72: -1- AM_SET_LEADING_DOT
+m4trace:configure.ac:72: -1- m4_pattern_allow([^am__leading_dot$])
+m4trace:configure.ac:72: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+	      		     [_AM_PROG_TAR([v7])])])
+m4trace:configure.ac:72: -2- _AM_MANGLE_OPTION([tar-ustar])
+m4trace:configure.ac:72: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])])
+m4trace:configure.ac:72: -2- _AM_MANGLE_OPTION([tar-pax])
+m4trace:configure.ac:72: -1- _AM_PROG_TAR([v7])
+m4trace:configure.ac:72: -1- AM_MISSING_PROG([AMTAR], [tar])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^AMTAR$])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^am__tar$])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^am__untar$])
+m4trace:configure.ac:72: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC],
+                  [_AM_DEPENDENCIES(CC)],
+                  [define([AC_PROG_CC],
+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [_AM_DEPENDENCIES(CXX)],
+                  [define([AC_PROG_CXX],
+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+m4trace:configure.ac:72: -2- _AM_MANGLE_OPTION([no-dependencies])
+m4trace:configure.ac:72: -1- _AM_DEPENDENCIES([CXX])
+m4trace:configure.ac:72: -1- AM_SET_DEPDIR
+m4trace:configure.ac:72: -1- m4_pattern_allow([^DEPDIR$])
+m4trace:configure.ac:72: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:72: -1- AM_MAKE_INCLUDE
+m4trace:configure.ac:72: -1- m4_pattern_allow([^am__include$])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^am__quote$])
+m4trace:configure.ac:72: -1- AM_DEP_TRACK
+m4trace:configure.ac:72: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^AMDEP_TRUE$])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^AMDEP_FALSE$])
+m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
+m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
+m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^CXXDEPMODE$])
+m4trace:configure.ac:72: -1- AM_CONDITIONAL([am__fastdepCXX], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
+m4trace:configure.ac:72: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
+m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
+m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
+m4trace:configure.ac:80: -1- m4_pattern_allow([^HAVE_LIBGL$])
+m4trace:configure.ac:82: -1- m4_pattern_allow([^USE_OPENGL$])
+m4trace:configure.ac:86: -1- m4_pattern_allow([^LIBSDL_CONFIG$])
+m4trace:configure.ac:91: -1- m4_pattern_allow([^LIBSDL_LIBS$])
+m4trace:configure.ac:92: -1- m4_pattern_allow([^LIBSDL_CFLAGS$])
+m4trace:configure.ac:94: -1- m4_pattern_allow([^HAVE_LIBSDL$])
+m4trace:configure.ac:97: -1- m4_pattern_allow([^HAVE_LIBSDL$])
+m4trace:configure.ac:114: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:114: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:114: -1- _AC_AM_CONFIG_HEADER_HOOK([$ac_file])
+m4trace:configure.ac:114: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
diff --git a/configure.ac b/configure.ac
index 6816c743..b85683ff 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([The Mana World], [0.0.24.1], [elvenprogrammer@gmail.com], [tmw])
+AC_INIT([The Mana Experiment], [Tme SVN 0.0.25], [blame582@gmail.com], [tme])
 AC_CONFIG_HEADERS([config.h:config.h.in])
 AC_LANG_CPLUSPLUS
 
diff --git a/depcomp b/depcomp
new file mode 100755
index 00000000..e5f9736c
--- /dev/null
+++ b/depcomp
@@ -0,0 +1,589 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2007-03-29.01
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
+# Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by `PROGRAMS ARGS'.
+  object      Object file output by `PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputing dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
+## that the space means something, we add a space to the output as
+## well.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like `#:fec' to the end of the
+    # dependency line.
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> $depfile
+    echo >> $depfile
+
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> $depfile
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+    # That's a tab and a space in the [].
+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+icc)
+  # Intel's C compiler understands `-MD -MF file'.  However on
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # ICC 7.0 will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want:
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  # ICC 7.1 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using \ :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add `dependent.h:' lines.
+    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+  else
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+   # The Tru64 compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+   if test "$libtool" = yes; then
+      # With Tru64 cc, shared objects can also be used to make a
+      # static library.  This mechanism is used in libtool 1.4 series to
+      # handle both shared and static libraries in a single compilation.
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+      #
+      # With libtool 1.5 this exception was removed, and libtool now
+      # generates 2 separate objects for the 2 libraries.  These two
+      # compilations output dependencies in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
+      "$@" -Wc,-MD
+   else
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
+      "$@" -MD
+   fi
+
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+      exit $stat
+   fi
+
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   do
+     test -f "$tmpdepfile" && break
+   done
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a tab and a space in the [].
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for `:'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  "$@" $dashmflag |
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no
+  for arg in "$@"; do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  "$@" || exit $?
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+	set fnord "$@"
+	shift
+	shift
+	;;
+    *)
+	set fnord "$@" "$arg"
+	shift
+	shift
+	;;
+    esac
+  done
+  "$@" -E |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 1ee9a9a6..43c0f6cc 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,4 +1,4 @@
-man6_MANS = tmw.6
+man6_MANS = tme.6
 
 EXTRA_DIST = $(man6_MANS) \
 	     packages.txt \
diff --git a/docs/tme.6 b/docs/tme.6
new file mode 100644
index 00000000..f4fe85cf
--- /dev/null
+++ b/docs/tme.6
@@ -0,0 +1,97 @@
+.TH "TME" "6"
+.SH "NAME"
+tme \- tme is The Mana Experiment: A fantasy online game
+.SH "SYNOPSIS"
+\fBtme\fR
+.SH "DESCRIPTION"
+This manual page documents briefly the
+\fBtme\fR ingame
+commands.
+\fBtme\fR is a great online game based upon the Seiken Densetsu Serie.
+It has its own universe, and and its own character management system, which will
+give you the opportunity to play in a 2D heroic-fantasy world forever.
+.SH "BINARY PARAMETERS"
+This program follows the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-version
+Show version of the program.
+.TP
+.B \-u, \-\-skipupdate
+Skip the update process.
+.TP
+.B \-U, \-\-username
+Login with this username.
+.TP
+.B \-P, \-\-password
+Login with this password.
+.TP
+.B \-D, \-\-default
+Bypass the login process with default settings.
+.TP
+.B \-p, \-\-playername
+Login with this player.
+.TP
+.B \-C, \-\-configfile
+Configuration file to use
+.SH "COMMON KEYS"
+.TP
+.B Arrow Keys:
+Move your character around.
+.TP
+.B Left Ctrl:
+Make your character attack.
+.TP
+.B Key A:
+Target nearest monster.
+.TP
+.B Key Z:
+Get items on the ground or in a chest.
+.TP
+.B Key S:
+Make your character sit.
+.TP
+.B Alt + 1...9:
+Shows an emoticon above your character.
+.TP
+.B F1:
+Displays / Hides in game help.
+.TP
+.B F2:
+Displays / Hides status window.
+.TP
+.B F3:
+Displays / Hides inventory window.
+.TP
+.B F4:
+Displays / Hides equipment window.
+.TP
+.B F5:
+Displays / Hides skills window.
+.TP
+.B F6:
+Displays / Hides map.
+.TP
+.B F7
+Displays / Hides messages.
+.TP
+.B F8
+Displays / Hides hot-keys.
+.TP
+.B F9:
+Displays / Hides configuration window.
+.TP
+.B F10
+Displays / Hides debug window.
+.SH "AUTHOR"
+This manual page was written by Patrick Matth\[:a]i <patrick.matthaei@web.de>
+for The Mana World project.
+With slight alterations by Daniel Thomas\[:a]i <kraant@gmail.com>,
+for The Mana Experiment.
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU General Public License, Version 2 any
+later version published by the Free Software Foundation.
diff --git a/docs/tmw.6 b/docs/tmw.6
deleted file mode 100644
index 0dee82c7..00000000
--- a/docs/tmw.6
+++ /dev/null
@@ -1,74 +0,0 @@
-.TH "TMW" "6"
-.SH "NAME"
-tmw \- tmw is The Mana World: A fantasy online game
-.SH "SYNOPSIS"
-\fBtmw\fR
-.SH "DESCRIPTION"
-This manual page documents briefly the
-\fBtmw\fR ingame
-commands.
-\fBtmw\fR is a great online game based upon the Seiken Densetsu Serie.
-It has its own universe, and and its own character management system, which will
-give you the opportunity to play in a 2D heroic-fantasy world forever.
-.SH "BINARY PARAMETERS"
-This program follows the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B \-h, \-\-help
-Show summary of options.
-.TP
-.B \-v, \-\-version
-Show version of the program.
-.TP
-.B \-u, \-\-skipupdate
-Skip the update process.
-.TP
-.B \-U, \-\-username
-Login with this username.
-.TP
-.B \-P, \-\-password
-Login with this password.
-.TP
-.B \-D, \-\-default
-Bypass the login process with default settings.
-.TP
-.B \-p, \-\-playername
-Login with this player.
-.TP
-.B \-C, \-\-configfile
-Configuration file to use
-.SH "COMMON KEYS"
-.TP
-.B Arrow Keys:
-Move your character around.
-.TP
-.B Left Ctrl:
-Make your character attack.
-.TP
-.B Key A:
-Target nearest monster.
-.TP
-.B Key G:
-Get items on the ground or in a chest.
-.TP
-.B Alt + 1...9:
-Shows an emoticon above your character.
-.TP
-.B Alt + I:
-Shows / Hide inventory window.
-.TP
-.B Alt + K:
-Shows / Hide skills window.
-.TP
-.B Alt + E:
-Shows / Hide equipment window.
-.TP
-.B Alt + C:
-Shows configuration window.
-.SH "AUTHOR"
-This manual page was written by Patrick Matth\[:a]i <patrick.matthaei@web.de>
-for The Mana World project.
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU General Public License, Version 2 any
-later version published by the Free Software Foundation.
diff --git a/install-sh b/install-sh
new file mode 100755
index 00000000..a5897de6
--- /dev/null
+++ b/install-sh
@@ -0,0 +1,519 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2006-12-25.00
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+no_target_directory=
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+	shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
+
+    -o) chowncmd="$chownprog $2"
+	shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t) dst_arg=$2
+	shift;;
+
+    -T) no_target_directory=true;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --)	shift
+	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dst_arg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst;;
+    esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dst_arg: Is a directory" >&2
+	exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix='/';;
+	-*) prefix='./';;
+	*)  prefix='';;
+      esac
+
+      eval "$initialize_posix_glob"
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
+      shift
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/missing b/missing
new file mode 100755
index 00000000..1c8ff704
--- /dev/null
+++ b/missing
@@ -0,0 +1,367 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+
+scriptversion=2006-05-10.23
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+#   Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case $1 in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
+  ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case $1 in
+  lex|yacc)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  tar)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
+
+  *)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
+    fi
+    ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $1 in
+  aclocal*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case $f in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
+  bison|yacc)
+    echo 1>&2 "\
+WARNING: \`$1' $msg.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if test $# -ne 1; then
+        eval LASTARG="\${$#}"
+	case $LASTARG in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if test ! -f y.tab.h; then
+	echo >y.tab.h
+    fi
+    if test ! -f y.tab.c; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex|flex)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if test $# -ne 1; then
+        eval LASTARG="\${$#}"
+	case $LASTARG in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if test ! -f lex.yy.c; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit 1
+    fi
+    ;;
+
+  makeinfo)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -z "$file"; then
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* \([^ ]*\) *$/\1/
+	  p
+	  q
+	}' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
+    touch $file
+    ;;
+
+  tar)
+    shift
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar "$@" && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar "$@" && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case $firstarg in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+	case $firstarg in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequisites for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/src/.deps/tmw-action.Po b/src/.deps/tmw-action.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-action.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-ambientoverlay.Po b/src/.deps/tmw-ambientoverlay.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-ambientoverlay.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-animatedsprite.Po b/src/.deps/tmw-animatedsprite.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-animatedsprite.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-animation.Po b/src/.deps/tmw-animation.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-animation.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-animationparticle.Po b/src/.deps/tmw-animationparticle.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-animationparticle.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-base64.Po b/src/.deps/tmw-base64.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-base64.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-being.Po b/src/.deps/tmw-being.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-being.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-beinghandler.Po b/src/.deps/tmw-beinghandler.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-beinghandler.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-beingmanager.Po b/src/.deps/tmw-beingmanager.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-beingmanager.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-box.Po b/src/.deps/tmw-box.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-box.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-browserbox.Po b/src/.deps/tmw-browserbox.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-browserbox.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-buddylist.Po b/src/.deps/tmw-buddylist.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-buddylist.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-buddywindow.Po b/src/.deps/tmw-buddywindow.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-buddywindow.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-button.Po b/src/.deps/tmw-button.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-button.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-buy.Po b/src/.deps/tmw-buy.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-buy.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-buysell.Po b/src/.deps/tmw-buysell.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-buysell.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-buysellhandler.Po b/src/.deps/tmw-buysellhandler.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-buysellhandler.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-char_select.Po b/src/.deps/tmw-char_select.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-char_select.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-char_server.Po b/src/.deps/tmw-char_server.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-char_server.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-chargedialog.Po b/src/.deps/tmw-chargedialog.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-chargedialog.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-charserverhandler.Po b/src/.deps/tmw-charserverhandler.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-charserverhandler.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-chat.Po b/src/.deps/tmw-chat.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-chat.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-chathandler.Po b/src/.deps/tmw-chathandler.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-chathandler.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-chatinput.Po b/src/.deps/tmw-chatinput.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-chatinput.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-checkbox.Po b/src/.deps/tmw-checkbox.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-checkbox.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-configuration.Po b/src/.deps/tmw-configuration.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-configuration.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-confirm_dialog.Po b/src/.deps/tmw-confirm_dialog.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-confirm_dialog.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-connection.Po b/src/.deps/tmw-connection.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-connection.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-debugwindow.Po b/src/.deps/tmw-debugwindow.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-debugwindow.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-dropdown.Po b/src/.deps/tmw-dropdown.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-dropdown.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-dye.Po b/src/.deps/tmw-dye.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-dye.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-engine.Po b/src/.deps/tmw-engine.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-engine.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-equipment.Po b/src/.deps/tmw-equipment.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-equipment.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-equipmenthandler.Po b/src/.deps/tmw-equipmenthandler.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-equipmenthandler.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-equipmentwindow.Po b/src/.deps/tmw-equipmentwindow.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-equipmentwindow.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-floor_item.Po b/src/.deps/tmw-floor_item.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-floor_item.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-flooritemmanager.Po b/src/.deps/tmw-flooritemmanager.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-flooritemmanager.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-focushandler.Po b/src/.deps/tmw-focushandler.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-focushandler.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-game.Po b/src/.deps/tmw-game.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-game.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-gccontainer.Po b/src/.deps/tmw-gccontainer.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-gccontainer.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-graphics.Po b/src/.deps/tmw-graphics.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-graphics.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-gui.Po b/src/.deps/tmw-gui.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-gui.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-hbox.Po b/src/.deps/tmw-hbox.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-hbox.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-help.Po b/src/.deps/tmw-help.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-help.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-image.Po b/src/.deps/tmw-image.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-image.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-imageloader.Po b/src/.deps/tmw-imageloader.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-imageloader.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-imageparticle.Po b/src/.deps/tmw-imageparticle.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-imageparticle.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-imageset.Po b/src/.deps/tmw-imageset.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-imageset.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-imagewriter.Po b/src/.deps/tmw-imagewriter.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-imagewriter.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-inttextbox.Po b/src/.deps/tmw-inttextbox.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-inttextbox.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-inventory.Po b/src/.deps/tmw-inventory.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-inventory.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-inventoryhandler.Po b/src/.deps/tmw-inventoryhandler.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-inventoryhandler.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-inventorywindow.Po b/src/.deps/tmw-inventorywindow.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-inventorywindow.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-item.Po b/src/.deps/tmw-item.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-item.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-item_amount.Po b/src/.deps/tmw-item_amount.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-item_amount.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-itemcontainer.Po b/src/.deps/tmw-itemcontainer.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-itemcontainer.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-itemdb.Po b/src/.deps/tmw-itemdb.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-itemdb.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-itemhandler.Po b/src/.deps/tmw-itemhandler.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-itemhandler.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-iteminfo.Po b/src/.deps/tmw-iteminfo.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-iteminfo.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-itemshortcut.Po b/src/.deps/tmw-itemshortcut.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-itemshortcut.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-itemshortcutcontainer.Po b/src/.deps/tmw-itemshortcutcontainer.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-itemshortcutcontainer.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-itemshortcutwindow.Po b/src/.deps/tmw-itemshortcutwindow.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-itemshortcutwindow.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-joystick.Po b/src/.deps/tmw-joystick.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-joystick.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-keyboardconfig.Po b/src/.deps/tmw-keyboardconfig.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-keyboardconfig.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-listbox.Po b/src/.deps/tmw-listbox.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-listbox.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-localplayer.Po b/src/.deps/tmw-localplayer.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-localplayer.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-log.Po b/src/.deps/tmw-log.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-log.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-login.Po b/src/.deps/tmw-login.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-login.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-loginhandler.Po b/src/.deps/tmw-loginhandler.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-loginhandler.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-main.Po b/src/.deps/tmw-main.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-main.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-map.Po b/src/.deps/tmw-map.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-map.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-maploginhandler.Po b/src/.deps/tmw-maploginhandler.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-maploginhandler.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-mapreader.Po b/src/.deps/tmw-mapreader.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-mapreader.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-menuwindow.Po b/src/.deps/tmw-menuwindow.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-menuwindow.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-messagehandler.Po b/src/.deps/tmw-messagehandler.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-messagehandler.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-messagein.Po b/src/.deps/tmw-messagein.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-messagein.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-messageout.Po b/src/.deps/tmw-messageout.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-messageout.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-minimap.Po b/src/.deps/tmw-minimap.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-minimap.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-ministatus.Po b/src/.deps/tmw-ministatus.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-ministatus.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-monster.Po b/src/.deps/tmw-monster.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-monster.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-monsterdb.Po b/src/.deps/tmw-monsterdb.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-monsterdb.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-monsterinfo.Po b/src/.deps/tmw-monsterinfo.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-monsterinfo.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-music.Po b/src/.deps/tmw-music.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-music.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-network.Po b/src/.deps/tmw-network.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-network.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-newskill.Po b/src/.deps/tmw-newskill.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-newskill.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-npc.Po b/src/.deps/tmw-npc.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-npc.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-npc_text.Po b/src/.deps/tmw-npc_text.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-npc_text.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-npcdb.Po b/src/.deps/tmw-npcdb.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-npcdb.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-npchandler.Po b/src/.deps/tmw-npchandler.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-npchandler.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-npclistdialog.Po b/src/.deps/tmw-npclistdialog.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-npclistdialog.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-ok_dialog.Po b/src/.deps/tmw-ok_dialog.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-ok_dialog.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-openglgraphics.Po b/src/.deps/tmw-openglgraphics.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-openglgraphics.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-particle.Po b/src/.deps/tmw-particle.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-particle.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-particleemitter.Po b/src/.deps/tmw-particleemitter.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-particleemitter.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-passwordfield.Po b/src/.deps/tmw-passwordfield.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-passwordfield.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-player.Po b/src/.deps/tmw-player.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-player.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-player_relations.Po b/src/.deps/tmw-player_relations.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-player_relations.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-playerbox.Po b/src/.deps/tmw-playerbox.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-playerbox.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-playerhandler.Po b/src/.deps/tmw-playerhandler.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-playerhandler.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-popupmenu.Po b/src/.deps/tmw-popupmenu.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-popupmenu.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-progressbar.Po b/src/.deps/tmw-progressbar.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-progressbar.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-protocol.Po b/src/.deps/tmw-protocol.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-protocol.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-radiobutton.Po b/src/.deps/tmw-radiobutton.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-radiobutton.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-register.Po b/src/.deps/tmw-register.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-register.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-resizegrip.Po b/src/.deps/tmw-resizegrip.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-resizegrip.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-resource.Po b/src/.deps/tmw-resource.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-resource.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-resourcemanager.Po b/src/.deps/tmw-resourcemanager.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-resourcemanager.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-scrollarea.Po b/src/.deps/tmw-scrollarea.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-scrollarea.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-sell.Po b/src/.deps/tmw-sell.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-sell.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-setup.Po b/src/.deps/tmw-setup.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-setup.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-setup_audio.Po b/src/.deps/tmw-setup_audio.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-setup_audio.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-setup_joystick.Po b/src/.deps/tmw-setup_joystick.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-setup_joystick.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-setup_keyboard.Po b/src/.deps/tmw-setup_keyboard.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-setup_keyboard.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-setup_players.Po b/src/.deps/tmw-setup_players.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-setup_players.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-setup_video.Po b/src/.deps/tmw-setup_video.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-setup_video.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-shop.Po b/src/.deps/tmw-shop.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-shop.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-shoplistbox.Po b/src/.deps/tmw-shoplistbox.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-shoplistbox.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-simpleanimation.Po b/src/.deps/tmw-simpleanimation.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-simpleanimation.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-skill.Po b/src/.deps/tmw-skill.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-skill.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-skillhandler.Po b/src/.deps/tmw-skillhandler.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-skillhandler.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-slider.Po b/src/.deps/tmw-slider.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-slider.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-sound.Po b/src/.deps/tmw-sound.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-sound.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-soundeffect.Po b/src/.deps/tmw-soundeffect.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-soundeffect.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-spritedef.Po b/src/.deps/tmw-spritedef.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-spritedef.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-status.Po b/src/.deps/tmw-status.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-status.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-strprintf.Po b/src/.deps/tmw-strprintf.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-strprintf.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-tabbedcontainer.Po b/src/.deps/tmw-tabbedcontainer.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-tabbedcontainer.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-table.Po b/src/.deps/tmw-table.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-table.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-table_model.Po b/src/.deps/tmw-table_model.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-table_model.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-textbox.Po b/src/.deps/tmw-textbox.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-textbox.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-textfield.Po b/src/.deps/tmw-textfield.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-textfield.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-textparticle.Po b/src/.deps/tmw-textparticle.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-textparticle.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-trade.Po b/src/.deps/tmw-trade.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-trade.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-tradehandler.Po b/src/.deps/tmw-tradehandler.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-tradehandler.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-updatewindow.Po b/src/.deps/tmw-updatewindow.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-updatewindow.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-vbox.Po b/src/.deps/tmw-vbox.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-vbox.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-viewport.Po b/src/.deps/tmw-viewport.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-viewport.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-window.Po b/src/.deps/tmw-window.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-window.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-windowcontainer.Po b/src/.deps/tmw-windowcontainer.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-windowcontainer.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/.deps/tmw-xml.Po b/src/.deps/tmw-xml.Po
new file mode 100644
index 00000000..9ce06a81
--- /dev/null
+++ b/src/.deps/tmw-xml.Po
@@ -0,0 +1 @@
+# dummy
diff --git a/src/Makefile.am b/src/Makefile.am
index 3156a800..f1352f9e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,16 @@
-bin_PROGRAMS = tmw
-tmw_SOURCES = gui/widgets/resizegrip.cpp \
+bin_PROGRAMS = tme
+tme_SOURCES = gui/widgets/dropdown.cpp \
+              gui/widgets/dropdown.h \
+              gui/widgets/resizegrip.cpp \
 	      gui/widgets/resizegrip.h \
 	      gui/box.h \
 	      gui/box.cpp \
 	      gui/browserbox.cpp \
 	      gui/browserbox.h \
-	      gui/buddywindow.cpp \
-	      gui/buddywindow.h \
 	      gui/button.cpp \
 	      gui/button.h \
+              gui/buttonbox.cpp \
+              gui/buttonbox.h \
 	      gui/buy.cpp \
 	      gui/buy.h \
 	      gui/buysell.cpp \
@@ -163,6 +165,8 @@ tmw_SOURCES = gui/widgets/resizegrip.cpp \
 	      net/network.h \
 	      net/npchandler.cpp \
 	      net/npchandler.h \
+              net/partyhandler.cpp \
+              net/partyhandler.h \
 	      net/playerhandler.cpp \
 	      net/playerhandler.h \
 	      net/protocol.cpp \
@@ -278,11 +282,15 @@ tmw_SOURCES = gui/widgets/resizegrip.cpp \
 	      particle.h \
 	      particleemitter.cpp \
 	      particleemitter.h \
+              party.cpp \
+              party.h \
 	      player.cpp \
 	      player.h \
 	      player_relations.cpp \
 	      player_relations.h \
 	      properties.h \
+              recorder.cpp \
+              recorder.h \
 	      serverinfo.h \
 	      shopitem.cpp \
 	      shopitem.h \
@@ -291,6 +299,10 @@ tmw_SOURCES = gui/widgets/resizegrip.cpp \
 	      sound.cpp \
 	      sound.h \
 	      sprite.h \
+	      text.cpp \
+	      text.h \
+	      textmanager.cpp \
+	      textmanager.h \
 	      textparticle.cpp \
 	      textparticle.h \
 	      tileset.h \
@@ -302,7 +314,7 @@ INCLUDES =					\
 	-DTMW_DATADIR=\""$(pkgdatadir)/"\"
 
 # the library search path.
-tmw_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) `pkg-config --libs libxml-2.0`
-tmw_CXXFLAGS = -Wall $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` $(CURL_CFLAGS)
-tmw_LDADD = $(LIBSDL_LIBS) -lguichan_sdl $(CURL_LIBS)
-tmw_TARGET = tmw
+tme_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) `pkg-config --libs libxml-2.0`
+tme_CXXFLAGS = -Wall $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` $(CURL_CFLAGS)
+tme_LDADD = $(LIBSDL_LIBS) -lguichan_sdl $(CURL_LIBS)
+tme_TARGET = tme
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 466779fd..dd43e0f1 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: animatedsprite.cpp 3752 2007-11-20 10:50:00Z b_lindeijer $
  */
 
 #include "animatedsprite.h"
diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index a1fbe7a0..1fac5220 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: animatedsprite.h 3752 2007-11-20 10:50:00Z b_lindeijer $
  */
 
 #ifndef _TMW_ANIMATEDSPRITE_H
diff --git a/src/being.cpp b/src/being.cpp
index 625b0eef..14f7ce20 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: being.cpp 4301 2008-05-28 16:06:48Z peaveydk $
  */
 #include "being.h"
 
@@ -32,6 +32,7 @@
 #include "log.h"
 #include "map.h"
 #include "particle.h"
+#include "text.h"
 
 #include "resources/resourcemanager.h"
 #include "resources/imageset.h"
@@ -45,6 +46,9 @@
 int Being::instances = 0;
 ImageSet *Being::emotionSet = NULL;
 
+static const int X_SPEECH_OFFSET = 18;
+static const int Y_SPEECH_OFFSET = 60;
+
 Being::Being(int id, int job, Map *map):
     mJob(job),
     mX(0), mY(0),
@@ -77,6 +81,7 @@ Being::Being(int id, int job, Map *map):
     }
 
     instances++;
+    mSpeech = 0;
 }
 
 Being::~Being()
@@ -100,6 +105,10 @@ Being::~Being()
         emotionSet->decRef();
         emotionSet = NULL;
     }
+    if (mSpeech)
+    {
+        delete mSpeech;
+    }
 }
 
 void
@@ -147,7 +156,13 @@ Being::setSprite(int slot, int id, std::string color)
 void
 Being::setSpeech(const std::string &text, Uint32 time)
 {
-    mSpeech = text;
+    if (mSpeech) // don't introduce a memory leak
+    {
+        delete mSpeech;
+    }
+    mSpeech = new Text(text, mPx + X_SPEECH_OFFSET, mPy - Y_SPEECH_OFFSET,
+                       gcn::Graphics::CENTER, speechFont,
+                       gcn::Color(255, 255, 255));
     mSpeechTime = 500;
 }
 
@@ -355,13 +370,28 @@ void
 Being::logic()
 {
     // Reduce the time that speech is still displayed
-    if (mSpeechTime > 0)
-        mSpeechTime--;
+    if (mSpeechTime > 0 && mSpeech)
+    {
+        if (--mSpeechTime == 0)
+        {
+            delete mSpeech;
+            mSpeech = 0;
+        }
+    }
 
+    int oldPx = mPx;
+    int oldPy = mPy;
     // Update pixel coordinates
     mPx = mX * 32 + getXOffset();
     mPy = mY * 32 + getYOffset();
-
+    if (mPx != oldPx || mPy != oldPy)
+    {
+        if (mSpeech)
+        {
+            mSpeech->adviseXY(mPx + X_SPEECH_OFFSET, mPy - Y_SPEECH_OFFSET);
+        }
+        updateCoords();
+    }
     if (mEmotion != 0)
     {
         mEmotionTime--;
@@ -426,21 +456,6 @@ Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
         graphics->drawImage(emotionSet->get(emotionIndex), px, py);
 }
 
-void
-Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
-{
-    int px = mPx + offsetX;
-    int py = mPy + offsetY;
-
-    // Draw speech above this being
-    if (mSpeechTime > 0)
-    {
-        graphics->setFont(speechFont);
-        graphics->setColor(gcn::Color(255, 255, 255));
-        graphics->drawText(mSpeech, px + 18, py - 60, gcn::Graphics::CENTER);
-    }
-}
-
 Being::Type
 Being::getType() const
 {
diff --git a/src/being.h b/src/being.h
index 5ea8c0be..2f711fb8 100644
--- a/src/being.h
+++ b/src/being.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: being.h 4321 2008-06-02 11:42:26Z b_lindeijer $
  */
 
 #ifndef _TMW_BEING_H
@@ -47,6 +47,7 @@ class Map;
 class Graphics;
 class ImageSet;
 class Particle;
+class Text;
 
 /**
  * A position along a being's path.
@@ -183,7 +184,7 @@ class Being : public Sprite
          *
          * @param name The name that should appear.
          */
-        void
+        virtual void
         setName(const std::string &name) { mName = name; }
 
         /**
@@ -234,24 +235,12 @@ class Being : public Sprite
         virtual void
         logic();
 
-        /**
-         * Draws the speech text above the being.
-         */
-        void
-        drawSpeech(Graphics *graphics, int offsetX, int offsetY);
-
         /**
          * Draws the emotion picture above the being.
          */
         void
         drawEmotion(Graphics *graphics, int offsetX, int offsetY);
 
-        /**
-         * Draws the name text below the being.
-         */
-        virtual void
-        drawName(Graphics *, int, int) {};
-
         /**
          * Returns the type of the being.
          */
@@ -359,7 +348,11 @@ class Being : public Sprite
          */
         void controlParticle(Particle *particle);
 
-        void setEmote(Uint8 emotion, Uint8 emote_time) { mEmotion = emotion; mEmotionTime = emote_time; }
+        void setEmote(Uint8 emotion, Uint8 emote_time)
+        {
+            mEmotion = emotion;
+            mEmotionTime = emote_time;
+        }
 
         const std::auto_ptr<Equipment> mEquipment;
 
@@ -369,6 +362,11 @@ class Being : public Sprite
          */
         void setPath(const Path &path);
 
+        /**
+         * Let the sub-classes react to a replacement
+         */
+        virtual void updateCoords() {}
+
         /**
          * Returns the sprite direction of this being.
          */
@@ -385,7 +383,7 @@ class Being : public Sprite
         const ItemInfo* mEquippedWeapon;
 
         Path mPath;
-        std::string mSpeech;
+        Text *mSpeech;
         Uint16 mHairStyle, mHairColor;
         Uint8 mGender;
         Uint32 mSpeechTime;
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index b683b1bd..d1a333d0 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: beingmanager.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
 #include <algorithm>
diff --git a/src/beingmanager.h b/src/beingmanager.h
index 243486e4..ff2d1980 100644
--- a/src/beingmanager.h
+++ b/src/beingmanager.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: beingmanager.h 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
 #ifndef _TMW_BEINGMANAGER_H
diff --git a/src/configlistener.h b/src/configlistener.h
index 7ce5d949..bf00f3ef 100644
--- a/src/configlistener.h
+++ b/src/configlistener.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: configlistener.h 1673 2005-08-29 22:00:35Z der_doener $
  */
 
 #ifndef _TMW_CONFIGLISTENER_H
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 7e8cb542..e9c8db7a 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: configuration.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
 
diff --git a/src/configuration.h b/src/configuration.h
index 36d9e150..7dadb083 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: configuration.h 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
 #ifndef _TMW_CONFIGURATION_H
diff --git a/src/engine.cpp b/src/engine.cpp
index d4033193..d1912b0d 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: engine.cpp 4000 2008-03-23 11:47:52Z b_lindeijer $
  */
 
 #include "engine.h"
diff --git a/src/engine.h b/src/engine.h
index 4575051e..ed76a595 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: engine.h 4000 2008-03-23 11:47:52Z b_lindeijer $
  */
 
 #ifndef _ENGINE_H
diff --git a/src/equipment.cpp b/src/equipment.cpp
index d1f9a6cf..0a285447 100644
--- a/src/equipment.cpp
+++ b/src/equipment.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: equipment.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "equipment.h"
diff --git a/src/equipment.h b/src/equipment.h
index 80a2ae49..04017549 100644
--- a/src/equipment.h
+++ b/src/equipment.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: equipment.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _TMW_EQUIPMENT_H_
diff --git a/src/floor_item.cpp b/src/floor_item.cpp
index 9727093f..399a4149 100644
--- a/src/floor_item.cpp
+++ b/src/floor_item.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: floor_item.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "floor_item.h"
diff --git a/src/floor_item.h b/src/floor_item.h
index a87e3f79..7771d935 100644
--- a/src/floor_item.h
+++ b/src/floor_item.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: floor_item.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _TMW_FLOORITEM_H_
diff --git a/src/flooritemmanager.cpp b/src/flooritemmanager.cpp
index 8a00cc51..f6ad3442 100644
--- a/src/flooritemmanager.cpp
+++ b/src/flooritemmanager.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: flooritemmanager.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $
  */
 
 #include <algorithm>
diff --git a/src/flooritemmanager.h b/src/flooritemmanager.h
index c12883a4..a6bfbdc3 100644
--- a/src/flooritemmanager.h
+++ b/src/flooritemmanager.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: flooritemmanager.h 2150 2006-02-06 02:56:48Z der_doener $
  */
 
 #ifndef _TMW_FLOORITEMMANAGER_H
diff --git a/src/game.cpp b/src/game.cpp
index 58c28640..d018852b 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: game.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
 #include "game.h"
@@ -68,7 +68,6 @@
 #include "gui/status.h"
 #include "gui/trade.h"
 #include "gui/viewport.h"
-
 #include "net/beinghandler.h"
 #include "net/buysellhandler.h"
 #include "net/chathandler.h"
@@ -135,14 +134,14 @@ const int MAX_TIME = 10000;
 namespace {
     struct ExitListener : public gcn::ActionListener
     {
-        void action(const gcn::ActionEvent &event)
-        {
-            if (event.getId() == "yes" || event.getId() == "ok") {
-                done = true;
-            }
-            exitConfirm = NULL;
-            disconnectedDialog = NULL;
-        }
+	void action(const gcn::ActionEvent &event)
+	{
+	    if (event.getId() == "yes" || event.getId() == "ok") {
+		done = true;
+	    }
+	    exitConfirm = NULL;
+	    disconnectedDialog = NULL;
+	}
     } exitListener;
 }
 
@@ -169,10 +168,10 @@ Uint32 nextSecond(Uint32 interval, void *param)
 int get_elapsed_time(int start_time)
 {
     if (start_time <= tick_time) {
-        return (tick_time - start_time) * 10;
+	return (tick_time - start_time) * 10;
     }
     else {
-        return (tick_time + (MAX_TIME - start_time)) * 10;
+	return (tick_time + (MAX_TIME - start_time)) * 10;
     }
 }
 
@@ -219,7 +218,7 @@ void createGuiWindows(Network *network)
 
     if (config.getValue("logToChat", 0))
     {
-        logger->setChatWindow(chatWindow);
+	logger->setChatWindow(chatWindow);
     }
 }
 
@@ -291,7 +290,7 @@ Game::Game(Network *network):
     // Open the first device
     if (Joystick::getNumberOfJoysticks() > 0)
     {
-        joystick = new Joystick(0);
+	joystick = new Joystick(0);
     }
 
     network->registerHandler(mBeingHandler.get());
@@ -332,30 +331,30 @@ bool saveScreenshot(SDL_Surface *screenshot)
     bool found = false;
 
     do {
-        screenshotCount++;
-        filename.str("");
+	screenshotCount++;
+	filename.str("");
 #if (defined __USE_UNIX98 || defined __FreeBSD__)
-        filename << PHYSFS_getUserDir() << ".tmw/";
+	filename << PHYSFS_getUserDir() << ".tme/";
 #elif defined __APPLE__
-        filename << PHYSFS_getUserDir() << "Desktop/";
+	filename << PHYSFS_getUserDir() << "Desktop/";
 #endif
-        filename << "TMW_Screenshot_" << screenshotCount << ".png";
-        testExists.open(filename.str().c_str(), std::ios::in);
-        found = !testExists.is_open();
-        testExists.close();
+	filename << "TMW_Screenshot_" << screenshotCount << ".png";
+	testExists.open(filename.str().c_str(), std::ios::in);
+	found = !testExists.is_open();
+	testExists.close();
     } while (!found);
 
     if (ImageWriter::writePNG(screenshot, filename.str()))
     {
-        std::stringstream chatlogentry;
-        chatlogentry << "Screenshot saved to " << filename.str().c_str();
-        chatWindow->chatLog(chatlogentry.str(), BY_SERVER);
-        return true;
+	std::stringstream chatlogentry;
+	chatlogentry << "Screenshot saved to " << filename.str().c_str();
+	chatWindow->chatLog(chatlogentry.str(), BY_SERVER);
+	return true;
     }
     else
     {
-        chatWindow->chatLog("Saving screenshot failed!", BY_SERVER);
-        return false;
+	chatWindow->chatLog("Saving screenshot failed!", BY_SERVER);
+	return false;
     }
 }
 
@@ -379,60 +378,61 @@ void Game::logic()
 
     while (!done)
     {
-        // Handle all necessary game logic
-        while (get_elapsed_time(gameTime) > 0)
-        {
-            handleInput();
-            engine->logic();
-            gameTime++;
-        }
-
-        // This is done because at some point tick_time will wrap.
-        gameTime = tick_time;
-
-        // Update the screen when application is active, delay otherwise.
-        if (SDL_GetAppState() & SDL_APPACTIVE)
-        {
-            // Draw a frame if either frames are not limited or enough time has
-            // passed since the last frame.
-            if (!mMinFrameTime ||
-                    get_elapsed_time(mDrawTime / 10) > mMinFrameTime)
-            {
-                frame++;
-                gui->draw();
-                graphics->updateScreen();
-                mDrawTime += mMinFrameTime;
-
-                // Make sure to wrap mDrawTime, since tick_time will wrap.
-                if (mDrawTime > MAX_TIME * 10)
-                    mDrawTime -= MAX_TIME * 10;
-            }
-            else
-            {
-                SDL_Delay(10);
-            }
-        }
-        else
-        {
-            SDL_Delay(10);
-            mDrawTime = tick_time * 10;
-        }
-
-        // Handle network stuff
-        mNetwork->flush();
-        mNetwork->dispatchMessages();
-
-        if (!mNetwork->isConnected())
-        {
-            if (!disconnectedDialog)
-            {
-                disconnectedDialog = new
-                    OkDialog("Network Error",
-                    "The connection to the server was lost, the program will now quit");
-                disconnectedDialog->addActionListener(&exitListener);
-                disconnectedDialog->requestMoveToTop();
-            }
-        }
+	// Handle all necessary game logic
+	while (get_elapsed_time(gameTime) > 0)
+	{
+	    handleInput();
+	    engine->logic();
+	    gameTime++;
+	}
+
+	// This is done because at some point tick_time will wrap.
+	gameTime = tick_time;
+
+	// Update the screen when application is active, delay otherwise.
+	if (SDL_GetAppState() & SDL_APPACTIVE)
+	{
+	    // Draw a frame if either frames are not limited or enough time has
+	    // passed since the last frame.
+	    if (!mMinFrameTime ||
+		    get_elapsed_time(mDrawTime / 10) > mMinFrameTime)
+	    {
+		frame++;
+		gui->draw();
+		graphics->updateScreen();
+		mDrawTime += mMinFrameTime;
+
+		// Make sure to wrap mDrawTime, since tick_time will wrap.
+		if (mDrawTime > MAX_TIME * 10)
+		    mDrawTime -= MAX_TIME * 10;
+	    }
+	    else
+	    {
+		SDL_Delay(10);
+	    }
+	}
+	else
+	{
+	    SDL_Delay(10);
+	    mDrawTime = tick_time * 10;
+	}
+
+	// Handle network stuff
+	mNetwork->flush();
+	mNetwork->dispatchMessages();
+
+	if (!mNetwork->isConnected())
+	{
+	    if (!disconnectedDialog)
+	    {
+		disconnectedDialog = new
+		    OkDialog("Network Error",
+		             "The connection to the server was lost, the "
+                             "program will now quit");
+		disconnectedDialog->addActionListener(&exitListener);
+		disconnectedDialog->requestMoveToTop();
+	    }
+	}
     }
 }
 
@@ -440,289 +440,296 @@ void Game::handleInput()
 {
     if (joystick != NULL)
     {
-        joystick->update();
+	joystick->update();
     }
 
     // Events
     SDL_Event event;
     while (SDL_PollEvent(&event))
     {
-        bool used = false;
-
-        // Keyboard events (for discontinuous keys)
-        if (event.type == SDL_KEYDOWN)
-        {
-            gcn::Window *requestedWindow = NULL;
-
-            if (setupWindow->isVisible() &&
-                keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE)
-            {
-                keyboard.setNewKey((int) event.key.keysym.sym);
-                keyboard.callbackNewKey();
-                keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
-                return;
-            }
-            // Keys pressed together with Alt/Meta
-            // Emotions and some internal gui windows
-            #ifndef __APPLE__
-            if (event.key.keysym.mod & KMOD_ALT)
-            #else
-            if (event.key.keysym.mod & KMOD_LMETA)
-            #endif
-            {
-                switch (event.key.keysym.sym)
-                {
-                    case SDLK_p:
-                        // Screenshot (picture, hence the p)
-                        {
-                            SDL_Surface *screenshot = graphics->getScreenshot();
-                            if (!saveScreenshot(screenshot))
-                            {
-                                logger->log("Error: could not save Screenshot.");
-                            }
-                            SDL_FreeSurface(screenshot);
-                        }
-                        used = true;
-                        break;
-
-                    default:
-                        break;
-
-                    case SDLK_f:
-                        // Find path to mouse (debug purpose)
-                        viewport->toggleDebugPath();
-                        used = true;
-                        break;
-
-                    case SDLK_t:
-                        // Toggle accepting of incoming trade requests
-                        {
-                            unsigned int deflt = player_relations.getDefault();
-                            if (deflt & PlayerRelation::TRADE) {
-                                chatWindow->chatLog("Ignoring incoming trade requests", BY_SERVER);
-                                deflt &= ~PlayerRelation::TRADE;
-                            } else {
-                                chatWindow->chatLog("Accepting incoming trade requests", BY_SERVER);
-                                deflt |= PlayerRelation::TRADE;
-                            }
-
-                            player_relations.setDefault(deflt);
-                        }
-                        used = true;
-                        break;
-                }
-
-                // Emotions
-                Uint8 emotion;
-                switch (event.key.keysym.sym)
-                {
-                    case SDLK_1: emotion = 1; break;
-                    case SDLK_2: emotion = 2; break;
-                    case SDLK_3: emotion = 3; break;
-                    case SDLK_4: emotion = 4; break;
-                    case SDLK_5: emotion = 5; break;
-                    case SDLK_6: emotion = 6; break;
-                    case SDLK_7: emotion = 7; break;
-                    case SDLK_8: emotion = 8; break;
-                    case SDLK_9: emotion = 9; break;
-                    case SDLK_0: emotion = 10; break;
-                    case SDLK_MINUS: emotion = 11; break;
-                    case SDLK_EQUALS: emotion = 12; break;
-                    default: emotion = 0; break;
-                }
-
-                if (emotion)
-                {
-                    player_node->emote(emotion);
-                    used = true;
-                }
-            }
-            switch (event.key.keysym.sym)
-            {
-                case SDLK_PAGEUP:
-                    if (chatWindow->isVisible())
-                    {
-                        chatWindow->scroll(-DEFAULT_CHAT_WINDOW_SCROLL);
-                        used = true;
-                    }
-                    break;
-
-                case SDLK_PAGEDOWN:
-                    if (chatWindow->isVisible())
-                    {
-                        chatWindow->scroll(DEFAULT_CHAT_WINDOW_SCROLL);
-                        used = true;
-                    }
-                    break;
-
-                case SDLK_F1:
-                    // In-game Help
-                    if (helpWindow->isVisible())
-                    {
-                        helpWindow->setVisible(false);
-                    }
-                    else
-                    {
-                        helpWindow->loadHelp("index");
-                        helpWindow->requestMoveToTop();
-                    }
-                    used = true;
-                    break;
-
-                case SDLK_F2: requestedWindow = statusWindow; break;
-                case SDLK_F3: requestedWindow = inventoryWindow; break;
-                case SDLK_F4: requestedWindow = equipmentWindow; break;
-                case SDLK_F5: requestedWindow = skillDialog; break;
-                case SDLK_F6: requestedWindow = minimap; break;
-                case SDLK_F7: requestedWindow = chatWindow; break;
-                case SDLK_F8: requestedWindow = itemShortcutWindow; break;
-                case SDLK_F9: requestedWindow = setupWindow; break;
-                case SDLK_F10: requestedWindow = debugWindow; break;
-                //case SDLK_F11: requestedWindow = newSkillWindow; break;
-
-                case SDLK_RETURN:
-                    // Input chat window
-                    if (chatWindow->isInputFocused() ||
-                        deathNotice != NULL ||
-                        weightNotice != NULL)
-                    {
-                        break;
-                    }
-
-                    // Quit by pressing Enter if the exit confirm is there
-                    if (exitConfirm)
-                    {
-                        done = true;
-                    }
-                    // Close the Browser if opened
-                    else if (helpWindow->isVisible())
-                    {
-                        helpWindow->setVisible(false);
-                    }
-                    // Close the config window, cancelling changes if opened
-                    else if (setupWindow->isVisible())
-                    {
-                        setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
-                    }
-                    // Else, open the chat edit box
-                    else
-                    {
-                        chatWindow->requestChatFocus();
-                        used = true;
-                    }
-                    break;
-                   // Quitting confirmation dialog
-                case SDLK_ESCAPE:
-                    if (!exitConfirm) {
-                        exitConfirm = new ConfirmDialog(
-                                "Quit", "Are you sure you want to quit?");
-                        exitConfirm->addActionListener(&exitListener);
-                        exitConfirm->requestMoveToTop();
-                    }
-                    else
-                    {
-                        exitConfirm->action(gcn::ActionEvent(NULL, "no"));
-                    }
-                    break;
-
-                default:
-                    break;
-            }
-            if (keyboard.isEnabled() && !chatWindow->isInputFocused())
-            {
-                const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
-                // Checks if any item shortcut is pressed.
-                for (int i = KeyboardConfig::KEY_SHORTCUT_0;
-                    i <= KeyboardConfig::KEY_SHORTCUT_9;
-                    i++)
-                {
-                    if (tKey == i && !used) {
-                        itemShortcut->useItem(
-                                i - KeyboardConfig::KEY_SHORTCUT_0);
-                        break;
-                    }
-                }
-                switch (tKey) {
-                    case KeyboardConfig::KEY_PICKUP:
-                        {
-                            FloorItem *item = floorItemManager->findByCoordinates(
-                                    player_node->mX, player_node->mY);
-
-                            // If none below the player, try the tile in front of
-                            // the player
-                            if (!item) {
-                                Uint16 x = player_node->mX;
-                                Uint16 y = player_node->mY;
-                                if (player_node->getDirection() & Being::UP)
-                                    y--;
-                                if (player_node->getDirection() & Being::DOWN)
-                                    y++;
-                                if (player_node->getDirection() & Being::LEFT)
-                                    x--;
-                                if (player_node->getDirection() & Being::RIGHT)
-                                    x++;
-
-                                item = floorItemManager->findByCoordinates(x, y);
-                            }
-
-                            if (item)
-                                player_node->pickUp(item);
-
-                            used = true;
-                        }
-                        break;
-                    case KeyboardConfig::KEY_SIT:
-                        // Player sit action
-                        player_node->toggleSit();
-                        used = true;
-                        break;
-                    case KeyboardConfig::KEY_HIDE_WINDOWS:
-                         // Hide certain windows
-                        if (!chatWindow->isInputFocused())
-                        {
-                            statusWindow->setVisible(false);
-                            inventoryWindow->setVisible(false);
-                            skillDialog->setVisible(false);
-                            setupWindow->setVisible(false);
-                            equipmentWindow->setVisible(false);
-                            helpWindow->setVisible(false);
-                            debugWindow->setVisible(false);
-                        }
-                        break;
-                }
-            }
-
-            if (requestedWindow)
-            {
-                requestedWindow->setVisible(!requestedWindow->isVisible());
-                if (requestedWindow->isVisible())
-                {
-                    requestedWindow->requestMoveToTop();
-                }
-                used = true;
-            }
-
-        }
-
-        // Quit event
-        else if (event.type == SDL_QUIT)
-        {
-            done = true;
-        }
-
-        // Push input to GUI when not used
-        if (!used)
-        {
-            try
-            {
-                guiInput->pushInput(event);
-            }
-            catch (gcn::Exception e)
-            {
-                const char* err = e.getMessage().c_str();
-                logger->log("Warning: guichan input exception: %s", err);
-            }
-        }
+	bool used = false;
+
+	// Keyboard events (for discontinuous keys)
+	if (event.type == SDL_KEYDOWN)
+	{
+	    gcn::Window *requestedWindow = NULL;
+
+	    if (setupWindow->isVisible() &&
+		keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE)
+	    {
+		keyboard.setNewKey((int) event.key.keysym.sym);
+		keyboard.callbackNewKey();
+		keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
+		return;
+	    }
+	    // Keys pressed together with Alt/Meta
+	    // Emotions and some internal gui windows
+	    #ifndef __APPLE__
+	    if (event.key.keysym.mod & KMOD_ALT)
+	    #else
+	    if (event.key.keysym.mod & KMOD_LMETA)
+	    #endif
+	    {
+		switch (event.key.keysym.sym)
+		{
+		    case SDLK_p:
+			// Screenshot (picture, hence the p)
+			{
+			    SDL_Surface *screenshot =
+                                graphics->getScreenshot();
+			    if (!saveScreenshot(screenshot))
+			    {
+				logger->
+                                    log("Error: could not save Screenshot.");
+			    }
+			    SDL_FreeSurface(screenshot);
+			}
+			used = true;
+			break;
+
+		    default:
+			break;
+
+		    case SDLK_f:
+			// Find path to mouse (debug purpose)
+			viewport->toggleDebugPath();
+			used = true;
+			break;
+
+		    case SDLK_t:
+			// Toggle accepting of incoming trade requests
+			{
+			    unsigned int deflt = player_relations.getDefault();
+			    if (deflt & PlayerRelation::TRADE) {
+				chatWindow->
+                                    chatLog("Ignoring incoming trade requests",
+                                    BY_SERVER);
+				deflt &= ~PlayerRelation::TRADE;
+			    } else {
+				chatWindow->chatLog("Accepting incoming trade "
+                                                    "requests", BY_SERVER);
+				deflt |= PlayerRelation::TRADE;
+			    }
+
+			    player_relations.setDefault(deflt);
+			}
+			used = true;
+			break;
+		}
+
+		// Emotions
+		Uint8 emotion;
+		switch (event.key.keysym.sym)
+		{
+		    case SDLK_1: emotion = 1; break;
+		    case SDLK_2: emotion = 2; break;
+		    case SDLK_3: emotion = 3; break;
+		    case SDLK_4: emotion = 4; break;
+		    case SDLK_5: emotion = 5; break;
+		    case SDLK_6: emotion = 6; break;
+		    case SDLK_7: emotion = 7; break;
+		    case SDLK_8: emotion = 8; break;
+		    case SDLK_9: emotion = 9; break;
+		    case SDLK_0: emotion = 10; break;
+		    case SDLK_MINUS: emotion = 11; break;
+		    case SDLK_EQUALS: emotion = 12; break;
+		    default: emotion = 0; break;
+		}
+
+		if (emotion)
+		{
+		    player_node->emote(emotion);
+		    used = true;
+		}
+	    }
+	    switch (event.key.keysym.sym)
+	    {
+		case SDLK_PAGEUP:
+		    if (chatWindow->isVisible())
+		    {
+			chatWindow->scroll(-DEFAULT_CHAT_WINDOW_SCROLL);
+			used = true;
+		    }
+		    break;
+
+		case SDLK_PAGEDOWN:
+		    if (chatWindow->isVisible())
+		    {
+			chatWindow->scroll(DEFAULT_CHAT_WINDOW_SCROLL);
+			used = true;
+		    }
+		    break;
+
+		case SDLK_F1:
+		    // In-game Help
+		    if (helpWindow->isVisible())
+		    {
+			helpWindow->setVisible(false);
+		    }
+		    else
+		    {
+			helpWindow->loadHelp("index");
+			helpWindow->requestMoveToTop();
+		    }
+		    used = true;
+		    break;
+
+		case SDLK_F2: requestedWindow = statusWindow; break;
+		case SDLK_F3: requestedWindow = inventoryWindow; break;
+		case SDLK_F4: requestedWindow = equipmentWindow; break;
+		case SDLK_F5: requestedWindow = skillDialog; break;
+		case SDLK_F6: requestedWindow = minimap; break;
+		case SDLK_F7: requestedWindow = chatWindow; break;
+		case SDLK_F8: requestedWindow = itemShortcutWindow; break;
+		case SDLK_F9: requestedWindow = setupWindow; break;
+		case SDLK_F10: requestedWindow = debugWindow; break;
+		//case SDLK_F11: requestedWindow = newSkillWindow; break;
+
+		case SDLK_RETURN:
+		    // Input chat window
+		    if (chatWindow->isInputFocused() ||
+			deathNotice != NULL ||
+			weightNotice != NULL)
+		    {
+			break;
+		    }
+
+		    // Quit by pressing Enter if the exit confirm is there
+		    if (exitConfirm)
+		    {
+			done = true;
+		    }
+		    // Close the Browser if opened
+		    else if (helpWindow->isVisible())
+		    {
+			helpWindow->setVisible(false);
+		    }
+		    // Close the config window, cancelling changes if opened
+		    else if (setupWindow->isVisible())
+		    {
+			setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
+		    }
+		    // Else, open the chat edit box
+		    else
+		    {
+			chatWindow->requestChatFocus();
+			used = true;
+		    }
+		    break;
+		   // Quitting confirmation dialog
+		case SDLK_ESCAPE:
+		    if (!exitConfirm) {
+			exitConfirm = new ConfirmDialog(
+				"Quit", "Are you sure you want to quit?");
+			exitConfirm->addActionListener(&exitListener);
+			exitConfirm->requestMoveToTop();
+		    }
+		    else
+		    {
+			exitConfirm->action(gcn::ActionEvent(NULL, "no"));
+		    }
+		    break;
+
+		default:
+		    break;
+	    }
+	    if (keyboard.isEnabled() && !chatWindow->isInputFocused())
+	    {
+		const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
+		// Checks if any item shortcut is pressed.
+		for (int i = KeyboardConfig::KEY_SHORTCUT_0;
+		    i <= KeyboardConfig::KEY_SHORTCUT_9;
+		    i++)
+		{
+		    if (tKey == i && !used) {
+			itemShortcut->useItem(
+				i - KeyboardConfig::KEY_SHORTCUT_0);
+			break;
+		    }
+		}
+		switch (tKey) {
+		    case KeyboardConfig::KEY_PICKUP:
+			{
+			    FloorItem *item =
+                                floorItemManager->findByCoordinates(
+				    player_node->mX, player_node->mY);
+
+			    // If none below the player, try the tile in front
+			    // of the player
+			    if (!item) {
+				Uint16 x = player_node->mX;
+				Uint16 y = player_node->mY;
+				if (player_node->getDirection() & Being::UP)
+				    y--;
+				if (player_node->getDirection() & Being::DOWN)
+				    y++;
+				if (player_node->getDirection() & Being::LEFT)
+				    x--;
+				if (player_node->getDirection() & Being::RIGHT)
+				    x++;
+
+				item = floorItemManager->
+                                    findByCoordinates(x, y);
+			    }
+
+			    if (item)
+				player_node->pickUp(item);
+
+			    used = true;
+			}
+			break;
+		    case KeyboardConfig::KEY_SIT:
+			// Player sit action
+			player_node->toggleSit();
+			used = true;
+			break;
+		    case KeyboardConfig::KEY_HIDE_WINDOWS:
+			 // Hide certain windows
+			if (!chatWindow->isInputFocused())
+			{
+			    statusWindow->setVisible(false);
+			    inventoryWindow->setVisible(false);
+			    skillDialog->setVisible(false);
+			    setupWindow->setVisible(false);
+			    equipmentWindow->setVisible(false);
+			    helpWindow->setVisible(false);
+			    debugWindow->setVisible(false);
+			}
+			break;
+		}
+	    }
+
+	    if (requestedWindow)
+	    {
+		requestedWindow->setVisible(!requestedWindow->isVisible());
+		if (requestedWindow->isVisible())
+		{
+		    requestedWindow->requestMoveToTop();
+		}
+		used = true;
+	    }
+
+	}
+
+	// Quit event
+	else if (event.type == SDL_QUIT)
+	{
+	    done = true;
+	}
+
+	// Push input to GUI when not used
+	if (!used)
+	{
+	    try
+	    {
+		guiInput->pushInput(event);
+	    }
+	    catch (gcn::Exception e)
+	    {
+		const char* err = e.getMessage().c_str();
+		logger->log("Warning: guichan input exception: %s", err);
+	    }
+	}
 
     } // End while
     // If the user is configuring the keys then don't respond.
@@ -732,111 +739,112 @@ void Game::handleInput()
     }
     // Moving player around
     if (player_node->mAction != Being::DEAD &&
-        current_npc == 0 &&
-        !chatWindow->isInputFocused())
+	current_npc == 0 &&
+	!chatWindow->isInputFocused())
     {
-        // Get the state of the keyboard keys
-        keyboard.refreshActiveKeys();
-
-        const Uint16 x = player_node->mX;
-        const Uint16 y = player_node->mY;
-        unsigned char direction = 0;
-
-        // Translate pressed keys to movement and direction
-        if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP) ||
-            (joystick && joystick->isUp()))
-        {
-            direction |= Being::UP;
-        }
-        else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) ||
-                 (joystick && joystick->isDown()))
-        {
-            direction |= Being::DOWN;
-        }
-
-        if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) ||
-            (joystick && joystick->isLeft()))
-        {
-            direction |= Being::LEFT;
-        }
-        else if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) ||
-                 (joystick && joystick->isRight()))
-        {
-            direction |= Being::RIGHT;
-        }
-
-        player_node->setWalkingDir(direction);
-
-        // Attacking monsters
-        if (keyboard.isKeyActive(keyboard.KEY_ATTACK) ||
-                (joystick && joystick->buttonPressed(0)))
-        {
-            Being *target = NULL;
-            bool newTarget = keyboard.isKeyActive(keyboard.KEY_TARGET);
-            // A set target has highest priority
-            if (newTarget || !player_node->getTarget())
-            {
-                Uint16 targetX = x, targetY = y;
-
-                if (player_node->getDirection() & Being::UP)
-                    targetY--;
-                if (player_node->getDirection() & Being::DOWN)
-                    targetY++;
-                if (player_node->getDirection() & Being::LEFT)
-                    targetX--;
-                if (player_node->getDirection() & Being::RIGHT)
-                    targetX++;
-
-                // Attack priorioty is: Monster, Player, auto target
-                target = beingManager->findBeing(
-                        targetX, targetY, Being::MONSTER);
-                if (!target)
-                    target = beingManager->findBeing(
-                            targetX, targetY, Being::PLAYER);
-            }
-
-            player_node->attack(target, newTarget);
-        }
-
-        // Target the nearest player if 'q' is pressed
-        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) )
-        //if (keys[SDLK_q])
-        {
-            Being *target =
-                beingManager->findNearestLivingBeing(player_node, 20, Being::PLAYER);
-
-            if (target)
-            {
-                player_node->setTarget(target);
-            }
-        }
-
-        // Target the nearest monster if 'a' pressed
-        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) )
-        //if (keys[SDLK_a])
-        {
-            Being *target =
-                beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER);
-
-            if (target)
-            {
-                player_node->setTarget(target);
-            }
-        }
-
-        if (joystick)
-        {
-            if (joystick->buttonPressed(1))
-            {
-                FloorItem *item = floorItemManager->findByCoordinates(x, y);
-
-                if (item)
-                    player_node->pickUp(item);
-            }
-            else if (joystick->buttonPressed(2))
-            {
-                player_node->toggleSit();
-            }
-        }
+	// Get the state of the keyboard keys
+	keyboard.refreshActiveKeys();
+
+	const Uint16 x = player_node->mX;
+	const Uint16 y = player_node->mY;
+	unsigned char direction = 0;
+
+	// Translate pressed keys to movement and direction
+	if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP) ||
+	    (joystick && joystick->isUp()))
+	{
+	    direction |= Being::UP;
+	}
+	else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) ||
+		 (joystick && joystick->isDown()))
+	{
+	    direction |= Being::DOWN;
+	}
+
+	if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) ||
+	    (joystick && joystick->isLeft()))
+	{
+	    direction |= Being::LEFT;
+	}
+	else if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) ||
+		 (joystick && joystick->isRight()))
+	{
+	    direction |= Being::RIGHT;
+	}
+
+	player_node->setWalkingDir(direction);
+
+	// Attacking monsters
+	if (keyboard.isKeyActive(keyboard.KEY_ATTACK) ||
+		(joystick && joystick->buttonPressed(0)))
+	{
+	    Being *target = NULL;
+	    bool newTarget = keyboard.isKeyActive(keyboard.KEY_TARGET);
+	    // A set target has highest priority
+	    if (newTarget || !player_node->getTarget())
+	    {
+		Uint16 targetX = x, targetY = y;
+
+		if (player_node->getDirection() & Being::UP)
+		    targetY--;
+		if (player_node->getDirection() & Being::DOWN)
+		    targetY++;
+		if (player_node->getDirection() & Being::LEFT)
+		    targetX--;
+		if (player_node->getDirection() & Being::RIGHT)
+		    targetX++;
+
+		// Attack priorioty is: Monster, Player, auto target
+		target = beingManager->findBeing(
+			targetX, targetY, Being::MONSTER);
+		if (!target)
+		    target = beingManager->findBeing(
+			    targetX, targetY, Being::PLAYER);
+	    }
+
+	    player_node->attack(target, newTarget);
+	}
+
+	// Target the nearest player if 'q' is pressed
+	if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) )
+	//if (keys[SDLK_q])
+	{
+	    Being *target =
+		beingManager->
+                    findNearestLivingBeing(player_node, 20, Being::PLAYER);
+
+	    if (target)
+	    {
+		player_node->setTarget(target);
+	    }
+	}
+
+	// Target the nearest monster if 'a' pressed
+	if ( keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) )
+	//if (keys[SDLK_a])
+	{
+	    Being *target =
+		beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER);
+
+	    if (target)
+	    {
+		player_node->setTarget(target);
+	    }
+	}
+
+	if (joystick)
+	{
+	    if (joystick->buttonPressed(1))
+	    {
+		FloorItem *item = floorItemManager->findByCoordinates(x, y);
+
+		if (item)
+		    player_node->pickUp(item);
+	    }
+	    else if (joystick->buttonPressed(2))
+	    {
+		player_node->toggleSit();
+	    }
+	}
     }
 }
diff --git a/src/game.h b/src/game.h
index 5b73832e..583aea70 100644
--- a/src/game.h
+++ b/src/game.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: game.h 3859 2008-01-26 19:38:43Z b_lindeijer $
  */
 
 #ifndef _TMW_GAME_
@@ -42,35 +42,35 @@ extern volatile int tick_time;
 class Game : public ConfigListener
 {
     public:
-        Game(Network *network);
-        ~Game();
+	Game(Network *network);
+	~Game();
 
-        void logic();
+	void logic();
 
-        void handleInput();
+	void handleInput();
 
-        void optionChanged(const std::string &name);
+	void optionChanged(const std::string &name);
 
     private:
-        Network *mNetwork;
-
-        /** Used to determine whether to draw the next frame. */
-        int mDrawTime;
-
-        /** The minimum frame time (used for frame limiting). */
-        int mMinFrameTime;
-
-        typedef const std::auto_ptr<MessageHandler> MessageHandlerPtr;
-        MessageHandlerPtr mBeingHandler;
-        MessageHandlerPtr mBuySellHandler;
-        MessageHandlerPtr mChatHandler;
-        MessageHandlerPtr mEquipmentHandler;
-        MessageHandlerPtr mInventoryHandler;
-        MessageHandlerPtr mItemHandler;
-        MessageHandlerPtr mNpcHandler;
-        MessageHandlerPtr mPlayerHandler;
-        MessageHandlerPtr mSkillHandler;
-        MessageHandlerPtr mTradeHandler;
+	Network *mNetwork;
+
+	/** Used to determine whether to draw the next frame. */
+	int mDrawTime;
+
+	/** The minimum frame time (used for frame limiting). */
+	int mMinFrameTime;
+
+	typedef const std::auto_ptr<MessageHandler> MessageHandlerPtr;
+	MessageHandlerPtr mBeingHandler;
+	MessageHandlerPtr mBuySellHandler;
+	MessageHandlerPtr mChatHandler;
+	MessageHandlerPtr mEquipmentHandler;
+	MessageHandlerPtr mInventoryHandler;
+	MessageHandlerPtr mItemHandler;
+	MessageHandlerPtr mNpcHandler;
+	MessageHandlerPtr mPlayerHandler;
+	MessageHandlerPtr mSkillHandler;
+	MessageHandlerPtr mTradeHandler;
 };
 
 /**
diff --git a/src/graphics.cpp b/src/graphics.cpp
index 586f9f49..0433678f 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: graphics.cpp 3628 2007-10-18 18:39:48Z b_lindeijer $
  */
 
 #include <cassert>
diff --git a/src/graphics.h b/src/graphics.h
index 564826a2..0cf58141 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: graphics.h 3628 2007-10-18 18:39:48Z b_lindeijer $
  */
 
 #ifndef _GRAPHICS_H
diff --git a/src/gui/box.cpp b/src/gui/box.cpp
index 6af3ae3e..f53bc18e 100644
--- a/src/gui/box.cpp
+++ b/src/gui/box.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: box.cpp 1456 2005-07-15 23:17:00Z b_lindeijer $
  */
 
 #include "box.h"
diff --git a/src/gui/box.h b/src/gui/box.h
index ed1a7163..280fd3e2 100644
--- a/src/gui/box.h
+++ b/src/gui/box.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: box.h 2529 2006-08-13 10:20:19Z b_lindeijer $
  */
 
 
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index bc76335f..4f771a7e 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: browserbox.cpp 4348 2008-06-14 12:42:49Z the_enemy $
  */
 
 #include <algorithm>
diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h
index 9c0e8ef1..636fe5a0 100644
--- a/src/gui/browserbox.h
+++ b/src/gui/browserbox.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: browserbox.h 3687 2007-10-26 00:22:12Z crush_tmw $
  */
 
 #ifndef __TMW_BROWSERBOX_H__
diff --git a/src/gui/buddywindow.cpp b/src/gui/buddywindow.cpp
deleted file mode 100644
index 0ed383ce..00000000
--- a/src/gui/buddywindow.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#include "buddywindow.h"
-
-#include <guichan/widgets/listbox.hpp>
-
-#include "button.h"
-#include "chat.h"
-#include "scrollarea.h"
-
-#include "../resources/buddylist.h"
-
-extern ChatWindow *chatWindow;
-
-BuddyWindow::BuddyWindow():
-    Window("Buddy")
-{
-    setContentSize(124, 202);
-
-    mBuddyList = new BuddyList();
-
-    mListbox = new gcn::ListBox();
-    mListbox->setListModel(mBuddyList);
-
-    ScrollArea *scrollArea = new ScrollArea(mListbox);
-    scrollArea->setDimension(gcn::Rectangle(
-                7, 5, 110, 170));
-    add(scrollArea);
-
-    Button *talk = new Button("Talk", "Talk", this);
-    Button *remove = new Button("Remove", "Remove", this);
-    Button *cancel = new Button("Cancel", "Cancel", this);
-
-    talk->setPosition(2,180);
-    remove->setPosition(talk->getWidth()+2,180);
-    cancel->setPosition(talk->getWidth()+remove->getWidth()+2,180);
-
-    add(talk);
-    add(remove);
-    add(cancel);
-}
-
-void BuddyWindow::action(const gcn::ActionEvent &event)
-{
-    if (event.getId() == "Talk") {
-        int selected = mListbox->getSelected();
-        if ( selected > -1 )
-        {
-            std::string who = mBuddyList->getElementAt(selected);
-            chatWindow->setInputText(who +": ");
-        }
-    }
-    else if (event.getId() == "Remove") {
-        int selected = mListbox->getSelected();
-        if ( selected > -1 )
-        {
-            std::string who = mBuddyList->getElementAt(selected);
-            mBuddyList->removeBuddy(who);
-        }
-    }
-    else if (event.getId() == "Cancel") {
-        setVisible(false);
-    }
-}
diff --git a/src/gui/buddywindow.h b/src/gui/buddywindow.h
deleted file mode 100644
index a3ca4de2..00000000
--- a/src/gui/buddywindow.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#ifndef _TMW_BUDDYWINDOW_H
-#define _TMW_BUDDYWINDOW_H
-
-#include <guichan/actionlistener.hpp>
-
-#include "window.h"
-
-#include "../guichanfwd.h"
-
-class BuddyList;
-
-/**
- * Window showing buddy list.
- *
- * \ingroup Interface
- */
-class BuddyWindow : public Window, public gcn::ActionListener
-{
-    public:
-        /**
-         * Constructor.
-         */
-        BuddyWindow();
-
-        /**
-         * Performs action.
-         */
-        void action(const gcn::ActionEvent &event);
-
-    private:
-        BuddyList *mBuddyList;
-        gcn::ListBox *mListbox;
-};
-
-#endif /* _TMW_BUDDYWINDOW_H */
diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index c6bc4ccb..1243d798 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: button.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include <algorithm>
diff --git a/src/gui/button.h b/src/gui/button.h
index d12173b2..8e045a74 100644
--- a/src/gui/button.h
+++ b/src/gui/button.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: button.h 3606 2007-09-27 14:54:09Z b_lindeijer $
  */
 
 #ifndef _TMW_BUTTON_H
diff --git a/src/gui/buttonbox.cpp b/src/gui/buttonbox.cpp
new file mode 100644
index 00000000..592cb92a
--- /dev/null
+++ b/src/gui/buttonbox.cpp
@@ -0,0 +1,47 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: buttonbox.cpp
+ */
+
+#include "buttonbox.h"
+
+#include "button.h"
+
+ButtonBox::ButtonBox(const std::string &title, const std::string &buttonTxt,
+		     ButtonBoxListener *listener) :
+		     Window(title),
+		     mListener(listener)
+{
+    Button *button = new Button(buttonTxt, "activate", this);
+    setContentSize(button->getWidth() + 10,
+		   button->getHeight() + 10);
+    button->setPosition(5, 5);
+    add(button);
+}
+
+void
+ButtonBox::action(const gcn::ActionEvent &event)
+{
+    if (event.getId() == "activate")
+    {
+	mListener->buttonBoxRespond();
+    }
+}
diff --git a/src/gui/buttonbox.h b/src/gui/buttonbox.h
new file mode 100644
index 00000000..1b76e619
--- /dev/null
+++ b/src/gui/buttonbox.h
@@ -0,0 +1,70 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: buttonbox.h
+ */
+
+#ifndef _TMW_BUTTONBOX_H
+#define _TMW_BUTTONBOX_H
+
+#include <string>
+
+#include <guichan/actionlistener.hpp>
+
+#include "window.h"
+
+class ButtonBoxListener
+{
+    public:
+
+	/*
+	 * function that ButtonBox calls when the button has been pressed
+	 */
+	virtual void buttonBoxRespond() = 0;
+};
+
+class ButtonBox : public Window, public gcn::ActionListener
+{
+    public:
+
+	/*
+	 * Constructor
+	 *
+	 * @param title is the text that appears at the top of the box
+	 * @param buttonTxt is the text that appears on the button
+	 * @param listener points to the class that should respond to the
+	 *                 button press
+	 */
+	ButtonBox(const std::string &title, const std::string &buttonTxt,
+		  ButtonBoxListener *listener);
+
+	/*
+	 * called when the button is pressed
+	 *
+	 * @param event is the event that is generated
+	 */
+	void
+	action(const gcn::ActionEvent &event);
+
+    private:
+
+	ButtonBoxListener *mListener;
+};
+#endif
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 259fcfd9..24acf2d1 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: buy.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "buy.h"
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 3a9ea3c5..6f75cab5 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: buy.h 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #ifndef _TMW_BUY_H
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index ae5c7358..9cc3b297 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: buysell.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #include "buysell.h"
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index 97caf34b..64c37e39 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: buysell.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _TMW_BUYSELL_H
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 8ab3b879..c4b1d89e 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: char_select.cpp 3760 2007-11-21 19:43:11Z b_lindeijer $
  */
 
 #include "char_select.h"
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index 283ecf42..182600d1 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: char_select.h 3752 2007-11-20 10:50:00Z b_lindeijer $
  */
 
 #ifndef _CHAR_SELECT_H
diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp
index 638c05a6..3465fb69 100644
--- a/src/gui/char_server.cpp
+++ b/src/gui/char_server.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: char_server.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include "char_server.h"
@@ -105,10 +105,11 @@ ServerSelectDialog::action(const gcn::ActionEvent &event)
         const SERVER_INFO *si = server_info[mServerList->getSelected()];
         mLoginData->hostname = iptostring(si->address);
         mLoginData->port = si->port;
-        state = CHAR_CONNECT_STATE;
+        mLoginData->updateHost = si->updateHost;
+        state = UPDATE_STATE; 
     }
     else if (event.getId() == "cancel") {
-        state = LOADDATA_STATE;
+        state = LOGIN_STATE; 
     }
 }
 
diff --git a/src/gui/char_server.h b/src/gui/char_server.h
index 26e723f9..32a0645f 100644
--- a/src/gui/char_server.h
+++ b/src/gui/char_server.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: char_server.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _CHAR_SEL_SERVER_H
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 5e3aaf60..7b69ec1c 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -18,12 +18,11 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: chat.cpp 4227 2008-05-08 00:39:29Z peaveydk $
  */
 
 #include <algorithm>
-#include <sstream>
-
+#include <fstream>
 #include <guichan/focushandler.hpp>
 #include <guichan/key.hpp>
 
@@ -37,6 +36,9 @@
 #include "../configuration.h"
 #include "../game.h"
 #include "../localplayer.h"
+#include "../beingmanager.h"
+#include "../recorder.h"
+#include "../party.h"
 
 #include "../net/messageout.h"
 #include "../net/protocol.h"
@@ -64,9 +66,9 @@ ChatWindow::ChatWindow(Network *network):
     mTextOutput->setMaxRow((int) config.getValue("ChatLogLength", 0));
     mScrollArea = new ScrollArea(mTextOutput);
     mScrollArea->setPosition(
-            mScrollArea->getFrameSize(), mScrollArea->getFrameSize());
+	    mScrollArea->getFrameSize(), mScrollArea->getFrameSize());
     mScrollArea->setScrollPolicy(
-            gcn::ScrollArea::SHOW_NEVER, gcn::ScrollArea::SHOW_ALWAYS);
+	    gcn::ScrollArea::SHOW_NEVER, gcn::ScrollArea::SHOW_ALWAYS);
     mScrollArea->setOpaque(false);
 
     add(mScrollArea);
@@ -75,6 +77,22 @@ ChatWindow::ChatWindow(Network *network):
     // Add key listener to chat input to be able to respond to up/down
     mChatInput->addKeyListener(this);
     mCurHist = mHistory.end();
+
+    // Read the party prefix
+    std::string partyPrefix = config.getValue("PartyPrefix", "$");
+    mPartyPrefix = (partyPrefix == "" ? '$' : partyPrefix.at(0));
+    mReturnToggles = config.getValue("ReturnToggles", "0") == "1";
+    mRecorder = new Recorder(this);
+    mParty = new Party(this, mNetwork);
+}
+
+ChatWindow::~ChatWindow()
+{
+    char partyPrefix[2] = ".";
+    *partyPrefix = mPartyPrefix;
+    config.setValue("PartyPrefix", partyPrefix);
+    config.setValue("ReturnToggles", mReturnToggles ? "1" : "0");
+    delete mRecorder;
 }
 
 void
@@ -85,17 +103,17 @@ ChatWindow::logic()
     const gcn::Rectangle area = getChildrenArea();
 
     mChatInput->setPosition(mChatInput->getFrameSize(),
-                            area.height - mChatInput->getHeight() -
-                                mChatInput->getFrameSize());
+			    area.height - mChatInput->getHeight() -
+				mChatInput->getFrameSize());
     mChatInput->setWidth(area.width - 2 * mChatInput->getFrameSize());
     mScrollArea->setWidth(area.width - 2 * mScrollArea->getFrameSize());
     mScrollArea->setHeight(area.height - 2 * mScrollArea->getFrameSize() -
-            mChatInput->getHeight() - 5);
+	    mChatInput->getHeight() - 5);
     mScrollArea->logic();
 }
 
 void
-ChatWindow::chatLog(std::string line, int own)
+ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
 {
     // Trim whitespace
     trim(line);
@@ -108,47 +126,51 @@ ChatWindow::chatLog(std::string line, int own)
     // Fix the owner of welcome message.
     if (line.substr(0, 7) == "Welcome")
     {
-        own = BY_SERVER;
+	own = BY_SERVER;
     }
 
     std::string::size_type pos = line.find(" : ");
     if (pos != std::string::npos) {
-        tmp.nick = line.substr(0, pos);
-        tmp.text = line.substr(pos + 3);
+	tmp.nick = line.substr(0, pos);
+	tmp.text = line.substr(pos + 3);
     }
 
     std::string lineColor = "##0"; // Equiv. to BrowserBox::BLACK
     switch (own) {
-        case BY_GM:
-            tmp.nick += std::string("Global announcement: ");
-            lineColor = "##1"; // Equiv. to BrowserBox::RED
-            break;
-        case BY_PLAYER:
-            tmp.nick += CAT_NORMAL;
-            lineColor = "##2"; // Equiv. to BrowserBox::GREEN
-            break;
-        case BY_OTHER:
-            tmp.nick += CAT_NORMAL;
-            lineColor = "##0"; // Equiv. to BrowserBox::BLACK
-            break;
-        case BY_SERVER:
-            tmp.nick = "Server: ";
-            tmp.text = line;
-            lineColor = "##7"; // Equiv. to BrowserBox::PINK
-            break;
-        case ACT_WHISPER:
-            tmp.nick += CAT_WHISPER;
-            lineColor = "##3"; // Equiv. to BrowserBox::BLUE
-            break;
-        case ACT_IS:
-            tmp.nick += CAT_IS;
-            lineColor = "##5"; // Equiv. to BrowserBox::YELLOW
-            break;
-        case BY_LOGGER:
-            tmp.nick = "";
-            tmp.text = line;
-            lineColor = "##8"; // Equiv. to BrowserBox::GREY
-            break;
+	case BY_GM:
+	    tmp.nick += std::string("Global announcement: ");
+	    lineColor = "##1"; // Equiv. to BrowserBox::RED
+	    break;
+	case BY_PLAYER:
+	    tmp.nick += CAT_NORMAL;
+	    lineColor = "##2"; // Equiv. to BrowserBox::GREEN
+	    break;
+	case BY_OTHER:
+	    tmp.nick += CAT_NORMAL;
+	    lineColor = "##0"; // Equiv. to BrowserBox::BLACK
+	    break;
+	case BY_SERVER:
+	    tmp.nick = "Server: ";
+	    tmp.text = line;
+	    lineColor = "##7"; // Equiv. to BrowserBox::PURPLE
+	    break;
+	case BY_PARTY:
+	    tmp.nick += CAT_NORMAL;
+	    lineColor = "##6"; // Equiv. to BrowserBox::PINK
+	    break;
+	case ACT_WHISPER:
+	    tmp.nick += CAT_WHISPER;
+	    lineColor = "##3"; // Equiv. to BrowserBox::BLUE
+	    break;
+	case ACT_IS:
+	    tmp.nick += CAT_IS;
+	    lineColor = "##5"; // Equiv. to BrowserBox::YELLOW
+	    break;
+	case BY_LOGGER:
+	    tmp.nick = "";
+	    tmp.text = line;
+	    lineColor = "##8"; // Equiv. to BrowserBox::GRAY
+	    break;
     }
 
     // Get the current system time
@@ -158,12 +180,12 @@ ChatWindow::chatLog(std::string line, int own)
     // Format the time string properly
     std::stringstream timeStr;
     timeStr << "["
-            << ((((t / 60) / 60) % 24 < 10) ? "0" : "")
-            << (int)(((t / 60) / 60) % 24)
-            << ":"
-            << (((t / 60) % 60 < 10) ? "0" : "")
-            << (int)((t / 60) % 60)
-            << "] ";
+	    << ((((t / 60) / 60) % 24 < 10) ? "0" : "")
+	    << (int)(((t / 60) / 60) % 24)
+	    << ":"
+	    << (((t / 60) % 60 < 10) ? "0" : "")
+	    << (int)((t / 60) % 60)
+	    << "] ";
 
     line = lineColor + timeStr.str() + tmp.nick + tmp.text;
 
@@ -172,13 +194,15 @@ ChatWindow::chatLog(std::string line, int own)
     // at comparison.
     if (mScrollArea->getVerticalScrollAmount() == mScrollArea->getVerticalMaxScroll())
     {
-        mTextOutput->addRow(line);
-        mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll());
+	mTextOutput->addRow(line);
+	mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll());
     }
     else
     {
-        mTextOutput->addRow(line);
+	mTextOutput->addRow(line);
     }
+
+    mRecorder->record(line.substr(3));
 }
 
 void
@@ -192,32 +216,35 @@ ChatWindow::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "chatinput")
     {
-        std::string message = mChatInput->getText();
-
-        if (!message.empty()) {
-            // If message different from previous, put it in the history
-            if (mHistory.empty() || message != mHistory.back()) {
-                mHistory.push_back(message);
-            }
-
-            // Reset history iterator
-            mCurHist = mHistory.end();
-
-            // Send the message to the server
-            chatSend(player_node->getName(), message);
-
-            // Clear the text from the chat input
-            mChatInput->setText("");
-        }
-
-        // Remove focus and hide input
-        mFocusHandler->focusNone();
-
-        // If the chatWindow is shown up because you want to send a message
-        // It should hide now
-        if (mTmpVisible) {
-            setVisible(false);
-        }
+	std::string message = mChatInput->getText();
+
+	if (!message.empty()) {
+	    // If message different from previous, put it in the history
+	    if (mHistory.empty() || message != mHistory.back()) {
+		mHistory.push_back(message);
+	    }
+
+	    // Reset history iterator
+	    mCurHist = mHistory.end();
+
+	    // Send the message to the server
+	    chatSend(player_node->getName(), message);
+
+	    // Clear the text from the chat input
+	    mChatInput->setText("");
+	}
+	if (message.empty() || !mReturnToggles)
+	{
+	    // Remove focus and hide input
+	    mFocusHandler->focusNone();
+
+	    // If the chatWindow is shown up because you want to send a message
+	    // It should hide now
+	    if (mTmpVisible)
+	    {
+		setVisible(false);
+	    }
+	}
     }
 }
 
@@ -227,14 +254,14 @@ ChatWindow::requestChatFocus()
     // Make sure chatWindow is visible
     if (!isVisible())
     {
-        setVisible(true);
-
-        /*
-         * This is used to hide chatWindow after sending the message. There is
-         * a trick here, because setVisible will set mTmpVisible to false, you
-         * have to put this sentence *after* setVisible, not before it
-         */
-        mTmpVisible = true;
+	setVisible(true);
+
+	/*
+	 * This is used to hide chatWindow after sending the message. There is
+	 * a trick here, because setVisible will set mTmpVisible to false, you
+	 * have to put this sentence *after* setVisible, not before it
+	 */
+	mTmpVisible = true;
     }
 
     // Give focus to the chat input
@@ -255,81 +282,224 @@ ChatWindow::chatSend(const std::string &nick, std::string msg)
      * require server handling by proper packet. Probably
      * those if elses should be replaced by protocol calls */
 
+    // Send party message
+    if (msg.at(0) == mPartyPrefix)
+    {
+	msg.erase(0, 1);
+	std::size_t length = msg.length() + 1;
+
+	if (length == 0)
+	{
+	    chatLog("Trying to send a blank party message.", BY_SERVER);
+	    return;
+	}
+	MessageOut outMsg(mNetwork);
+
+	outMsg.writeInt16(CMSG_PARTY_MESSAGE);
+	outMsg.writeInt16(length + 4);
+	outMsg.writeString(msg, length);
+	return;
+    }
     // Prepare ordinary message
     if (msg.substr(0, 1) != "/") {
-        msg = nick + " : " + msg;
+	msg = nick + " : " + msg;
+
+	MessageOut outMsg(mNetwork);
+	outMsg.writeInt16(CMSG_CHAT_MESSAGE);
+	// Added + 1 in order to let eAthena parse admin commands correctly
+	outMsg.writeInt16(msg.length() + 4 + 1);
+	outMsg.writeString(msg, msg.length() + 1);
+	return;
+    }
+    msg.erase(0, 1);
+    trim(msg);
 
-        MessageOut outMsg(mNetwork);
-        outMsg.writeInt16(CMSG_CHAT_MESSAGE);
-        // Added + 1 in order to let eAthena parse admin commands correctly
-        outMsg.writeInt16(msg.length() + 4 + 1);
-        outMsg.writeString(msg, msg.length() + 1);
+    std::size_t space = msg.find(" ");
+    std::string command = msg.substr(0, space);
+    if (space == std::string::npos)
+    {
+	msg = "";
     }
-    else if (msg.substr(0, IS_ANNOUNCE_LENGTH) == IS_ANNOUNCE)
+    else
     {
-        msg.erase(0, IS_ANNOUNCE_LENGTH);
-        MessageOut outMsg(mNetwork);
-        outMsg.writeInt16(0x0099);
-        outMsg.writeInt16(msg.length() + 4);
-        outMsg.writeString(msg, msg.length());
+	msg = msg.substr(space);
+	trim(msg);
     }
-    else if (msg.substr(0, IS_HELP_LENGTH) == IS_HELP)
+
+    if (command == "announce")
     {
-        chatLog("-- Help --", BY_SERVER);
-        chatLog("/help: Display this help.", BY_SERVER);
-        chatLog("/announce: Global announcement (GM only)", BY_SERVER);
-        chatLog("/where: Display map name", BY_SERVER);
-        chatLog("/who: Display number of online users", BY_SERVER);
-        chatLog("/clear: Clears this window", BY_SERVER);
-        chatLog("/whisper <nick> <message>: Sends a private <message> to <nick>", BY_SERVER);
+	MessageOut outMsg(mNetwork);
+	outMsg.writeInt16(0x0099);
+	outMsg.writeInt16(msg.length() + 4);
+	outMsg.writeString(msg, msg.length());
+	return;
     }
-    else if (msg.substr(0, IS_WHERE_LENGTH) == IS_WHERE)
+    if (command == "help")
     {
-        chatLog(map_path, BY_SERVER);
+	std::size_t space = msg.find(" ");
+	std::string msg1;
+	if (space == std::string::npos)
+	{
+	    msg1 = "";
+	}
+	else
+	{
+	    msg1 = msg.substr(space + 1, msg.length());
+	    msg = msg.substr(0, space);
+	}
+	if (msg != "" && msg.at(0) == '/')
+	{
+	    msg.erase(0, 1);
+	}
+	while (msg1 != "" && msg1.at(0) == ' ')
+	{
+	    msg1.erase(0, 1);
+	}
+	help(msg, msg1);
+	return;
     }
-    else if (msg.substr(0, IS_WHO_LENGTH) == IS_WHO)
+    if (command == "where")
     {
-        MessageOut outMsg(mNetwork);
-        outMsg.writeInt16(0x00c1);
+	chatLog(map_path, BY_SERVER);
+	return;
     }
-    else if (msg.substr(0, IS_CLEAR_LENGTH) == IS_CLEAR)
+    if (command == "who")
     {
-        mTextOutput->clearRows();
+	MessageOut outMsg(mNetwork);
+	outMsg.writeInt16(0x00c1);
+	return;
     }
-    else if (msg.substr(0, IS_WHISPER_LENGTH) == IS_WHISPER)
+    if (command == "clear")
     {
-        std::string recvnick = "";
-        msg.erase(0, IS_WHISPER_LENGTH + 1);
-
-        if (msg.substr(0,1) == "\"")
-        {
-            const std::string::size_type pos = msg.find('"', 1);
-            if (pos != std::string::npos) {
-                recvnick = msg.substr(1, pos - 1);
-                msg.erase(0, pos + 2);
-            }
-        }
-        else
-        {
-            const std::string::size_type pos = msg.find(" ");
-            if (pos != std::string::npos) {
-                recvnick = msg.substr(0, pos);
-                msg.erase(0, pos + 1);
-            }
-        }
-
-        MessageOut outMsg(mNetwork);
-        outMsg.writeInt16(CMSG_CHAT_WHISPER);
-        outMsg.writeInt16(msg.length() + 28);
-        outMsg.writeString(recvnick, 24);
-        outMsg.writeString(msg, msg.length());
-
-        chatLog("Whispering to " + recvnick + " : " + msg, BY_PLAYER);
+	mTextOutput->clearRows();
+	return;
     }
-    else
+    if (command == "whisper")
+    {
+	std::string recvnick = "";
+
+	if (msg.substr(0,1) == "\"")
+	{
+	    const std::string::size_type pos = msg.find('"', 1);
+	    if (pos != std::string::npos) {
+		recvnick = msg.substr(1, pos - 1);
+		msg.erase(0, pos + 2);
+	    }
+	}
+	else
+	{
+	    const std::string::size_type pos = msg.find(" ");
+	    if (pos != std::string::npos) {
+		recvnick = msg.substr(0, pos);
+		msg.erase(0, pos + 1);
+	    }
+	}
+
+	MessageOut outMsg(mNetwork);
+	outMsg.writeInt16(CMSG_CHAT_WHISPER);
+	outMsg.writeInt16(msg.length() + 28);
+	outMsg.writeString(recvnick, 24);
+	outMsg.writeString(msg, msg.length());
+
+	chatLog("Whispering to " + recvnick + " : " + msg, BY_PLAYER);
+	return;
+    }
+    if (command == "record")
     {
-        chatLog("Unknown command", BY_SERVER);
+        mRecorder->respond(msg);
+	return;
     }
+    if (command == "toggle")
+    {
+	if (msg == "")
+	{
+	    chatLog(mReturnToggles ? "Return toggles chat."
+		                   : "Message closes chat.", BY_SERVER);
+	    return;
+	}
+	msg = msg.substr(0, 1);
+	if (msg == "1" || msg == "y" || msg == "t" || msg == "Y" || msg == "T")
+	{
+	    chatLog("Return now toggles chat.", BY_SERVER);
+	    mReturnToggles = true;
+	    return;
+	}
+	if (msg == "0" || msg == "n" || msg == "f" || msg == "N" || msg == "F")
+	{
+	    chatLog("Message now closes chat.", BY_SERVER);
+	    mReturnToggles = false;
+	    return;
+	}
+	chatLog("Options to /toggle are \"yes\", \"no\", \"true\", \"false\", "
+		"\"1\", \"0\".", BY_SERVER);
+	return;
+    }
+    if (command == "party")
+    {
+	if (msg == "")
+	{
+	    chatLog("Unknown party command... Type \"/help\" party for more "
+		    "information.", BY_SERVER);
+	    return;
+	}
+	const std::string::size_type space = msg.find(" ");
+	std::string rest = (space == std::string::npos ? ""
+				     : msg.substr(space + 1, msg.length()));
+	if (rest != "")
+	{
+	    msg = msg.substr(0, space);
+	    while (msg != "" && msg[0] == ' ')
+	    {
+		msg = msg.substr(1, msg.length());
+	    }
+	}
+	party(msg, rest);
+	return;
+    }
+    if (command == "present")
+    {
+	Beings &beings = beingManager->getAll();
+	std::string response = "";
+	for (BeingIterator bi = beings.begin(), be = beings.end();
+	     bi != be;
+	     ++bi)
+	{
+	    if ((*bi)->getType() == Being::PLAYER)
+	    {
+		if (response != "")
+		{
+		    response += ", ";
+		}
+		response += (*bi)->getName();
+	    }
+	}
+	if (mRecorder->isRecording())
+	{
+	    // Get the current system time
+ 	    time_t t;
+	    time(&t);
+	    
+	    // Format the time string properly
+	    std::stringstream timeStr;
+	    timeStr << "["
+		    << ((((t / 60) / 60) % 24 < 10) ? "0" : "")
+		    << (int)(((t / 60) / 60) % 24)
+		    << ":"
+		    << (((t / 60) % 60 < 10) ? "0" : "")
+		    << (int)((t / 60) % 60)
+		    << "] ";
+
+  
+	    mRecorder->record(timeStr.str() + "Present: " + response + ".");
+	    chatLog("Attendance written to record log.", BY_SERVER, true);
+	}
+	else
+	{
+	    chatLog("Present: " + response, BY_SERVER);
+	}
+	return;
+    }
+    chatLog("Unknown command", BY_SERVER);
 }
 
 std::string
@@ -337,76 +507,75 @@ ChatWindow::const_msg(CHATSKILL act)
 {
     std::string msg;
     if (act.success == SKILL_FAILED && act.skill == SKILL_BASIC) {
-        switch (act.bskill) {
-            case BSKILL_TRADE :
-                msg = "Trade failed!";
-                break;
-            case BSKILL_EMOTE :
-                msg = "Emote failed!";
-                break;
-            case BSKILL_SIT :
-                msg = "Sit failed!";
-                break;
-            case BSKILL_CREATECHAT :
-                msg = "Chat creating failed!";
-                break;
-            case BSKILL_JOINPARTY :
-                msg = "Could not join party!";
-                break;
-            case BSKILL_SHOUT :
-                msg = "Cannot shout!";
-                break;
-        }
-
-        switch (act.reason) {
-            case RFAIL_SKILLDEP :
-                msg += " You have not yet reached a high enough lvl!";
-                break;
-            case RFAIL_INSUFHP :
-                msg += " Insufficient HP!";
-                break;
-            case RFAIL_INSUFSP :
-                msg += " Insufficient SP!";
-                break;
-            case RFAIL_NOMEMO :
-                msg += " You have no memos!";
-                break;
-            case RFAIL_SKILLDELAY :
-                msg += " You cannot do that right now!";
-                break;
-            case RFAIL_ZENY :
-                msg += " Seems you need more Zeny... ;-)";
-                break;
-            case RFAIL_WEAPON :
-                msg += " You cannot use this skill with that kind of weapon!";
-                break;
-            case RFAIL_REDGEM :
-                msg += " You need another red gem!";
-                break;
-            case RFAIL_BLUEGEM :
-                msg += " You need another blue gem!";
-                break;
-            case RFAIL_OVERWEIGHT :
-                msg += " You're carrying to much to do this!";
-                break;
-            default :
-                msg += " Huh? What's that?";
-                break;
-        }
+	switch (act.bskill) {
+	    case BSKILL_TRADE :
+		msg = "Trade failed!";
+		break;
+	    case BSKILL_EMOTE :
+		msg = "Emote failed!";
+		break;
+	    case BSKILL_SIT :
+		msg = "Sit failed!";
+		break;
+	    case BSKILL_CREATECHAT :
+		msg = "Chat creating failed!";
+		break;
+	    case BSKILL_JOINPARTY :
+		msg = "Could not join party!";
+		break;
+	    case BSKILL_SHOUT :
+		msg = "Cannot shout!";
+		break;
+	}
+
+	switch (act.reason) {
+	    case RFAIL_SKILLDEP :
+		msg += " You have not yet reached a high enough level!";
+		break;
+	    case RFAIL_INSUFHP :
+		msg += " Insufficient HP!";
+		break;
+	    case RFAIL_INSUFSP :
+		msg += " Insufficient SP!";
+		break;
+	    case RFAIL_NOMEMO :
+		msg += " You have no memos!";
+		break;
+	    case RFAIL_SKILLDELAY :
+		msg += " You cannot do that right now!";
+		break;
+	    case RFAIL_ZENY :
+		msg += " Seems you need more Zeny... ;-)";
+		break;
+	    case RFAIL_WEAPON :
+		msg += " You cannot use this skill with that kind of weapon!";
+		break;
+	    case RFAIL_REDGEM :
+		msg += " You need another red gem!";
+		break;
+	    case RFAIL_BLUEGEM :
+		msg += " You need another blue gem!";
+		break;
+	    case RFAIL_OVERWEIGHT :
+		msg += " You're carrying to much to do this!";
+		break;
+	    default :
+		msg += " Huh? What's that?";
+		break;
+	}
     } else {
-        switch(act.skill) {
-            case SKILL_WARP :
-                msg = "Warp failed...";
-                break;
-            case SKILL_STEAL :
-                msg = "Could not steal anything...";
-                break;
-            case SKILL_ENVENOM :
-                msg = "Poison had no effect...";
-                break;
-        }
+	switch(act.skill) {
+	    case SKILL_WARP :
+		msg = "Warp failed...";
+		break;
+	    case SKILL_STEAL :
+		msg = "Could not steal anything...";
+		break;
+	    case SKILL_ENVENOM :
+		msg = "Poison had no effect...";
+		break;
+	}
     }
-
     return msg;
 }
 
@@ -414,7 +583,7 @@ void
 ChatWindow::scroll(int amount)
 {
     if (!isVisible())
-        return;
+	return;
 
     int range = mScrollArea->getHeight() / 8 * amount;
     gcn::Rectangle scr;
@@ -427,25 +596,25 @@ void
 ChatWindow::keyPressed(gcn::KeyEvent &event)
 {
     if (event.getKey().getValue() == gcn::Key::DOWN &&
-            mCurHist != mHistory.end())
-    {
-        // Move forward through the history
-        HistoryIterator prevHist = mCurHist++;
-        if (mCurHist != mHistory.end()) {
-            mChatInput->setText(*mCurHist);
-            mChatInput->setCaretPosition(mChatInput->getText().length());
-        }
-        else {
-            mCurHist = prevHist;
-        }
+	    mCurHist != mHistory.end())
+    {
+	// Move forward through the history
+	HistoryIterator prevHist = mCurHist++;
+	if (mCurHist != mHistory.end()) {
+	    mChatInput->setText(*mCurHist);
+	    mChatInput->setCaretPosition(mChatInput->getText().length());
+	}
+	else {
+	    mCurHist = prevHist;
+	}
     }
     else if (event.getKey().getValue() == gcn::Key::UP &&
-            mCurHist != mHistory.begin() && mHistory.size() > 0)
+	    mCurHist != mHistory.begin() && mHistory.size() > 0)
     {
-        // Move backward through the history
-        mCurHist--;
-        mChatInput->setText(*mCurHist);
-        mChatInput->setCaretPosition(mChatInput->getText().length());
+	// Move backward through the history
+	mCurHist--;
+	mChatInput->setText(*mCurHist);
+	mChatInput->setCaretPosition(mChatInput->getText().length());
     }
 }
 
@@ -469,3 +638,138 @@ ChatWindow::setVisible(bool isVisible)
     mTmpVisible = false;
 }
 
+void
+ChatWindow::party(const std::string &command, const std::string &rest)
+{
+    if (command == "prefix")
+    {
+	if (rest == "")
+	{
+	    char temp[2] = ".";
+	    *temp = mPartyPrefix;
+	    chatLog("The current party prefix is " + std::string(temp),
+		    BY_SERVER);
+	    return;
+	}
+	if (rest.length() != 1)
+	{
+	    chatLog("Party prefix must be one character long.", BY_SERVER);
+	}
+	else
+	{
+	    if (rest == "/")
+	    {
+		chatLog("Cannot use a '/' as the prefix.", BY_SERVER);
+	    }
+	    else
+	    {
+		mPartyPrefix = rest.at(0);
+		chatLog("Changing prefix to " + rest, BY_SERVER);
+	    }
+	}
+	return;
+    }
+    mParty->respond(command, rest);
+}
+
+void
+ChatWindow::help(const std::string &msg1, const std::string &msg2)
+{
+    chatLog("-- Help --", BY_SERVER);
+    if (msg1 == "")
+    {
+	chatLog("/announce: Global announcement (GM only)", BY_SERVER);
+	chatLog("/clear: Clears this window", BY_SERVER);
+	chatLog("/help: Display this help.", BY_SERVER);
+	mParty->help();
+	chatLog("/present: Get list of players present", BY_SERVER);
+	mRecorder->help();
+	chatLog("/toggle: Determine whether <return> toggles the chat log.",
+		BY_SERVER);
+	chatLog("/where: Display map name", BY_SERVER);
+	chatLog("/whisper <nick> <message>: Sends a private <message>"
+		" to <nick>", BY_SERVER);
+	chatLog("/who: Display number of online users", BY_SERVER);
+	chatLog("For more information, type /help <command>", BY_SERVER);
+	return;
+    }
+    if (msg1 == "announce")
+    {
+	chatLog("Command: /announce <msg>", BY_SERVER);
+	chatLog("*** only available to a GM ***", BY_SERVER);
+	chatLog("This command sends the message <msg> to "
+		"all players currently online.", BY_SERVER);
+	return;
+    }
+    if (msg1 == "clear")
+    {
+	chatLog("Command: /clear", BY_SERVER);
+	chatLog("This command clears the chat log of previous chat.",
+		BY_SERVER);
+	return;
+    }
+    if (msg1 == "help")
+    {
+        chatLog("Command: /help", BY_SERVER);
+        chatLog("This command displays a list of all commands available.",
+                BY_SERVER);
+        chatLog("Command: /help <command>", BY_SERVER);
+        chatLog("This command displays help on <command>.", BY_SERVER);
+        return;
+    }
+    if (msg1 == "party")
+    {
+        mParty->help(msg2);
+	return;
+    }
+    if (msg1 == "present")
+    {
+	chatLog("Command: /present", BY_SERVER);
+	chatLog("This command gets a list of players within hearing "
+		"and sends it to either the record log if recording, or the "
+		"chat log otherwise.", BY_SERVER);
+	return;
+    }
+    if (msg1 == "record")
+    {
+        mRecorder->help(msg2);
+	return;
+    }
+    if (msg1 == "toggle")
+    {
+	chatLog("Command: /toggle <state>", BY_SERVER);
+	chatLog("This command sets whether the return key should toggle the "
+		"chat log, or whether the chat log turns off automatically.",
+		BY_SERVER);
+	chatLog("<state> can be one of \"1\", \"yes\", \"true\" to turn "
+		"the toggle on, or \"0\", \"no\", \"false\" to turn the "
+		"toggle off.", BY_SERVER);
+	chatLog("Command: /toggle", BY_SERVER);
+	chatLog("This command displays the return toggle status.", BY_SERVER);
+	return;
+    }
+    if (msg1 == "where")
+    {
+	chatLog("Command: /where", BY_SERVER);
+	chatLog("This command displays the name of the current map.",
+		BY_SERVER);
+	return;
+    }
+    if (msg1 == "whisper")
+    {
+	chatLog("Command: /whisper <nick> <msg>", BY_SERVER);
+	chatLog("This command sends the message <msg> to <nick.", BY_SERVER);
+	chatLog("If the <nick> has spaces in it, enclose it in "
+		"double quotes (\").", BY_SERVER);
+	return;
+    }
+    if (msg1 == "who")
+    {
+	chatLog("Command: /who", BY_SERVER);
+	chatLog("This command displays the number of players currently "
+		"online.", BY_SERVER);
+	return;
+    }
+    chatLog("Unknown command.", BY_SERVER);
+    chatLog("Type /help for a list of commands.", BY_SERVER);
+}
diff --git a/src/gui/chat.h b/src/gui/chat.h
index 0bdc76f1..5e5ca110 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: chat.h 4227 2008-05-08 00:39:29Z peaveydk $
  */
 
 #ifndef _TMW_CHAT_H
@@ -26,6 +26,7 @@
 
 #include <list>
 #include <string>
+#include <fstream>
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
@@ -37,29 +38,19 @@
 class BrowserBox;
 class Network;
 class ScrollArea;
+class Recorder;
+class Party;
 
 #define BY_GM         0   // those should be self-explanatory =)
 #define BY_PLAYER     1
 #define BY_OTHER      2
 #define BY_SERVER     3
+#define BY_PARTY      4
 
-#define ACT_WHISPER   4   // getting whispered at
-#define ACT_IS        5   // equivalent to "/me" on IRC
+#define ACT_WHISPER   5   // getting whispered at
+#define ACT_IS        6   // equivalent to "/me" on IRC
 
-#define BY_LOGGER     6
-
-#define IS_ANNOUNCE         "/announce "
-#define IS_ANNOUNCE_LENGTH  10
-#define IS_HELP             "/help"
-#define IS_HELP_LENGTH      5
-#define IS_WHERE            "/where"
-#define IS_WHERE_LENGTH     6
-#define IS_WHO              "/who"
-#define IS_WHO_LENGTH       4
-#define IS_CLEAR            "/clear"
-#define IS_CLEAR_LENGTH     6
-#define IS_WHISPER          "/whisper"
-#define IS_WHISPER_LENGTH   8
+#define BY_LOGGER     7
 
 /**
  * gets in between usernick and message text depending on
@@ -118,121 +109,150 @@ struct CHATSKILL
  * \ingroup Interface
  */
 class ChatWindow : public Window, public gcn::ActionListener,
-                   public gcn::KeyListener
+		   public gcn::KeyListener
 {
     public:
-        /**
-         * Constructor.
-         */
-        ChatWindow(Network *network);
-
-        /**
-         * Logic (updates components' size)
-         */
-        void logic();
-
-        /*
-         * Adds a line of text to our message list. Parameters:
-         *
-         * @param line Text message.
-         * @parem own  Type of message (usually the owner-type).
-         */
-        void chatLog(std::string line, int own);
-
-        /*
-         * Calls original chat_log() after processing the packet.
-         */
-        void chatLog(CHATSKILL);
-
-        /**
-         * Performs action.
-         */
-        void action(const gcn::ActionEvent &event);
-
-        /**
-         * Request focus for typing chat message.
-         */
-        void requestChatFocus();
-
-        /**
-         * Checks whether ChatWindow is Focused or not.
-         */
-        bool isInputFocused();
-
-        /**
-         * Determines whether to send a command or an ordinary message, then
-         * contructs packets & sends them.
-         *
-         * @param nick The character's name to display in front.
-         * @param msg  The message text which is to be send.
-         *
-         * NOTE:
-         * The nickname is required by the server, if not specified
-         * the message may not be sent unless a command was intended
-         * which requires another packet to be constructed! you can
-         * achieve this by putting a slash ("/") infront of the
-         * message followed by the command name and the message.
-         * of course all slash-commands need implemented handler-
-         * routines. ;-)
-         * remember, a line starting with "@" is not a command that needs
-         * to be parsed rather is sent using the normal chat-packet.
-         *
-         * EXAMPLE:
-         * // for an global announcement   /- command
-         * chatlog.chat_send("", "/announce Hello to all logged in users!");
-         * // for simple message by a user /- message
-         * chatlog.chat_send("Zaeiru", "Hello to all users on the screen!");
-         */
-        void
-        chatSend(const std::string &nick, std::string msg);
-
-        /** Called when key is pressed */
-        void
-        keyPressed(gcn::KeyEvent &event);
-
-        /** Called to set current text */
-        void
-        setInputText(std::string input_str);
-
-        /** Override to reset mTmpVisible */
-        void
-        setVisible(bool visible);
+	/**
+	 * Constructor.
+	 */
+	ChatWindow(Network *network);
+
+	/**
+	 * Destructor: used to write back values to the config file
+	 */
+	~ChatWindow();
+
+	/**
+	 * Logic (updates components' size)
+	 */
+	void logic();
+
+	/**
+	 * Adds a line of text to our message list. Parameters:
+	 *
+	 * @param line Text message.
+	 * @parem own  Type of message (usually the owner-type).
+	 */
+	void chatLog(std::string line, int own, bool ignoreRecord = false);
+
+	/**
+	 * Calls original chat_log() after processing the packet.
+	 */
+	void chatLog(CHATSKILL);
+
+	/**
+	 * Performs action.
+	 */
+	void action(const gcn::ActionEvent &event);
+
+	/**
+	 * Request focus for typing chat message.
+	 */
+	void requestChatFocus();
+
+	/**
+	 * Checks whether ChatWindow is Focused or not.
+	 */
+	bool isInputFocused();
+
+	/**
+	 * Determines whether to send a command or an ordinary message, then
+	 * contructs packets & sends them.
+	 *
+	 * @param nick The character's name to display in front.
+	 * @param msg  The message text which is to be send.
+	 *
+	 * NOTE:
+	 * The nickname is required by the server, if not specified
+	 * the message may not be sent unless a command was intended
+	 * which requires another packet to be constructed! you can
+	 * achieve this by putting a slash ("/") infront of the
+	 * message followed by the command name and the message.
+	 * of course all slash-commands need implemented handler-
+	 * routines. ;-)
+	 * remember, a line starting with "@" is not a command that needs
+	 * to be parsed rather is sent using the normal chat-packet.
+	 *
+	 * EXAMPLE:
+	 * // for an global announcement   /- command
+	 * chatlog.chat_send("", "/announce Hello to all logged in users!");
+	 * // for simple message by a user /- message
+	 * chatlog.chat_send("Zaeiru", "Hello to all users on the screen!");
+	 */
+	void
+	chatSend(const std::string &nick, std::string msg);
+
+	/** Called when key is pressed */
+	void
+	keyPressed(gcn::KeyEvent &event);
+
+	/** Called to set current text */
+	void
+	setInputText(std::string input_str);
+
+	/** Override to reset mTmpVisible */
+	void
+	setVisible(bool visible);
 
        /**
-        * Scrolls the chat window
-        *
-        * @param amount direction and amount to scroll.  Negative numbers scroll
-        * up, positive numbers scroll down.  The absolute amount indicates the
-        * amount of 1/8ths of chat window real estate that should be scrolled.
-        */
-        void
-        scroll(int amount);
+	* Scrolls the chat window
+	*
+	* @param amount direction and amount to scroll.  Negative numbers scroll
+	* up, positive numbers scroll down.  The absolute amount indicates the
+	* amount of 1/8ths of chat window real estate that should be scrolled.
+	*/
+	void
+	scroll(int amount);
+
+	/**
+	 * party implements the partying chat commands
+	 *
+	 * @param command is the party command to perform
+	 * @param msg is the remainder of the message
+	 */
+	void
+	party(const std::string &command, const std::string &msg);
+
+	/**
+	 * help implements the /help command
+	 *
+	 * @param msg1 is the command that the player needs help on
+	 * @param msg2 is the sub-command relating to the command
+	 */
+	void
+	help(const std::string &msg1, const std::string &msg2);
 
     private:
-        Network *mNetwork;
-        bool mTmpVisible;
-
-        /** One item in the chat log */
-        struct CHATLOG
-        {
-            std::string nick;
-            std::string text;
-            int own;
-        };
-
-        /** Constructs failed messages for actions */
-        std::string const_msg(CHATSKILL);
-
-        gcn::TextField *mChatInput; /**< Input box for typing chat messages */
-        BrowserBox *mTextOutput;    /**< Text box for displaying chat history */
-        ScrollArea *mScrollArea;    /**< Scroll area around text output */
-
-        typedef std::list<std::string> History;
-        typedef History::iterator HistoryIterator;
-        History mHistory;           /**< Command history */
-        HistoryIterator mCurHist; /**< History iterator */
-};
 
+	Network *mNetwork;
+	bool mTmpVisible;
+
+	/** One item in the chat log */
+	struct CHATLOG
+	{
+	    std::string nick;
+	    std::string text;
+	    int own;
+	};
+
+	/** Constructs failed messages for actions */
+	std::string const_msg(CHATSKILL);
+
+	gcn::TextField *mChatInput; /**< Input box for typing chat messages */
+	BrowserBox *mTextOutput;    /**< Text box for displaying chat history */
+	ScrollArea *mScrollArea;    /**< Scroll area around text output */
+
+	typedef std::list<std::string> History;
+	typedef History::iterator HistoryIterator;
+	History mHistory;           /**< Command history */
+	HistoryIterator mCurHist; /**< History iterator */
+	Recorder *mRecorder; /**< Recording class */
+	char mPartyPrefix; /**< Messages beginning with the prefix are sent to
+			      the party */
+	bool mReturnToggles; /**< Marks whether <Return> toggles the chat log
+				or not */
+	Party *mParty;
+};
 extern ChatWindow *chatWindow;
 
 #endif
diff --git a/src/gui/chatinput.cpp b/src/gui/chatinput.cpp
index fc5d6aab..b403a03e 100644
--- a/src/gui/chatinput.cpp
+++ b/src/gui/chatinput.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: chatinput.cpp 3361 2007-07-07 20:12:58Z b_lindeijer $
  */
 
 #include "chatinput.h"
diff --git a/src/gui/chatinput.h b/src/gui/chatinput.h
index da2342ae..6ac8c1a5 100644
--- a/src/gui/chatinput.h
+++ b/src/gui/chatinput.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: chatinput.h 3361 2007-07-07 20:12:58Z b_lindeijer $
  */
 
 #ifndef _TMW_CHATINPUT_H
diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp
index 5b300d33..b530bbea 100644
--- a/src/gui/checkbox.cpp
+++ b/src/gui/checkbox.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: checkbox.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include "checkbox.h"
diff --git a/src/gui/checkbox.h b/src/gui/checkbox.h
index 262e63ae..36083390 100644
--- a/src/gui/checkbox.h
+++ b/src/gui/checkbox.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: checkbox.h 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #ifndef _TMW_CHECKBOX_H
diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp
index 0ff8be17..5b700831 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirm_dialog.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: confirm_dialog.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #include "confirm_dialog.h"
diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h
index 8728f83f..3115485d 100644
--- a/src/gui/confirm_dialog.h
+++ b/src/gui/confirm_dialog.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: confirm_dialog.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _TMW_OPTION_DIALOG_H
diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index baa1ea34..0b62ca3c 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: connection.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #include "connection.h"
diff --git a/src/gui/connection.h b/src/gui/connection.h
index 7a072d2e..86b688a3 100644
--- a/src/gui/connection.h
+++ b/src/gui/connection.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: connection.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_CONNECTION_H
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index d6d99307..1e7d5b35 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: debugwindow.cpp 3509 2007-08-23 13:43:17Z b_lindeijer $
  */
 
 #include "debugwindow.h"
diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h
index 9b6f2017..59ae765c 100644
--- a/src/gui/debugwindow.h
+++ b/src/gui/debugwindow.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: debugwindow.h 3509 2007-08-23 13:43:17Z b_lindeijer $
  */
 
 #ifndef _TMW_DEBUGWINDOW_H
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 93b9ea37..564486aa 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: equipmentwindow.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "equipmentwindow.h"
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 99a3cc60..0cb5cb24 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: equipmentwindow.h 2545 2006-08-17 19:11:28Z crush_tmw $
  */
 
 #ifndef _TMW_EQUIPMENT_H
diff --git a/src/gui/focushandler.cpp b/src/gui/focushandler.cpp
index ffdb7896..966d2013 100644
--- a/src/gui/focushandler.cpp
+++ b/src/gui/focushandler.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: focushandler.cpp 2239 2006-03-09 05:16:27Z der_doener $
  */
 
 #include "focushandler.h"
diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h
index 252fdd9d..5fde09f1 100644
--- a/src/gui/focushandler.h
+++ b/src/gui/focushandler.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: focushandler.h 2239 2006-03-09 05:16:27Z der_doener $
  */
 
 #ifndef _TMW_FOCUSHANDLER_H
diff --git a/src/gui/gccontainer.cpp b/src/gui/gccontainer.cpp
index 1edb4daf..8095be61 100644
--- a/src/gui/gccontainer.cpp
+++ b/src/gui/gccontainer.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: gccontainer.cpp 4208 2008-04-29 11:25:26Z b_lindeijer $
  */
 
 #include "gccontainer.h"
diff --git a/src/gui/gccontainer.h b/src/gui/gccontainer.h
index 8b8a7ffe..6c6bee80 100644
--- a/src/gui/gccontainer.h
+++ b/src/gui/gccontainer.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: gccontainer.h 4208 2008-04-29 11:25:26Z b_lindeijer $
  */
 
 #ifndef _TMW_GUI_GCCONTAINER_H
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index db0b9f80..e56afc76 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: gui.cpp 3628 2007-10-18 18:39:48Z b_lindeijer $
  */
 
 #include "gui.h"
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 1e4b9348..d2a832c7 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: gui.h 3628 2007-10-18 18:39:48Z b_lindeijer $
  */
 
 #ifndef _TMW_GUI
diff --git a/src/gui/hbox.cpp b/src/gui/hbox.cpp
index 69564fbb..dc909195 100644
--- a/src/gui/hbox.cpp
+++ b/src/gui/hbox.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: hbox.cpp 1881 2005-10-18 21:40:25Z der_doener $
  */
 
 #include "hbox.h"
diff --git a/src/gui/hbox.h b/src/gui/hbox.h
index 560b1a29..99364866 100644
--- a/src/gui/hbox.h
+++ b/src/gui/hbox.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: hbox.h 1881 2005-10-18 21:40:25Z der_doener $
  */
 
 #ifndef HBOX_H
diff --git a/src/gui/help.cpp b/src/gui/help.cpp
index 0b010253..56a5e70e 100644
--- a/src/gui/help.cpp
+++ b/src/gui/help.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: help.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #include "help.h"
diff --git a/src/gui/help.h b/src/gui/help.h
index 3c3715a0..3b45283c 100644
--- a/src/gui/help.h
+++ b/src/gui/help.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: help.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _TMW_HELP_H
diff --git a/src/gui/inttextbox.cpp b/src/gui/inttextbox.cpp
index 2a09f255..7a39c2df 100644
--- a/src/gui/inttextbox.cpp
+++ b/src/gui/inttextbox.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: inttextbox.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #include "inttextbox.h"
diff --git a/src/gui/inttextbox.h b/src/gui/inttextbox.h
index b5d339ac..64351f48 100644
--- a/src/gui/inttextbox.h
+++ b/src/gui/inttextbox.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: inttextbox.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef INTTEXTBOX_H
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index fcc602f9..b53fa43b 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: inventorywindow.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "inventorywindow.h"
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index d45602d2..4793069c 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: inventorywindow.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _TMW_INVENTORYWINDOW_H
diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp
index f72462f9..40e2e121 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: item_amount.cpp 3718 2007-11-11 14:46:33Z b_lindeijer $
  */
 
 #include "item_amount.h"
diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h
index 67002703..668dfe3b 100644
--- a/src/gui/item_amount.h
+++ b/src/gui/item_amount.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: item_amount.h 3718 2007-11-11 14:46:33Z b_lindeijer $
  */
 
 #ifndef _TMW_ITEM_AMOUNT_WINDOW_H
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index cf5dcb92..ce7337d2 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: itemcontainer.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "itemcontainer.h"
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index db8c6f3d..353ac51d 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: itemcontainer.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _TMW_ITEMCONTAINER_H__
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index 0ce4f6b7..5899abd1 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: itemshortcutcontainer.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "itemshortcutcontainer.h"
diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h
index 58f0aea7..7698755b 100644
--- a/src/gui/itemshortcutcontainer.h
+++ b/src/gui/itemshortcutcontainer.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: itemshortcutcontainer.h 4076 2008-04-12 18:36:15Z b_lindeijer $
  */
 
 #ifndef _TMW_ITEMSHORTCUTCONTAINER_H__
diff --git a/src/gui/itemshortcutwindow.cpp b/src/gui/itemshortcutwindow.cpp
index 3724516a..31f3bf4e 100644
--- a/src/gui/itemshortcutwindow.cpp
+++ b/src/gui/itemshortcutwindow.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: itemshortcutwindow.cpp 4076 2008-04-12 18:36:15Z b_lindeijer $
  */
 
 #include "itemshortcutwindow.h"
diff --git a/src/gui/itemshortcutwindow.h b/src/gui/itemshortcutwindow.h
index 9742abdc..5f7ba3d7 100644
--- a/src/gui/itemshortcutwindow.h
+++ b/src/gui/itemshortcutwindow.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: itemshortcutwindow.h 4076 2008-04-12 18:36:15Z b_lindeijer $
  */
 
 #ifndef _TMW_ITEMSHORTCUTWINDOW_H
diff --git a/src/gui/linkhandler.h b/src/gui/linkhandler.h
index 3a32f825..93a8c000 100644
--- a/src/gui/linkhandler.h
+++ b/src/gui/linkhandler.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: linkhandler.h 3606 2007-09-27 14:54:09Z b_lindeijer $
  */
 
 #ifndef _TMW_LINK_HANDLER_H_
diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp
index 634afa07..cf941be1 100644
--- a/src/gui/listbox.cpp
+++ b/src/gui/listbox.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: listbox.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include "listbox.h"
diff --git a/src/gui/listbox.h b/src/gui/listbox.h
index b226a11e..ec95734d 100644
--- a/src/gui/listbox.h
+++ b/src/gui/listbox.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: listbox.h 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #ifndef _TMW_LISTBOX_H
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index d85f4e83..526a8e8f 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: login.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include "login.h"
@@ -29,12 +29,19 @@
 
 #include "../main.h"
 #include "../logindata.h"
+#include "../configuration.h"
 
 #include "button.h"
 #include "checkbox.h"
 #include "ok_dialog.h"
 #include "passwordfield.h"
 #include "textfield.h"
+#include "../utils/tostring.h"
+
+static const int MAX_SERVER_LIST_SIZE = 5;
+static const int LOGIN_DIALOG_WIDTH = 220;
+static const int LOGIN_DIALOG_HEIGHT = 140;
+static const int FIELD_WIDTH = LOGIN_DIALOG_WIDTH - 70;
 
 LoginDialog::LoginDialog(LoginData *loginData):
     Window("Login"), mLoginData(loginData)
@@ -42,59 +49,89 @@ LoginDialog::LoginDialog(LoginData *loginData):
     gcn::Label *userLabel = new gcn::Label("Name:");
     gcn::Label *passLabel = new gcn::Label("Password:");
     gcn::Label *serverLabel = new gcn::Label("Server:");
+    gcn::Label *portLabel = new gcn::Label("Port:");
+    mServerList = new DropDownList("MostRecent00",
+                                   "216.139.126.36",
+                                   "6901",
+                                   MAX_SERVER_LIST_SIZE);
+    mServerListBox = new gcn::ListBox(mServerList);
+    mServerScrollArea = new ScrollArea();
+
     mUserField = new TextField(mLoginData->username);
     mPassField = new PasswordField(mLoginData->password);
-    mServerField = new TextField(mLoginData->hostname);
+    mServerField = new TextField(mServerList->getServerAt(0));
+    mPortField = new TextField(mServerList->getPortAt(0));
+    mServerDropDown = new DropDown(mServerList,
+                                   mServerScrollArea,
+                                   mServerListBox);
+
     mKeepCheck = new CheckBox("Keep", mLoginData->remember);
     mOkButton = new Button("OK", "ok", this);
     mCancelButton = new Button("Cancel", "cancel", this);
     mRegisterButton = new Button("Register", "register", this);
 
-    const int width = 220;
-    const int height = 100;
-
-    setContentSize(width, height);
-
-    userLabel->setPosition(5, 5);
-    passLabel->setPosition(5, 14 + userLabel->getHeight());
-    serverLabel->setPosition(
-            5, 23 + userLabel->getHeight() + passLabel->getHeight());
-    mUserField->setPosition(65, 5);
-    mPassField->setPosition(65, 14 + userLabel->getHeight());
-    mServerField->setPosition(
-            65, 23 + userLabel->getHeight() + passLabel->getHeight());
-    mUserField->setWidth(width - 70);
-    mPassField->setWidth(width - 70);
-    mServerField->setWidth(width - 70);
-    mKeepCheck->setPosition(4, 77);
+    setContentSize(LOGIN_DIALOG_WIDTH, LOGIN_DIALOG_HEIGHT);
+
+    const int USER_TOP = 5;
+    userLabel->setPosition(5, USER_TOP);
+    mUserField->setPosition(65, USER_TOP);
+    mUserField->setWidth(FIELD_WIDTH);
+
+    const int PASS_TOP = 9 + USER_TOP + userLabel->getHeight();
+    passLabel->setPosition(5, PASS_TOP);
+    mPassField->setPosition(65, PASS_TOP);
+    mPassField->setWidth(FIELD_WIDTH);
+
+    const int SERVER_TOP = 9 + PASS_TOP + passLabel->getHeight();
+    serverLabel->setPosition(5, SERVER_TOP);
+    mServerField->setPosition(65, SERVER_TOP);
+    mServerField->setWidth(FIELD_WIDTH);
+
+    const int PORT_TOP = 9 + SERVER_TOP + serverLabel->getHeight();
+    portLabel->setPosition(5, PORT_TOP);
+    mPortField->setPosition(65, PORT_TOP);
+    mPortField->setWidth(FIELD_WIDTH);
+
+    const int DROP_DOWN_TOP = 9 + PORT_TOP + serverLabel->getHeight();
+    mServerDropDown->setPosition(5, DROP_DOWN_TOP);
+    mServerDropDown->setWidth(FIELD_WIDTH);
+
+    const int REST_TOP = LOGIN_DIALOG_HEIGHT - mCancelButton->getHeight() - 5;
+
+    mKeepCheck->setPosition(4, REST_TOP);
     mCancelButton->setPosition(
-            width - mCancelButton->getWidth() - 5,
-            height - mCancelButton->getHeight() - 5);
+            LOGIN_DIALOG_WIDTH - mCancelButton->getWidth() - 5, REST_TOP);
     mOkButton->setPosition(
-            mCancelButton->getX() - mOkButton->getWidth() - 5,
-            height - mOkButton->getHeight() - 5);
+            mCancelButton->getX() - mOkButton->getWidth() - 5, REST_TOP);
     mRegisterButton->setPosition(
-            mKeepCheck->getX() + mKeepCheck->getWidth() + 10,
-            height - mRegisterButton->getHeight() - 5);
+            mKeepCheck->getX() + mKeepCheck->getWidth() + 10, REST_TOP);
 
     mUserField->setActionEventId("ok");
     mPassField->setActionEventId("ok");
     mServerField->setActionEventId("ok");
+    mServerDropDown->setActionEventId("changeSelection");
 
     mUserField->addKeyListener(this);
     mPassField->addKeyListener(this);
     mServerField->addKeyListener(this);
+    mPortField->addKeyListener(this);
+    mServerDropDown->addKeyListener(this);
     mUserField->addActionListener(this);
     mPassField->addActionListener(this);
     mServerField->addActionListener(this);
+    mPortField->addActionListener(this);
+    mServerDropDown->addActionListener(this);
     mKeepCheck->addActionListener(this);
 
     add(userLabel);
     add(passLabel);
     add(serverLabel);
+    add(portLabel);
     add(mUserField);
     add(mPassField);
     add(mServerField);
+    add(mPortField);
+    add(mServerDropDown);
     add(mKeepCheck);
     add(mOkButton);
     add(mCancelButton);
@@ -114,6 +151,9 @@ LoginDialog::LoginDialog(LoginData *loginData):
 
 LoginDialog::~LoginDialog()
 {
+    delete mServerList;
+    delete mServerListBox;
+    delete mServerScrollArea;
 }
 
 void
@@ -122,6 +162,7 @@ LoginDialog::action(const gcn::ActionEvent &event)
     if (event.getId() == "ok" && canSubmit())
     {
         mLoginData->hostname = mServerField->getText();
+        mLoginData->port = getUShort(mPortField->getText());
         mLoginData->username = mUserField->getText();
         mLoginData->password = mPassField->getText();
         mLoginData->remember = mKeepCheck->isSelected();
@@ -129,9 +170,15 @@ LoginDialog::action(const gcn::ActionEvent &event)
 
         mOkButton->setEnabled(false);
         mRegisterButton->setEnabled(false);
-
+        mServerList->save(mServerField->getText(), mPortField->getText());
         state = ACCOUNT_STATE;
     }
+    else if (event.getId() == "changeSelection")
+    {
+        int selected = mServerListBox->getSelected();
+        mServerField->setText(mServerList->getServerAt(selected));
+        mPortField->setText(mServerList->getPortAt(selected));
+    }
     else if (event.getId() == "cancel")
     {
         state = EXIT_STATE;
@@ -140,6 +187,14 @@ LoginDialog::action(const gcn::ActionEvent &event)
     {
         // Transfer these fields on to the register dialog
         mLoginData->hostname = mServerField->getText();
+        if (isUShort(mPortField->getText()))
+        {
+            mLoginData->port = getUShort(mPortField->getText());
+        }
+        else
+        {
+        mLoginData->port = 6901;
+    }
         mLoginData->username = mUserField->getText();
         mLoginData->password = mPassField->getText();
 
@@ -159,5 +214,148 @@ LoginDialog::canSubmit()
     return !mUserField->getText().empty() &&
            !mPassField->getText().empty() &&
            !mServerField->getText().empty() &&
+           isUShort(mPortField->getText()) &&
            state == LOGIN_STATE;
 }
+
+bool
+LoginDialog::isUShort(const std::string &str)
+{
+    if (str == "")
+    {
+        return false;
+    }
+    unsigned long l = 0;
+    for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end();
+         strPtr != strEnd; ++strPtr)
+    {
+        if (*strPtr < '0' || *strPtr > '9')
+        {
+            return false;
+        }
+        l = l * 10 + (*strPtr - '0'); // *strPtr - '0' will never be negative
+        if (l > 65535)
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+unsigned short
+LoginDialog::getUShort(const std::string &str)
+{
+    unsigned long l = 0;
+    for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end();
+         strPtr != strEnd; ++strPtr)
+    {
+        l = l * 10 + (*strPtr - '0');
+    }
+    return static_cast<unsigned short>(l);
+}
+
+/**
+ * LoginDialog::DropDownList
+ */
+
+void
+LoginDialog::DropDownList::saveEntry(const std::string &server,
+                     const std::string &port, int &saved)
+{
+    if (saved < MAX_SERVER_LIST_SIZE && server != "")
+    {
+        config.setValue(mConfigPrefix + "Server" + toString(saved), server);
+        config.setValue(mConfigPrefix + "Port" + toString(saved), port);
+        ++saved;
+    }
+}
+
+LoginDialog::DropDownList::DropDownList(std::string prefix,
+                                        std::string dflt,
+                    std::string dfltPort,
+                                        int maxEntries) :
+                                        mConfigPrefix(prefix),
+                                        mMaxEntries(maxEntries)
+{
+    for (int i = 0; i < maxEntries; ++i)
+    {
+        std::string server = config.getValue(mConfigPrefix + "Server" +
+                                             toString(i), "");
+        if (server == "") // Just in case had original config entries
+        {
+            server = config.getValue(mConfigPrefix + "ServerList" +
+                                     toString(i), "");
+        }
+        std::string port = config.getValue(mConfigPrefix + "Port" +
+                                           toString(i), dfltPort);
+
+        if (server != "")
+        {
+            mServers.push_back(server);
+            mPorts.push_back(port);
+        }
+    }
+    if (mServers.size() == 0)
+    {
+        mServers.push_back(dflt);
+        mPorts.push_back(dfltPort);
+    }
+
+}
+
+void
+LoginDialog::DropDownList::save(const std::string &server,
+                const std::string &port)
+{
+    int position = 0;
+    saveEntry(server, port, position);
+    for (std::vector<std::string>::const_iterator sPtr = mServers.begin(),
+             sEnd = mServers.end(),
+             pPtr = mPorts.begin(),
+             pEnd = mPorts.end();
+         sPtr != sEnd && pPtr != pEnd;
+         ++sPtr, ++pPtr)
+    {
+        if (*sPtr != server || *pPtr != port)
+        {
+            saveEntry(*sPtr, *pPtr, position);
+        }
+    }
+}
+
+int
+LoginDialog::DropDownList::getNumberOfElements()
+{
+    return mServers.size();
+}
+
+std::string
+LoginDialog::DropDownList::getElementAt(int i)
+{
+    if (i < 0 || i >= getNumberOfElements())
+    {
+      return "";
+    }
+    return getServerAt(i) + ":" + getPortAt(i);
+}
+
+std::string
+LoginDialog::DropDownList::getServerAt(int i)
+{
+    if (i < 0 || i >= getNumberOfElements())
+    {
+        return "";
+    }
+    return mServers.at(i);
+}
+
+
+std::string
+LoginDialog::DropDownList::getPortAt(int i)
+{
+    if (i < 0 || i >= getNumberOfElements())
+    {
+        return "";
+    }
+    return mPorts.at(i);
+}
diff --git a/src/gui/login.h b/src/gui/login.h
index e08120cb..8a228b5f 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -18,18 +18,23 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: login.h 3234 2007-03-24 13:05:27Z b_lindeijer $
  */
 
 #ifndef _TMW_LOGIN_H
 #define _TMW_LOGIN_H
 
 #include <iosfwd>
+#include <vector>
+#include <string>
+
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
 
 #include "window.h"
 #include "../guichanfwd.h"
+#include "widgets/dropdown.h"
+#include "scrollarea.h"
 
 class LoginData;
 
@@ -72,15 +77,66 @@ class LoginDialog : public Window, public gcn::ActionListener,
         bool
         canSubmit();
 
+	/**
+	 * Function to decide whether string is an unsigned short or not
+	 *
+	 * @param str the string to parse
+	 *
+	 * @return true is str is an unsigned short, false otherwise
+	 */
+	static bool
+        isUShort(const std::string &str);
+
+	/**
+	 * Converts string to an unsigned short (undefined if invalid)
+	 *
+	 * @param str the string to parse
+	 *
+	 * @return the value str represents
+	 */
+	static unsigned short
+	getUShort(const std::string &str);
+
+        DropDown *mServerDropDown;
         gcn::TextField *mUserField;
         gcn::TextField *mPassField;
         gcn::TextField *mServerField;
+	gcn::TextField *mPortField;
         gcn::CheckBox *mKeepCheck;
         gcn::Button *mOkButton;
         gcn::Button *mCancelButton;
         gcn::Button *mRegisterButton;
 
         LoginData *mLoginData;
+
+        /**
+         * Helper class to keep a list of all the recent entries for the
+         * dropdown
+         */
+        class DropDownList : public gcn::ListModel
+        {
+            private:
+                std::vector<std::string> mServers;
+		std::vector<std::string> mPorts;
+                std::string mConfigPrefix;
+                int mMaxEntries;
+                void saveEntry(const std::string &server,
+			       const std::string &port, int &saved);
+            public:
+                DropDownList(std::string prefix,
+                             std::string dfltServer,
+			     std::string dfltPort,
+                             int maxEntries);
+                void save(const std::string &server, const std::string &port);
+                int getNumberOfElements();
+                std::string getElementAt(int i);
+		std::string getServerAt(int i);
+		std::string getPortAt(int i);
+        };
+        DropDownList *mServerList;
+        gcn::ListBox *mServerListBox;
+        ScrollArea *mServerScrollArea;
+
 };
 
 #endif
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index 2043b7d1..c3af6896 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: menuwindow.cpp 4060 2008-04-09 14:49:07Z b_lindeijer $
  */
 
 #include "menuwindow.h"
diff --git a/src/gui/menuwindow.h b/src/gui/menuwindow.h
index f43b9921..add04095 100644
--- a/src/gui/menuwindow.h
+++ b/src/gui/menuwindow.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: menuwindow.h 2417 2006-07-19 15:12:06Z umperio $
  */
 
 #ifndef _TMW_MENU_H
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index c17fa06b..dc7df9b9 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: minimap.cpp 4116 2008-04-17 12:48:43Z peaveydk $
  */
 
 #include "minimap.h"
diff --git a/src/gui/minimap.h b/src/gui/minimap.h
index 5e9458bf..d2640caa 100644
--- a/src/gui/minimap.h
+++ b/src/gui/minimap.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: minimap.h 2417 2006-07-19 15:12:06Z umperio $
  */
 
 #ifndef _TMW_MINIMAP_H
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 8f121368..3a7e7bf0 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: ministatus.cpp 3753 2007-11-20 12:27:56Z b_lindeijer $
  */
 
 #include "ministatus.h"
diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h
index 718fe140..d4002d93 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatus.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: ministatus.h 2581 2006-08-25 22:04:17Z b_lindeijer $
  */
 
 #ifndef _TMW_MINISTATUS_H
diff --git a/src/gui/newskill.cpp b/src/gui/newskill.cpp
index 6783a546..c2088e75 100644
--- a/src/gui/newskill.cpp
+++ b/src/gui/newskill.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: newskill.cpp 3587 2007-09-20 13:24:20Z b_lindeijer $
  */
 
  /* This file implements the new skill dialog for use under the latest
diff --git a/src/gui/newskill.h b/src/gui/newskill.h
index 6e12169f..c553ab1d 100644
--- a/src/gui/newskill.h
+++ b/src/gui/newskill.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: newskill.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _TMW_NSKILL_H
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 7b4fc634..52f35a88 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: npc_text.cpp 4096 2008-04-16 08:39:59Z b_lindeijer $
  */
 
 #include "npc_text.h"
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 0ef1b938..9e2b4ecd 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: npc_text.h 4096 2008-04-16 08:39:59Z b_lindeijer $
  */
 
 #ifndef _TMW_NPC_TEXT_H
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 1bcdc8ff..e6523583 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: npclistdialog.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #include "npclistdialog.h"
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index c09b0a8c..a96fd766 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: npclistdialog.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _TMW_GUI_NPCLISTDIALOG_H
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index ca9d2a7b..c49bb6bb 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: ok_dialog.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #include "ok_dialog.h"
diff --git a/src/gui/ok_dialog.h b/src/gui/ok_dialog.h
index a7b24a90..1c8e0c18 100644
--- a/src/gui/ok_dialog.h
+++ b/src/gui/ok_dialog.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: ok_dialog.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _OK_DIALOG_H
diff --git a/src/gui/passwordfield.cpp b/src/gui/passwordfield.cpp
index 533f54fb..710eb767 100644
--- a/src/gui/passwordfield.cpp
+++ b/src/gui/passwordfield.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: passwordfield.cpp 2132 2006-02-01 14:53:10Z der_doener $
  */
 
 #include "passwordfield.h"
diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h
index cae1f92e..725bfbcf 100644
--- a/src/gui/passwordfield.h
+++ b/src/gui/passwordfield.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: passwordfield.h 2895 2006-12-09 01:44:18Z b_lindeijer $
  */
 
 #ifndef _TMW_PASSWORDFIELD_H_
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index 2c633b72..6d39ce05 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: playerbox.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include <algorithm>
diff --git a/src/gui/playerbox.h b/src/gui/playerbox.h
index c226e750..0aa48a2c 100644
--- a/src/gui/playerbox.h
+++ b/src/gui/playerbox.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: playerbox.h 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #ifndef __TMW_PLAYERBOX_H__
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index cdc998e0..7e40abed 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: popupmenu.cpp 4243 2008-05-16 15:48:52Z the_enemy $
  */
 
 #include "popupmenu.h"
@@ -40,6 +40,9 @@
 #include "../npc.h"
 #include "../player_relations.h"
 
+#include "../net/messageout.h"
+#include "../net/protocol.h"
+
 #include "../resources/iteminfo.h"
 #include "../resources/itemdb.h"
 
@@ -70,49 +73,53 @@ void PopupMenu::showPopup(int x, int y, Being *being)
 
     switch (mBeing->getType())
     {
-        case Being::PLAYER:
-            {
-                // Players can be traded with. Later also attack, follow and
-                // add as buddy will be options in this menu.
-                const std::string &name = mBeing->getName();
-                mBrowserBox->addRow("@@trade|Trade With " + name + "@@");
-                mBrowserBox->addRow("@@attack|Attack " + name + "@@");
-
-                mBrowserBox->addRow("##3---");
-
-                switch (player_relations.getRelation(name)) {
-                case PlayerRelation::NEUTRAL:
-                    mBrowserBox->addRow("@@friend|Befriend " + name + "@@");
-
-                case PlayerRelation::FRIEND:
-                    mBrowserBox->addRow("@@disregard|Disregard " + name + "@@");
-                    mBrowserBox->addRow("@@ignore|Ignore " + name + "@@");
-                    break;
-
-                case PlayerRelation::DISREGARDED:
-                    mBrowserBox->addRow("@@unignore|Un-Ignore " + name + "@@");
-                    mBrowserBox->addRow("@@ignore|Completely ignore " + name + "@@");
-                    break;
-
-                case PlayerRelation::IGNORED:
-                    mBrowserBox->addRow("@@unignore|Un-Ignore " + name + "@@");
-                    break;
-                }
-
-                //mBrowserBox->addRow("@@follow|Follow " + name + "@@");
-                //mBrowserBox->addRow("@@buddy|Add " + name + " to Buddy List@@");
-            }
-            break;
-
-        case Being::NPC:
-            // NPCs can be talked to (single option, candidate for removal
-            // unless more options would be added)
-            mBrowserBox->addRow("@@talk|Talk To NPC@@");
-            break;
-
-        default:
-            /* Other beings aren't interesting... */
-            break;
+	case Being::PLAYER:
+	    {
+		// Players can be traded with. Later also attack, follow and
+		// add as buddy will be options in this menu.
+		const std::string &name = mBeing->getName();
+		mBrowserBox->addRow("@@trade|Trade With " + name + "@@");
+		mBrowserBox->addRow("@@attack|Attack " + name + "@@");
+
+		mBrowserBox->addRow("##3---");
+
+		switch (player_relations.getRelation(name)) {
+		case PlayerRelation::NEUTRAL:
+		    mBrowserBox->addRow("@@friend|Befriend " + name + "@@");
+
+		case PlayerRelation::FRIEND:
+		    mBrowserBox->addRow("@@disregard|Disregard " + name + "@@");
+		    mBrowserBox->addRow("@@ignore|Ignore " + name + "@@");
+		    break;
+
+		case PlayerRelation::DISREGARDED:
+		    mBrowserBox->addRow("@@unignore|Un-Ignore " + name + "@@");
+		    mBrowserBox->addRow("@@ignore|Completely ignore " + name + "@@");
+		    break;
+
+		case PlayerRelation::IGNORED:
+		    mBrowserBox->addRow("@@unignore|Un-Ignore " + name + "@@");
+		    break;
+		}
+
+		//mBrowserBox->addRow("@@follow|Follow " + name + "@@");
+		//mBrowserBox->addRow("@@buddy|Add " + name + " to Buddy List@@");
+
+		mBrowserBox->addRow("##3---");
+		mBrowserBox->addRow("@@party-invite|Invite " + name +
+				    " to party@@");
+	    }
+	    break;
+
+	case Being::NPC:
+	    // NPCs can be talked to (single option, candidate for removal
+	    // unless more options would be added)
+	    mBrowserBox->addRow("@@talk|Talk To NPC@@");
+	    break;
+
+	default:
+	    /* Other beings aren't interesting... */
+	    break;
     }
 
     //browserBox->addRow("@@look|Look To@@");
@@ -142,56 +149,56 @@ void PopupMenu::handleLink(const std::string& link)
 {
     // Talk To action
     if (link == "talk" &&
-        mBeing != NULL &&
-        mBeing->getType() == Being::NPC &&
-        current_npc == 0)
+	mBeing != NULL &&
+	mBeing->getType() == Being::NPC &&
+	current_npc == 0)
     {
-        dynamic_cast<NPC*>(mBeing)->talk();
+	dynamic_cast<NPC*>(mBeing)->talk();
     }
 
     // Trade action
     else if (link == "trade" &&
-             mBeing != NULL &&
-             mBeing->getType() == Being::PLAYER)
+	     mBeing != NULL &&
+	     mBeing->getType() == Being::PLAYER)
     {
-        player_node->trade(mBeing);
-        tradePartnerName = mBeing->getName();
+	player_node->trade(mBeing);
+	tradePartnerName = mBeing->getName();
     }
 
     // Attack action
     else if (link == "attack" &&
-             mBeing != NULL &&
-             mBeing->getType() == Being::PLAYER)
+	     mBeing != NULL &&
+	     mBeing->getType() == Being::PLAYER)
     {
-        player_node->attack(mBeing, true);
+	player_node->attack(mBeing, true);
     }
 
     else if (link == "unignore" &&
-             mBeing != NULL &&
-             mBeing->getType() == Being::PLAYER)
+	     mBeing != NULL &&
+	     mBeing->getType() == Being::PLAYER)
     {
-        player_relations.setRelation(mBeing->getName(), PlayerRelation::NEUTRAL);
+	player_relations.setRelation(mBeing->getName(), PlayerRelation::NEUTRAL);
     }
 
     else if (link == "ignore" &&
-             mBeing != NULL &&
-             mBeing->getType() == Being::PLAYER)
+	     mBeing != NULL &&
+	     mBeing->getType() == Being::PLAYER)
     {
-        player_relations.setRelation(mBeing->getName(), PlayerRelation::IGNORED);
+	player_relations.setRelation(mBeing->getName(), PlayerRelation::IGNORED);
     }
 
     else if (link == "disregard" &&
-             mBeing != NULL &&
-             mBeing->getType() == Being::PLAYER)
+	     mBeing != NULL &&
+	     mBeing->getType() == Being::PLAYER)
     {
-        player_relations.setRelation(mBeing->getName(), PlayerRelation::DISREGARDED);
+	player_relations.setRelation(mBeing->getName(), PlayerRelation::DISREGARDED);
     }
 
     else if (link == "friend" &&
-             mBeing != NULL &&
-             mBeing->getType() == Being::PLAYER)
+	     mBeing != NULL &&
+	     mBeing->getType() == Being::PLAYER)
     {
-        player_relations.setRelation(mBeing->getName(), PlayerRelation::FRIEND);
+	player_relations.setRelation(mBeing->getName(), PlayerRelation::FRIEND);
     }
 
     /*
@@ -204,16 +211,16 @@ void PopupMenu::handleLink(const std::string& link)
     // Add Buddy action
     else if ((link == "buddy") && mBeing != NULL && mBeing->isPlayer())
     {
-        if (!buddyWindow->isVisible())
-            buddyWindow->setVisible(true);
+	if (!buddyWindow->isVisible())
+	    buddyWindow->setVisible(true);
 
-        buddyWindow->addBuddy(mBeing->getName());
+	buddyWindow->addBuddy(mBeing->getName());
     }*/
 
     // Pick Up Floor Item action
     else if ((link == "pickup") && mFloorItem != NULL)
     {
-        player_node->pickUp(mFloorItem);
+	player_node->pickUp(mFloorItem);
     }
 
     // Look To action
@@ -223,39 +230,47 @@ void PopupMenu::handleLink(const std::string& link)
 
     else if (link == "use")
     {
-        assert(mItem);
-        if (mItem->isEquipment())
-        {
-            if (mItem->isEquipped())
-            {
-                player_node->unequipItem(mItem);
-            }
-            else
-            {
-                player_node->equipItem(mItem);
-            }
-        }
-        else
-        {
-            player_node->useItem(mItem);
-        }
+	assert(mItem);
+	if (mItem->isEquipment())
+	{
+	    if (mItem->isEquipped())
+	    {
+		player_node->unequipItem(mItem);
+	    }
+	    else
+	    {
+		player_node->equipItem(mItem);
+	    }
+	}
+	else
+	{
+	    player_node->useItem(mItem);
+	}
     }
 
     else if (link == "drop")
     {
-        new ItemAmountWindow(AMOUNT_ITEM_DROP, inventoryWindow, mItem);
+	new ItemAmountWindow(AMOUNT_ITEM_DROP, inventoryWindow, mItem);
     }
 
     else if (link == "description")
     {
-        // do nothing for now, I need to write
-        // a window for the description first
+	// do nothing for now, I need to write
+	// a window for the description first
+    }
+    else if (link == "party-invite" &&
+	     mBeing != NULL &&
+	     mBeing->getType() == Being::PLAYER)
+    {
+	MessageOut outMsg(player_node->getNetwork());
+	outMsg.writeInt16(CMSG_PARTY_INVITE);
+	outMsg.writeInt32(mBeing->getId());
     }
 
     // Unknown actions
     else
     {
-        std::cout << link << std::endl;
+	std::cout << link << std::endl;
     }
 
     setVisible(false);
@@ -273,13 +288,13 @@ void PopupMenu::showPopup(int x, int y, Item *item)
 
     if (item->isEquipment())
     {
-        if (item->isEquipped())
-            mBrowserBox->addRow("@@use|Unequip@@");
-        else
-            mBrowserBox->addRow("@@use|Equip@@");
+	if (item->isEquipped())
+	    mBrowserBox->addRow("@@use|Unequip@@");
+	else
+	    mBrowserBox->addRow("@@use|Equip@@");
     }
     else
-        mBrowserBox->addRow("@@use|Use@@");
+	mBrowserBox->addRow("@@use|Use@@");
 
     mBrowserBox->addRow("@@drop|Drop@@");
     mBrowserBox->addRow("@@description|Description@@");
@@ -293,9 +308,9 @@ void PopupMenu::showPopup(int x, int y)
 {
     setContentSize(mBrowserBox->getWidth() + 8, mBrowserBox->getHeight() + 8);
     if (windowContainer->getWidth() < (x + getWidth() + 5))
-        x = windowContainer->getWidth() - getWidth();
+	x = windowContainer->getWidth() - getWidth();
     if (windowContainer->getHeight() < (y + getHeight() + 5))
-        y = windowContainer->getHeight() - getHeight();
+	y = windowContainer->getHeight() - getHeight();
     setPosition(x, y);
     setVisible(true);
     requestMoveToTop();
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index 9fe9f866..601fa2ae 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: popupmenu.h 2239 2006-03-09 05:16:27Z der_doener $
  */
 
 #ifndef _TMW_POPUP_MENU_H
diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index 6d18b2f7..6dbc3b85 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: progressbar.cpp 4008 2008-03-27 14:51:10Z b_lindeijer $
  */
 
 #include "progressbar.h"
diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h
index 3e58f14e..ed8eace4 100644
--- a/src/gui/progressbar.h
+++ b/src/gui/progressbar.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: progressbar.h 2240 2006-03-09 12:24:36Z der_doener $
  */
 
 #ifndef _TMW_PROGRESSBAR_H
diff --git a/src/gui/radiobutton.cpp b/src/gui/radiobutton.cpp
index 0ac4dea8..cbab4d2d 100644
--- a/src/gui/radiobutton.cpp
+++ b/src/gui/radiobutton.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: radiobutton.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include "radiobutton.h"
diff --git a/src/gui/radiobutton.h b/src/gui/radiobutton.h
index 4f868fdb..bab4a9dc 100644
--- a/src/gui/radiobutton.h
+++ b/src/gui/radiobutton.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: radiobutton.h 1584 2005-08-13 12:49:52Z der_doener $
  */
 
 #ifndef _TMW_RADIOBUTTON_H
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 9496da93..e0b663b8 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: register.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include "register.h"
@@ -41,6 +41,8 @@
 #include "textfield.h"
 #include "ok_dialog.h"
 
+#include "../utils/tostring.h"
+
 void
 WrongDataNoticeListener::setTarget(gcn::TextField *textField)
 {
@@ -65,53 +67,65 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
     gcn::Label *passwordLabel = new gcn::Label("Password:");
     gcn::Label *confirmLabel = new gcn::Label("Confirm:");
     gcn::Label *serverLabel = new gcn::Label("Server:");
+    gcn::Label *portLabel = new gcn::Label("Port:");
+
     mUserField = new TextField(loginData->username);
     mPasswordField = new PasswordField(loginData->password);
     mConfirmField = new PasswordField();
     mServerField = new TextField(loginData->hostname);
+    mPortField = new TextField(toString(loginData->port));
     mMaleButton = new RadioButton("Male", "sex", true);
     mFemaleButton = new RadioButton("Female", "sex", false);
     mRegisterButton = new Button("Register", "register", this);
     mCancelButton = new Button("Cancel", "cancel", this);
 
-    const int width = 220;
-    const int height = 150;
-    setContentSize(width, height);
-
-    mUserField->setPosition(65, 5);
-    mUserField->setWidth(width - 70);
-    mPasswordField->setPosition(
-            65, mUserField->getY() + mUserField->getHeight() + 7);
-    mPasswordField->setWidth(mUserField->getWidth());
-    mConfirmField->setPosition(
-            65, mPasswordField->getY() + mPasswordField->getHeight() + 7);
-    mConfirmField->setWidth(mUserField->getWidth());
-    mServerField->setPosition(
-            65, 23 + mConfirmField->getY() + mConfirmField->getHeight() + 7);
-    mServerField->setWidth(mUserField->getWidth());
-
-    userLabel->setPosition(5, mUserField->getY() + 1);
-    passwordLabel->setPosition(5, mPasswordField->getY() + 1);
-    confirmLabel->setPosition(5, mConfirmField->getY() + 1);
-    serverLabel->setPosition(5, mServerField->getY() + 1);
-
-    mMaleButton->setPosition(
-            70, mConfirmField->getY() + mConfirmField->getHeight() + 7);
-    mFemaleButton->setPosition(
-            70 + 10 + mMaleButton->getWidth(),
-            mMaleButton->getY());
+    const int WIDTH = 220;
+    const int HEIGHT = 170;
+    const int FIELD_WIDTH = WIDTH - 70;
+
+    setContentSize(WIDTH, HEIGHT);
+
+    const int USER_TOP = 5;
+    userLabel->setPosition(5, USER_TOP);
+    mUserField->setPosition(65, USER_TOP);
+    mUserField->setWidth(FIELD_WIDTH);
+
+    const int PASS_TOP = 9 + USER_TOP + userLabel->getHeight();
+    passwordLabel->setPosition(5, PASS_TOP);
+    mPasswordField->setPosition(65, PASS_TOP);
+    mPasswordField->setWidth(FIELD_WIDTH);
+
+    const int CONFIRM_TOP = 9 + PASS_TOP + passwordLabel->getHeight();
+    confirmLabel->setPosition(5, CONFIRM_TOP);
+    mConfirmField->setPosition(65, CONFIRM_TOP);
+    mConfirmField->setWidth(FIELD_WIDTH);
+
+    const int SEX_TOP = 9 + CONFIRM_TOP + confirmLabel->getHeight();
+    mMaleButton->setPosition(70, SEX_TOP);
+    mFemaleButton->setPosition(80 + mMaleButton->getWidth(), SEX_TOP);
+
+    const int SERVER_TOP = 9 + SEX_TOP + mMaleButton->getHeight() + 5;
+    serverLabel->setPosition(5, SERVER_TOP);
+    mServerField->setPosition(65, SERVER_TOP);
+    mServerField->setWidth(FIELD_WIDTH);
+
+    const int PORT_TOP = 9 + SERVER_TOP + serverLabel->getHeight();
+    portLabel->setPosition(5, PORT_TOP);
+    mPortField->setPosition(65, PORT_TOP);
+    mPortField->setWidth(FIELD_WIDTH);
 
     mCancelButton->setPosition(
-            width - mCancelButton->getWidth() - 5,
-            height - mCancelButton->getHeight() - 5);
+            WIDTH - mCancelButton->getWidth() - 5,
+            HEIGHT - mCancelButton->getHeight() - 5);
     mRegisterButton->setPosition(
             mCancelButton->getX() - mRegisterButton->getWidth() - 5,
-            height - mRegisterButton->getHeight() - 5);
+            HEIGHT - mRegisterButton->getHeight() - 5);
 
     mUserField->addKeyListener(this);
     mPasswordField->addKeyListener(this);
     mConfirmField->addKeyListener(this);
     mServerField->addKeyListener(this);
+    mPortField->addKeyListener(this);
 
     /* TODO:
      * This is a quick and dirty way to respond to the ENTER key, regardless of
@@ -122,19 +136,26 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
     mPasswordField->setActionEventId("register");
     mConfirmField->setActionEventId("register");
     mServerField->setActionEventId("register");
+    mPortField->setActionEventId("register");
+
     mUserField->addActionListener(this);
     mPasswordField->addActionListener(this);
     mConfirmField->addActionListener(this);
     mServerField->addActionListener(this);
+    mPortField->addActionListener(this);
 
     add(userLabel);
     add(passwordLabel);
-    add(serverLabel);
     add(confirmLabel);
+    add(serverLabel);
+    add(portLabel);
+
     add(mUserField);
     add(mPasswordField);
     add(mConfirmField);
     add(mServerField);
+    add(mPortField);
+
     add(mMaleButton);
     add(mFemaleButton);
     add(mRegisterButton);
@@ -232,7 +253,7 @@ RegisterDialog::action(const gcn::ActionEvent &event)
             mRegisterButton->setEnabled(false);
 
             mLoginData->hostname = mServerField->getText();
-            mLoginData->port = (short) config.getValue("port", 0);
+            mLoginData->port = getUShort(mPortField->getText());
             mLoginData->username = mUserField->getText();
             mLoginData->password = mPasswordField->getText();
             mLoginData->username += mFemaleButton->isSelected() ? "_F" : "_M";
@@ -256,5 +277,42 @@ RegisterDialog::canSubmit()
            !mPasswordField->getText().empty() &&
            !mConfirmField->getText().empty() &&
            !mServerField->getText().empty() &&
+           isUShort(mPortField->getText()) &&
            state == REGISTER_STATE;
 }
+
+bool
+RegisterDialog::isUShort(const std::string &str)
+{
+    if (str == "")
+    {
+	return false;
+    }
+    unsigned long l = 0;
+    for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end();
+	 strPtr != strEnd; ++strPtr)
+    {
+	if (*strPtr < '0' || *strPtr > '9')
+        {
+	    return false;
+	}
+	l = l * 10 + (*strPtr - '0'); // *strPtr - '0' will never be negative
+	if (l > 65535)
+	{
+	    return false;
+	}
+    }
+    return true;
+}
+
+unsigned short
+RegisterDialog::getUShort(const std::string &str)
+{
+    unsigned long l = 0;
+    for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end();
+	 strPtr != strEnd; ++strPtr)
+    {
+	l = l * 10 + (*strPtr - '0');
+    }
+    return static_cast<unsigned short>(l);
+}
diff --git a/src/gui/register.h b/src/gui/register.h
index a80594af..6f997b75 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: register.h 3234 2007-03-24 13:05:27Z b_lindeijer $
  */
 
 #ifndef _TMW_REGISTER_H
@@ -87,10 +87,31 @@ class RegisterDialog : public Window, public gcn::ActionListener,
         bool
         canSubmit();
 
+	/**
+	 * Function to decide whether string is an unsigned short or not
+	 *
+	 * @param str the string to parse
+	 *
+	 * @return true if str is an unsigned short, false otherwise
+	 */
+	static bool
+        isUShort(const std::string &str);
+
+	/**
+	 * Converts string to an unsigned short (undefined if invalid)
+	 *
+	 * @param str the string to parse
+	 *
+	 * @return the value str represents
+	 */
+	static unsigned short
+	getUShort(const std::string &str);
+
         gcn::TextField *mUserField;
         gcn::TextField *mPasswordField;
         gcn::TextField *mConfirmField;
         gcn::TextField *mServerField;
+	gcn::TextField *mPortField;
 
         gcn::Button *mRegisterButton;
         gcn::Button *mCancelButton;
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index 255aa2d8..a3aef702 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: scrollarea.cpp 4204 2008-04-28 18:29:04Z b_lindeijer $
  */
 
 #include <algorithm>
diff --git a/src/gui/scrollarea.h b/src/gui/scrollarea.h
index be361f68..b3fa17f3 100644
--- a/src/gui/scrollarea.h
+++ b/src/gui/scrollarea.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: scrollarea.h 4204 2008-04-28 18:29:04Z b_lindeijer $
  */
 
 #ifndef __TMW_SCROLLAREA_H__
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 82d340fb..5f64fcea 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: sell.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "sell.h"
diff --git a/src/gui/sell.h b/src/gui/sell.h
index 0c1a2007..11528f89 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: sell.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _TMW_SELL_H
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index c895d166..ce843452 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: setup.cpp 4306 2008-05-28 20:22:37Z crush_tmw $
  */
 
 #include <algorithm>
diff --git a/src/gui/setup.h b/src/gui/setup.h
index 543cab2c..d4f0857b 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: setup.h 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
 #ifndef _TMW_SETUP_H
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 4227b5ca..09357cce 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: setup_audio.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include "setup_audio.h"
diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h
index 6e722f74..76420101 100644
--- a/src/gui/setup_audio.h
+++ b/src/gui/setup_audio.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: setup_audio.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _TMW_GUI_SETUP_AUDIO_H
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index a501298e..41e91595 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: setup_joystick.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include "setup_joystick.h"
diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h
index 6d3ad129..399156d8 100644
--- a/src/gui/setup_joystick.h
+++ b/src/gui/setup_joystick.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: setup_joystick.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _TMW_GUI_SETUP_JOYSTICK_H
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index e88080b5..704fc691 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: setup_keyboard.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #include "setup_keyboard.h"
diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h
index b72e8746..7f945181 100644
--- a/src/gui/setup_keyboard.h
+++ b/src/gui/setup_keyboard.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: setup_keyboard.h 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #ifndef _TMW_GUI_SETUP_KEYBOARD_H
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 24b559da..809364ea 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: setup_players.cpp 4353 2008-06-16 07:04:46Z b_lindeijer $
  */
 
 #include "setup_players.h"
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 97e4cdd6..bc38f1f9 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: setup_video.cpp 4338 2008-06-05 18:41:39Z crush_tmw $
  */
 
 #include "setup_video.h"
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index a0701a3c..0d7ea700 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: setup_video.h 4306 2008-05-28 20:22:37Z crush_tmw $
  */
 
 #ifndef _TMW_GUI_SETUP_VIDEO_H
diff --git a/src/gui/setuptab.h b/src/gui/setuptab.h
index a7d45b9a..bbfe4fac 100644
--- a/src/gui/setuptab.h
+++ b/src/gui/setuptab.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: setuptab.h 2273 2006-03-19 00:48:10Z der_doener $
  */
 
 #ifndef _TMW_GUI_SETUPTAB_H
diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp
index 62d18769..015e70d5 100644
--- a/src/gui/shop.cpp
+++ b/src/gui/shop.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: shop.cpp 4348 2008-06-14 12:42:49Z the_enemy $
  */
 
 #include "shop.h"
diff --git a/src/gui/shop.h b/src/gui/shop.h
index 22e715c9..78276610 100644
--- a/src/gui/shop.h
+++ b/src/gui/shop.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: shop.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _SHOP_H
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 3ab40c9a..e70fb3ef 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: skill.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $
  */
 
 #include <algorithm>
diff --git a/src/gui/skill.h b/src/gui/skill.h
index 6879640c..6bd6c51b 100644
--- a/src/gui/skill.h
+++ b/src/gui/skill.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: skill.h 3494 2007-08-20 05:29:12Z joshlangley $
  */
 
 #ifndef _TMW_SKILL_H
diff --git a/src/gui/slider.cpp b/src/gui/slider.cpp
index c94c7bfb..a1ae6acc 100644
--- a/src/gui/slider.cpp
+++ b/src/gui/slider.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: slider.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include "slider.h"
diff --git a/src/gui/slider.h b/src/gui/slider.h
index dc38b738..524d8799 100644
--- a/src/gui/slider.h
+++ b/src/gui/slider.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: slider.h 1584 2005-08-13 12:49:52Z der_doener $
  */
 
 #ifndef _TMW_SLIDER_H
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 927b3554..cba815b5 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: status.cpp 3510 2007-08-23 14:14:51Z b_lindeijer $
  */
 
 #include "status.h"
diff --git a/src/gui/status.h b/src/gui/status.h
index 10773e10..4d082148 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: status.h 3538 2007-08-28 00:01:38Z b_lindeijer $
  */
 
 #ifndef _TMW_STATUS_H
diff --git a/src/gui/tabbedcontainer.cpp b/src/gui/tabbedcontainer.cpp
index d6267e65..71e0f3c4 100644
--- a/src/gui/tabbedcontainer.cpp
+++ b/src/gui/tabbedcontainer.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: tabbedcontainer.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include <algorithm>
diff --git a/src/gui/tabbedcontainer.h b/src/gui/tabbedcontainer.h
index 7f8deef9..14f27aba 100644
--- a/src/gui/tabbedcontainer.h
+++ b/src/gui/tabbedcontainer.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: tabbedcontainer.h 3152 2007-02-27 16:31:34Z crush_tmw $
  */
 
 #ifndef _TMW_TABPANE_H
diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp
index 8d16dc46..743d88b6 100644
--- a/src/gui/textbox.cpp
+++ b/src/gui/textbox.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: textbox.cpp 4096 2008-04-16 08:39:59Z b_lindeijer $
  */
 
 #include "textbox.h"
diff --git a/src/gui/textbox.h b/src/gui/textbox.h
index f06f98ec..7df30fd9 100644
--- a/src/gui/textbox.h
+++ b/src/gui/textbox.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: textbox.h 4096 2008-04-16 08:39:59Z b_lindeijer $
  */
 
 #ifndef __TMW_TEXTBOX_H__
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index 8db720cf..95291267 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: textfield.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include <algorithm>
diff --git a/src/gui/textfield.h b/src/gui/textfield.h
index bc47d501..39bcbf85 100644
--- a/src/gui/textfield.h
+++ b/src/gui/textfield.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: textfield.h 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #ifndef __TMW_TEXTFIELD_H__
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 42b6e9bc..d8f23171 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: updatewindow.cpp 4332 2008-06-05 07:33:12Z b_lindeijer $
  */
 
 #include "updatewindow.h"
diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index 61ea4a27..b669f829 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: updatewindow.h 4332 2008-06-05 07:33:12Z b_lindeijer $
  */
 
 #ifndef _UPDATERWINDOW_H
diff --git a/src/gui/vbox.cpp b/src/gui/vbox.cpp
index b503508e..6f36dc9c 100644
--- a/src/gui/vbox.cpp
+++ b/src/gui/vbox.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: vbox.cpp 3587 2007-09-20 13:24:20Z b_lindeijer $
  */
 
 #include "vbox.h"
diff --git a/src/gui/vbox.h b/src/gui/vbox.h
index 06a270ef..ff52717b 100644
--- a/src/gui/vbox.h
+++ b/src/gui/vbox.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: vbox.h 1881 2005-10-18 21:40:25Z der_doener $
  */
 
 #ifndef VBOX_H
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 01324a47..e7fdb522 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: viewport.cpp 4098 2008-04-16 11:36:41Z b_lindeijer $
  */
 
 #include "viewport.h"
@@ -37,6 +37,7 @@
 #include "../map.h"
 #include "../monster.h"
 #include "../npc.h"
+#include "../textmanager.h"
 
 #include "../resources/animation.h"
 #include "../resources/monsterinfo.h"
@@ -228,7 +229,6 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
         mMap->draw(graphics, (int) mPixelViewX, (int) mPixelViewY, 2);
         mMap->drawOverlay(graphics, mPixelViewX, mPixelViewY,
                 (int) config.getValue("OverlayDetail", 2));
-        drawTargetName(graphics);
     }
 
     // Find a path from the player to the mouse, and draw it. This is for debug
@@ -259,12 +259,16 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
         }
     }
 
+    // Draw text
+    if (textManager)
+    {
+        textManager->draw(graphics, mPixelViewX, mPixelViewY);
+    }
+
     // Draw player nickname, speech, and emotion sprite as needed
     Beings &beings = beingManager->getAll();
     for (BeingIterator i = beings.begin(); i != beings.end(); i++)
     {
-        (*i)->drawSpeech(graphics, -(int) mPixelViewX, -(int) mPixelViewY);
-        (*i)->drawName(graphics, -(int) mPixelViewX, -(int) mPixelViewY);
         (*i)->drawEmotion(graphics, -(int) mPixelViewX, -(int) mPixelViewY);
     }
 
@@ -331,24 +335,6 @@ Viewport::drawTargetCursor(Graphics *graphics)
     }
 }
 
-void
-Viewport::drawTargetName(Graphics *graphics)
-{
-    // Draw target marker if needed
-    Being *target = player_node->getTarget();
-    if (target && target->getType() == Being::MONSTER)
-    {
-        graphics->setFont(speechFont);
-        graphics->setColor(gcn::Color(255, 32, 32));
-
-        const MonsterInfo &mi = static_cast<Monster*>(target)->getInfo();
-        int posX = target->getPixelX() + 16 - (int)mPixelViewX;
-        int posY = target->getPixelY() + 16 - target->getHeight() - (int)mPixelViewY;
-
-        graphics->drawText(mi.getName(), posX, posY, gcn::Graphics::CENTER);
-    }
-}
-
 void
 Viewport::mousePressed(gcn::MouseEvent &event)
 {
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 8d3fbd3c..44a877a6 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: viewport.h 4247 2008-05-19 10:48:18Z b_lindeijer $
  */
 
 #ifndef _TMW_VIEWPORT_H_
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
new file mode 100644
index 00000000..b33a55cf
--- /dev/null
+++ b/src/gui/widgets/dropdown.cpp
@@ -0,0 +1,169 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include <algorithm>
+
+#include "dropdown.h"
+
+#include "../../graphics.h"
+
+#include "../../resources/image.h"
+#include "../../resources/resourcemanager.h"
+
+#include "../../utils/dtor.h"
+
+int DropDown::instances = 0;
+Image *DropDown::buttons[2][2];
+ImageRect DropDown::skin;
+
+DropDown::DropDown(gcn::ListModel *listModel,
+                   gcn::ScrollArea *scrollArea,
+                   gcn::ListBox *listBox):
+                   gcn::DropDown::DropDown(listModel,
+                   scrollArea, listBox)
+{
+    setFrameSize(2);
+
+    // Initialize graphics
+    if (instances == 0)
+    {
+        // Load the background skin
+        ResourceManager *resman = ResourceManager::getInstance();
+
+        // Get the button skin
+        buttons[1][0] =
+            resman->getImage("graphics/gui/vscroll_up_default.png");
+        buttons[0][0] =
+            resman->getImage("graphics/gui/vscroll_down_default.png");
+        buttons[1][1] =
+            resman->getImage("graphics/gui/vscroll_up_pressed.png");
+        buttons[0][1] =
+            resman->getImage("graphics/gui/vscroll_down_pressed.png");
+
+        // get the border skin
+        Image *boxBorder = resman->getImage("graphics/gui/deepbox.png");
+        int gridx[4] = {0, 3, 28, 31};
+        int gridy[4] = {0, 3, 28, 31};
+        int a = 0, x, y;
+
+        for (y = 0; y < 3; y++) {
+            for (x = 0; x < 3; x++) {
+                skin.grid[a] = boxBorder->getSubImage(
+                        gridx[x], gridy[y],
+                        gridx[x + 1] - gridx[x] + 1,
+                        gridy[y + 1] - gridy[y] + 1);
+                a++;
+            }
+        }
+
+        boxBorder->decRef();
+    }
+
+    instances++;
+}
+
+DropDown::~DropDown()
+{
+    instances--;
+    // Free images memory
+    if (instances == 0)
+    {
+        buttons[0][0]->decRef();
+        buttons[0][1]->decRef();
+        buttons[1][0]->decRef();
+        buttons[1][1]->decRef();
+
+        for_each(skin.grid, skin.grid + 9, dtor<Image*>());
+    }
+}
+
+void DropDown::draw(gcn::Graphics* graphics)
+{
+    int h;
+
+    if (mDroppedDown)
+    {
+        h = mFoldedUpHeight;
+    }
+    else
+    {
+        h = getHeight();
+    }
+
+    int alpha = getBaseColor().a;
+    gcn::Color faceColor = getBaseColor();
+    faceColor.a = alpha;
+    gcn::Color highlightColor = faceColor + 0x303030;
+    highlightColor.a = alpha;
+    gcn::Color shadowColor = faceColor - 0x303030;
+    shadowColor.a = alpha;
+
+
+    graphics->setColor(getBackgroundColor());
+    graphics->fillRectangle(gcn::Rectangle(0, 0, getWidth(), h));
+
+    graphics->setColor(getForegroundColor());
+    graphics->setFont(getFont());
+
+    if (mListBox->getListModel() && mListBox->getSelected() >= 0)
+    {
+        graphics->drawText(mListBox->getListModel()->getElementAt(mListBox->getSelected()), 1, 0);
+    }
+
+    if (isFocused())
+    {
+        graphics->setColor(highlightColor);
+        graphics->drawRectangle(gcn::Rectangle(0, 0, getWidth() - h, h));
+    }
+
+    drawButton(graphics);
+
+    if (mDroppedDown)
+    {
+        drawChildren(graphics);
+
+        // Draw two lines separating the ListBox with se selected
+        // element view.
+        graphics->setColor(highlightColor);
+        graphics->drawLine(0, h, getWidth(), h);
+        graphics->setColor(shadowColor);
+        graphics->drawLine(0, h + 1, getWidth(), h + 1);
+    }
+}
+
+void DropDown::drawFrame(gcn::Graphics *graphics)
+{
+    const int bs = getFrameSize();
+    const int w = getWidth() + bs * 2;
+    const int h = getHeight() + bs * 2;
+
+    static_cast<Graphics*>(graphics)->drawImageRect(0, 0, w, h, skin);
+}
+
+void DropDown::drawButton(gcn::Graphics *graphics)
+{
+    int height = mDroppedDown ? mFoldedUpHeight : getHeight();
+
+    static_cast<Graphics*>(graphics)->
+        drawImage(buttons[mDroppedDown][mPushed], getWidth() - height, 1);
+}
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
new file mode 100644
index 00000000..d0dab7d2
--- /dev/null
+++ b/src/gui/widgets/dropdown.h
@@ -0,0 +1,85 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef DROPDOWN_H
+#define DROPDOWN_H
+
+#include <iosfwd>
+
+#include <guichan/widgets/dropdown.hpp>
+#include "../scrollarea.h"
+#include "../listbox.h"
+
+class Image;
+class ImageRect;
+
+    /**
+     * A drop down box from which you can select different values. It is one of
+     * the most complicated Widgets you will find in Guichan. For drawing the
+     * DroppedDown box it uses one ScrollArea and one ListBox. It also uses an
+     * internal FocusHandler to handle the focus of the internal ScollArea and
+     * ListBox. DropDown uses a ListModel to handle the list. To be able to use
+     * DropDown you must give DropDown an implemented ListModel which represents
+     * your list.
+     */
+class DropDown : public gcn::DropDown
+{
+    public:
+        /**
+         * Contructor.
+         *
+         * @param listModel the ListModel to use.
+         * @param scrollArea the ScrollArea to use.
+         * @param listBox the listBox to use.
+         * @see ListModel, ScrollArea, ListBox.
+         */
+        DropDown(gcn::ListModel *listModel = NULL,
+                 gcn::ScrollArea *scrollArea = NULL,
+                 gcn::ListBox *listBox = NULL);
+
+        /**
+         * Destructor.
+         */
+        ~DropDown();
+
+        void draw(gcn::Graphics* graphics);
+
+        void drawFrame(gcn::Graphics* graphics);
+
+
+    protected:
+        /**
+         * Draws the button with the little down arrow.
+         *
+         * @param graphics a Graphics object to draw with.
+         */
+        void drawButton(gcn::Graphics *graphics);
+
+        // Add own Images.
+        static int instances;
+        static Image *buttons[2][2];
+        static ImageRect skin;
+};
+
+#endif // end DROPDOWN_H
+
diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp
index 6be50f2c..e13493bb 100644
--- a/src/gui/widgets/resizegrip.cpp
+++ b/src/gui/widgets/resizegrip.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: resizegrip.cpp 3587 2007-09-20 13:24:20Z b_lindeijer $
  */
 
 #include "resizegrip.h"
diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h
index 04be3db3..dab720dd 100644
--- a/src/gui/widgets/resizegrip.h
+++ b/src/gui/widgets/resizegrip.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: resizegrip.h 3270 2007-04-15 01:22:17Z b_lindeijer $
  */
 
 #ifndef _TMW_RESIZEGRIP_H
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 4ce167cd..4f94b3fb 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: window.cpp 4207 2008-04-29 09:10:43Z b_lindeijer $
  */
 
 #include <algorithm>
diff --git a/src/gui/window.h b/src/gui/window.h
index f88e5c01..8f288991 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: window.h 4207 2008-04-29 09:10:43Z b_lindeijer $
  */
 
 #ifndef _TMW_WINDOW_H__
diff --git a/src/gui/windowcontainer.cpp b/src/gui/windowcontainer.cpp
index d10c519c..0a0a0a55 100644
--- a/src/gui/windowcontainer.cpp
+++ b/src/gui/windowcontainer.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: windowcontainer.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $
  */
 
 #include <algorithm>
diff --git a/src/gui/windowcontainer.h b/src/gui/windowcontainer.h
index df255f84..294c855b 100644
--- a/src/gui/windowcontainer.h
+++ b/src/gui/windowcontainer.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: windowcontainer.h 2884 2006-12-04 11:20:54Z b_lindeijer $
  */
 
 #ifndef _TMW_WINDOWCONTAINER_H_
diff --git a/src/guichanfwd.h b/src/guichanfwd.h
index 812f3f7a..0a2560bf 100644
--- a/src/guichanfwd.h
+++ b/src/guichanfwd.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: guichanfwd.h 2907 2006-12-12 15:33:46Z b_lindeijer $
  */
 
 #ifndef _TMW_GUICHANFWD_H
diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp
index 965434b0..d4ff8f02 100644
--- a/src/imageparticle.cpp
+++ b/src/imageparticle.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: imageparticle.cpp 4360 2008-06-23 14:44:20Z crush_tmw $
  */
 
 #include "imageparticle.h"
diff --git a/src/imageparticle.h b/src/imageparticle.h
index 0ad515cc..ef663473 100644
--- a/src/imageparticle.h
+++ b/src/imageparticle.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: imageparticle.h 3567 2007-09-07 09:13:17Z b_lindeijer $
  */
 
 #ifndef _IMAGEPARTICLE_H
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 470b6c85..e6f006de 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: inventory.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "inventory.h"
diff --git a/src/inventory.h b/src/inventory.h
index 0d2bbc5a..2e0dd792 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: inventory.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _INVENTORY_H
diff --git a/src/item.cpp b/src/item.cpp
index e84a06df..2e33a9de 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: item.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "item.h"
diff --git a/src/item.h b/src/item.h
index 9e1c5ec8..449b388c 100644
--- a/src/item.h
+++ b/src/item.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: item.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _ITEM_H_
diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp
index a32e50e0..5379f0eb 100644
--- a/src/itemshortcut.cpp
+++ b/src/itemshortcut.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: itemshortcut.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "itemshortcut.h"
diff --git a/src/itemshortcut.h b/src/itemshortcut.h
index d75db2e8..bbf21332 100644
--- a/src/itemshortcut.h
+++ b/src/itemshortcut.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: itemshortcut.h 4180 2008-04-24 20:49:30Z peaveydk $
  */
 
 #ifndef _TMW_ITEMSHORTCUT_H__
diff --git a/src/joystick.cpp b/src/joystick.cpp
index a5dab4f4..ebae5c3a 100644
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: joystick.cpp 2595 2006-08-26 20:19:39Z b_lindeijer $
  */
 
 #include "joystick.h"
diff --git a/src/joystick.h b/src/joystick.h
index 321e3e7d..5c6f7c86 100644
--- a/src/joystick.h
+++ b/src/joystick.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: joystick.h 3587 2007-09-20 13:24:20Z b_lindeijer $
  */
 
 #ifndef _TMW_JOYSTICK_H
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index a959e244..5534b96e 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: keyboardconfig.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #include "keyboardconfig.h"
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index 53a5c96d..b98fcb7a 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: keyboardconfig.h 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #ifndef _TMW_KEYBOARDCONFIG_H
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 3929da8b..5f392a52 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: localplayer.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "localplayer.h"
@@ -31,6 +31,7 @@
 #include "main.h"
 #include "particle.h"
 #include "sound.h"
+#include "monster.h"
 
 #include "gui/gui.h"
 
@@ -226,6 +227,23 @@ void LocalPlayer::walk(unsigned char dir)
     }
 }
 
+void LocalPlayer::setTarget(Being *target)
+{
+    if (target == mTarget)
+    {
+        return;
+    }
+    if (mTarget && mTarget->getType() == Being::MONSTER)
+    {
+        static_cast<Monster *>(mTarget)->showName(false);
+    }
+    mTarget = target;
+    if (target && target->getType() == Being::MONSTER)
+    {
+        static_cast<Monster *>(target)->showName(true);
+    }
+}
+
 void LocalPlayer::setDestination(Uint16 x, Uint16 y)
 {
     // Only send a new message to the server when destination changes
@@ -363,9 +381,13 @@ void LocalPlayer::attack(Being *target, bool keep)
         return;
 
     if (keep && target)
-        mTarget = target;
+    {
+        setTarget(target);
+    }
     else if (mTarget)
+    {
         target = mTarget;
+    }
 
     if (!target)
         return;
@@ -411,7 +433,7 @@ void LocalPlayer::attack(Being *target, bool keep)
 
 void LocalPlayer::stopAttack()
 {
-    mTarget = NULL;
+    setTarget(NULL);
 }
 
 Being* LocalPlayer::getTarget() const
@@ -454,7 +476,7 @@ bool LocalPlayer::withinAttackRange(Being *target)
 
 void LocalPlayer::setGotoTarget(Being *target)
 {
-    mTarget = target;
+    setTarget(target);
     mGoingToTarget = true;
     setDestination(target->mX, target->mY);
 }
diff --git a/src/localplayer.h b/src/localplayer.h
index 5ce94081..64e6c5ad 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: localplayer.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _TMW_LOCALPLAYER_H
@@ -54,8 +54,9 @@ class LocalPlayer : public Player
          */
         ~LocalPlayer();
 
+        void setName(const std::string &name) {Being::setName(name); }
         void setNetwork(Network *network) { mNetwork = network; }
-
+        Network *getNetwork() {return mNetwork; }
         virtual void logic();
 
         /**
@@ -64,12 +65,6 @@ class LocalPlayer : public Player
          */
         virtual void nextStep();
 
-        /**
-         * Draws the name text below the being.
-         */
-        virtual void
-        drawName(Graphics *graphics, Sint32 offsetX, Sint32 offsetY) {};
-
         /**
          * Returns the player's inventory.
          */
@@ -140,7 +135,7 @@ class LocalPlayer : public Player
         /**
          * Sets the target being of the player.
          */
-        void setTarget(Being* target) { mTarget = target; }
+        void setTarget(Being* target);
 
         /**
          * Sets a new destination for this being to walk to.
diff --git a/src/lockedarray.h b/src/lockedarray.h
index 7ec2f9da..bbb72520 100644
--- a/src/lockedarray.h
+++ b/src/lockedarray.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: lockedarray.h 2277 2006-03-19 21:40:21Z der_doener $
  */
 
 #ifndef _TMW_LOCKEDARRAY_H
diff --git a/src/logindata.h b/src/logindata.h
index 8513428f..d2fe3043 100644
--- a/src/logindata.h
+++ b/src/logindata.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: logindata.h 3606 2007-09-27 14:54:09Z b_lindeijer $
  */
 
 #ifndef _TMW_LOGINDATA_H
@@ -31,6 +31,7 @@ struct LoginData
     std::string username;
     std::string password;
     std::string hostname;
+    std::string updateHost;
     short port;
 
     int account_ID;
diff --git a/src/main.cpp b/src/main.cpp
index 7a854123..2b8a3882 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: main.cpp 4332 2008-06-05 07:33:12Z b_lindeijer $
  */
 
 #include "main.h"
@@ -57,6 +57,7 @@
 #ifdef USE_OPENGL
 #include "openglgraphics.h"
 #endif
+#include "serverinfo.h"
 #include "sound.h"
 
 #include "gui/char_server.h"
@@ -150,23 +151,65 @@ struct Options
     std::string updateHost;
 };
 
+/**
+ * Parse the update host and determine the updates directory
+ * Then verify that the directory exists (creating if needed).
+ */
+void setUpdatesDir()
+{
+    // If updatesHost is currently empty, fill it from config file
+    if (updateHost.empty()) {
+        updateHost =
+            config.getValue("updatehost", "http://updates.thanaworld.org");
+    }
+
+    // Parse out any "http://" or "ftp://", and set the updates directory
+    size_t pos;
+    pos = updateHost.find("://");
+    if (pos != updateHost.npos) {
+        if (pos + 3 < updateHost.length()) {
+            updatesDir =
+                "updates/" + updateHost.substr(pos + 3);
+        } else {
+            logger->log("Error: Invalid update host: %s", updateHost.c_str());
+            errorMessage = "Invalid update host: " + updateHost;
+            state = ERROR_STATE;
+        }
+    } else {
+        logger->log("Warning: no protocol was specified for the update host");
+        updatesDir = "updates/" + updateHost;
+    }
+
+    ResourceManager *resman = ResourceManager::getInstance();
+
+    // Verify that the updates directory exists. Create if necessary.
+    if (!resman->isDirectory("/" + updatesDir)) {
+        if (resman->mkdir("/" + updatesDir)) {
+            logger->log("Error: %s/%s can't be made, but doesn't exist!",
+                         homeDir.c_str(), updatesDir.c_str());
+            errorMessage = "Error creating updates directory!";
+            state = ERROR_STATE;
+        }
+    }
+}
+
 /**
  * Do all initialization stuff
  */
 void init_engine(const Options &options)
 {
-    homeDir = std::string(PHYSFS_getUserDir()) + "/.tmw";
+    homeDir = std::string(PHYSFS_getUserDir()) + "/.tme";
 #if defined WIN32
     if (!CreateDirectory(homeDir.c_str(), 0) &&
             GetLastError() != ERROR_ALREADY_EXISTS)
 #elif defined __APPLE__
-    // Use Application Directory instead of .tmw
-    homeDir = std::string(PHYSFS_getUserDir()) + 
+    // Use Application Directory instead of .tme
+    homeDir = std::string(PHYSFS_getUserDir()) +
         "/Library/Application Support/The Mana World";
     if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) &&
             (errno != EEXIST))
 #else
-    // Checking if /home/user/.tmw folder exists.
+    // Checking if /home/user/.tme folder exists.
     if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) &&
             (errno != EEXIST))
 #endif
@@ -230,7 +273,7 @@ void init_engine(const Options &options)
 
     // Fill configuration with defaults
     logger->log("Initializing configuration...");
-    config.setValue("host", "server.themanaworld.org");
+    config.setValue("host", "216.139.126.36");
     config.setValue("port", 6901);
     config.setValue("hwaccel", 0);
 #if (defined __APPLE__ || defined WIN32) && defined USE_OPENGL
@@ -245,7 +288,7 @@ void init_engine(const Options &options)
     config.setValue("sfxVolume", 100);
     config.setValue("musicVolume", 60);
     config.setValue("fpslimit", 60);
-    config.setValue("updatehost", "http://updates.themanaworld.org");
+    config.setValue("updatehost", "http://216.139.126.36/updates");
     config.setValue("customcursor", 1);
     config.setValue("ChatLogLength", 128);
 
@@ -272,45 +315,7 @@ void init_engine(const Options &options)
         config.init(configPath);
     }
 
-
-    // Take host for updates from config if it wasn't set on the command line
-    if (options.updateHost.empty()) {
-        updateHost =
-            config.getValue("updatehost", "http://updates.thanaworld.org");
-    } else {
-        updateHost = options.updateHost;
-    }
-
-    // Parse out any "http://" or "ftp://", and set the updates directory
-    size_t pos;
-    pos = updateHost.find("//");
-    if (pos != updateHost.npos) {
-        if (pos + 2 < updateHost.length()) {
-            updatesDir =
-                "updates/" + updateHost.substr(pos + 2);
-        } else {
-            std::cout << "The updates host - " << updateHost
-                      << " does not appear to be valid!" << std::endl
-                      << "Please fix the \"updatehost\" in your configuration"
-                      << " file. Exiting." << std::endl;
-            exit(1);
-        }
-    } else {
-        logger->log("Warning: no protocol was specified for the update host");
-        updatesDir = "updates/" + updateHost;
-    }
-
-    // Verify that the updates directory exists. Create if necessary.
-    if (!resman->isDirectory("/" + updatesDir)) {
-        if (!resman->mkdir("/" + updatesDir)) {
-            std::cout << homeDir << "/" << updatesDir
-                      << " can't be made, but it doesn't exist! Exiting."
-                      << std::endl;
-            exit(1);
-        }
-    }
-
-    SDL_WM_SetCaption("The Mana World", NULL);
+    SDL_WM_SetCaption("The Mana Experiment", NULL);
 #ifdef WIN32
     static SDL_SysWMinfo pInfo;
     SDL_GetWMInfo(&pInfo);
@@ -363,7 +368,7 @@ void init_engine(const Options &options)
     itemShortcut = new ItemShortcut();
 
     gui = new Gui(graphics);
-    state = UPDATE_STATE; /**< Initial game state */
+    state = LOGIN_STATE; /**< Initial game state */
 
     // Initialize sound engine
     try {
@@ -424,7 +429,8 @@ void printHelp()
         << "  -u --skipupdate : Skip the update process" << std::endl
         << "  -U --username   : Login with this username" << std::endl
         << "  -P --password   : Login with this password" << std::endl
-        << "  -D --default    : Bypass the login process with default settings" << std::endl
+        << "  -D --default    : Bypass the login process with default "
+                                "settings" << std::endl
         << "  -p --playername : Login with this player" << std::endl
         << "  -C --configfile : Configuration file to use" << std::endl
         << "  -H --updatehost : Use this update host" << std::endl;
@@ -541,7 +547,13 @@ void accountLogin(Network *network, LoginData *loginData)
     outMsg.writeInt32(0); // client version
     outMsg.writeString(loginData->username, 24);
     outMsg.writeString(loginData->password, 24);
-    outMsg.writeInt8(0); // unknown
+
+    /*
+     * eAthena calls the last byte "client version 2", but it isn't
+     * used at all.  We're retasking it, with bit 0  to indicate whether
+     * the client can handle the 0x63 "update host" packet
+     */
+    outMsg.writeInt8(0x01);
 
     // Clear the password, avoids auto login when returning to login
     loginData->password = "";
@@ -648,13 +660,6 @@ int main(int argc, char *argv[])
 
     SDL_Event event;
 
-    if (options.skipUpdate && state != ERROR_STATE) {
-        state = LOADDATA_STATE;
-    }
-    else {
-        state = UPDATE_STATE;
-    }
-
     unsigned int oldstate = !state; // We start with a status change.
 
     Game *game = NULL;
@@ -684,7 +689,7 @@ int main(int argc, char *argv[])
     if (!options.password.empty()) {
         loginData.password = options.password;
     }
-    loginData.hostname = config.getValue("host", "server.themanaworld.org");
+    loginData.hostname = config.getValue("host", "216.139.126.36");
     loginData.port = (short)config.getValue("port", 0);
     loginData.remember = config.getValue("remember", 0);
     loginData.registerLogin = false;
@@ -751,11 +756,15 @@ int main(int argc, char *argv[])
             switch (oldstate)
             {
                 case UPDATE_STATE:
-                    loadUpdates();
-                    // Reload the wallpaper in case that it was updated
-                    login_wallpaper->decRef();
-                    login_wallpaper = ResourceManager::getInstance()->
-                        getImage("graphics/images/login_wallpaper.png");
+                    if (options.skipUpdate) {
+                        state = LOADDATA_STATE;
+                    } else {
+                        loadUpdates();
+                        // Reload the wallpaper in case that it was updated
+                        login_wallpaper->decRef();
+                        login_wallpaper = ResourceManager::getInstance()->
+                            getImage("graphics/images/login_wallpaper.png");
+                    }
                     break;
 
                     // Those states don't cause a network disconnect
@@ -797,7 +806,7 @@ int main(int argc, char *argv[])
                     ItemDB::load();
                     MonsterDB::load();
                     NPCDB::load();
-                    state = LOGIN_STATE;
+                    state = CHAR_CONNECT_STATE;
                     break;
 
                 case LOGIN_STATE:
@@ -818,13 +827,20 @@ int main(int argc, char *argv[])
 
                 case CHAR_SERVER_STATE:
                     logger->log("State: CHAR_SERVER");
-                    currentDialog = new ServerSelectDialog(&loginData);
-                    if (options.chooseDefault || options.playername != "") {
-                        ((ServerSelectDialog*) currentDialog)->action(
-                            gcn::ActionEvent(NULL, "ok"));
+                    if (n_server == 1) {
+                        SERVER_INFO *si = *server_info;
+                        loginData.hostname = iptostring(si->address);
+                        loginData.port = si->port;
+                        loginData.updateHost = si->updateHost;
+                        state = UPDATE_STATE;
+                    } else {
+                        currentDialog = new ServerSelectDialog(&loginData);
+                        if (options.chooseDefault || options.playername != "") {
+                            ((ServerSelectDialog*) currentDialog)->action(
+                                gcn::ActionEvent(NULL, "ok"));
+                        }
                     }
                     break;
-
                 case CHAR_SELECT_STATE:
                     logger->log("State: CHAR_SELECT");
                     currentDialog = new CharSelectDialog(network, &charInfo,
@@ -865,6 +881,13 @@ int main(int argc, char *argv[])
                     break;
 
                 case UPDATE_STATE:
+                    // Determine which source to use for the update host
+                    if(!options.updateHost.empty())
+                        updateHost = options.updateHost;
+                    else
+                        updateHost = loginData.updateHost;
+
+                    setUpdatesDir();
                     logger->log("State: UPDATE");
                     currentDialog = new UpdaterWindow(updateHost,
                             homeDir + "/" + updatesDir);
diff --git a/src/main.h b/src/main.h
index c18a2ddd..af59ea26 100644
--- a/src/main.h
+++ b/src/main.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: main.h 3628 2007-10-18 18:39:48Z b_lindeijer $
  */
 
 #ifndef _TMW_MAIN_H
diff --git a/src/map.cpp b/src/map.cpp
index c65b0cd6..d9d3a319 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: map.cpp 4171 2008-04-22 18:42:21Z b_lindeijer $
  */
 
 #include "map.h"
diff --git a/src/map.h b/src/map.h
index fab7bfb7..7695ba31 100644
--- a/src/map.h
+++ b/src/map.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: map.h 3887 2008-02-12 19:49:37Z umperio $
  */
 
 #ifndef _TMW_MAP_H_
diff --git a/src/monster.cpp b/src/monster.cpp
index e2a07e86..1a7f6c4e 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: monster.cpp 3823 2007-12-28 18:36:58Z crush_tmw $
  */
 
 #include "monster.h"
@@ -27,14 +27,21 @@
 #include "game.h"
 #include "sound.h"
 #include "particle.h"
+#include "text.h"
+#include "localplayer.h"
+
+#include "gui/gui.h"
 
 #include "resources/monsterdb.h"
 
 #include "utils/tostring.h"
 
+static const int NAME_X_OFFSET = 16;
+static const int NAME_Y_OFFSET = 16;
 
 Monster::Monster(Uint32 id, Uint16 job, Map *map):
-    Being(id, job, map)
+    Being(id, job, map),
+    mText(0)
 {
     const MonsterInfo&  info = MonsterDB::get(job - 1002);
 
@@ -59,6 +66,14 @@ Monster::Monster(Uint32 id, Uint16 job, Map *map):
     }
 }
 
+Monster::~Monster()
+{
+    if (mText)
+    {
+        player_node->setTarget(0);
+    }
+}
+
 void
 Monster::logic()
 {
@@ -141,3 +156,31 @@ Monster::getInfo() const
 {
     return MonsterDB::get(mJob - 1002);
 }
+
+void Monster::showName(bool show)
+{
+    if (mText)
+    {
+        delete mText;
+    }
+    if (show)
+    {
+        mText = new Text(getInfo().getName(), mPx + NAME_X_OFFSET,
+                         mPy + NAME_Y_OFFSET - getHeight(),
+                         gcn::Graphics::CENTER,
+                         speechFont, gcn::Color(255, 32, 32));
+    }
+    else
+    {
+        mText = 0;
+    }
+}
+
+void Monster::updateCoords()
+{
+    if (mText)
+    {
+        mText->adviseXY(mPx + NAME_X_OFFSET,
+                        mPy + NAME_Y_OFFSET - getHeight());
+    }
+}
diff --git a/src/monster.h b/src/monster.h
index 39556b44..b613e96d 100644
--- a/src/monster.h
+++ b/src/monster.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: monster.h 3690 2007-10-26 12:50:49Z crush_tmw $
  */
 
 #ifndef _TMW_MONSTER_H
@@ -27,12 +27,15 @@
 #include "being.h"
 
 class MonsterInfo;
+class Text;
 
 class Monster : public Being
 {
     public:
         Monster(Uint32 id, Uint16 job, Map *map);
 
+        ~Monster();
+
         virtual void logic();
 
         virtual void setAction(Uint8 action);
@@ -63,6 +66,19 @@ class Monster : public Being
          */
         const MonsterInfo&
         getInfo() const;
+
+        /**
+         * Determine whether the mob should show it's name
+         */
+        void showName(bool show);
+
+    protected:
+        /**
+         * Update the text when the monster moves
+         */
+        void updateCoords();
+    private:
+        Text *mText; /**< holds a text object when the mod displays it's name, 0 otherwise */
 };
 
 #endif
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index be8412d9..e077ab14 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: beinghandler.cpp 4321 2008-06-02 11:42:26Z b_lindeijer $
  */
 
 #include "beinghandler.h"
@@ -55,6 +55,8 @@ BeingHandler::BeingHandler()
         SMSG_PLAYER_UPDATE_1,
         SMSG_PLAYER_UPDATE_2,
         SMSG_PLAYER_MOVE,
+        SMSG_PLAYER_STOP,
+        SMSG_PLAYER_MOVE_TO_ATTACK,
         0x0119,
         0
     };
@@ -122,7 +124,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
             headTop = msg->readInt16();
             headMid = msg->readInt16();
             hairColor = msg->readInt16();
-            msg->readInt16();  // clothes color -not used 
+            msg->readInt16();  // clothes color -not used
             msg->readInt16();  // head dir
             msg->readInt16();  // guild
             msg->readInt16();  // unknown
@@ -133,9 +135,9 @@ void BeingHandler::handleMessage(MessageIn *msg)
             dstBeing->setGender(1 - msg->readInt8());   // gender
 
             // Set these after the gender, as the sprites may be gender-specific
-            dstBeing->setSprite(Being::BOTTOMCLOTHES_SPRITE, headBottom); 
-            dstBeing->setSprite(Being::TOPCLOTHES_SPRITE, headMid); 
-            dstBeing->setSprite(Being::HAT_SPRITE, headTop); 
+            dstBeing->setSprite(Being::BOTTOMCLOTHES_SPRITE, headBottom);
+            dstBeing->setSprite(Being::TOPCLOTHES_SPRITE, headMid);
+            dstBeing->setSprite(Being::HAT_SPRITE, headTop);
             dstBeing->setHairStyle(hairStyle, hairColor);
 
             if (msg->getId() == SMSG_BEING_MOVE)
@@ -257,7 +259,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
         case SMSG_BEING_CHANGE_LOOKS2:
         {
             /*
-             * SMSG_BEING_CHANGE_LOOKS (0x00c3) and 
+             * SMSG_BEING_CHANGE_LOOKS (0x00c3) and
              * SMSG_BEING_CHANGE_LOOKS2 (0x01d7) do basically the same
              * thing.  The difference is that ...LOOKS carries a single
              * 8 bit value, where ...LOOKS2 carries two 16 bit values.
@@ -288,7 +290,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
                 case 1:     // eAthena LOOK_HAIR
                     dstBeing->setHairStyle(id, -1);
                     break;
-                case 2:     // Weapon ID in id, Shield ID in id2 
+                case 2:     // Weapon ID in id, Shield ID in id2
                     dstBeing->setSprite(Being::WEAPON_SPRITE, id);
                     dstBeing->setSprite(Being::SHIELD_SPRITE, id2);
                     break;
@@ -304,6 +306,9 @@ void BeingHandler::handleMessage(MessageIn *msg)
                 case 6:     // eAthena LOOK_HAIR_COLOR
                     dstBeing->setHairStyle(-1, id);
                     break;
+                case 8:     // eAthena LOOK_SHIELD
+                    dstBeing->setSprite(Being::SHIELD_SPRITE, id);
+                    break;
                 case 9:     // eAthena LOOK_SHOES
                     dstBeing->setSprite(Being::SHOE_SPRITE, id);
                     break;
@@ -345,7 +350,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
             hairStyle = msg->readInt16();
             dstBeing->setSprite(Being::WEAPON_SPRITE, msg->readInt16());
             dstBeing->setSprite(Being::SHIELD_SPRITE, msg->readInt16());
-            headBottom = msg->readInt16(); 
+            headBottom = msg->readInt16();
 
             if (msg->getId() == SMSG_PLAYER_MOVE)
             {
@@ -355,7 +360,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
             headTop = msg->readInt16();
             headMid = msg->readInt16();
             hairColor = msg->readInt16();
-            msg->readInt16();  // clothes color - not used 
+            msg->readInt16();  // clothes color - not used
             msg->readInt16();  // head dir
             msg->readInt32();  // guild
             msg->readInt32();  // emblem
@@ -364,7 +369,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
             dstBeing->setGender(1 - msg->readInt8());   // gender
 
             // Set these after the gender, as the sprites may be gender-specific
-            dstBeing->setSprite(Being::BOTTOMCLOTHES_SPRITE, headBottom); 
+            dstBeing->setSprite(Being::BOTTOMCLOTHES_SPRITE, headBottom);
             dstBeing->setSprite(Being::TOPCLOTHES_SPRITE, headMid);
             dstBeing->setSprite(Being::HAT_SPRITE, headTop);
             dstBeing->setHairStyle(hairStyle, hairColor);
@@ -406,6 +411,32 @@ void BeingHandler::handleMessage(MessageIn *msg)
             dstBeing->mFrame = 0;
             break;
 
+        case SMSG_PLAYER_STOP:
+            // Instruction from server to stop walking at x, y.
+            id = msg->readInt32();
+            dstBeing = beingManager->findBeing(id);
+
+            if (dstBeing) {
+                dstBeing->mX = msg->readInt16();
+                dstBeing->mY = msg->readInt16();
+                if (dstBeing->mAction == Being::WALK) {
+                     dstBeing->mFrame = 0;
+                     dstBeing->setAction(Being::STAND);
+                }
+            } else {
+                logger->log("0x0088: Non-existent being %d", id);
+            }
+            break;
+
+        case SMSG_PLAYER_MOVE_TO_ATTACK:
+            /*
+             * This is an *advisory* message, telling the client that
+             * it needs to move the character before attacking
+             * a target (out of range, obstruction in line of fire).
+             * We can safely ignore this...
+             */
+            break;
+
         case 0x0119:
             // Change in players look
             logger->log("0x0119 %i %i %i %x %i", msg->readInt32(),
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index 03012f39..5429d962 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: beinghandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_BEINGHANDLER_H
diff --git a/src/net/buysellhandler.cpp b/src/net/buysellhandler.cpp
index 26261664..b4e2cf30 100644
--- a/src/net/buysellhandler.cpp
+++ b/src/net/buysellhandler.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: buysellhandler.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "buysellhandler.h"
diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h
index 673aaac1..4da52c95 100644
--- a/src/net/buysellhandler.h
+++ b/src/net/buysellhandler.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: buysellhandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_BUYSELLHANDLER_H
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 5cc53f7d..91f098ba 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: charserverhandler.cpp 4330 2008-06-04 08:53:01Z b_lindeijer $
  */
 
 #include "charserverhandler.h"
diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h
index ab4ca1c7..663de94d 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: charserverhandler.h 3228 2007-03-22 23:53:13Z b_lindeijer $
  */
 
 #ifndef _TMW_NET_CHARSERVERHANDLER_H
diff --git a/src/net/chathandler.cpp b/src/net/chathandler.cpp
index 524911d3..bee19112 100644
--- a/src/net/chathandler.cpp
+++ b/src/net/chathandler.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: chathandler.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
 #include "chathandler.h"
diff --git a/src/net/chathandler.h b/src/net/chathandler.h
index eed19206..08a560f3 100644
--- a/src/net/chathandler.h
+++ b/src/net/chathandler.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: chathandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_CHATHANDLER_H
diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index 85790b42..7b15ee8b 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: equipmenthandler.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "equipmenthandler.h"
diff --git a/src/net/equipmenthandler.h b/src/net/equipmenthandler.h
index 656f7a73..0121e6ad 100644
--- a/src/net/equipmenthandler.h
+++ b/src/net/equipmenthandler.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: equipmenthandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_EQUIPMENTHANDLER_H
diff --git a/src/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp
index 48cf18ff..c0661710 100644
--- a/src/net/inventoryhandler.cpp
+++ b/src/net/inventoryhandler.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: inventoryhandler.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "inventoryhandler.h"
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index aedbc3a1..64ef8464 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: inventoryhandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_INVENTORYHANDLER_H
diff --git a/src/net/itemhandler.cpp b/src/net/itemhandler.cpp
index 567a5382..9af2be10 100644
--- a/src/net/itemhandler.cpp
+++ b/src/net/itemhandler.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: itemhandler.cpp 2150 2006-02-06 02:56:48Z der_doener $
  */
 
 #include "itemhandler.h"
diff --git a/src/net/itemhandler.h b/src/net/itemhandler.h
index b2104722..702e193a 100644
--- a/src/net/itemhandler.h
+++ b/src/net/itemhandler.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: itemhandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_ITEMHANDLER_H
diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp
index ab788e41..6505e39f 100644
--- a/src/net/loginhandler.cpp
+++ b/src/net/loginhandler.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: loginhandler.cpp 3233 2007-03-24 01:57:39Z b_lindeijer $
  */
 
 #include "loginhandler.h"
@@ -37,6 +37,7 @@ extern SERVER_INFO **server_info;
 LoginHandler::LoginHandler()
 {
     static const Uint16 _messages[] = {
+        0x0063,
         0x0069,
         0x006a,
         0
@@ -48,6 +49,16 @@ void LoginHandler::handleMessage(MessageIn *msg)
 {
     switch (msg->getId())
     {
+        case 0x0063:
+             int len;
+             
+             len = msg->readInt16() - 4; 
+             mUpdateHost = msg->readString(len);
+
+             logger->log("Received update host \"%s\" from login server", 
+                          mUpdateHost.c_str());
+             break;
+
         case 0x0069:
             // Skip the length word
             msg->skip(2);
@@ -70,6 +81,7 @@ void LoginHandler::handleMessage(MessageIn *msg)
                 server_info[i]->port = msg->readInt16();
                 server_info[i]->name = msg->readString(20);
                 server_info[i]->online_users = msg->readInt32();
+                server_info[i]->updateHost = mUpdateHost;
                 msg->skip(2);                        // unknown
 
                 logger->log("Network: Server: %s (%s:%d)",
@@ -77,7 +89,7 @@ void LoginHandler::handleMessage(MessageIn *msg)
                         iptostring(server_info[i]->address),
                         server_info[i]->port);
             }
-            state = CHAR_SERVER_STATE;
+            state = CHAR_SERVER_STATE; 
             break;
 
         case 0x006a:
diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h
index 52014559..797655c3 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.h
@@ -18,13 +18,14 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: loginhandler.h 2137 2006-02-04 16:54:35Z der_doener $
  */
 
 #ifndef _TMW_NET_LOGINHANDLER_H
 #define _TMW_NET_LOGINHANDLER_H
 
 #include "messagehandler.h"
+#include <string>
 
 struct LoginData;
 
@@ -39,6 +40,9 @@ class LoginHandler : public MessageHandler
 
     protected:
         LoginData *mLoginData;
+    
+    private:
+        std::string mUpdateHost;
 };
 
 #endif
diff --git a/src/net/maploginhandler.cpp b/src/net/maploginhandler.cpp
index 0afc8357..15f70baf 100644
--- a/src/net/maploginhandler.cpp
+++ b/src/net/maploginhandler.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: maploginhandler.cpp 2239 2006-03-09 05:16:27Z der_doener $
  */
 
 #include "maploginhandler.h"
diff --git a/src/net/maploginhandler.h b/src/net/maploginhandler.h
index fe597549..6ff6bc00 100644
--- a/src/net/maploginhandler.h
+++ b/src/net/maploginhandler.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: maploginhandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_MAPLOGINHANDLER_H
diff --git a/src/net/messagehandler.cpp b/src/net/messagehandler.cpp
index 849b6716..370a01ab 100644
--- a/src/net/messagehandler.cpp
+++ b/src/net/messagehandler.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: messagehandler.cpp 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #include "messagehandler.h"
diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h
index c09037f6..90ffa489 100644
--- a/src/net/messagehandler.h
+++ b/src/net/messagehandler.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: messagehandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_MESSAGEHANDLER_H
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index bbc0a44c..bec47a5a 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: messagein.cpp 2369 2006-06-26 21:32:52Z b_lindeijer $
  */
 
 #include "messagein.h"
diff --git a/src/net/messagein.h b/src/net/messagein.h
index d97cd8b6..0a6b8b8b 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: messagein.h 1879 2005-10-16 21:18:11Z der_doener $
  */
 
 #ifndef _TMW_MESSAGEIN_
diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp
index 9c87e69e..f5f3dad9 100644
--- a/src/net/messageout.cpp
+++ b/src/net/messageout.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: messageout.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $
  */
 
 #include <cstring>
diff --git a/src/net/messageout.h b/src/net/messageout.h
index f6468adb..33deb1bb 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: messageout.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_MESSAGEOUT_
diff --git a/src/net/network.cpp b/src/net/network.cpp
index fa5964d6..4db0df54 100644
--- a/src/net/network.cpp
+++ b/src/net/network.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: network.cpp 3550 2007-08-30 16:46:21Z b_lindeijer $
  */
 
 #include "network.h"
@@ -41,7 +41,7 @@ short packet_lengths[] = {
 // #0x0040
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 55, 17,  3, 37, 46, -1, 23, -1,  3,108,  3,  2,
+    0,  0,  0, -1, 55, 17,  3, 37, 46, -1, 23, -1,  3,108,  3,  2,
     3, 28, 19, 11,  3, -1,  9,  5, 54, 53, 58, 60, 41,  2,  6,  6,
 // #0x0080
     7,  3,  2,  2,  2,  5, 16, 12, 10,  7, 29, 23, -1, -1, -1,  0,
diff --git a/src/net/network.h b/src/net/network.h
index d6fec761..53800b1e 100644
--- a/src/net/network.h
+++ b/src/net/network.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: network.h 3234 2007-03-24 13:05:27Z b_lindeijer $
  */
 
 #ifndef _TMW_NETWORK_
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index da21b2a5..29855fc0 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: npchandler.cpp 2883 2006-12-03 17:00:07Z b_lindeijer $
  */
 
 #include "npchandler.h"
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index 903ecd10..7abd7495 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: npchandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_NPCHANDLER_H
diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp
new file mode 100644
index 00000000..c1f2ba2e
--- /dev/null
+++ b/src/net/partyhandler.cpp
@@ -0,0 +1,127 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: partyhandler.cpp
+ */
+
+#include "partyhandler.h"
+
+#include "protocol.h"
+#include "messagein.h"
+
+#include "../gui/chat.h"
+#include "../gui/confirm_dialog.h"
+
+#include "../game.h"
+#include "../party.h"
+#include "../beingmanager.h"
+
+#include <guichan/actionlistener.hpp>
+
+PartyHandler::PartyHandler(Party *party) : mParty(party)
+{
+    static const Uint16 _messages[] = {
+	SMSG_PARTY_CREATE,
+	SMSG_PARTY_INFO,
+	SMSG_PARTY_INVITE,
+	SMSG_PARTY_INVITED,
+	SMSG_PARTY_SETTINGS,
+	SMSG_PARTY_MEMBER_INFO,
+	SMSG_PARTY_LEAVE,
+	SMSG_PARTY_UPDATE_HP,
+	SMSG_PARTY_UPDATE_COORDS,
+	SMSG_PARTY_MESSAGE,
+	0
+    };
+    handledMessages = _messages;
+}
+
+void
+PartyHandler::handleMessage(MessageIn *msg)
+{
+    switch (msg->getId())
+    {
+	case SMSG_PARTY_CREATE:
+  	    mParty->createResponse(msg->readInt8());
+	    break;
+	case SMSG_PARTY_INFO:
+	    break;
+	case SMSG_PARTY_INVITE:
+	    {
+		std::string nick = msg->readString(24);
+		int status = msg->readInt8();
+		mParty->inviteResponse(nick, status);
+		break;
+	    }
+	case SMSG_PARTY_INVITED:
+	    {
+		int id = msg->readInt32();
+		Being *being = beingManager->findBeing(id);
+		if (being == NULL)
+		{
+		    break;
+		}
+		std::string nick;
+                int gender = 0;
+		std::string partyName = "";
+		if (being->getType() != Being::PLAYER)
+		{
+ 		    nick = "";
+		}
+		else
+		{
+		    nick = being->getName();
+		    gender = being->getGender();
+		    partyName = msg->readString(24);
+		}
+		mParty->invitedAsk(nick, gender, partyName);
+		break;
+	    }
+	case SMSG_PARTY_SETTINGS:
+	    break;
+	case SMSG_PARTY_MEMBER_INFO:
+	    break;
+	case SMSG_PARTY_LEAVE:
+	    {
+	        /*int id = */msg->readInt32();
+		std::string nick = msg->readString(24);
+		/*int fail = */msg->readInt8();
+		mParty->leftResponse(nick);
+		break;
+	    }
+	case SMSG_PARTY_UPDATE_HP:
+	    break;
+	case SMSG_PARTY_UPDATE_COORDS:
+	    break;
+	case SMSG_PARTY_MESSAGE:
+	    { // new block to enable local variables
+		int msgLength = msg->readInt16() - 8;
+		if (msgLength <= 0)
+		{
+ 		    return;
+		}
+		int id = msg->readInt32();
+		Being *being = beingManager->findBeing(id);
+		std::string chatMsg = msg->readString(msgLength);
+		mParty->receiveChat(being, chatMsg);
+	    }
+	    break;
+    }
+}
diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h
new file mode 100644
index 00000000..de97d084
--- /dev/null
+++ b/src/net/partyhandler.h
@@ -0,0 +1,41 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: partyhandler.h
+ */
+
+#ifndef _TMW_NET_PARTYHANDLER_H
+#define _TMW_NET_PARTYHANDLER_H
+
+#include "messagehandler.h"
+
+class Party;
+
+class PartyHandler : public MessageHandler
+{
+    public:
+	PartyHandler(Party *party);
+
+	void handleMessage(MessageIn *msg);
+    private:
+	Party *mParty;
+};
+
+#endif
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 2502c144..7f9e455a 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: playerhandler.cpp 4190 2008-04-26 17:37:03Z peaveydk $
  */
 
 #include "playerhandler.h"
@@ -109,10 +109,16 @@ void PlayerHandler::handleMessage(MessageIn *msg)
     switch (msg->getId())
     {
         case SMSG_WALK_RESPONSE:
-            // It is assumed by the client any request to walk actually
-            // succeeds on the server. The plan is to have a correction
-            // message when the server senses the client has the wrong
-            // idea.
+            /*
+             * This client assumes that all walk messages succeed,
+             * and that the server will send a correction notice
+             * otherwise.
+             *
+             * Note that this packet is also used by eAthena to notify
+             * the client of a server-generated auto-move.  A patch has
+             * been submitted to Mantis to eliminate these auto moves,
+             * since they're inconsistent with the client design.
+             */
             break;
 
         case SMSG_PLAYER_WARP:
@@ -345,18 +351,5 @@ void PlayerHandler::handleMessage(MessageIn *msg)
                 }
             }
             break;
-
-        //Stop walking
-        //case 0x0088:  // Disabled because giving some problems
-        //if (being = beingManager->findBeing(readInt32(2))) {
-        //    if (being->getId() != player_node->getId()) {
-        //        being->action = STAND;
-        //        being->mFrame = 0;
-        //        set_coordinates(being->coordinates,
-        //                        readWord(6), readWord(8),
-        //                        get_direction(being->coordinates));
-        //    }
-        //}
-        //break;
     }
 }
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index b28a23f5..f7c0672d 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: playerhandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_PLAYERHANDLER_H
diff --git a/src/net/protocol.cpp b/src/net/protocol.cpp
index d3db50bf..791b7fe5 100644
--- a/src/net/protocol.cpp
+++ b/src/net/protocol.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: protocol.cpp 2158 2006-02-07 10:37:54Z der_doener $
  */
 
 #include "protocol.h"
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 811d5481..f90fcba3 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: protocol.h 4321 2008-06-02 11:42:26Z b_lindeijer $
  */
 
 #ifndef _TMW_PROTOCOL_
@@ -29,6 +29,8 @@
 #define SMSG_PLAYER_UPDATE_1         0x01d8
 #define SMSG_PLAYER_UPDATE_2         0x01d9
 #define SMSG_PLAYER_MOVE             0x01da /**< A nearby player moves */
+#define SMSG_PLAYER_STOP             0x0088 /**< Stop walking, set position */
+#define SMSG_PLAYER_MOVE_TO_ATTACK   0x0139 /**< Move to within attack range */
 #define SMSG_PLAYER_STAT_UPDATE_1    0x00b0
 #define SMSG_PLAYER_STAT_UPDATE_2    0x00b1
 #define SMSG_PLAYER_STAT_UPDATE_3    0x0141
@@ -63,6 +65,7 @@
 #define SMSG_BEING_ACTION            0x008a /**< Attack, sit, stand up, ... */
 #define SMSG_BEING_CHAT              0x008d /**< A being talks */
 #define SMSG_BEING_NAME_RESPONSE     0x0095 /**< Has to be requested */
+
 #define SMSG_NPC_MESSAGE             0x00b4
 #define SMSG_NPC_NEXT                0x00b5
 #define SMSG_NPC_CLOSE               0x00b6
@@ -72,11 +75,13 @@
 #define SMSG_NPC_SELL                0x00c7
 #define SMSG_NPC_BUY_RESPONSE        0x00ca
 #define SMSG_NPC_SELL_RESPONSE       0x00cb
+
 #define SMSG_PLAYER_CHAT             0x008e /**< Player talks */
 #define SMSG_WHISPER                 0x0097 /**< Whisper Recieved */
 #define SMSG_WHISPER_RESPONSE        0x0098
 #define SMSG_GM_CHAT                 0x009a /**< GM announce */
 #define SMSG_WALK_RESPONSE           0x0087
+
 #define SMSG_TRADE_REQUEST           0x00e5 /**< Receiving a request to trade */
 #define SMSG_TRADE_RESPONSE          0x00e7
 #define SMSG_TRADE_ITEM_ADD          0x00e9
@@ -85,6 +90,17 @@
 #define SMSG_TRADE_CANCEL            0x00ee
 #define SMSG_TRADE_COMPLETE          0x00f0
 
+#define SMSG_PARTY_CREATE            0x00fa
+#define SMSG_PARTY_INFO              0x00fb
+#define SMSG_PARTY_INVITE            0x00fd
+#define SMSG_PARTY_INVITED           0x00fe
+#define SMSG_PARTY_SETTINGS          0x0102
+#define SMSG_PARTY_MEMBER_INFO       0x0104
+#define SMSG_PARTY_LEAVE             0x0105
+#define SMSG_PARTY_UPDATE_HP         0x0106
+#define SMSG_PARTY_UPDATE_COORDS     0x0107
+#define SMSG_PARTY_MESSAGE           0x0109
+
 // Packets from client to server
 #define CMSG_TRADE_RESPONSE          0x00e6
 #define CMSG_ITEM_PICKUP             0x009f
@@ -93,6 +109,8 @@
 #define CMSG_NPC_BUY_SELL_REQUEST    0x00c5
 #define CMSG_CHAT_MESSAGE            0x008c
 #define CMSG_CHAT_WHISPER            0x0096
+#define CMSG_CHAT_ANNOUNCE           0x0099
+#define CMSG_CHAT_WHO                0x00c1
 #define CMSG_NPC_LIST_CHOICE         0x00b8
 #define CMSG_NPC_NEXT_REQUEST        0x00b9
 #define CMSG_NPC_SELL_REQUEST        0x00c9
@@ -109,6 +127,13 @@
 #define CMSG_PLAYER_EQUIP            0x00a9
 #define CMSG_PLAYER_UNEQUIP          0x00ab
 
+#define CMSG_PARTY_CREATE            0x00f9
+#define CMSG_PARTY_INVITE            0x00fc
+#define CMSG_PARTY_INVITED           0x00ff
+#define CMSG_PARTY_LEAVE             0x0100 /** Undocumented */
+#define CMSG_PARTY_SETTINGS          0x0101
+#define CMSG_PARTY_MESSAGE           0x0108
+
 /** Encodes coords and direction in 3 bytes data */
 void set_coordinates(char *data, unsigned short x, unsigned short y, unsigned char direction);
 
diff --git a/src/net/skillhandler.cpp b/src/net/skillhandler.cpp
index 828c2378..1f9403f4 100644
--- a/src/net/skillhandler.cpp
+++ b/src/net/skillhandler.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: skillhandler.cpp 2832 2006-11-05 20:57:59Z b_lindeijer $
  */
 
 #include "skillhandler.h"
diff --git a/src/net/skillhandler.h b/src/net/skillhandler.h
index 820a7b6a..734772b4 100644
--- a/src/net/skillhandler.h
+++ b/src/net/skillhandler.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: skillhandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_SKILLHANDLER_H
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index 9599fa9d..cfd24977 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: tradehandler.cpp 4354 2008-06-17 16:52:44Z the_enemy $
  */
 
 #include "tradehandler.h"
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index a1971004..22e01f48 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: tradehandler.h 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
 #ifndef _TMW_NET_TRADEHANDLER_H
diff --git a/src/npc.cpp b/src/npc.cpp
index 2177aedc..ec7088ab 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: npc.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #include "npc.h"
@@ -26,6 +26,7 @@
 #include "animatedsprite.h"
 #include "graphics.h"
 #include "particle.h"
+#include "text.h"
 
 #include "net/messageout.h"
 #include "net/protocol.h"
@@ -35,6 +36,9 @@
 
 NPC *current_npc = 0;
 
+static const int NAME_X_OFFSET = 15;
+static const int NAME_Y_OFFSET = 30;
+
 NPC::NPC(Uint32 id, Uint16 job, Map *map, Network *network):
     Being(id, job, map), mNetwork(network)
 {
@@ -62,23 +66,32 @@ NPC::NPC(Uint32 id, Uint16 job, Map *map, Network *network):
         Particle *p = particleEngine->addEffect(*i, 0, 0);
         this->controlParticle(p);
     }
+    mName = 0;
 }
 
-Being::Type
-NPC::getType() const
+NPC::~NPC()
 {
-    return Being::NPC;
+    if (mName)
+    {
+        delete mName;
+    }
 }
 
-void
-NPC::drawName(Graphics *graphics, Sint32 offsetX, Sint32 offsetY)
+void NPC::setName(const std::string &name)
 {
-    int px = mPx + offsetX;
-    int py = mPy + offsetY;
+    if (mName)
+    {
+        delete mName;
+    }
+    mName = new Text(name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET,
+                     gcn::Graphics::CENTER, speechFont,
+                     gcn::Color(200, 200, 255));
+                 }
 
-    graphics->setFont(speechFont);
-    graphics->setColor(gcn::Color(200, 200, 255));
-    graphics->drawText(mName, px + 15, py + 30, gcn::Graphics::CENTER);
+Being::Type
+NPC::getType() const
+{
+    return Being::NPC;
 }
 
 void
@@ -129,3 +142,11 @@ NPC::sell()
     outMsg.writeInt32(mId);
     outMsg.writeInt8(1);
 }
+
+void NPC::updateCoords()
+{
+    if (mName)
+    {
+        mName->adviseXY(mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET);
+    }
+}
diff --git a/src/npc.h b/src/npc.h
index 0d9966bd..432d26d1 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: npc.h 2883 2006-12-03 17:00:07Z b_lindeijer $
  */
 
 #ifndef _TMW_NPC_H
@@ -28,18 +28,20 @@
 
 class Network;
 class Graphics;
+class Text;
 
 class NPC : public Being
 {
     public:
         NPC(Uint32 id, Uint16 job, Map *map, Network *network);
 
+        ~NPC();
+
+        void setName(const std::string &name);
+
         virtual Type
         getType() const;
 
-        virtual void
-        drawName(Graphics *graphics, Sint32 offsetX, Sint32 offsetY);
-
         void talk();
         void nextDialog();
         void dialogChoice(char choice);
@@ -49,6 +51,9 @@ class NPC : public Being
 
     protected:
         Network *mNetwork;
+        void updateCoords();
+    private:
+        Text *mName;
 };
 
 extern NPC *current_npc;
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index 5b34de18..6ffc5668 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: openglgraphics.cpp 4130 2008-04-18 20:39:29Z the_enemy $
  */
 
 #include "main.h"
diff --git a/src/openglgraphics.h b/src/openglgraphics.h
index ee5bc1e1..c3dc794c 100644
--- a/src/openglgraphics.h
+++ b/src/openglgraphics.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: openglgraphics.h 3628 2007-10-18 18:39:48Z b_lindeijer $
  */
 
 #ifndef _TMW_OPENGLGRAPHICS_H
diff --git a/src/particle.cpp b/src/particle.cpp
index 3b3f5116..651fae41 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: particle.cpp 4362 2008-06-24 12:29:33Z crush_tmw $
  */
 
 #include <algorithm>
diff --git a/src/particle.h b/src/particle.h
index 88a38417..d4a671c7 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: particle.h 4362 2008-06-24 12:29:33Z crush_tmw $
  */
 
 #ifndef _PARTICLE_H
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index 631ca228..996e3396 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: particleemitter.cpp 4362 2008-06-24 12:29:33Z crush_tmw $
  */
 
 #include "particleemitter.h"
diff --git a/src/particleemitter.h b/src/particleemitter.h
index 2f45608d..481d4b44 100644
--- a/src/particleemitter.h
+++ b/src/particleemitter.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: particleemitter.h 4362 2008-06-24 12:29:33Z crush_tmw $
  */
 
 #ifndef _PARTICLEEMITTER_H
diff --git a/src/party.cpp b/src/party.cpp
new file mode 100644
index 00000000..39c39352
--- /dev/null
+++ b/src/party.cpp
@@ -0,0 +1,219 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: party.cpp
+ */
+
+#include "party.h"
+
+#include "beingmanager.h"
+#include "localplayer.h"
+#include "game.h"
+
+#include "gui/chat.h"
+#include "gui/confirm_dialog.h"
+
+#include "net/messageout.h"
+#include "net/protocol.h"
+
+Party::Party(ChatWindow *chat, Network *network) :
+             mChat(chat), mNetwork(network), mInviteListener(network, &mInParty)
+{
+}
+
+void Party::respond(const std::string &command, const std::string &args)
+{
+    if (command == "new" || command == "create")
+    {
+	create(args);
+	return;
+    }
+    if (command == "leave")
+    {
+	leave(args);
+	return;
+    }
+    if (command == "settings")
+    {
+	mChat->chatLog("Not yet implemented!", BY_SERVER);
+	return;
+	/*
+	  MessageOut outMsg(mNetwork);
+	  outMsg.writeInt16(CMSG_PARTY_SETTINGS);
+	  outMsg.writeInt16(0); // Experience
+	  outMsg.writeInt16(0); // Item
+	 */
+    }
+    mChat->chatLog("Party command not known.", BY_SERVER);
+}
+
+void Party::create(const std::string &party)
+{
+    if (party == "")
+    {
+	mChat->chatLog("Party name is missing.", BY_SERVER);
+	return;
+    }
+    MessageOut outMsg(mNetwork);
+    outMsg.writeInt16(CMSG_PARTY_CREATE);
+    outMsg.writeString(party.substr(0, 23), 24);
+    mCreating = true;
+}
+
+void Party::leave(const std::string &args)
+{
+    MessageOut outMsg(mNetwork);
+    outMsg.writeInt16(CMSG_PARTY_LEAVE);
+    mChat->chatLog("Left party.", BY_SERVER);
+    mInParty = false;
+}
+
+void Party::createResponse(bool ok)
+{
+    if (ok)
+    {
+	mChat->chatLog("Party successfully created.", BY_SERVER);
+	mInParty = true;
+    }
+    else
+    {
+	mChat->chatLog("Could not create party.", BY_SERVER);
+    }
+}
+
+void Party::inviteResponse(const std::string &nick, int status)
+{
+    switch (status)
+    {
+        case 0:
+  	    mChat->chatLog(nick + " is already a member of a party.",
+			   BY_SERVER);
+	    break;
+        case 1:
+  	    mChat->chatLog(nick + " refused your invitation.", BY_SERVER);
+	    break;
+        case 2:
+ 	    mChat->chatLog(nick + " is now a member of your party.",
+			   BY_SERVER);
+	    break;
+    }
+}
+
+void Party::invitedAsk(const std::string &nick, int gender,
+		       const std::string &partyName)
+{
+    mPartyName = partyName; /* Quick and nasty - needs redoing */
+    if (nick == "")
+    {
+        mChat->chatLog("Something\'s wrong!", BY_SERVER);
+	return;
+    }
+    mCreating = false;
+    ConfirmDialog *dlg = new ConfirmDialog("Invite to party",
+					   nick + " invites you to join " +
+					   (gender == 0 ? "his" : "her") +
+					   " party, " + partyName +
+					   ", do you accept?");
+    dlg->addActionListener(&mInviteListener);
+}
+
+void Party::InviteListener::action(const gcn::ActionEvent &event)
+{
+    MessageOut outMsg(mNetwork);
+    outMsg.writeInt16(CMSG_PARTY_INVITED);
+    outMsg.writeInt32(player_node->getId());
+    bool accept = event.getId() == "yes";
+    outMsg.writeInt32(accept ? 1 : 0);
+    *mInParty = *mInParty || accept;
+}
+
+void Party::leftResponse(const std::string &nick)
+{
+    mChat->chatLog(nick + " has left your party.", BY_SERVER);
+}
+
+void Party::receiveChat(Being *being, const std::string &msg)
+{
+    if (being == NULL)
+    {
+	return;
+    }
+    if (being->getType() != Being::PLAYER)
+    {
+	mChat->chatLog("Something\'s wrong!", BY_SERVER);
+	return;
+    }
+    being->setSpeech(msg, SPEECH_TIME);
+    mChat->chatLog(being->getName() + " : " + msg, BY_PARTY);
+}
+
+void Party::help()
+{
+    mChat->chatLog("/party <command> <params>: Party commands.", BY_SERVER);
+}
+
+void Party::help(const std::string &msg)
+{
+    if (msg == "")
+    {
+	mChat->chatLog("Command: /party <command> <args>", BY_SERVER);
+	mChat->chatLog("where <command> can be one of:", BY_SERVER);
+	mChat->chatLog("   /new", BY_SERVER);
+	mChat->chatLog("   /create", BY_SERVER);
+	mChat->chatLog("   /prefix", BY_SERVER);
+	mChat->chatLog("   /leave", BY_SERVER);
+	mChat->chatLog("This command implements the partying function.",
+		       BY_SERVER);
+	mChat->chatLog("Type /help party <command> for further help.",
+		       BY_SERVER);
+	return;
+    }
+    if (msg == "new" || msg == "create")
+    {
+	mChat->chatLog("Command: /party new <party-name>", BY_SERVER);
+	mChat->chatLog("Command: /party create <party-name>", BY_SERVER);
+	mChat->chatLog("These commands create a new party <party-name.",
+		       BY_SERVER);
+	return;
+    }
+    if (msg == "prefix")
+    {
+	mChat->chatLog("Command: /party prefix <prefix-char>", BY_SERVER);
+	mChat->chatLog("This command sets the party prefix character.",
+		       BY_SERVER);
+	mChat->chatLog("Any message preceded by <prefix-char> is sent to "
+		       "the party instead of everyone.", BY_SERVER);
+	mChat->chatLog("Command: /party prefix", BY_SERVER);
+	mChat->chatLog("This command reports the current party prefix "
+		       "character.", BY_SERVER);
+	return;
+    }
+    //if (msg == "settings")
+    //if (msg == "info")
+    if (msg == "leave")
+    {
+	mChat->chatLog("Command: /party leave", BY_SERVER);
+	mChat->chatLog("This command causes the player to leave the party.",
+		       BY_SERVER);
+	return;
+    }
+    mChat->chatLog("Unknown /party command.", BY_SERVER);
+    mChat->chatLog("Type /help party for a list of options.", BY_SERVER);
+}
diff --git a/src/party.h b/src/party.h
new file mode 100644
index 00000000..d4f51b5a
--- /dev/null
+++ b/src/party.h
@@ -0,0 +1,75 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: party.h
+ */
+
+#ifndef _TMW_PARTY_H
+#define _TMW_PARTY_H
+
+#include <string>
+
+#include <guichan/actionlistener.hpp>
+
+class PartyHandler;
+class Being;
+class ChatWindow;
+class Network;
+
+class Party
+{
+     public:
+  Party(ChatWindow *chat, Network *network);
+	 void respond(const std::string &command, const std::string &args);
+
+	 void create(const std::string &party);
+	 void leave(const std::string &args);
+
+	 void createResponse(bool ok);
+	 void inviteResponse(const std::string &nick, int status);
+	 void invitedAsk(const std::string &nick, int gender,
+			 const std::string &partyName);
+	 void leftResponse(const std::string &nick);
+	 void receiveChat(Being *being, const std::string &msg);
+
+	 void help();
+	 void help(const std::string &msg);
+     private:
+         ChatWindow *mChat;
+         std::string mPartyName;
+	 Network *mNetwork;
+	 bool mInParty;
+	 bool mCreating; /**< Used to give an appropriate response to
+			    failure */
+	 PartyHandler *handler;
+
+	 class InviteListener : public gcn::ActionListener
+	 {
+    	     public:
+	         InviteListener(Network *network, bool *inParty) :
+	                        mNetwork(network), mInParty(inParty) {};
+		 void action(const gcn::ActionEvent &event);
+		 Network *mNetwork;
+	     private:
+		 bool *mInParty;
+	 };
+	 InviteListener mInviteListener;
+};
+#endif
diff --git a/src/player.cpp b/src/player.cpp
index d0c6bdc6..5db009ba 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: player.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
 #include "player.h"
@@ -34,11 +34,34 @@
 #include "utils/strprintf.h"
 
 #include "gui/gui.h"
+#include <iostream>
+
+static const int NAME_X_OFFSET = 15;
+static const int NAME_Y_OFFSET = 30;
 
 Player::Player(int id, int job, Map *map):
-    Being(id, job, map),
-    mDrawStrategy(NULL)
+    Being(id, job, map)
 {
+    mName = 0;
+}
+
+Player::~Player()
+{
+    if (mName)
+    {
+        delete mName;
+    }
+}
+
+void Player::setName(const std::string &name)
+{
+    if (mName == 0)
+    {
+        mName = new FlashText(name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET,
+                              gcn::Graphics::CENTER,
+                              speechFont, gcn::Color(255, 255, 255));
+        Being::setName(name);
+    }
 }
 
 void
@@ -75,37 +98,13 @@ Player::getType() const
     return PLAYER;
 }
 
-
 void
-Player::setNameDrawStrategy(PlayerNameDrawStrategy *draw_strategy)
+Player::flash(int time)
 {
-    if (mDrawStrategy)
-        delete mDrawStrategy;
-    mDrawStrategy = draw_strategy;
-}
-
-class
-DefaultPlayerNameDrawStrategy : public PlayerNameDrawStrategy
-{
-public:
-    virtual void draw(Player *player, Graphics *graphics, int px, int py)
+    if (mName)
     {
-        graphics->setFont(speechFont);
-        graphics->setColor(gcn::Color(255, 255, 255));
-        graphics->drawText(player->getName(), px + 15, py + 30, gcn::Graphics::CENTER);
+        mName->flash(time);
     }
-};
-
-void
-Player::drawName(Graphics *graphics, int offsetX, int offsetY)
-{
-    int px = mPx + offsetX;
-    int py = mPy + offsetY;
-
-    if (mDrawStrategy)
-        mDrawStrategy->draw(this, graphics, px, py);
-    else
-        DefaultPlayerNameDrawStrategy().draw(this, graphics, px, py);
 }
 
 void Player::setGender(int gender)
@@ -202,3 +201,11 @@ void Player::setSprite(int slot, int id, std::string color)
 
     Being::setSprite(slot, id, color);
 }
+
+void Player::updateCoords()
+{
+    if (mName)
+    {
+        mName->adviseXY(mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET);
+    }
+}
diff --git a/src/player.h b/src/player.h
index f43a6039..fdca64e8 100644
--- a/src/player.h
+++ b/src/player.h
@@ -18,30 +18,18 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: player.h 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
 #ifndef _TMW_PLAYER_H
 #define _TMW_PLAYER_H
 
 #include "being.h"
+#include "text.h"
 
 class Graphics;
 class Map;
 
-class Player;
-
-class PlayerNameDrawStrategy
-{
-public:
-    virtual ~PlayerNameDrawStrategy(void) {}
-
-    /**
-     * Draw the player's name
-     */
-    virtual void draw(Player *p, Graphics *graphics, int px, int py) = 0;
-};
-
 /**
  * A player being. Players have their name drawn beneath them. This class also
  * implements player-specific loading of base sprite, hair sprite and equipment
@@ -52,15 +40,20 @@ class Player : public Being
     public:
         Player(int id, int job, Map *map);
 
+        ~Player();
+
+        /**
+         * Set up mName to be the character's name
+         */
+        virtual void
+        setName(const std::string &name);
+
         virtual void
         logic();
 
         virtual Type
         getType() const;
 
-        virtual void
-        drawName(Graphics *graphics, int offsetX, int offsetY);
-
         virtual void
         setGender(int gender);
 
@@ -83,19 +76,13 @@ class Player : public Being
         setSprite(int slot, int id, std::string color = "");
 
         /**
-         * Sets the strategy responsible for drawing the player's name
-         *
-         * \param draw_strategy A strategy describing how the player's name
-         * should be drawn, or NULL for default
+         * Flash the player's name
          */
-        virtual void
-        setNameDrawStrategy(PlayerNameDrawStrategy *draw_strategy);
-
-        virtual PlayerNameDrawStrategy *
-        getNameDrawStrategy(void) const { return mDrawStrategy; }
-
+        void flash(int time);
+    protected:
+        void updateCoords();
     private:
-        PlayerNameDrawStrategy *mDrawStrategy;
+        FlashText *mName;
 };
 
 #endif
diff --git a/src/player_relations.cpp b/src/player_relations.cpp
index 610f5d04..8abc9848 100644
--- a/src/player_relations.cpp
+++ b/src/player_relations.cpp
@@ -88,7 +88,7 @@ PlayerRelationsManager::PlayerRelationsManager() :
     mDefaultPermissions(PlayerRelation::DEFAULT),
     mIgnoreStrategy(NULL)
 {
-}    
+}
 
 void
 PlayerRelationsManager::clear()
@@ -325,29 +325,6 @@ public:
 };
 
 
-class
-BlinkPlayerNameDrawStrategy : public PlayerNameDrawStrategy
-{
-public:
-    BlinkPlayerNameDrawStrategy(int count) :
-        mCount(count)
-    {
-    }
-
-    virtual void draw(Player *player, Graphics *graphics, int px, int py)
-    {
-        graphics->setFont(speechFont);
-        if (mCount & 4)
-            graphics->drawText(player->getName(), px + 15, py + 30, gcn::Graphics::CENTER);
-
-        if (mCount-- <= 0)
-            player->setNameDrawStrategy(NULL);
-    }
-private:
-    int mCount; // Number of steps to blink
-};
-
-
 class PIS_blinkname : public PlayerIgnoreStrategy
 {
 public:
@@ -360,7 +337,7 @@ public:
     virtual void
     ignore(Player *player, unsigned int flags)
      {
-         player->setNameDrawStrategy(new BlinkPlayerNameDrawStrategy(200));
+         player->flash(200);
      }
 };
 
@@ -407,4 +384,3 @@ PlayerRelationsManager::getPlayerIgnoreStrategies()
 
 
 PlayerRelationsManager player_relations;
-
diff --git a/src/properties.h b/src/properties.h
index 93148bdf..9ebead66 100644
--- a/src/properties.h
+++ b/src/properties.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: properties.h 3754 2007-11-20 15:19:50Z b_lindeijer $
  */
 
 #ifndef _TMW_PROPERTIES_H_
diff --git a/src/recorder.cpp b/src/recorder.cpp
new file mode 100644
index 00000000..48ecb837
--- /dev/null
+++ b/src/recorder.cpp
@@ -0,0 +1,112 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: record.cpp
+ */
+
+#include "recorder.h"
+
+#include "gui/chat.h"
+#include "gui/buttonbox.h"
+
+#include "utils/trim.h"
+
+Recorder::Recorder(ChatWindow *chat) : mChat(chat)
+{
+    mButtonBox = new ButtonBox("Recording...", "Stop recording", this);
+    mButtonBox->setY(20);
+}
+
+void Recorder::record(const std::string &msg)
+{
+    if (mStream.is_open())
+    {
+	mStream << msg << std::endl;
+    }
+}
+
+void Recorder::respond(const std::string &msg)
+{
+    std::string msgCopy = msg;
+    trim(msgCopy);
+    if (msgCopy == "")
+    {
+	if (mStream.is_open())
+	{
+	    mStream.close();
+	    mButtonBox->setVisible(false);
+	    /*
+	     * Message should go after mStream is closed so that it isn't
+	     * recorded.
+	     */
+	    mChat->chatLog("Finishing recording.", BY_SERVER);
+	}
+	else
+	{
+	    mChat->chatLog("Not currently recording.", BY_SERVER);
+	}
+	return;
+    }
+    if (mStream.is_open())
+    {
+	mChat->chatLog("Already recording.", BY_SERVER);
+    }
+    else
+    {
+	/*
+	 * Message should go before mStream is opened so that it isn't
+	 * recorded.
+	 */
+	mChat->chatLog("Starting to record...", BY_SERVER);
+	mStream.open(msg.c_str(), std::ios_base::trunc);
+	if (mStream.is_open())
+	{
+	    mButtonBox->setVisible(true);
+	}
+	else
+	{
+	    mChat->chatLog("Failed to start recording.", BY_SERVER);
+	}
+    }
+}
+
+void Recorder::help() const
+{
+    mChat->chatLog("/record <filename>: Start recording the chat.", BY_SERVER);
+}
+
+void Recorder::help(const std::string &args) const
+{
+    mChat->chatLog("Command: /record <filename>", BY_SERVER);
+    mChat->chatLog("This command starts recording the chat log to the file "
+		  "<filename>.", BY_SERVER);
+    mChat->chatLog("Command: /record", BY_SERVER);
+    mChat->chatLog("This command finishes a recording session.", BY_SERVER);
+}
+
+void Recorder::buttonBoxRespond()
+{
+    respond("");
+}
+
+Recorder::~Recorder()
+{
+    delete mButtonBox;
+}
diff --git a/src/recorder.h b/src/recorder.h
new file mode 100644
index 00000000..2795cd53
--- /dev/null
+++ b/src/recorder.h
@@ -0,0 +1,50 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: record.h
+ */
+
+#ifndef _TMW_RECORD_H
+#define _TMW_RECORD_H
+
+#include <string>
+#include <fstream>
+
+#include "gui/buttonbox.h"
+
+class ChatWindow;
+
+class Recorder : public ButtonBoxListener
+{
+    public:
+        Recorder(ChatWindow *chat);
+	void record(const std::string &msg);
+	void respond(const std::string &msg);
+	void help() const;
+	void help(const std::string &args) const;
+	void buttonBoxRespond();
+	bool isRecording() const {return mStream.is_open();}
+        ~Recorder();
+    private:
+	ChatWindow *mChat;
+	std::ofstream mStream;
+	ButtonBox *mButtonBox;
+};
+#endif
diff --git a/src/resources/action.cpp b/src/resources/action.cpp
index 6b3c2f52..facd23fb 100644
--- a/src/resources/action.cpp
+++ b/src/resources/action.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: action.cpp 3676 2007-10-23 08:02:22Z b_lindeijer $
  */
 
 #include "action.h"
diff --git a/src/resources/action.h b/src/resources/action.h
index 8d5e8d11..61307652 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: action.h 2905 2006-12-12 15:06:06Z b_lindeijer $
  */
 
 #ifndef _TMW_ACTION_H
diff --git a/src/resources/ambientoverlay.cpp b/src/resources/ambientoverlay.cpp
index 058b6083..654cbb32 100644
--- a/src/resources/ambientoverlay.cpp
+++ b/src/resources/ambientoverlay.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: ambientoverlay.cpp 2727 2006-10-07 20:01:34Z b_lindeijer $
  */
 
 #include "ambientoverlay.h"
diff --git a/src/resources/ambientoverlay.h b/src/resources/ambientoverlay.h
index a939cbb4..c0b18600 100644
--- a/src/resources/ambientoverlay.h
+++ b/src/resources/ambientoverlay.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: ambientoverlay.h 2727 2006-10-07 20:01:34Z b_lindeijer $
  */
 
 #ifndef _TMW_RESOURCES_AMBIENTOVERLAY_H_
diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp
index de96525c..b740b9b5 100644
--- a/src/resources/animation.cpp
+++ b/src/resources/animation.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: animation.cpp 2905 2006-12-12 15:06:06Z b_lindeijer $
  */
 
 #include "animation.h"
diff --git a/src/resources/animation.h b/src/resources/animation.h
index aad93cda..53420ecd 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: animation.h 3301 2007-05-23 21:35:01Z b_lindeijer $
  */
 
 #ifndef _TMW_ANIMATION_H
diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp
index 32d8d9f4..c917a45e 100644
--- a/src/resources/buddylist.cpp
+++ b/src/resources/buddylist.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: buddylist.cpp 4332 2008-06-05 07:33:12Z b_lindeijer $
  */
 
 #include <algorithm>
diff --git a/src/resources/buddylist.h b/src/resources/buddylist.h
index 3791a03a..5a8f2324 100644
--- a/src/resources/buddylist.h
+++ b/src/resources/buddylist.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: buddylist.h 2239 2006-03-09 05:16:27Z der_doener $
  */
 
 #ifndef _TMW_BUDDYLIST_H
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index d0dae462..dc22a69b 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: image.cpp 3760 2007-11-21 19:43:11Z b_lindeijer $
  */
 
 #include <SDL_image.h>
diff --git a/src/resources/image.h b/src/resources/image.h
index 52f286f8..6f10f858 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: image.h 3760 2007-11-21 19:43:11Z b_lindeijer $
  */
 
 #ifndef _TMW_IMAGE_H
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index 4b6dd592..6228f4e4 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: imageset.cpp 4209 2008-04-29 12:58:21Z b_lindeijer $
  */
 
 #include <algorithm>
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index 15c21d90..719e9769 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: imageset.h 3753 2007-11-20 12:27:56Z b_lindeijer $
  */
 
 #ifndef _TMW_IMAGESET_H
diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp
index 7cfa16b4..f11cad24 100644
--- a/src/resources/imagewriter.cpp
+++ b/src/resources/imagewriter.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: imagewriter.cpp 2417 2006-07-19 15:12:06Z umperio $
  */
 
 #include "imagewriter.h"
diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h
index 205e4584..c7968d30 100644
--- a/src/resources/imagewriter.h
+++ b/src/resources/imagewriter.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: imagewriter.h 1766 2005-09-18 01:31:33Z bertram25 $
  */
 
 #include <iosfwd>
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 71bd898a..52d19161 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: itemdb.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include <algorithm>
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 0029129c..1ee1b5f0 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: itemdb.h 3587 2007-09-20 13:24:20Z b_lindeijer $
  */
 
 #ifndef _TMW_ITEM_MANAGER_H
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index f1ebd0a9..64f5c37e 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: iteminfo.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "iteminfo.h"
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 680c8d61..85f79263 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: iteminfo.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _TMW_ITEMINFO_H_
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 2a080fb0..3dbaefde 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: mapreader.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #include "mapreader.h"
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index d16ff1d5..0d59fc9f 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: mapreader.h 3587 2007-09-20 13:24:20Z b_lindeijer $
  */
 
 #ifndef _TMW_MAPREADER_H_
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 0a98762f..04de0e7c 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: monsterdb.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #include <algorithm>
diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h
index 46a33b06..43865bb3 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/monsterdb.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: monsterdb.h 3606 2007-09-27 14:54:09Z b_lindeijer $
  */
 
 #ifndef _TMW_MONSTER_DB_H
diff --git a/src/resources/music.cpp b/src/resources/music.cpp
index 161d8b01..0e327218 100644
--- a/src/resources/music.cpp
+++ b/src/resources/music.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: music.cpp 3753 2007-11-20 12:27:56Z b_lindeijer $
  */
 
 #include "music.h"
diff --git a/src/resources/music.h b/src/resources/music.h
index 72e76295..a15d22c1 100644
--- a/src/resources/music.h
+++ b/src/resources/music.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: music.h 3753 2007-11-20 12:27:56Z b_lindeijer $
  */
 
 #ifndef _TMW_MUSIC_H
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 5869e295..c310d6e3 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: npcdb.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #include "npcdb.h"
diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h
index 2abf959b..e1240c5e 100644
--- a/src/resources/npcdb.h
+++ b/src/resources/npcdb.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: npcdb.h 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #ifndef _TMW_NPC_DB_H
diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp
index 8f21f5d2..2bb60e56 100644
--- a/src/resources/resource.cpp
+++ b/src/resources/resource.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: resource.cpp 3808 2007-12-22 21:33:47Z b_lindeijer $
  */
 
 #include <cassert>
diff --git a/src/resources/resource.h b/src/resources/resource.h
index 5b9a5eb8..9c70f6c0 100644
--- a/src/resources/resource.h
+++ b/src/resources/resource.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: resource.h 3808 2007-12-22 21:33:47Z b_lindeijer $
  */
 
 #ifndef _TMW_RESOURCE_H
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index ef8671a8..6b45c9d7 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: resourcemanager.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include <cassert>
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index da85e2f9..3f0f1704 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: resourcemanager.h 3839 2008-01-13 16:28:50Z the_enemy $
  */
 
 #ifndef _TMW_RESOURCE_MANAGER_H
diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp
index ec9bc65c..03fa337e 100644
--- a/src/resources/soundeffect.cpp
+++ b/src/resources/soundeffect.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: soundeffect.cpp 3753 2007-11-20 12:27:56Z b_lindeijer $
  */
 
 #include "soundeffect.h"
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index 866c53ec..0a574e7d 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: soundeffect.h 3753 2007-11-20 12:27:56Z b_lindeijer $
  */
 
 #ifndef _TMW_SOUND_EFFECT_H
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 334474d7..550b2d1c 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: spritedef.cpp 4332 2008-06-05 07:33:12Z b_lindeijer $
  */
 
 #include <set>
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 531dfb3d..2872af06 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: spritedef.h 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #ifndef _TMW_SPRITEDEF_H
diff --git a/src/serverinfo.h b/src/serverinfo.h
index b317b87b..9a9eef1d 100644
--- a/src/serverinfo.h
+++ b/src/serverinfo.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: serverinfo.h 1735 2005-09-13 22:56:29Z der_doener $
  */
 
 #ifndef _TMW_SERVERINFO_
@@ -32,6 +32,7 @@ struct SERVER_INFO
     short port;
     std::string name;
     short online_users;
+    std::string updateHost;
 };
 
 #endif
diff --git a/src/shopitem.cpp b/src/shopitem.cpp
index ed5d30a9..8bd79cc1 100644
--- a/src/shopitem.cpp
+++ b/src/shopitem.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: shopitem.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "shopitem.h"
diff --git a/src/shopitem.h b/src/shopitem.h
index ffafbebe..4e6fd3a3 100644
--- a/src/shopitem.h
+++ b/src/shopitem.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: shopitem.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _SHOPITEM_H_
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index 18e732ef..db1c0c91 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: simpleanimation.cpp 3587 2007-09-20 13:24:20Z b_lindeijer $
  */
 
 #include "simpleanimation.h"
diff --git a/src/simpleanimation.h b/src/simpleanimation.h
index 561c540d..dfca33e2 100644
--- a/src/simpleanimation.h
+++ b/src/simpleanimation.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: simpleanimation.h 3301 2007-05-23 21:35:01Z b_lindeijer $
  */
 
 #ifndef _TMW_SIMPLEANIMAION_H
diff --git a/src/sound.cpp b/src/sound.cpp
index 0a20d3f2..f0101442 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: sound.cpp 3892 2008-02-18 10:00:45Z umperio $
  */
 
 #include "sound.h"
diff --git a/src/sound.h b/src/sound.h
index ebcd6442..038f299e 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: sound.h 3606 2007-09-27 14:54:09Z b_lindeijer $
  */
 
 #ifndef _TMW_SOUND_H
diff --git a/src/sprite.h b/src/sprite.h
index 89780519..cbe32186 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: sprite.h 3292 2007-05-07 16:22:54Z crush_tmw $
  */
 
 #ifndef _TMW_SPRITE_H_
diff --git a/src/text.cpp b/src/text.cpp
new file mode 100644
index 00000000..545c1c0e
--- /dev/null
+++ b/src/text.cpp
@@ -0,0 +1,102 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Douglas Boffey                                  *
+ *                                                                         *
+ *       DougABoffey@netscape.net                                          *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed with The Mana Experiment                  *
+ *   in the hope that it will be useful,                                   *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include "text.h"
+
+#include <cstring>
+
+#include <guichan/font.hpp>
+
+#include "textmanager.h"
+
+int Text::mInstances = 0;
+
+
+Text::Text(const std::string &text, int x, int y,
+           gcn::Graphics::Alignment alignment, gcn::Font *font,
+           gcn::Color colour) :
+    mText(text), mColour(colour)
+{
+    if (textManager == 0)
+    {
+        textManager = new TextManager();
+    }
+    ++mInstances;
+    mHeight = font->getHeight();
+    mWidth = font->getWidth(text);
+    switch (alignment)
+    {
+        case gcn::Graphics::LEFT:
+            mXOffset = 0;
+            break;
+        case gcn::Graphics::CENTER:
+            mXOffset = mWidth / 2;
+            break;
+        case gcn::Graphics::RIGHT:
+            mXOffset = mWidth;
+            break;
+    }
+    mX = x - mXOffset;
+    mY = y;
+    textManager->addText(this);
+    mFont = font;
+}
+
+void Text::adviseXY(int x, int y)
+{
+    textManager->moveText(this, x - mXOffset, y);
+}
+
+Text::~Text()
+{
+    textManager->removeText(this);
+    if (--mInstances == 0)
+    {
+        delete textManager;
+        textManager = 0;
+    }
+}
+
+void Text::draw(Graphics *graphics, int xOff, int yOff)
+{
+    graphics->setFont(mFont);
+    graphics->setColor(mColour);
+    graphics->drawText(mText, mX - xOff, mY - yOff, gcn::Graphics::LEFT);
+}
+
+FlashText::FlashText(const std::string &text, int x, int y,
+                     gcn::Graphics::Alignment alignment, gcn::Font *font,
+                     gcn::Color colour) :
+    Text(text, x, y, alignment, font, colour), mTime(0)
+{
+}
+
+void FlashText::draw(Graphics *graphics, int xOff, int yOff)
+{
+    if (mTime)
+    {
+        if ((--mTime & 4) == 0)
+        {
+            return;
+        }
+    }
+    Text::draw(graphics, xOff, yOff);
+}
diff --git a/src/text.h b/src/text.h
new file mode 100644
index 00000000..04b213b3
--- /dev/null
+++ b/src/text.h
@@ -0,0 +1,93 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Douglas Boffey                                  *
+ *                                                                         *
+ *       DougABoffey@netscape.net                                          *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed with The Mana Experiment                  *
+ *   in the hope that it will be useful,                                   *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef _TME_TEXT_H
+#define _TME_TEXT_H
+
+#include "graphics.h"
+
+#include <list>
+
+class TextManager;
+
+class Text
+{
+        friend class TextManager;
+    public:
+        /**
+         * Constructor creates a text object to display on the screen
+         */
+        Text(const std::string &text, int x, int y,
+             gcn::Graphics::Alignment alignment, gcn::Font *font,
+             gcn::Color colour);
+
+        /**
+         * Allows the originator of the text to specify the ideal coordinates
+         */
+        void
+        adviseXY(int x, int y);
+
+        /**
+         * Remove the text from the screen
+         */
+        ~Text();
+
+        /**
+         * Draws the text
+         */
+        virtual void
+        draw(Graphics *graphics, int xOff, int yOff);
+
+    private:
+
+        int mX; /**< Actual x-value of left of text written */
+        int mY; /**< Actual y-value of top of text written */
+        int mWidth; /**< The width of the text */
+        int mHeight; /**< The height of the text */
+        int mXOffset; /**< The offset of mX from the desired x */
+        static int mInstances; /**< Instances of text */
+        gcn::Font *mFont; /**< The font used */
+        std::string mText; /**< The text to display */
+        gcn::Color mColour; /**< The colour of the text */
+};
+
+class FlashText : public Text
+{
+    public:
+        FlashText(const std::string &text, int x, int y,
+                  gcn::Graphics::Alignment alignment, gcn::Font *font,
+                  gcn::Color colour);
+
+        /**
+         * Flash the text for so many refreshes
+         */
+        void flash(int time) {mTime = time; }
+
+        /**
+         * Draws the text
+         */
+        virtual void
+        draw(Graphics *graphics, int xOff, int yOff);
+
+    private:
+        int mTime; /**< Time left for flashing */
+};
+#endif
diff --git a/src/textmanager.cpp b/src/textmanager.cpp
new file mode 100644
index 00000000..54d44c2a
--- /dev/null
+++ b/src/textmanager.cpp
@@ -0,0 +1,177 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Douglas Boffey                                  *
+ *                                                                         *
+ *       DougABoffey@netscape.net                                          *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed with The Mana Experiment                  *
+ *   in the hope that it will be useful,                                   *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include "textmanager.h"
+
+#include <cstring>
+
+#include "text.h"
+
+TextManager *textManager = 0;
+
+TextManager::TextManager()
+{
+}
+
+void TextManager::addText(Text *text)
+{
+    place(text, 0, text->mX, text->mY, text->mHeight);
+    mTextList.push_back(text);
+}
+
+void TextManager::moveText(Text *text, int x, int y)
+{
+    text->mX = x;
+    text->mY = y;
+    place(text, text, text->mX, text->mY, text->mHeight);
+}
+
+void TextManager::removeText(const Text *text)
+{
+    for (TextList::iterator ptr = mTextList.begin(),
+             pEnd = mTextList.end(); ptr != pEnd; ++ptr)
+    {
+        if (*ptr == text)
+        {
+            mTextList.erase(ptr);
+            return;
+        }
+    }
+}
+
+TextManager::~TextManager()
+{
+}
+
+void TextManager::draw(Graphics *graphics, int xOff, int yOff)
+{
+    for (TextList::iterator bPtr = mTextList.begin(), ePtr = mTextList.end();
+         bPtr != ePtr; ++bPtr)
+    {
+        (*bPtr)->draw(graphics, xOff, yOff);
+    }
+}
+
+void TextManager::place(const Text *textObj, const Text *omit,
+                        int &x, int &y, int h)
+{
+    int xLeft = textObj->mX;
+    int xRight = xLeft + textObj->mWidth - 1;
+    const int TEST = 100; // Number of lines to test for text
+    bool occupied[TEST]; // is some other text obscuring this line?
+    std::memset(&occupied, 0, sizeof(occupied)); // set all to false
+    int wantedTop = (TEST - h) / 2; // Entry in occupied at top of text
+    int occupiedTop = y - wantedTop; // Line in map representing to of occupied
+
+    for (TextList::const_iterator ptr = mTextList.begin(),
+             pEnd = mTextList.end(); ptr != pEnd; ++ptr)
+    {
+        if (*ptr != omit &&
+            (*ptr)->mX <= xRight &&
+            (*ptr)->mX + (*ptr)->mWidth > xLeft)
+        {
+            int from = (*ptr)->mY - occupiedTop;
+            int to = from + (*ptr)->mHeight - 1;
+            if (to < 0 || from >= TEST) // out of range considered
+            {
+                continue;
+            }
+            if (from < 0)
+            {
+                from = 0;
+            }
+            if (to >= TEST)
+            {
+                to = TEST - 1;
+            }
+            for (int i = from; i <= to; ++i)
+            {
+                occupied[i] = true;
+            }
+        }
+    }
+    bool ok = true;
+    for (int i = wantedTop; i < wantedTop + h; ++i)
+    {
+        ok = ok && !occupied[i];
+    }
+    if (ok)
+    {
+        return;
+    }
+    // Have to move it up or down, so find nearest spaces either side
+    int consec = 0;
+    int upSlot = -1; // means not found
+    for (int seek = wantedTop + h - 2; seek >= 0; --seek)
+    {
+        if (occupied[seek])
+        {
+            consec = 0;
+        }
+        else
+        {
+            if (++consec == h)
+            {
+                upSlot = seek;
+                break;
+            }
+        }
+    }
+    int downSlot = -1;
+    consec = 0;
+    for (int seek = wantedTop + 1; seek < TEST; ++seek)
+    {
+        if (occupied[seek])
+        {
+            consec = 0;
+        }
+        else
+        {
+            if (++consec == h)
+            {
+                downSlot = seek - h + 1;
+                break;
+            }
+        }
+    }
+    if (upSlot == -1 && downSlot == -1) // no good solution, so leave as is
+    {
+        return;
+    }
+    if (upSlot == -1) // must go down
+    {
+        y += downSlot - wantedTop;
+        return;
+    }
+    if (downSlot == -1) // must go up
+    {
+        y -= wantedTop - upSlot;
+        return;
+    }
+    if (wantedTop - upSlot > downSlot - wantedTop) // down is better
+    {
+        y += downSlot - wantedTop;
+    }
+    else
+    {
+        y -= wantedTop - upSlot;
+    }
+}
diff --git a/src/textmanager.h b/src/textmanager.h
new file mode 100644
index 00000000..53419240
--- /dev/null
+++ b/src/textmanager.h
@@ -0,0 +1,75 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Douglas Boffey                                  *
+ *                                                                         *
+ *       DougABoffey@netscape.net                                          *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed with The Mana Experiment                  *
+ *   in the hope that it will be useful,                                   *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef _TME_TEXTMANAGER_H
+#define _TME_TEXTMANAGER_H
+
+#include <list>
+
+class Text;
+class Graphics;
+
+class TextManager
+{
+    public:
+        /**
+         * Constructor
+         */
+        TextManager();
+
+        /**
+         * Add text to the manager
+         */
+        void addText(Text *text);
+
+        /**
+         * Move the text around the screen
+         */
+        void moveText(Text *text, int x, int y);
+
+        /**
+         * Remove the text from the manager
+         */
+        void removeText(const Text *text);
+
+        /**
+         * Destroy the manager
+         */
+        ~TextManager();
+
+        /**
+         * Draw the text
+         */
+        void draw(Graphics *graphics, int xOff, int yOff);
+
+    private:
+        /**
+         * Position the text so as to avoid conflict
+         */
+        void place(const Text *textObj, const Text *omit,
+        int &x, int &y, int h);
+
+        typedef std::list<Text *> TextList; /**< The container type */
+        TextList mTextList; /**< The container */
+};
+
+extern TextManager *textManager;
+#endif
diff --git a/src/textparticle.cpp b/src/textparticle.cpp
index 89466006..c4b432f3 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: textparticle.cpp 4360 2008-06-23 14:44:20Z crush_tmw $
  */
 
 #include "textparticle.h"
diff --git a/src/textparticle.h b/src/textparticle.h
index 34badb57..5f81abff 100644
--- a/src/textparticle.h
+++ b/src/textparticle.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: textparticle.h 3539 2007-08-28 16:42:47Z b_lindeijer $
  */
 
 #ifndef _TEXTPARTICLE_H
diff --git a/src/tileset.h b/src/tileset.h
index 6af69235..6272d64a 100644
--- a/src/tileset.h
+++ b/src/tileset.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: tileset.h 3753 2007-11-20 12:27:56Z b_lindeijer $
  */
 
 #ifndef _TMW_TILESET_H_
diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp
index 9a8f6356..e98216d4 100644
--- a/src/utils/base64.cpp
+++ b/src/utils/base64.cpp
@@ -26,7 +26,7 @@
    | Author: Jim Winstead (jimw@php.net)                                  |
    +----------------------------------------------------------------------+
    */
-/* $Id$ */
+/* $Id: base64.cpp 2906 2006-12-12 15:18:30Z b_lindeijer $ */
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/utils/base64.h b/src/utils/base64.h
index ff20ac53..3356debf 100644
--- a/src/utils/base64.h
+++ b/src/utils/base64.h
@@ -26,7 +26,7 @@
    | Author: Jim Winstead (jimw@php.net)                                  |
    +----------------------------------------------------------------------+
  */
-/* $Id$ */
+/* $Id: base64.h 2906 2006-12-12 15:18:30Z b_lindeijer $ */
 
 #ifndef _TMW_BASE64_H
 #define _TMW_BASE64_H
diff --git a/src/utils/dtor.h b/src/utils/dtor.h
index f2c6c1b8..3b8aeb0e 100644
--- a/src/utils/dtor.h
+++ b/src/utils/dtor.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: dtor.h 2271 2006-03-18 15:15:33Z der_doener $
  */
 
 #ifndef _TMW_UTILS_DTOR_H
diff --git a/src/utils/fastsqrt.h b/src/utils/fastsqrt.h
index afadb901..4513a79d 100644
--- a/src/utils/fastsqrt.h
+++ b/src/utils/fastsqrt.h
@@ -6,7 +6,7 @@
  *
  * Unfortunately the original creator of this function seems to be unknown.
  *
- * $Id$
+ * $Id: fastsqrt.h 3508 2007-08-22 16:32:52Z b_lindeijer $
  */
 
 float fastInvSqrt(float x)
diff --git a/src/utils/minmax.h b/src/utils/minmax.h
index 427c5da7..daf18c68 100644
--- a/src/utils/minmax.h
+++ b/src/utils/minmax.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: minmax.h 3628 2007-10-18 18:39:48Z b_lindeijer $
  */
 
 #include <cstdlib>
diff --git a/src/utils/tostring.h b/src/utils/tostring.h
index 95b8985f..3cbeef27 100644
--- a/src/utils/tostring.h
+++ b/src/utils/tostring.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: tostring.h 3500 2007-08-21 15:11:19Z joshlangley $
  */
 
 #ifndef _TMW_UTILS_TOSTRING_H
diff --git a/src/utils/trim.h b/src/utils/trim.h
index fec99100..7b236730 100644
--- a/src/utils/trim.h
+++ b/src/utils/trim.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: trim.h 3606 2007-09-27 14:54:09Z b_lindeijer $
  */
 
 #ifndef _TMW_UTILS_TRIM_H_
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 98b474cb..c0b921b8 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: xml.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #include "xml.h"
diff --git a/src/utils/xml.h b/src/utils/xml.h
index 5473b2ca..c64c1204 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: xml.h 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #ifndef _TMW_XML_H
diff --git a/src/vector.h b/src/vector.h
index 7a5da241..379c50e1 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: vector.h 3541 2007-08-29 00:31:59Z b_lindeijer $
  */
 
 #ifndef _TMW_VECTOR_H_
diff --git a/stamp-h1 b/stamp-h1
new file mode 100644
index 00000000..4547fe1b
--- /dev/null
+++ b/stamp-h1
@@ -0,0 +1 @@
+timestamp for config.h
diff --git a/tme.desktop b/tme.desktop
new file mode 100644
index 00000000..cff8d732
--- /dev/null
+++ b/tme.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=The Mana Experiment
+Name[fr]=L'expérimentation de Mana
+Comment=An on-line fantasy role playing game
+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
+Exec=tme
+StartupNotify=false
+Terminal=false
+Type=Application
+Icon=tmw.png
+Categories=Application;Game
diff --git a/tmw.cbp b/tmw.cbp
index 5943f74e..ba49b449 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="default">
-				<Option output="tmw.exe" prefix_auto="0" extension_auto="0" />
+				<Option output="tme.exe" prefix_auto="0" extension_auto="0" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="0" />
diff --git a/tmw.desktop b/tmw.desktop
deleted file mode 100644
index 398fb439..00000000
--- a/tmw.desktop
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=The Mana World
-Name[fr]=Le Monde de Mana
-Comment=An on-line fantasy role playing game
-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
-Exec=tmw
-StartupNotify=false
-Terminal=false
-Type=Application
-Icon=tmw.png
-Categories=Application;Game
diff --git a/tools/adler32.c b/tools/adler32.c
index 4e851713..cd85d58e 100644
--- a/tools/adler32.c
+++ b/tools/adler32.c
@@ -7,9 +7,9 @@
  *  Usage: adler32 [file]...
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <zlib.h>
-
 /**
  * Calculates the Adler-32 checksum for the given file.
  */
diff --git a/tools/tmxcopy/Makefile b/tools/tmxcopy/Makefile
deleted file mode 100644
index 732dec36..00000000
--- a/tools/tmxcopy/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-CC=g++
-CFLAGS=-c `pkg-config --cflags libxml-2.0`
-LDFLAGS=`pkg-config --libs libxml-2.0`
-SOURCES=base64.cpp main.cpp map.cpp xmlutils.cpp zlibutils.cpp
-OBJECTS=$(SOURCES:.cpp=.o)
-EXECUTABLE=tmxcopy
-
-all: $(SOURCES) $(EXECUTABLE)
-	make clean
-
-$(EXECUTABLE): $(OBJECTS)
-	$(CC) $(LDFLAGS) $(OBJECTS) -o $@
-
-.cpp.o:
-	$(CC) $(CFLAGS) $< -o $@
-
-clean:
-	rm -f *.o
diff --git a/tools/tmxcopy/base64.cpp b/tools/tmxcopy/base64.cpp
index 9a8f6356..6b7a4ad9 100644
--- a/tools/tmxcopy/base64.cpp
+++ b/tools/tmxcopy/base64.cpp
@@ -26,7 +26,7 @@
    | Author: Jim Winstead (jimw@php.net)                                  |
    +----------------------------------------------------------------------+
    */
-/* $Id$ */
+/* $Id: base64.cpp 3773 2007-12-12 15:45:25Z crush_tmw $ */
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/tools/tmxcopy/base64.h b/tools/tmxcopy/base64.h
index ff20ac53..9e1193be 100644
--- a/tools/tmxcopy/base64.h
+++ b/tools/tmxcopy/base64.h
@@ -26,7 +26,7 @@
    | Author: Jim Winstead (jimw@php.net)                                  |
    +----------------------------------------------------------------------+
  */
-/* $Id$ */
+/* $Id: base64.h 3773 2007-12-12 15:45:25Z crush_tmw $ */
 
 #ifndef _TMW_BASE64_H
 #define _TMW_BASE64_H
diff --git a/tools/tmxcopy/tostring.h b/tools/tmxcopy/tostring.h
index 95b8985f..b70882b0 100644
--- a/tools/tmxcopy/tostring.h
+++ b/tools/tmxcopy/tostring.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: tostring.h 3773 2007-12-12 15:45:25Z crush_tmw $
  */
 
 #ifndef _TMW_UTILS_TOSTRING_H
-- 
cgit v1.2.3-70-g09d2


From b1d854bfcd7d62ed7938ef404a5684f271ea4dd3 Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Fri, 18 Jul 2008 22:35:01 +0000
Subject: Added support for animated shoe and glove sprites

---
 ChangeLog                     |  4 ++++
 src/being.h                   |  1 +
 src/net/beinghandler.cpp      | 16 ++++++++++++----
 src/net/charserverhandler.cpp |  7 +++++--
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83ab07d3..c278ea45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-18  Lloyd Bryant ("Sanga")  <lloyd_bryant@netzero.net>
+
+	* Added code to provide viewable glove and shoe sprites
+
 2008-07-11  Douglas Boffey  <DougABoffey@netscape.net>
 
 	* Added code to avoid collision between different displayed text.
diff --git a/src/being.h b/src/being.h
index 2f711fb8..3ddff097 100644
--- a/src/being.h
+++ b/src/being.h
@@ -96,6 +96,7 @@ class Being : public Sprite
             TOPCLOTHES_SPRITE,
             HAIR_SPRITE,
             HAT_SPRITE,
+            GLOVES_SPRITE,
             WEAPON_SPRITE,
             SHIELD_SPRITE,
             VECTOREND_SPRITE
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index e077ab14..f48e7751 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -68,6 +68,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
     Uint32 id;
     Uint16 job, speed;
     Uint16 headTop, headMid, headBottom;
+    Uint16 shoes, gloves;
     Sint16 param1;
     Sint8 type;
     Being *srcBeing, *dstBeing;
@@ -124,8 +125,8 @@ void BeingHandler::handleMessage(MessageIn *msg)
             headTop = msg->readInt16();
             headMid = msg->readInt16();
             hairColor = msg->readInt16();
-            msg->readInt16();  // clothes color -not used
-            msg->readInt16();  // head dir
+            shoes = msg->readInt16();
+            gloves = msg->readInt16();
             msg->readInt16();  // guild
             msg->readInt16();  // unknown
             msg->readInt16();  // unknown
@@ -138,6 +139,8 @@ void BeingHandler::handleMessage(MessageIn *msg)
             dstBeing->setSprite(Being::BOTTOMCLOTHES_SPRITE, headBottom);
             dstBeing->setSprite(Being::TOPCLOTHES_SPRITE, headMid);
             dstBeing->setSprite(Being::HAT_SPRITE, headTop);
+            dstBeing->setSprite(Being::SHOE_SPRITE, shoes);
+            dstBeing->setSprite(Being::GLOVES_SPRITE, gloves);
             dstBeing->setHairStyle(hairStyle, hairColor);
 
             if (msg->getId() == SMSG_BEING_MOVE)
@@ -312,6 +315,9 @@ void BeingHandler::handleMessage(MessageIn *msg)
                 case 9:     // eAthena LOOK_SHOES
                     dstBeing->setSprite(Being::SHOE_SPRITE, id);
                     break;
+                case 10:   // LOOK_GLOVES
+                    dstBeing->setSprite(Being::GLOVES_SPRITE, id);
+                    break;
                 default:
                     logger->log("SMSG_BEING_CHANGE_LOOKS: unsupported type: "
                             "%d, id: %d", type, id);
@@ -360,8 +366,8 @@ void BeingHandler::handleMessage(MessageIn *msg)
             headTop = msg->readInt16();
             headMid = msg->readInt16();
             hairColor = msg->readInt16();
-            msg->readInt16();  // clothes color - not used
-            msg->readInt16();  // head dir
+            shoes = msg->readInt16();
+            gloves = msg->readInt16();
             msg->readInt32();  // guild
             msg->readInt32();  // emblem
             msg->readInt16();  // manner
@@ -372,6 +378,8 @@ void BeingHandler::handleMessage(MessageIn *msg)
             dstBeing->setSprite(Being::BOTTOMCLOTHES_SPRITE, headBottom);
             dstBeing->setSprite(Being::TOPCLOTHES_SPRITE, headMid);
             dstBeing->setSprite(Being::HAT_SPRITE, headTop);
+            dstBeing->setSprite(Being::SHOE_SPRITE, shoes);
+            dstBeing->setSprite(Being::GLOVES_SPRITE, gloves);
             dstBeing->setHairStyle(hairStyle, hairColor);
 
             if (msg->getId() == SMSG_PLAYER_MOVE)
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 91f098ba..b421bc2b 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -191,7 +191,10 @@ LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
     tempPlayer->mGp = msg.readInt32();
     tempPlayer->mJobXp = msg.readInt32();
     tempPlayer->mJobLevel = msg.readInt32();
-    msg.skip(8);                          // unknown
+    tempPlayer->setSprite(Being::SHOE_SPRITE, msg.readInt16());
+    tempPlayer->setSprite(Being::GLOVES_SPRITE, msg.readInt16());
+    msg.readInt16();    // Cape
+    msg.readInt16();    // Misc1
     msg.readInt32();                       // option
     msg.readInt32();                       // karma
     msg.readInt32();                       // manner
@@ -208,7 +211,7 @@ LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
     tempPlayer->mLevel = msg.readInt16();
     msg.readInt16();                       // skill point
     tempPlayer->setSprite(Being::BOTTOMCLOTHES_SPRITE, msg.readInt16()); // head bottom
-    tempPlayer->setSprite(Being::SHIELD_SPRITE, msg.readInt16()); 
+    tempPlayer->setSprite(Being::SHIELD_SPRITE, msg.readInt16());
     tempPlayer->setSprite(Being::HAT_SPRITE, msg.readInt16()); // head option top
     tempPlayer->setSprite(Being::TOPCLOTHES_SPRITE, msg.readInt16()); // head option mid
     int hairColor = msg.readInt16();
-- 
cgit v1.2.3-70-g09d2


From e3fef730b69e4edc328e6105ea48b9774631563d Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Sat, 19 Jul 2008 07:43:43 +0000
Subject: removed unnecessary (weight) check in itemdb loader

---
 ChangeLog                | 4 ++++
 src/resources/itemdb.cpp | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c278ea45..206b3f4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-19  Lloyd Bryant ("Sanga")  <lloyd_bryant@netzero.net>
+
+	* Removed unnecessary check ("weight") from itemdb loader
+
 2008-07-18  Lloyd Bryant ("Sanga")  <lloyd_bryant@netzero.net>
 
 	* Added code to provide viewable glove and shoe sprites
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 52d19161..6ae7b499 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -127,10 +127,10 @@ void ItemDB::load()
 
         CHECK_PARAM(name, "");
         CHECK_PARAM(image, "");
-        // CHECK_PARAM(description, "");
-        // CHECK_PARAM(effect, "");
+        CHECK_PARAM(description, "");
+        CHECK_PARAM(effect, "");
         // CHECK_PARAM(type, 0);
-        CHECK_PARAM(weight, 0);
+        // CHECK_PARAM(weight, 0);
         // CHECK_PARAM(slot, 0);
 
 #undef CHECK_PARAM
-- 
cgit v1.2.3-70-g09d2


From 1e0d803e1b6ba168874522bba11ccd7dfa7503c2 Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Sat, 19 Jul 2008 22:45:23 +0000
Subject: Pulled the teeth from the stop walking packet handler

---
 src/net/beinghandler.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index f48e7751..f3c0cfb4 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -427,13 +427,18 @@ void BeingHandler::handleMessage(MessageIn *msg)
             if (dstBeing) {
                 dstBeing->mX = msg->readInt16();
                 dstBeing->mY = msg->readInt16();
+                /*
+                 * I'm deactivating this - players are reporting that
+                 * this makes things *worse*, not better.
                 if (dstBeing->mAction == Being::WALK) {
                      dstBeing->mFrame = 0;
                      dstBeing->setAction(Being::STAND);
                 }
+                */
             } else {
                 logger->log("0x0088: Non-existent being %d", id);
             }
+
             break;
 
         case SMSG_PLAYER_MOVE_TO_ATTACK:
-- 
cgit v1.2.3-70-g09d2


From 877188e5636738db262fdf55a9ed5d794ca7f5b8 Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Mon, 21 Jul 2008 03:16:07 +0000
Subject: Fixed a problem with creating the updates directory

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 2b8a3882..d66350b9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -184,7 +184,7 @@ void setUpdatesDir()
 
     // Verify that the updates directory exists. Create if necessary.
     if (!resman->isDirectory("/" + updatesDir)) {
-        if (resman->mkdir("/" + updatesDir)) {
+        if (!resman->mkdir("/" + updatesDir)) {
             logger->log("Error: %s/%s can't be made, but doesn't exist!",
                          homeDir.c_str(), updatesDir.c_str());
             errorMessage = "Error creating updates directory!";
-- 
cgit v1.2.3-70-g09d2


From a73a655f398ae9fae01253dec1cc1f9bb1d44ea7 Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Tue, 22 Jul 2008 18:05:08 +0000
Subject: Added support for the new eAthena version

---
 ChangeLog                |   8 +
 src/game.cpp             | 942 ++++++++++++++++++++++++-----------------------
 src/net/beinghandler.cpp |  28 ++
 src/net/protocol.h       |   4 +
 4 files changed, 520 insertions(+), 462 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 206b3f4b..90fed5cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-22  Lloyd Bryant ("Sanga")  <lloyd_bryant@netzero.net>
+
+	* Added handler for 0x0086 movement packet (new eAthena).
+	* Changed startup sequence for game.cpp to send a ping packet
+	  to the server after all the handlers have been initialized.
+	  This is required by the new eAthena version.
+	* Added #deines for some "ping" packets.
+
 2008-07-19  Lloyd Bryant ("Sanga")  <lloyd_bryant@netzero.net>
 
 	* Removed unnecessary check ("weight") from itemdb loader
diff --git a/src/game.cpp b/src/game.cpp
index d018852b..070cab52 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -68,6 +68,7 @@
 #include "gui/status.h"
 #include "gui/trade.h"
 #include "gui/viewport.h"
+#include "net/protocol.h"
 #include "net/beinghandler.h"
 #include "net/buysellhandler.h"
 #include "net/chathandler.h"
@@ -79,6 +80,7 @@
 #include "net/playerhandler.h"
 #include "net/skillhandler.h"
 #include "net/tradehandler.h"
+#include "net/messageout.h"
 
 #include "resources/imagewriter.h"
 
@@ -92,6 +94,7 @@ std::string map_path;
 bool done = false;
 volatile int tick_time;
 volatile int fps = 0, frame = 0;
+
 Engine *engine = NULL;
 Joystick *joystick = NULL;
 
@@ -134,14 +137,14 @@ const int MAX_TIME = 10000;
 namespace {
     struct ExitListener : public gcn::ActionListener
     {
-	void action(const gcn::ActionEvent &event)
-	{
-	    if (event.getId() == "yes" || event.getId() == "ok") {
-		done = true;
-	    }
-	    exitConfirm = NULL;
-	    disconnectedDialog = NULL;
-	}
+    void action(const gcn::ActionEvent &event)
+    {
+        if (event.getId() == "yes" || event.getId() == "ok") {
+            done = true;
+        }
+        exitConfirm = NULL;
+        disconnectedDialog = NULL;
+    }
     } exitListener;
 }
 
@@ -162,16 +165,17 @@ Uint32 nextSecond(Uint32 interval, void *param)
 {
     fps = frame;
     frame = 0;
+
     return interval;
 }
 
 int get_elapsed_time(int start_time)
 {
     if (start_time <= tick_time) {
-	return (tick_time - start_time) * 10;
+    return (tick_time - start_time) * 10;
     }
     else {
-	return (tick_time + (MAX_TIME - start_time)) * 10;
+    return (tick_time + (MAX_TIME - start_time)) * 10;
     }
 }
 
@@ -218,7 +222,7 @@ void createGuiWindows(Network *network)
 
     if (config.getValue("logToChat", 0))
     {
-	logger->setChatWindow(chatWindow);
+    logger->setChatWindow(chatWindow);
     }
 }
 
@@ -283,14 +287,13 @@ Game::Game(Network *network):
     // Initialize beings
     beingManager->setPlayer(player_node);
     player_node->setNetwork(network);
-    engine->changeMap(map_path);
 
     Joystick::init();
     // TODO: The user should be able to choose which one to use
     // Open the first device
     if (Joystick::getNumberOfJoysticks() > 0)
     {
-	joystick = new Joystick(0);
+    joystick = new Joystick(0);
     }
 
     network->registerHandler(mBeingHandler.get());
@@ -303,6 +306,21 @@ Game::Game(Network *network):
     network->registerHandler(mPlayerHandler.get());
     network->registerHandler(mSkillHandler.get());
     network->registerHandler(mTradeHandler.get());
+
+    /*
+     * To prevent the server from sending data before the client
+     * has initialized, I've modified it to wait for a "ping"
+     * from the client to complete its initialization
+     *
+     * Note: This only affects the latest eAthena version.  This
+     * packet is handled by the older version, but its response
+     * is ignored by the client
+     */
+    MessageOut msg(mNetwork);
+    msg.writeInt16(CMSG_CLIENT_PING);
+    msg.writeInt32(tick_time);
+
+    engine->changeMap(map_path);
 }
 
 Game::~Game()
@@ -331,30 +349,30 @@ bool saveScreenshot(SDL_Surface *screenshot)
     bool found = false;
 
     do {
-	screenshotCount++;
-	filename.str("");
+    screenshotCount++;
+    filename.str("");
 #if (defined __USE_UNIX98 || defined __FreeBSD__)
-	filename << PHYSFS_getUserDir() << ".tme/";
+    filename << PHYSFS_getUserDir() << ".tme/";
 #elif defined __APPLE__
-	filename << PHYSFS_getUserDir() << "Desktop/";
+    filename << PHYSFS_getUserDir() << "Desktop/";
 #endif
-	filename << "TMW_Screenshot_" << screenshotCount << ".png";
-	testExists.open(filename.str().c_str(), std::ios::in);
-	found = !testExists.is_open();
-	testExists.close();
+    filename << "TMW_Screenshot_" << screenshotCount << ".png";
+    testExists.open(filename.str().c_str(), std::ios::in);
+    found = !testExists.is_open();
+    testExists.close();
     } while (!found);
 
     if (ImageWriter::writePNG(screenshot, filename.str()))
     {
-	std::stringstream chatlogentry;
-	chatlogentry << "Screenshot saved to " << filename.str().c_str();
-	chatWindow->chatLog(chatlogentry.str(), BY_SERVER);
-	return true;
+    std::stringstream chatlogentry;
+    chatlogentry << "Screenshot saved to " << filename.str().c_str();
+    chatWindow->chatLog(chatlogentry.str(), BY_SERVER);
+    return true;
     }
     else
     {
-	chatWindow->chatLog("Saving screenshot failed!", BY_SERVER);
-	return false;
+    chatWindow->chatLog("Saving screenshot failed!", BY_SERVER);
+    return false;
     }
 }
 
@@ -378,61 +396,61 @@ void Game::logic()
 
     while (!done)
     {
-	// Handle all necessary game logic
-	while (get_elapsed_time(gameTime) > 0)
-	{
-	    handleInput();
-	    engine->logic();
-	    gameTime++;
-	}
-
-	// This is done because at some point tick_time will wrap.
-	gameTime = tick_time;
-
-	// Update the screen when application is active, delay otherwise.
-	if (SDL_GetAppState() & SDL_APPACTIVE)
-	{
-	    // Draw a frame if either frames are not limited or enough time has
-	    // passed since the last frame.
-	    if (!mMinFrameTime ||
-		    get_elapsed_time(mDrawTime / 10) > mMinFrameTime)
-	    {
-		frame++;
-		gui->draw();
-		graphics->updateScreen();
-		mDrawTime += mMinFrameTime;
-
-		// Make sure to wrap mDrawTime, since tick_time will wrap.
-		if (mDrawTime > MAX_TIME * 10)
-		    mDrawTime -= MAX_TIME * 10;
-	    }
-	    else
-	    {
-		SDL_Delay(10);
-	    }
-	}
-	else
-	{
-	    SDL_Delay(10);
-	    mDrawTime = tick_time * 10;
-	}
-
-	// Handle network stuff
-	mNetwork->flush();
-	mNetwork->dispatchMessages();
-
-	if (!mNetwork->isConnected())
-	{
-	    if (!disconnectedDialog)
-	    {
-		disconnectedDialog = new
-		    OkDialog("Network Error",
-		             "The connection to the server was lost, the "
+    // Handle all necessary game logic
+    while (get_elapsed_time(gameTime) > 0)
+    {
+        handleInput();
+        engine->logic();
+        gameTime++;
+    }
+
+    // This is done because at some point tick_time will wrap.
+    gameTime = tick_time;
+
+    // Update the screen when application is active, delay otherwise.
+    if (SDL_GetAppState() & SDL_APPACTIVE)
+    {
+        // Draw a frame if either frames are not limited or enough time has
+        // passed since the last frame.
+        if (!mMinFrameTime ||
+            get_elapsed_time(mDrawTime / 10) > mMinFrameTime)
+        {
+        frame++;
+        gui->draw();
+        graphics->updateScreen();
+        mDrawTime += mMinFrameTime;
+
+        // Make sure to wrap mDrawTime, since tick_time will wrap.
+        if (mDrawTime > MAX_TIME * 10)
+            mDrawTime -= MAX_TIME * 10;
+        }
+        else
+        {
+        SDL_Delay(10);
+        }
+    }
+    else
+    {
+        SDL_Delay(10);
+        mDrawTime = tick_time * 10;
+    }
+
+    // Handle network stuff
+    mNetwork->flush();
+    mNetwork->dispatchMessages();
+
+    if (!mNetwork->isConnected())
+    {
+        if (!disconnectedDialog)
+        {
+        disconnectedDialog = new
+            OkDialog("Network Error",
+                     "The connection to the server was lost, the "
                              "program will now quit");
-		disconnectedDialog->addActionListener(&exitListener);
-		disconnectedDialog->requestMoveToTop();
-	    }
-	}
+        disconnectedDialog->addActionListener(&exitListener);
+        disconnectedDialog->requestMoveToTop();
+        }
+    }
     }
 }
 
@@ -440,296 +458,296 @@ void Game::handleInput()
 {
     if (joystick != NULL)
     {
-	joystick->update();
+    joystick->update();
     }
 
     // Events
     SDL_Event event;
     while (SDL_PollEvent(&event))
     {
-	bool used = false;
-
-	// Keyboard events (for discontinuous keys)
-	if (event.type == SDL_KEYDOWN)
-	{
-	    gcn::Window *requestedWindow = NULL;
-
-	    if (setupWindow->isVisible() &&
-		keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE)
-	    {
-		keyboard.setNewKey((int) event.key.keysym.sym);
-		keyboard.callbackNewKey();
-		keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
-		return;
-	    }
-	    // Keys pressed together with Alt/Meta
-	    // Emotions and some internal gui windows
-	    #ifndef __APPLE__
-	    if (event.key.keysym.mod & KMOD_ALT)
-	    #else
-	    if (event.key.keysym.mod & KMOD_LMETA)
-	    #endif
-	    {
-		switch (event.key.keysym.sym)
-		{
-		    case SDLK_p:
-			// Screenshot (picture, hence the p)
-			{
-			    SDL_Surface *screenshot =
+    bool used = false;
+
+    // Keyboard events (for discontinuous keys)
+    if (event.type == SDL_KEYDOWN)
+    {
+        gcn::Window *requestedWindow = NULL;
+
+        if (setupWindow->isVisible() &&
+        keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE)
+        {
+        keyboard.setNewKey((int) event.key.keysym.sym);
+        keyboard.callbackNewKey();
+        keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
+        return;
+        }
+        // Keys pressed together with Alt/Meta
+        // Emotions and some internal gui windows
+        #ifndef __APPLE__
+        if (event.key.keysym.mod & KMOD_ALT)
+        #else
+        if (event.key.keysym.mod & KMOD_LMETA)
+        #endif
+        {
+        switch (event.key.keysym.sym)
+        {
+            case SDLK_p:
+            // Screenshot (picture, hence the p)
+            {
+                SDL_Surface *screenshot =
                                 graphics->getScreenshot();
-			    if (!saveScreenshot(screenshot))
-			    {
-				logger->
+                if (!saveScreenshot(screenshot))
+                {
+                logger->
                                     log("Error: could not save Screenshot.");
-			    }
-			    SDL_FreeSurface(screenshot);
-			}
-			used = true;
-			break;
-
-		    default:
-			break;
-
-		    case SDLK_f:
-			// Find path to mouse (debug purpose)
-			viewport->toggleDebugPath();
-			used = true;
-			break;
-
-		    case SDLK_t:
-			// Toggle accepting of incoming trade requests
-			{
-			    unsigned int deflt = player_relations.getDefault();
-			    if (deflt & PlayerRelation::TRADE) {
-				chatWindow->
+                }
+                SDL_FreeSurface(screenshot);
+            }
+            used = true;
+            break;
+
+            default:
+            break;
+
+            case SDLK_f:
+            // Find path to mouse (debug purpose)
+            viewport->toggleDebugPath();
+            used = true;
+            break;
+
+            case SDLK_t:
+            // Toggle accepting of incoming trade requests
+            {
+                unsigned int deflt = player_relations.getDefault();
+                if (deflt & PlayerRelation::TRADE) {
+                chatWindow->
                                     chatLog("Ignoring incoming trade requests",
                                     BY_SERVER);
-				deflt &= ~PlayerRelation::TRADE;
-			    } else {
-				chatWindow->chatLog("Accepting incoming trade "
+                deflt &= ~PlayerRelation::TRADE;
+                } else {
+                chatWindow->chatLog("Accepting incoming trade "
                                                     "requests", BY_SERVER);
-				deflt |= PlayerRelation::TRADE;
-			    }
-
-			    player_relations.setDefault(deflt);
-			}
-			used = true;
-			break;
-		}
-
-		// Emotions
-		Uint8 emotion;
-		switch (event.key.keysym.sym)
-		{
-		    case SDLK_1: emotion = 1; break;
-		    case SDLK_2: emotion = 2; break;
-		    case SDLK_3: emotion = 3; break;
-		    case SDLK_4: emotion = 4; break;
-		    case SDLK_5: emotion = 5; break;
-		    case SDLK_6: emotion = 6; break;
-		    case SDLK_7: emotion = 7; break;
-		    case SDLK_8: emotion = 8; break;
-		    case SDLK_9: emotion = 9; break;
-		    case SDLK_0: emotion = 10; break;
-		    case SDLK_MINUS: emotion = 11; break;
-		    case SDLK_EQUALS: emotion = 12; break;
-		    default: emotion = 0; break;
-		}
-
-		if (emotion)
-		{
-		    player_node->emote(emotion);
-		    used = true;
-		}
-	    }
-	    switch (event.key.keysym.sym)
-	    {
-		case SDLK_PAGEUP:
-		    if (chatWindow->isVisible())
-		    {
-			chatWindow->scroll(-DEFAULT_CHAT_WINDOW_SCROLL);
-			used = true;
-		    }
-		    break;
-
-		case SDLK_PAGEDOWN:
-		    if (chatWindow->isVisible())
-		    {
-			chatWindow->scroll(DEFAULT_CHAT_WINDOW_SCROLL);
-			used = true;
-		    }
-		    break;
-
-		case SDLK_F1:
-		    // In-game Help
-		    if (helpWindow->isVisible())
-		    {
-			helpWindow->setVisible(false);
-		    }
-		    else
-		    {
-			helpWindow->loadHelp("index");
-			helpWindow->requestMoveToTop();
-		    }
-		    used = true;
-		    break;
-
-		case SDLK_F2: requestedWindow = statusWindow; break;
-		case SDLK_F3: requestedWindow = inventoryWindow; break;
-		case SDLK_F4: requestedWindow = equipmentWindow; break;
-		case SDLK_F5: requestedWindow = skillDialog; break;
-		case SDLK_F6: requestedWindow = minimap; break;
-		case SDLK_F7: requestedWindow = chatWindow; break;
-		case SDLK_F8: requestedWindow = itemShortcutWindow; break;
-		case SDLK_F9: requestedWindow = setupWindow; break;
-		case SDLK_F10: requestedWindow = debugWindow; break;
-		//case SDLK_F11: requestedWindow = newSkillWindow; break;
-
-		case SDLK_RETURN:
-		    // Input chat window
-		    if (chatWindow->isInputFocused() ||
-			deathNotice != NULL ||
-			weightNotice != NULL)
-		    {
-			break;
-		    }
-
-		    // Quit by pressing Enter if the exit confirm is there
-		    if (exitConfirm)
-		    {
-			done = true;
-		    }
-		    // Close the Browser if opened
-		    else if (helpWindow->isVisible())
-		    {
-			helpWindow->setVisible(false);
-		    }
-		    // Close the config window, cancelling changes if opened
-		    else if (setupWindow->isVisible())
-		    {
-			setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
-		    }
-		    // Else, open the chat edit box
-		    else
-		    {
-			chatWindow->requestChatFocus();
-			used = true;
-		    }
-		    break;
-		   // Quitting confirmation dialog
-		case SDLK_ESCAPE:
-		    if (!exitConfirm) {
-			exitConfirm = new ConfirmDialog(
-				"Quit", "Are you sure you want to quit?");
-			exitConfirm->addActionListener(&exitListener);
-			exitConfirm->requestMoveToTop();
-		    }
-		    else
-		    {
-			exitConfirm->action(gcn::ActionEvent(NULL, "no"));
-		    }
-		    break;
-
-		default:
-		    break;
-	    }
-	    if (keyboard.isEnabled() && !chatWindow->isInputFocused())
-	    {
-		const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
-		// Checks if any item shortcut is pressed.
-		for (int i = KeyboardConfig::KEY_SHORTCUT_0;
-		    i <= KeyboardConfig::KEY_SHORTCUT_9;
-		    i++)
-		{
-		    if (tKey == i && !used) {
-			itemShortcut->useItem(
-				i - KeyboardConfig::KEY_SHORTCUT_0);
-			break;
-		    }
-		}
-		switch (tKey) {
-		    case KeyboardConfig::KEY_PICKUP:
-			{
-			    FloorItem *item =
+                deflt |= PlayerRelation::TRADE;
+                }
+
+                player_relations.setDefault(deflt);
+            }
+            used = true;
+            break;
+        }
+
+        // Emotions
+        Uint8 emotion;
+        switch (event.key.keysym.sym)
+        {
+            case SDLK_1: emotion = 1; break;
+            case SDLK_2: emotion = 2; break;
+            case SDLK_3: emotion = 3; break;
+            case SDLK_4: emotion = 4; break;
+            case SDLK_5: emotion = 5; break;
+            case SDLK_6: emotion = 6; break;
+            case SDLK_7: emotion = 7; break;
+            case SDLK_8: emotion = 8; break;
+            case SDLK_9: emotion = 9; break;
+            case SDLK_0: emotion = 10; break;
+            case SDLK_MINUS: emotion = 11; break;
+            case SDLK_EQUALS: emotion = 12; break;
+            default: emotion = 0; break;
+        }
+
+        if (emotion)
+        {
+            player_node->emote(emotion);
+            used = true;
+        }
+        }
+        switch (event.key.keysym.sym)
+        {
+        case SDLK_PAGEUP:
+            if (chatWindow->isVisible())
+            {
+            chatWindow->scroll(-DEFAULT_CHAT_WINDOW_SCROLL);
+            used = true;
+            }
+            break;
+
+        case SDLK_PAGEDOWN:
+            if (chatWindow->isVisible())
+            {
+            chatWindow->scroll(DEFAULT_CHAT_WINDOW_SCROLL);
+            used = true;
+            }
+            break;
+
+        case SDLK_F1:
+            // In-game Help
+            if (helpWindow->isVisible())
+            {
+            helpWindow->setVisible(false);
+            }
+            else
+            {
+            helpWindow->loadHelp("index");
+            helpWindow->requestMoveToTop();
+            }
+            used = true;
+            break;
+
+        case SDLK_F2: requestedWindow = statusWindow; break;
+        case SDLK_F3: requestedWindow = inventoryWindow; break;
+        case SDLK_F4: requestedWindow = equipmentWindow; break;
+        case SDLK_F5: requestedWindow = skillDialog; break;
+        case SDLK_F6: requestedWindow = minimap; break;
+        case SDLK_F7: requestedWindow = chatWindow; break;
+        case SDLK_F8: requestedWindow = itemShortcutWindow; break;
+        case SDLK_F9: requestedWindow = setupWindow; break;
+        case SDLK_F10: requestedWindow = debugWindow; break;
+        //case SDLK_F11: requestedWindow = newSkillWindow; break;
+
+        case SDLK_RETURN:
+            // Input chat window
+            if (chatWindow->isInputFocused() ||
+            deathNotice != NULL ||
+            weightNotice != NULL)
+            {
+            break;
+            }
+
+            // Quit by pressing Enter if the exit confirm is there
+            if (exitConfirm)
+            {
+            done = true;
+            }
+            // Close the Browser if opened
+            else if (helpWindow->isVisible())
+            {
+            helpWindow->setVisible(false);
+            }
+            // Close the config window, cancelling changes if opened
+            else if (setupWindow->isVisible())
+            {
+            setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
+            }
+            // Else, open the chat edit box
+            else
+            {
+            chatWindow->requestChatFocus();
+            used = true;
+            }
+            break;
+           // Quitting confirmation dialog
+        case SDLK_ESCAPE:
+            if (!exitConfirm) {
+            exitConfirm = new ConfirmDialog(
+                "Quit", "Are you sure you want to quit?");
+            exitConfirm->addActionListener(&exitListener);
+            exitConfirm->requestMoveToTop();
+            }
+            else
+            {
+            exitConfirm->action(gcn::ActionEvent(NULL, "no"));
+            }
+            break;
+
+        default:
+            break;
+        }
+        if (keyboard.isEnabled() && !chatWindow->isInputFocused())
+        {
+        const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
+        // Checks if any item shortcut is pressed.
+        for (int i = KeyboardConfig::KEY_SHORTCUT_0;
+            i <= KeyboardConfig::KEY_SHORTCUT_9;
+            i++)
+        {
+            if (tKey == i && !used) {
+            itemShortcut->useItem(
+                i - KeyboardConfig::KEY_SHORTCUT_0);
+            break;
+            }
+        }
+        switch (tKey) {
+            case KeyboardConfig::KEY_PICKUP:
+            {
+                FloorItem *item =
                                 floorItemManager->findByCoordinates(
-				    player_node->mX, player_node->mY);
-
-			    // If none below the player, try the tile in front
-			    // of the player
-			    if (!item) {
-				Uint16 x = player_node->mX;
-				Uint16 y = player_node->mY;
-				if (player_node->getDirection() & Being::UP)
-				    y--;
-				if (player_node->getDirection() & Being::DOWN)
-				    y++;
-				if (player_node->getDirection() & Being::LEFT)
-				    x--;
-				if (player_node->getDirection() & Being::RIGHT)
-				    x++;
-
-				item = floorItemManager->
+                    player_node->mX, player_node->mY);
+
+                // If none below the player, try the tile in front
+                // of the player
+                if (!item) {
+                Uint16 x = player_node->mX;
+                Uint16 y = player_node->mY;
+                if (player_node->getDirection() & Being::UP)
+                    y--;
+                if (player_node->getDirection() & Being::DOWN)
+                    y++;
+                if (player_node->getDirection() & Being::LEFT)
+                    x--;
+                if (player_node->getDirection() & Being::RIGHT)
+                    x++;
+
+                item = floorItemManager->
                                     findByCoordinates(x, y);
-			    }
-
-			    if (item)
-				player_node->pickUp(item);
-
-			    used = true;
-			}
-			break;
-		    case KeyboardConfig::KEY_SIT:
-			// Player sit action
-			player_node->toggleSit();
-			used = true;
-			break;
-		    case KeyboardConfig::KEY_HIDE_WINDOWS:
-			 // Hide certain windows
-			if (!chatWindow->isInputFocused())
-			{
-			    statusWindow->setVisible(false);
-			    inventoryWindow->setVisible(false);
-			    skillDialog->setVisible(false);
-			    setupWindow->setVisible(false);
-			    equipmentWindow->setVisible(false);
-			    helpWindow->setVisible(false);
-			    debugWindow->setVisible(false);
-			}
-			break;
-		}
-	    }
-
-	    if (requestedWindow)
-	    {
-		requestedWindow->setVisible(!requestedWindow->isVisible());
-		if (requestedWindow->isVisible())
-		{
-		    requestedWindow->requestMoveToTop();
-		}
-		used = true;
-	    }
-
-	}
-
-	// Quit event
-	else if (event.type == SDL_QUIT)
-	{
-	    done = true;
-	}
-
-	// Push input to GUI when not used
-	if (!used)
-	{
-	    try
-	    {
-		guiInput->pushInput(event);
-	    }
-	    catch (gcn::Exception e)
-	    {
-		const char* err = e.getMessage().c_str();
-		logger->log("Warning: guichan input exception: %s", err);
-	    }
-	}
+                }
+
+                if (item)
+                player_node->pickUp(item);
+
+                used = true;
+            }
+            break;
+            case KeyboardConfig::KEY_SIT:
+            // Player sit action
+            player_node->toggleSit();
+            used = true;
+            break;
+            case KeyboardConfig::KEY_HIDE_WINDOWS:
+             // Hide certain windows
+            if (!chatWindow->isInputFocused())
+            {
+                statusWindow->setVisible(false);
+                inventoryWindow->setVisible(false);
+                skillDialog->setVisible(false);
+                setupWindow->setVisible(false);
+                equipmentWindow->setVisible(false);
+                helpWindow->setVisible(false);
+                debugWindow->setVisible(false);
+            }
+            break;
+        }
+        }
+
+        if (requestedWindow)
+        {
+        requestedWindow->setVisible(!requestedWindow->isVisible());
+        if (requestedWindow->isVisible())
+        {
+            requestedWindow->requestMoveToTop();
+        }
+        used = true;
+        }
+
+    }
+
+    // Quit event
+    else if (event.type == SDL_QUIT)
+    {
+        done = true;
+    }
+
+    // Push input to GUI when not used
+    if (!used)
+    {
+        try
+        {
+        guiInput->pushInput(event);
+        }
+        catch (gcn::Exception e)
+        {
+        const char* err = e.getMessage().c_str();
+        logger->log("Warning: guichan input exception: %s", err);
+        }
+    }
 
     } // End while
     // If the user is configuring the keys then don't respond.
@@ -739,112 +757,112 @@ void Game::handleInput()
     }
     // Moving player around
     if (player_node->mAction != Being::DEAD &&
-	current_npc == 0 &&
-	!chatWindow->isInputFocused())
+    current_npc == 0 &&
+    !chatWindow->isInputFocused())
+    {
+    // Get the state of the keyboard keys
+    keyboard.refreshActiveKeys();
+
+    const Uint16 x = player_node->mX;
+    const Uint16 y = player_node->mY;
+    unsigned char direction = 0;
+
+    // Translate pressed keys to movement and direction
+    if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP) ||
+        (joystick && joystick->isUp()))
+    {
+        direction |= Being::UP;
+    }
+    else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) ||
+         (joystick && joystick->isDown()))
+    {
+        direction |= Being::DOWN;
+    }
+
+    if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) ||
+        (joystick && joystick->isLeft()))
+    {
+        direction |= Being::LEFT;
+    }
+    else if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) ||
+         (joystick && joystick->isRight()))
+    {
+        direction |= Being::RIGHT;
+    }
+
+    player_node->setWalkingDir(direction);
+
+    // Attacking monsters
+    if (keyboard.isKeyActive(keyboard.KEY_ATTACK) ||
+        (joystick && joystick->buttonPressed(0)))
     {
-	// Get the state of the keyboard keys
-	keyboard.refreshActiveKeys();
-
-	const Uint16 x = player_node->mX;
-	const Uint16 y = player_node->mY;
-	unsigned char direction = 0;
-
-	// Translate pressed keys to movement and direction
-	if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP) ||
-	    (joystick && joystick->isUp()))
-	{
-	    direction |= Being::UP;
-	}
-	else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) ||
-		 (joystick && joystick->isDown()))
-	{
-	    direction |= Being::DOWN;
-	}
-
-	if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) ||
-	    (joystick && joystick->isLeft()))
-	{
-	    direction |= Being::LEFT;
-	}
-	else if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) ||
-		 (joystick && joystick->isRight()))
-	{
-	    direction |= Being::RIGHT;
-	}
-
-	player_node->setWalkingDir(direction);
-
-	// Attacking monsters
-	if (keyboard.isKeyActive(keyboard.KEY_ATTACK) ||
-		(joystick && joystick->buttonPressed(0)))
-	{
-	    Being *target = NULL;
-	    bool newTarget = keyboard.isKeyActive(keyboard.KEY_TARGET);
-	    // A set target has highest priority
-	    if (newTarget || !player_node->getTarget())
-	    {
-		Uint16 targetX = x, targetY = y;
-
-		if (player_node->getDirection() & Being::UP)
-		    targetY--;
-		if (player_node->getDirection() & Being::DOWN)
-		    targetY++;
-		if (player_node->getDirection() & Being::LEFT)
-		    targetX--;
-		if (player_node->getDirection() & Being::RIGHT)
-		    targetX++;
-
-		// Attack priorioty is: Monster, Player, auto target
-		target = beingManager->findBeing(
-			targetX, targetY, Being::MONSTER);
-		if (!target)
-		    target = beingManager->findBeing(
-			    targetX, targetY, Being::PLAYER);
-	    }
-
-	    player_node->attack(target, newTarget);
-	}
-
-	// Target the nearest player if 'q' is pressed
-	if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) )
-	//if (keys[SDLK_q])
-	{
-	    Being *target =
-		beingManager->
+        Being *target = NULL;
+        bool newTarget = keyboard.isKeyActive(keyboard.KEY_TARGET);
+        // A set target has highest priority
+        if (newTarget || !player_node->getTarget())
+        {
+        Uint16 targetX = x, targetY = y;
+
+        if (player_node->getDirection() & Being::UP)
+            targetY--;
+        if (player_node->getDirection() & Being::DOWN)
+            targetY++;
+        if (player_node->getDirection() & Being::LEFT)
+            targetX--;
+        if (player_node->getDirection() & Being::RIGHT)
+            targetX++;
+
+        // Attack priorioty is: Monster, Player, auto target
+        target = beingManager->findBeing(
+            targetX, targetY, Being::MONSTER);
+        if (!target)
+            target = beingManager->findBeing(
+                targetX, targetY, Being::PLAYER);
+        }
+
+        player_node->attack(target, newTarget);
+    }
+
+    // Target the nearest player if 'q' is pressed
+    if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) )
+    //if (keys[SDLK_q])
+    {
+        Being *target =
+        beingManager->
                     findNearestLivingBeing(player_node, 20, Being::PLAYER);
 
-	    if (target)
-	    {
-		player_node->setTarget(target);
-	    }
-	}
-
-	// Target the nearest monster if 'a' pressed
-	if ( keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) )
-	//if (keys[SDLK_a])
-	{
-	    Being *target =
-		beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER);
-
-	    if (target)
-	    {
-		player_node->setTarget(target);
-	    }
-	}
-
-	if (joystick)
-	{
-	    if (joystick->buttonPressed(1))
-	    {
-		FloorItem *item = floorItemManager->findByCoordinates(x, y);
-
-		if (item)
-		    player_node->pickUp(item);
-	    }
-	    else if (joystick->buttonPressed(2))
-	    {
-		player_node->toggleSit();
-	    }
-	}
+        if (target)
+        {
+        player_node->setTarget(target);
+        }
+    }
+
+    // Target the nearest monster if 'a' pressed
+    if ( keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) )
+    //if (keys[SDLK_a])
+    {
+        Being *target =
+        beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER);
+
+        if (target)
+        {
+        player_node->setTarget(target);
+        }
+    }
+
+    if (joystick)
+    {
+        if (joystick->buttonPressed(1))
+        {
+        FloorItem *item = floorItemManager->findByCoordinates(x, y);
+
+        if (item)
+            player_node->pickUp(item);
+        }
+        else if (joystick->buttonPressed(2))
+        {
+        player_node->toggleSit();
+        }
+    }
     }
 }
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index f3c0cfb4..778c8cfe 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -45,6 +45,7 @@ BeingHandler::BeingHandler()
     static const Uint16 _messages[] = {
         SMSG_BEING_VISIBLE,
         SMSG_BEING_MOVE,
+        SMSG_BEING_MOVE2,
         SMSG_BEING_REMOVE,
         SMSG_BEING_ACTION,
         SMSG_BEING_LEVELUP,
@@ -164,6 +165,33 @@ void BeingHandler::handleMessage(MessageIn *msg)
             msg->readInt8();   // unknown / sit
             break;
 
+        case SMSG_BEING_MOVE2:
+            /*
+             * A simplified movement packet, used by the
+             * later versions of eAthena for both mobs and
+             * players
+             */
+            dstBeing = beingManager->findBeing(msg->readInt32());
+
+            Uint16 srcX, srcY, dstX, dstY;
+            msg->readCoordinatePair(srcX, srcY, dstX, dstY);
+            msg->readInt32();  // Server tick
+
+            /*
+             * This packet doesn't have enough info to actually
+             * create a new being, so if the being isn't found,
+             * we'll just pretend the packet didn't happen
+             */
+
+            if (dstBeing) {
+                dstBeing->setAction(Being::STAND);
+                dstBeing->mX = srcX;
+                dstBeing->mY = srcY;
+                dstBeing->setDestination(dstX, dstY);
+            }
+
+            break;
+
         case SMSG_BEING_REMOVE:
             // A being should be removed or has died
             dstBeing = beingManager->findBeing(msg->readInt32());
diff --git a/src/net/protocol.h b/src/net/protocol.h
index f90fcba3..53f245b5 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -26,6 +26,7 @@
 
 // Packets from server to client
 #define SMSG_LOGIN_SUCCESS           0x0073 /**< Contains starting location */
+#define SMSG_SERVER_PING             0x007f /**< Contains server tick */
 #define SMSG_PLAYER_UPDATE_1         0x01d8
 #define SMSG_PLAYER_UPDATE_2         0x01d9
 #define SMSG_PLAYER_MOVE             0x01da /**< A nearby player moves */
@@ -57,6 +58,8 @@
 #define SMSG_ITEM_REMOVE             0x00a1 /**< An item disappers */
 #define SMSG_BEING_VISIBLE           0x0078
 #define SMSG_BEING_MOVE              0x007b /**< A nearby monster moves */
+#define SMSG_BEING_SPAWN             0x007c /**< A being spawns nearby */
+#define SMSG_BEING_MOVE2             0x0086 /**< New eAthena being moves */
 #define SMSG_BEING_REMOVE            0x0080
 #define SMSG_BEING_CHANGE_LOOKS      0x00c3
 #define SMSG_BEING_CHANGE_LOOKS2     0x01d7 /**< Same as 0x00c3, but 16 bit ID */
@@ -102,6 +105,7 @@
 #define SMSG_PARTY_MESSAGE           0x0109
 
 // Packets from client to server
+#define CMSG_CLIENT_PING             0x007e /**< Send to server with tick */
 #define CMSG_TRADE_RESPONSE          0x00e6
 #define CMSG_ITEM_PICKUP             0x009f
 #define CMSG_MAP_LOADED              0x007d
-- 
cgit v1.2.3-70-g09d2


From c9b01f907d3720ad96b2435d00a47d31e1955f53 Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Wed, 23 Jul 2008 17:24:18 +0000
Subject: Added viewable cape/misc1/misc2, Chat button in GUI

---
 ChangeLog                |  6 ++++++
 src/being.h              |  3 +++
 src/gui/menuwindow.cpp   |  8 +++++++-
 src/net/beinghandler.cpp | 31 +++++++++++++++++++++++--------
 4 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 90fed5cd..849ecd2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-23  Lloyd Bryant ("Sanga")  <lloyd_bryant@netzero.net>
+
+	* Added "chat" button to open/close chat window
+	* Added support for viewable cape/misc1/misc2 (new eAthena
+	  version ONLY
+
 2008-07-22  Lloyd Bryant ("Sanga")  <lloyd_bryant@netzero.net>
 
 	* Added handler for 0x0086 movement packet (new eAthena).
diff --git a/src/being.h b/src/being.h
index 3ddff097..90bab9ac 100644
--- a/src/being.h
+++ b/src/being.h
@@ -94,8 +94,11 @@ class Being : public Sprite
             SHOE_SPRITE,
             BOTTOMCLOTHES_SPRITE,
             TOPCLOTHES_SPRITE,
+            MISC1_SPRITE,
+            MISC2_SPRITE,
             HAIR_SPRITE,
             HAT_SPRITE,
+            CAPE_SPRITE,
             GLOVES_SPRITE,
             WEAPON_SPRITE,
             SHIELD_SPRITE,
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index c3af6896..2d07e632 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -36,6 +36,7 @@ extern Window *equipmentWindow;
 extern Window *skillDialog;
 extern Window *statusWindow;
 extern Window *itemShortcutWindow;
+extern Window *chatWindow;
 
 namespace {
     struct MenuWindowListener : public gcn::ActionListener
@@ -58,6 +59,7 @@ MenuWindow::MenuWindow():
     // Buttons
     const char *buttonNames[] =
     {
+        "Chat",
         "Status",
         "Equipment",
         "Inventory",
@@ -91,7 +93,11 @@ void MenuWindowListener::action(const gcn::ActionEvent &event)
 {
     Window *window = NULL;
 
-    if (event.getId() == "Status")
+    if (event.getId() == "Chat")
+    {
+        window = chatWindow;
+    }
+    else if (event.getId() == "Status")
     {
         window = statusWindow;
     }
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 778c8cfe..048b7428 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -69,7 +69,8 @@ void BeingHandler::handleMessage(MessageIn *msg)
     Uint32 id;
     Uint16 job, speed;
     Uint16 headTop, headMid, headBottom;
-    Uint16 shoes, gloves;
+    Uint16 shoes, gloves, cape, misc1, misc2;
+    Uint16 weapon, shield;
     Sint16 param1;
     Sint8 type;
     Being *srcBeing, *dstBeing;
@@ -82,8 +83,8 @@ void BeingHandler::handleMessage(MessageIn *msg)
             // Information about a being in range
             id = msg->readInt32();
             speed = msg->readInt16();
-            msg->readInt16();  // unknown
-            msg->readInt16();  // unknown
+            msg->readInt16();  // opt1
+            msg->readInt16();  // opt2
             msg->readInt16();  // option
             job = msg->readInt16();  // class
 
@@ -346,6 +347,15 @@ void BeingHandler::handleMessage(MessageIn *msg)
                 case 10:   // LOOK_GLOVES
                     dstBeing->setSprite(Being::GLOVES_SPRITE, id);
                     break;
+                case 11:  // LOOK_CAPE
+                    dstBeing->setSprite(Being::CAPE_SPRITE, id);
+                    break;
+                case 12:
+                    dstBeing->setSprite(Being::MISC1_SPRITE, id);
+                    break;
+                case 13:
+                    dstBeing->setSprite(Being::MISC2_SPRITE, id);
+                    break;
                 default:
                     logger->log("SMSG_BEING_CHANGE_LOOKS: unsupported type: "
                             "%d, id: %d", type, id);
@@ -367,9 +377,9 @@ void BeingHandler::handleMessage(MessageIn *msg)
             // An update about a player, potentially including movement.
             id = msg->readInt32();
             speed = msg->readInt16();
-            msg->readInt16();  // option 1
-            msg->readInt16();  // option 2
-            msg->readInt16();  // option
+            cape = msg->readInt16();
+            misc1 = msg->readInt16();
+            misc2 = msg->readInt16();
             job = msg->readInt16();
 
             dstBeing = beingManager->findBeing(id);
@@ -382,8 +392,8 @@ void BeingHandler::handleMessage(MessageIn *msg)
             dstBeing->setWalkSpeed(speed);
             dstBeing->mJob = job;
             hairStyle = msg->readInt16();
-            dstBeing->setSprite(Being::WEAPON_SPRITE, msg->readInt16());
-            dstBeing->setSprite(Being::SHIELD_SPRITE, msg->readInt16());
+            weapon = msg->readInt16();
+            shield = msg->readInt16();
             headBottom = msg->readInt16();
 
             if (msg->getId() == SMSG_PLAYER_MOVE)
@@ -403,11 +413,16 @@ void BeingHandler::handleMessage(MessageIn *msg)
             dstBeing->setGender(1 - msg->readInt8());   // gender
 
             // Set these after the gender, as the sprites may be gender-specific
+            dstBeing->setSprite(Being::WEAPON_SPRITE, weapon);
+            dstBeing->setSprite(Being::SHIELD_SPRITE, shield);
             dstBeing->setSprite(Being::BOTTOMCLOTHES_SPRITE, headBottom);
             dstBeing->setSprite(Being::TOPCLOTHES_SPRITE, headMid);
             dstBeing->setSprite(Being::HAT_SPRITE, headTop);
             dstBeing->setSprite(Being::SHOE_SPRITE, shoes);
             dstBeing->setSprite(Being::GLOVES_SPRITE, gloves);
+            dstBeing->setSprite(Being::CAPE_SPRITE, cape);
+            dstBeing->setSprite(Being::MISC1_SPRITE, misc1);
+            dstBeing->setSprite(Being::MISC2_SPRITE, misc2);
             dstBeing->setHairStyle(hairStyle, hairColor);
 
             if (msg->getId() == SMSG_PLAYER_MOVE)
-- 
cgit v1.2.3-70-g09d2


From 475d46b774e9d9ebecf6ee9403e030414b2f7e3f Mon Sep 17 00:00:00 2001
From: Douglas Boffey <DougABoffey@netscape.net>
Date: Wed, 23 Jul 2008 17:52:16 +0000
Subject: Updated item database, Selim and network.cpp

---
 src/net/network.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/network.cpp b/src/net/network.cpp
index 4db0df54..efb11708 100644
--- a/src/net/network.cpp
+++ b/src/net/network.cpp
@@ -296,7 +296,7 @@ MessageIn Network::getNextMessage()
         len = readWord(2);
 
 #ifdef DEBUG
-    logger->log("Received packet 0x%x of length %d", msgId, length);
+    logger->log("Received packet 0x%x of length %d", msgId, len);
 #endif
 
     MessageIn msg(mInBuffer, len);
-- 
cgit v1.2.3-70-g09d2


From 8726fbf5c15602b39ec31810c3dbff02826116b9 Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Wed, 23 Jul 2008 18:13:31 +0000
Subject: Changed tmw.log to tme.log for log file

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index d66350b9..213e2939 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -221,7 +221,7 @@ void init_engine(const Options &options)
     }
 
     // Set log file
-    logger->setLogFile(homeDir + std::string("/tmw.log"));
+    logger->setLogFile(homeDir + std::string("/tme.log"));
 
     #ifdef PACKAGE_VERSION
         logger->log("Starting The Mana World Version %s", PACKAGE_VERSION);
-- 
cgit v1.2.3-70-g09d2


From cd0659cb30e2f242f42c7f464c8051bdaa566b9b Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Thu, 24 Jul 2008 03:39:32 +0000
Subject: Added cape/misc1/misc2 code into character selection display

---
 ChangeLog                     | 5 +++++
 src/net/charserverhandler.cpp | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 849ecd2b..6fe89c17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-23  Lloyd Bryant ("Sanga")	<lloyd_bryant@netzero.net>
+
+	* Added support for capes/misc1/misc2 into the character
+	  selection display
+
 2008-07-23  Lloyd Bryant ("Sanga")  <lloyd_bryant@netzero.net>
 
 	* Added "chat" button to open/close chat window
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index b421bc2b..d3ad0d92 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -193,8 +193,8 @@ LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
     tempPlayer->mJobLevel = msg.readInt32();
     tempPlayer->setSprite(Being::SHOE_SPRITE, msg.readInt16());
     tempPlayer->setSprite(Being::GLOVES_SPRITE, msg.readInt16());
-    msg.readInt16();    // Cape
-    msg.readInt16();    // Misc1
+    tempPlayer->setSprite(Being::CAPE_SPRITE, msg.readInt16());
+    tempPlayer->setSprite(Being::MISC1_SPRITE, msg.readInt16());
     msg.readInt32();                       // option
     msg.readInt32();                       // karma
     msg.readInt32();                       // manner
@@ -216,7 +216,7 @@ LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
     tempPlayer->setSprite(Being::TOPCLOTHES_SPRITE, msg.readInt16()); // head option mid
     int hairColor = msg.readInt16();
     tempPlayer->setHairStyle(hairStyle, hairColor);
-    msg.readInt16();                       // unknown
+    tempPlayer->setSprite(Being::MISC2_SPRITE, msg.readInt16());
     tempPlayer->setName(msg.readString(24));
     for (int i = 0; i < 6; i++) {
         tempPlayer->mAttr[i] = msg.readInt8();
-- 
cgit v1.2.3-70-g09d2


From 83f233b27ea4fdd5e9b16685af5c55eab8b0d295 Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Thu, 24 Jul 2008 13:59:50 +0000
Subject: Bugfix for visual glitch when using TMW server

---
 ChangeLog                | 5 +++++
 src/net/beinghandler.cpp | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 6fe89c17..907993d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-24  Lloyd Bryant ("Sanga")  <lloyd_bryant@netzero.net>
+
+	* Tweak in net/beinghandler.cpp to compensate for a visual
+	  bug when using the TMW server.
+
 2008-07-23  Lloyd Bryant ("Sanga")	<lloyd_bryant@netzero.net>
 
 	* Added support for capes/misc1/misc2 into the character
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 048b7428..00053083 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -419,7 +419,9 @@ void BeingHandler::handleMessage(MessageIn *msg)
             dstBeing->setSprite(Being::TOPCLOTHES_SPRITE, headMid);
             dstBeing->setSprite(Being::HAT_SPRITE, headTop);
             dstBeing->setSprite(Being::SHOE_SPRITE, shoes);
-            dstBeing->setSprite(Being::GLOVES_SPRITE, gloves);
+            // Compensation for the unpatched TMW server
+            if (gloves > 10)
+                dstBeing->setSprite(Being::GLOVES_SPRITE, gloves);
             dstBeing->setSprite(Being::CAPE_SPRITE, cape);
             dstBeing->setSprite(Being::MISC1_SPRITE, misc1);
             dstBeing->setSprite(Being::MISC2_SPRITE, misc2);
-- 
cgit v1.2.3-70-g09d2


From b7bc2f74f4f2253bd67b2d51fa3d2c47d648453e Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Fri, 25 Jul 2008 17:00:48 +0000
Subject: Applied patch by ElvenProgrammer to remember window locations between
 sessions

---
 ChangeLog                      |  5 +++++
 src/game.cpp                   | 13 +++++++++----
 src/gui/buy.cpp                |  1 +
 src/gui/itemshortcutwindow.cpp |  2 +-
 src/gui/sell.cpp               |  1 +
 src/gui/window.cpp             |  2 ++
 6 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 907993d9..6ca075b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-25  Lloyd Bryant ("Sanga")	<lloyd_bryant@netzero.net>
+
+	* Added feature to remember window locations from one 
+	  session to the next (patch from TMW by ElvenProgrammer)
+
 2008-07-24  Lloyd Bryant ("Sanga")  <lloyd_bryant@netzero.net>
 
 	* Tweak in net/beinghandler.cpp to compensate for a visual
diff --git a/src/game.cpp b/src/game.cpp
index 070cab52..2522c6e5 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -215,10 +215,15 @@ void createGuiWindows(Network *network)
     //buddyWindow->setPosition(10, minimap->getHeight() + 30);
 
     // Set initial window visibility
-    chatWindow->setVisible(true);
-    miniStatusWindow->setVisible(true);
-    menuWindow->setVisible(true);
-    itemShortcutWindow->setVisible(true);
+    chatWindow->setVisible((bool) config.getValue(
+        chatWindow->getWindowName() + "Visible", true));
+    miniStatusWindow->setVisible((bool) config.getValue(
+        miniStatusWindow->getWindowName() + "Visible",
+        true));
+    menuWindow->setVisible((bool) config.getValue(
+        menuWindow->getWindowName() + "Visible", true));
+    itemShortcutWindow->setVisible((bool) config.getValue(
+        itemShortcutWindow->getWindowName() + "Visible", true));
 
     if (config.getValue("logToChat", 0))
     {
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 24acf2d1..0e48ea29 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -42,6 +42,7 @@ BuyDialog::BuyDialog(Network *network):
     Window("Buy"), mNetwork(network),
     mMoney(0), mAmountItems(0), mMaxItems(0)
 {
+    setWindowName("Buy");
     setResizable(true);
     setMinWidth(260);
     setMinHeight(230);
diff --git a/src/gui/itemshortcutwindow.cpp b/src/gui/itemshortcutwindow.cpp
index 31f3bf4e..394fcbb7 100644
--- a/src/gui/itemshortcutwindow.cpp
+++ b/src/gui/itemshortcutwindow.cpp
@@ -30,7 +30,7 @@ static const int SCROLL_PADDING = 0;
 
 ItemShortcutWindow::ItemShortcutWindow()
 {
-    setWindowName("itemShortcut");
+    setWindowName("ItemShortcut");
     // no title presented, title bar is padding so window can be moved.
     gcn::Window::setTitleBarHeight(gcn::Window::getPadding());
     setShowTitle(false);
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 5f64fcea..9fed52f3 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -48,6 +48,7 @@ SellDialog::SellDialog(Network *network):
     mNetwork(network),
     mMaxItems(0), mAmountItems(0)
 {
+    setWindowName("Sell");
     setResizable(true);
     setMinWidth(260);
     setMinHeight(230);
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 4f94b3fb..55dac5e0 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -137,6 +137,7 @@ Window::~Window()
     // Saving X, Y and Width and Height for resizables in the config
     config.setValue(name + "WinX", getX());
     config.setValue(name + "WinY", getY());
+    config.setValue(name + "Visible", isVisible());
 
     if (mGrip)
     {
@@ -476,6 +477,7 @@ Window::loadWindowState()
 
     setPosition((int) config.getValue(name + "WinX", mDefaultX),
                 (int) config.getValue(name + "WinY", mDefaultY));
+    setVisible((bool) config.getValue(name + "Visible", false));
 
     if (mGrip)
     {
-- 
cgit v1.2.3-70-g09d2


From 0287bf686f04b9aecd5e7c719a153a01313e69d9 Mon Sep 17 00:00:00 2001
From: Douglas Boffey <DougABoffey@netscape.net>
Date: Sun, 27 Jul 2008 18:48:35 +0000
Subject: Changed files to tme

---
 AUTHORS                             |   19 +
 CMakeLists.txt                      |    4 +-
 INSTALL                             |   30 +-
 ManaExperiment.vcproj               |  876 +++++++++++
 ManaWorld.vcproj                    |  876 -----------
 README                              |    6 +-
 The Mana Experiment.dev             | 2859 ++++++++++++++++++++++++++++++++++
 The Mana World.dev                  | 2869 -----------------------------------
 configure.ac                        |    6 +-
 data/Makefile.am                    |    2 +-
 data/icons/Makefile.am              |    6 +-
 data/icons/The Mana Experiment.icns |  Bin 0 -> 65136 bytes
 data/icons/The Mana World.icns      |  Bin 65136 -> 0 bytes
 data/icons/tme.ico                  |  Bin 0 -> 22382 bytes
 data/icons/tme.png                  |  Bin 0 -> 18176 bytes
 data/icons/tme.xpm                  |  784 ++++++++++
 data/icons/tmw.ico                  |  Bin 22382 -> 0 bytes
 data/icons/tmw.png                  |  Bin 18176 -> 0 bytes
 data/icons/tmw.xpm                  |  784 ----------
 debian/control                      |   10 +-
 debian/rules                        |    2 +-
 debian/tme-data.install             |    5 +
 debian/tme.docs                     |    6 +
 debian/tme.install                  |    5 +
 debian/tme.menu                     |    4 +
 debian/tme.sgml                     |  149 ++
 debian/tme.xpm                      |  776 ++++++++++
 debian/tmw-data.install             |    5 -
 debian/tmw.desktop                  |   15 -
 debian/tmw.docs                     |    6 -
 debian/tmw.install                  |    5 -
 debian/tmw.menu                     |    4 -
 debian/tmw.sgml                     |  149 --
 debian/tmw.xpm                      |  776 ----------
 docs/FAQ.txt                        |   27 +-
 docs/HACKING.txt                    |    6 +-
 docs/INSTALL/debian.txt             |   30 +-
 docs/INSTALL/win32.txt              |   40 +-
 docs/Makefile.am                    |    4 +-
 docs/SOURCE/tme.doxcfg              | 1153 ++++++++++++++
 docs/SOURCE/tmedox.sh               |    1 +
 docs/SOURCE/tmw.doxcfg              | 1153 --------------
 docs/SOURCE/tmwdox.sh               |    1 -
 docs/packages.txt                   |   34 +-
 docs/sounddev.txt                   |   10 +-
 docs/win32-release.txt              |    8 +-
 src/CMakeLists.txt                  |   10 +-
 src/Makefile.am                     |   18 +-
 src/main.cpp                        |   29 +-
 src/main.h                          |    4 +-
 src/resources/resourcemanager.cpp   |    6 +-
 src/tme.rc                          |   23 +
 src/tmw.rc                          |   23 -
 tme.cbp                             |  383 +++++
 tmw.cbp                             |  364 -----
 55 files changed, 7184 insertions(+), 7181 deletions(-)
 create mode 100644 ManaExperiment.vcproj
 delete mode 100644 ManaWorld.vcproj
 create mode 100644 The Mana Experiment.dev
 delete mode 100644 The Mana World.dev
 create mode 100644 data/icons/The Mana Experiment.icns
 delete mode 100644 data/icons/The Mana World.icns
 create mode 100644 data/icons/tme.ico
 create mode 100644 data/icons/tme.png
 create mode 100644 data/icons/tme.xpm
 delete mode 100644 data/icons/tmw.ico
 delete mode 100644 data/icons/tmw.png
 delete mode 100644 data/icons/tmw.xpm
 create mode 100644 debian/tme-data.install
 create mode 100644 debian/tme.docs
 create mode 100644 debian/tme.install
 create mode 100644 debian/tme.menu
 create mode 100644 debian/tme.sgml
 create mode 100644 debian/tme.xpm
 delete mode 100644 debian/tmw-data.install
 delete mode 100644 debian/tmw.desktop
 delete mode 100644 debian/tmw.docs
 delete mode 100644 debian/tmw.install
 delete mode 100644 debian/tmw.menu
 delete mode 100644 debian/tmw.sgml
 delete mode 100644 debian/tmw.xpm
 create mode 100644 docs/SOURCE/tme.doxcfg
 create mode 100644 docs/SOURCE/tmedox.sh
 delete mode 100644 docs/SOURCE/tmw.doxcfg
 delete mode 100644 docs/SOURCE/tmwdox.sh
 create mode 100644 src/tme.rc
 delete mode 100644 src/tmw.rc
 create mode 100644 tme.cbp
 delete mode 100644 tmw.cbp

diff --git a/AUTHORS b/AUTHORS
index 19d28884..d3349490 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,22 @@
+---------------------------
+The Mana xperiment Dev Team
+---------------------------
+
+ Blameu aka Kevin Day (blame582@gmail.com)
+
+== Programmers ==
+
+ Sanga            
+ Scraggy          
+ Kraant
+
+== Artists ==
+
+
+== Map Designers ==
+
+ Ichigo Black
+
 -----------------------
 The Mana World Dev Team
 -----------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13399ef9..8181f6b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(TMW)
+PROJECT(TME)
 
 SET(VERSION 0.0.24.1)
 
@@ -18,4 +18,4 @@ ENDIF (WIN32)
 ADD_SUBDIRECTORY(data)
 ADD_SUBDIRECTORY(src)
 
-INSTALL(FILES tmw.desktop DESTINATION share/applications)
+INSTALL(FILES tme.desktop DESTINATION share/applications)
diff --git a/INSTALL b/INSTALL
index 81c2d148..aeb81213 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,20 +1,20 @@
-How to compile and run TMW on your GNU/Linux Box
+How to compile and run TME on your GNU/Linux Box
 ================================================
 
-Homepage:  http://themanaworld.org/
-IRC:       irc.freenode.net / #themanaworld
+Homepage:  http://209.168.213.109/
+IRC:       irc.freenode.net / #themanaexperiment
 
 1) Requirements
-2) Compiling The Mana World
+2) Compiling The Mana Experiment
 3) Notes
 
 
 1. Requirements
 ===============
 
-You are expected to have either checked out TMW from CVS or you have downloaded
-a source release. To get The Mana World to compile, you need a compiler (GCC)
-and some libraries. The required libraries are:
+You are expected to have either checked out TME from CVS or you have downloaded
+a source release. To get The Mana Experiment to compile, you need a compiler
+(GCC) and some libraries. The required libraries are:
 
 * SDL               http://www.libsdl.org/
 * SDL_mixer         http://www.libsdl.org/projects/SDL_mixer/
@@ -26,7 +26,7 @@ and some libraries. The required libraries are:
 * zlib 1.2.x        http://www.gzip.org/zlib/
 * libcurl           http://curl.haxx.se/libcurl/
 
-If you checked TMW out from Subversion you will also need these tools to
+If you checked TME out from Subversion you will also need these tools to
 compile:
 
 * GNU automake 1.9  http://www.gnu.org/software/automake/
@@ -36,8 +36,8 @@ Installing these dependencies is distributions-specific, and we'll leave it to
 you to figure this out.
 
 
-2. Compiling And Installing The Mana World
-==========================================
+2. Compiling And Installing The Mana Experiment
+===============================================
 
 1) Go to the directory you have extracted the source to.
 2) If you checked out from SVN, run "./autogen.sh" to generate configure.
@@ -45,12 +45,12 @@ you to figure this out.
 4) Run "make"
 5) Run "make install" as root
 
-It should have installed The Mana World on your system now, and you can run it
-with "tmw". By default all files are installed to /usr/local, you can pass a
-different prefix to configure as usual.
+It should have installed The Mana Experiment on your system now, and you can
+run it with "tme". By default all files are installed to /usr/local, you can
+pass a different prefix to configure as usual.
 
 
-  NOTE: It is possible to compile TMW without support for OpenGL rendering.
+  NOTE: It is possible to compile TME without support for OpenGL rendering.
   To do this perform step 3 as follows:
 
     ./configure --without-opengl
@@ -64,4 +64,4 @@ different prefix to configure as usual.
 If you have any problems, you are welcome to post your questions on our forums,
 or talk about them in our IRC channel.
 
-- The Mana World Dev Team
+- The Mana Experiment Dev Team
diff --git a/ManaExperiment.vcproj b/ManaExperiment.vcproj
new file mode 100644
index 00000000..6612e1a1
--- /dev/null
+++ b/ManaExperiment.vcproj
@@ -0,0 +1,876 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="ManaExperiment"
+	ProjectGUID="{DE31E83E-62BD-460E-8E6A-648CF98CC5A4}"
+	RootNamespace="ManaExperimet"
+	Keyword="Win32Proj"
+	SignManifests="true"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="physfs.lib sdl.lib sdlmain.lib sdl_image.lib sdl_mixer.lib guichan.lib guichan_sdl.lib ws2_32.lib libxml2.lib iconv.lib zlib.lib libcurl.lib"
+				OutputFile="$(OutDir)/ManaExperiment.exe"
+				LinkIncremental="2"
+				IgnoreDefaultLibraryNames="libc.lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/ManaExperiment.pdb"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;D:\Programming\Libraries\LibXml\libxml2-2.6.17.win32\lib&quot;;&quot;D:\Programming\Libraries\LibXml\libxml2-2.6.17.win32\include&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="physfs.lib alleg.lib guichan.lib guichan_sdl.lib sdl.lib sdlmain.lib sdl_mixer.lib sdl_image.lib ws2_32.lib libxml2.lib iconv.lib zlib.lib libcurl.lib"
+				OutputFile="tmw.exe"
+				LinkIncremental="1"
+				IgnoreDefaultLibraryNames="LIBC.lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Profile|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC71.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				RuntimeLibrary="2"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="SDL.lib"
+				AdditionalDependencies="allp.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\src\base64.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\base64.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\being.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\being.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\configuration.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\configuration.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\engine.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\engine.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\floor_item.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\floor_item.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\game.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\game.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\graphics.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\graphics.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\log.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\log.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\main.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\main.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\map.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\map.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\sound.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\sound.h"
+				>
+			</File>
+			<Filter
+				Name="graphic"
+				>
+				<File
+					RelativePath=".\src\graphic\spriteset.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\graphic\spriteset.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="net"
+				>
+				<File
+					RelativePath=".\src\net\network.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\network.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\protocol.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\protocol.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\win2linux.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\win2mac.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\win2mac.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="gui"
+				>
+				<File
+					RelativePath=".\src\gui\box.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\box.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\browserbox.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\browserbox.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\buddywindow.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\buddywindow.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\button.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\button.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\buy.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\buy.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\buysell.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\buysell.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\char_select.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\char_select.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\char_server.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\char_server.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\chargedialog.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\chargedialog.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\chat.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\chat.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\chatinput.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\chatinput.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\checkbox.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\checkbox.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\confirm_dialog.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\confirm_dialog.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\equipment.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\equipment.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\focushandler.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\focushandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\gui.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\gui.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\hbox.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\hbox.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\help.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\help.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\inttextbox.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\inttextbox.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\inventory.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\inventory.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\item_amount.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\item_amount.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\itemcontainer.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\itemcontainer.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\linkhandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\listbox.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\listbox.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\login.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\login.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\minimap.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\minimap.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\newskill.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\newskill.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\npc.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\npc.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\npc_text.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\npc_text.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\ok_dialog.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\ok_dialog.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\passwordfield.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\passwordfield.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\playerbox.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\playerbox.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\popupmenu.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\popupmenu.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\progressbar.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\progressbar.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\radiobutton.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\radiobutton.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\requesttrade.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\requesttrade.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\scrollarea.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\scrollarea.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\sell.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\sell.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\setup.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\setup.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\shop.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\shop.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\skill.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\skill.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\slider.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\slider.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\stats.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\stats.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\status.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\status.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\textbox.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\textbox.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\textfield.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\textfield.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\trade.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\trade.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\updatewindow.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\updatewindow.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\vbox.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\vbox.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\window.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\window.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\windowcontainer.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\windowcontainer.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="resources"
+				>
+				<File
+					RelativePath=".\src\resources\buddylist.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\buddylist.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\image.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\image.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\iteminfo.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\iteminfo.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\itemmanager.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\itemmanager.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\mapreader.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\mapreader.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\music.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\music.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\resource.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\resource.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\resourcemanager.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\resourcemanager.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\soundeffect.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\soundeffect.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/ManaWorld.vcproj b/ManaWorld.vcproj
deleted file mode 100644
index 478a345c..00000000
--- a/ManaWorld.vcproj
+++ /dev/null
@@ -1,876 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="ManaWorld"
-	ProjectGUID="{DE31E83E-62BD-460E-8E6A-648CF98CC5A4}"
-	RootNamespace="ManaWorld"
-	Keyword="Win32Proj"
-	SignManifests="true"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="physfs.lib sdl.lib sdlmain.lib sdl_image.lib sdl_mixer.lib guichan.lib guichan_sdl.lib ws2_32.lib libxml2.lib iconv.lib zlib.lib libcurl.lib"
-				OutputFile="$(OutDir)/ManaWorld.exe"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="libc.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/ManaWorld.pdb"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;D:\Programming\Libraries\LibXml\libxml2-2.6.17.win32\lib&quot;;&quot;D:\Programming\Libraries\LibXml\libxml2-2.6.17.win32\include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="physfs.lib alleg.lib guichan.lib guichan_sdl.lib sdl.lib sdlmain.lib sdl_mixer.lib sdl_image.lib ws2_32.lib libxml2.lib iconv.lib zlib.lib libcurl.lib"
-				OutputFile="tmw.exe"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="LIBC.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Profile|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC71.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				RuntimeLibrary="2"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="SDL.lib"
-				AdditionalDependencies="allp.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\src\base64.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\base64.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\being.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\being.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\configuration.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\configuration.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\engine.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\engine.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\floor_item.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\floor_item.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\game.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\game.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\graphics.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\graphics.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\log.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\log.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\main.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\main.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\map.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\map.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\sound.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\sound.h"
-				>
-			</File>
-			<Filter
-				Name="graphic"
-				>
-				<File
-					RelativePath=".\src\graphic\spriteset.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\graphic\spriteset.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="net"
-				>
-				<File
-					RelativePath=".\src\net\network.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\net\network.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\net\protocol.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\net\protocol.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\net\win2linux.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\net\win2mac.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\net\win2mac.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="gui"
-				>
-				<File
-					RelativePath=".\src\gui\box.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\box.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\browserbox.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\browserbox.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\buddywindow.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\buddywindow.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\button.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\button.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\buy.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\buy.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\buysell.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\buysell.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\char_select.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\char_select.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\char_server.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\char_server.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\chargedialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\chargedialog.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\chat.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\chat.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\chatinput.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\chatinput.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\checkbox.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\checkbox.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\confirm_dialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\confirm_dialog.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\equipment.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\equipment.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\focushandler.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\focushandler.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\gui.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\gui.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\hbox.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\hbox.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\help.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\help.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\inttextbox.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\inttextbox.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\inventory.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\inventory.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\item_amount.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\item_amount.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\itemcontainer.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\itemcontainer.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\linkhandler.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\listbox.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\listbox.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\login.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\login.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\minimap.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\minimap.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\newskill.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\newskill.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\npc.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\npc.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\npc_text.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\npc_text.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\ok_dialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\ok_dialog.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\passwordfield.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\passwordfield.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\playerbox.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\playerbox.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\popupmenu.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\popupmenu.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\progressbar.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\progressbar.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\radiobutton.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\radiobutton.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\requesttrade.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\requesttrade.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\scrollarea.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\scrollarea.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\sell.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\sell.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\setup.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\setup.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\shop.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\shop.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\skill.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\skill.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\slider.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\slider.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\stats.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\stats.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\status.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\status.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\textbox.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\textbox.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\textfield.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\textfield.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\trade.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\trade.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\updatewindow.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\updatewindow.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\vbox.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\vbox.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\window.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\window.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\windowcontainer.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\windowcontainer.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="resources"
-				>
-				<File
-					RelativePath=".\src\resources\buddylist.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\buddylist.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\image.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\image.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\iteminfo.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\iteminfo.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\itemmanager.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\itemmanager.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\mapreader.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\mapreader.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\music.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\music.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\resource.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\resource.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\resourcemanager.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\resourcemanager.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\soundeffect.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\soundeffect.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/README b/README
index 98772d58..88da7d97 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-THE MANA WORLD
-==============
+THE MANA EXPERIMENT
+===================
 
  Version: 0.0.24.1    Date: 7/4/2007
 
@@ -122,7 +122,7 @@ level 10: enables not used
 If you're having troubles, please first of all read the FAQ.
 If you can't find a solution to your problem, feel free to check our
 Bugs/Support section of the forum:
-- http://216.139.126.36/forums
+- http://209.168.213.109/forums
 or come visit us on our IRC channel:
 - #themanaexperiment @ irc.freenode.net
 
diff --git a/The Mana Experiment.dev b/The Mana Experiment.dev
new file mode 100644
index 00000000..0a0acf8a
--- /dev/null
+++ b/The Mana Experiment.dev	
@@ -0,0 +1,2859 @@
+[Project]
+FileName=The Mana Experiment.dev
+Name=tme
+UnitCount=277
+Type=0
+Ver=1
+ObjFiles=
+Includes=
+Libs=
+PrivateResource=The_Mana_Experiment_private.rc
+ResourceIncludes=
+MakeIncludes=
+Compiler=
+CppCompiler=-DUSE_OPENGL_@@_-Wall_@@_
+Linker=-lguichan_@@_-lguichan_sdl_@@_-lguichan_opengl_@@_-lwsock32_@@_-lSDL_image.dll_@@_-lSDL_mixer.dll_@@_-lSDL_net.dll_@@_-lmingw32_@@_-lSDLmain_@@_-lSDL.dll_@@_-lxml2.dll_@@_-lopengl32_@@_-lpng12.dll_@@_-lz.dll_@@_-lphysfs_@@_-lcurl.dll_@@_
+IsCpp=1
+Icon=
+ExeOutput=
+ObjectOutput=obj
+OverrideOutput=1
+OverrideOutputName=tme.exe
+HostApplication=
+Folders=gui,gui/header,gui/source,header,header/widgets,net,net/header,net/source,resources,utils
+CommandLine=
+UseCustomMakefile=0
+CustomMakefile=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=0010001001000001001101
+
+[VersionInfo]
+Major=0
+Minor=0
+Release=0
+Build=0
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=
+FileDescription=
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=
+AutoIncBuildNr=0
+
+[Unit8]
+FileName=src\floor_item.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit13]
+FileName=src\graphics.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit17]
+FileName=src\main.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit25]
+FileName=src\gui\button.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit29]
+FileName=src\gui\buysell.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit30]
+FileName=src\gui\char_select.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit32]
+FileName=src\gui\char_server.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit6]
+FileName=src\engine.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit7]
+FileName=src\engine.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit3]
+FileName=src\being.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit4]
+FileName=src\configuration.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit5]
+FileName=src\configuration.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit14]
+FileName=src\log.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit43]
+FileName=src\gui\confirm_dialog.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit44]
+FileName=src\gui\equipmentwindow.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit46]
+FileName=src\gui\gui.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit45]
+FileName=src\gui\equipmentwindow.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit49]
+FileName=src\gui\item_amount.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit50]
+FileName=src\gui\itemcontainer.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit55]
+FileName=src\gui\minimap.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit56]
+FileName=src\gui\npc_text.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit60]
+FileName=src\gui\passwordfield.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit69]
+FileName=src\gui\scrollarea.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit70]
+FileName=src\gui\sell.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit71]
+FileName=src\gui\sell.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit72]
+FileName=src\gui\setup.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit73]
+FileName=src\gui\setup.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit74]
+FileName=src\gui\shop.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit41]
+FileName=src\gui\checkbox.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit77]
+FileName=src\gui\skill.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit78]
+FileName=src\gui\slider.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit79]
+FileName=src\gui\slider.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit80]
+FileName=src\gui\status.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit81]
+FileName=src\gui\status.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit82]
+FileName=src\gui\textbox.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit84]
+FileName=src\gui\textfield.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit85]
+FileName=src\gui\textfield.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit86]
+FileName=src\gui\trade.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit89]
+FileName=src\gui\window.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit90]
+FileName=src\gui\windowcontainer.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit91]
+FileName=src\net\network.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit92]
+FileName=src\net\network.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit93]
+FileName=src\net\protocol.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit94]
+FileName=src\net\protocol.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit95]
+FileName=src\resources\soundeffect.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit96]
+FileName=src\resources\buddylist.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit42]
+FileName=src\gui\confirm_dialog.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit97]
+FileName=src\resources\buddylist.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit98]
+FileName=src\resources\image.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit99]
+FileName=src\resources\image.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit100]
+FileName=src\resources\iteminfo.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit101]
+FileName=src\resources\mapreader.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit102]
+FileName=src\resources\mapreader.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit103]
+FileName=src\resources\music.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit104]
+FileName=src\resources\music.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit106]
+FileName=src\resources\resource.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit109]
+FileName=src\resources\soundeffect.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit113]
+FileName=src\gui\item_amount.h
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit111]
+FileName=src\gui\help.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit112]
+FileName=src\gui\inttextbox.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit113]
+FileName=src\gui\inttextbox.h
+CompileCpp=1
+Folder=gui/header
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+Compile=1
+
+[Unit114]
+FileName=src\gui\focushandler.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit115]
+FileName=src\gui\focushandler.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit116]
+FileName=src\gui\popupmenu.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit117]
+FileName=src\gui\popupmenu.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit118]
+FileName=src\gui\browserbox.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit119]
+FileName=src\gui\browserbox.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit120]
+FileName=src\gui\updatewindow.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit121]
+FileName=src\gui\updatewindow.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit122]
+FileName=src\gui\box.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit124]
+FileName=src\item.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit125]
+FileName=src\equipment.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit126]
+FileName=src\equipment.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit127]
+FileName=src\item.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit128]
+FileName=src\gui\inventorywindow.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit1]
+FileName=src\sound.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit2]
+FileName=src\being.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit9]
+FileName=src\floor_item.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit10]
+FileName=src\game.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit11]
+FileName=src\game.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit12]
+FileName=src\graphics.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit15]
+FileName=src\log.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit16]
+FileName=src\main.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit18]
+FileName=src\map.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit19]
+FileName=src\map.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit20]
+FileName=src\sound.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit21]
+FileName=src\gui\windowcontainer.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit23]
+FileName=src\gui\buddywindow.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit24]
+FileName=src\gui\button.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit26]
+FileName=src\gui\buy.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit27]
+FileName=src\gui\buy.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit28]
+FileName=src\gui\buysell.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit31]
+FileName=src\gui\char_select.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit33]
+FileName=src\gui\char_server.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit34]
+FileName=src\gui\chargedialog.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit35]
+FileName=src\gui\chargedialog.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit36]
+FileName=src\gui\chat.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit37]
+FileName=src\gui\chat.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit38]
+FileName=src\gui\chatinput.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit39]
+FileName=src\gui\chatinput.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit40]
+FileName=src\gui\checkbox.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit47]
+FileName=src\gui\gui.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit48]
+FileName=src\gui\item_amount.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit51]
+FileName=src\gui\itemcontainer.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit53]
+FileName=src\gui\listbox.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit54]
+FileName=src\gui\minimap.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit57]
+FileName=src\gui\npc_text.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit61]
+FileName=src\gui\passwordfield.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit63]
+FileName=src\gui\playerbox.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit64]
+FileName=src\gui\progressbar.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit65]
+FileName=src\gui\progressbar.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit66]
+FileName=src\gui\radiobutton.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit67]
+FileName=src\gui\radiobutton.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit68]
+FileName=src\gui\scrollarea.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit75]
+FileName=src\gui\shop.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit76]
+FileName=src\gui\skill.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit83]
+FileName=src\gui\textbox.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit87]
+FileName=src\gui\trade.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit88]
+FileName=src\gui\window.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit107]
+FileName=src\resources\resourcemanager.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit108]
+FileName=src\resources\resourcemanager.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit123]
+FileName=src\gui\box.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit129]
+FileName=src\gui\inventorywindow.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit130]
+FileName=src\inventory.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit131]
+FileName=src\inventory.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit132]
+FileName=src\configlistener.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit133]
+FileName=src\guichanfwd.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit134]
+FileName=src\serverinfo.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit135]
+FileName=src\openglgraphics.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit138]
+FileName=src\gui\tabbedcontainer.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit139]
+FileName=src\net\messageout.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit140]
+FileName=src\net\messageout.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit141]
+FileName=src\net\messagein.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit142]
+FileName=src\net\messagein.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit143]
+FileName=src\gui\menuwindow.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit144]
+FileName=src\gui\menuwindow.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit145]
+FileName=src\gui\ministatus.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit146]
+FileName=src\gui\ministatus.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit147]
+FileName=src\resources\imagewriter.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit148]
+FileName=src\resources\imagewriter.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit149]
+FileName=src\gui\debugwindow.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit52]
+FileName=src\gui\listbox.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit150]
+FileName=src\gui\debugwindow.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit151]
+FileName=src\gui\connection.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit152]
+FileName=src\gui\connection.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit153]
+FileName=src\gui\gccontainer.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit154]
+FileName=src\gui\gccontainer.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit155]
+FileName=src\gui\login.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit156]
+FileName=src\gui\login.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit157]
+FileName=src\gui\register.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit158]
+FileName=src\gui\register.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit166]
+FileName=src\gui\npclistdialog.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit167]
+FileName=src\gui\npclistdialog.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit160]
+FileName=src\properties.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit161]
+FileName=src\sprite.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit105]
+FileName=src\resources\resource.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit110]
+FileName=src\gui\help.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit159]
+FileName=src\tileset.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit162]
+FileName=src\beingmanager.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit163]
+FileName=src\beingmanager.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit164]
+FileName=src\localplayer.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit165]
+FileName=src\localplayer.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit168]
+FileName=src\npc.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit169]
+FileName=src\npc.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit170]
+FileName=src\lockedarray.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit171]
+FileName=src\logindata.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit172]
+FileName=src\monster.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit173]
+FileName=src\monster.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit174]
+FileName=src\player.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit176]
+FileName=src\net\beinghandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit177]
+FileName=src\net\beinghandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit178]
+FileName=src\net\buysellhandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit136]
+FileName=src\openglgraphics.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit137]
+FileName=src\gui\tabbedcontainer.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit62]
+FileName=src\gui\playerbox.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit175]
+FileName=src\player.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit58]
+FileName=src\gui\ok_dialog.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit59]
+FileName=src\gui\ok_dialog.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit179]
+FileName=src\net\buysellhandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit180]
+FileName=src\net\charserverhandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit181]
+FileName=src\net\charserverhandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit182]
+FileName=src\net\chathandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit183]
+FileName=src\net\chathandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit184]
+FileName=src\net\equipmenthandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit185]
+FileName=src\net\equipmenthandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit186]
+FileName=src\net\inventoryhandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit187]
+FileName=src\net\inventoryhandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit188]
+FileName=src\net\itemhandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit189]
+FileName=src\net\itemhandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit190]
+FileName=src\net\loginhandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit191]
+FileName=src\net\loginhandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit192]
+FileName=src\net\maploginhandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit193]
+FileName=src\net\maploginhandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit194]
+FileName=src\net\messagehandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit195]
+FileName=src\net\messagehandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit196]
+FileName=src\net\npchandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit197]
+FileName=src\net\npchandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit198]
+FileName=src\net\playerhandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit199]
+FileName=src\net\playerhandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit200]
+FileName=src\net\skillhandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit201]
+FileName=src\net\skillhandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit202]
+FileName=src\net\tradehandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit203]
+FileName=src\net\tradehandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit204]
+FileName=src\joystick.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit205]
+FileName=src\flooritemmanager.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit206]
+FileName=src\flooritemmanager.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit207]
+FileName=src\joystick.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit208]
+FileName=src\gui\setup_video.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit209]
+FileName=src\gui\setup_audio.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit210]
+FileName=src\gui\setup_joystick.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit211]
+FileName=src\gui\setup_video.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit212]
+FileName=src\gui\setup_audio.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit213]
+FileName=src\gui\setup_joystick.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit214]
+FileName=src\gui\setuptab.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit215]
+FileName=src\utils\dtor.h
+CompileCpp=1
+Folder=utils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit216]
+FileName=src\utils\tostring.h
+CompileCpp=1
+Folder=utils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit217]
+FileName=src\tmw.rc
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit218]
+FileName=src\animatedsprite.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit219]
+FileName=src\animatedsprite.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit220]
+FileName=src\resources\iteminfo.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit221]
+FileName=src\resources\ambientoverlay.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit222]
+FileName=src\resources\ambientoverlay.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit223]
+FileName=src\gui\shoplistbox.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit224]
+FileName=src\gui\shoplistbox.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit225]
+FileName=src\utils\xml.cpp
+CompileCpp=1
+Folder=utils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit226]
+FileName=src\utils\xml.h
+CompileCpp=1
+Folder=utils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit227]
+FileName=src\resources\spritedef.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit228]
+FileName=src\resources\spritedef.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit229]
+FileName=src\resources\monsterdb.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit230]
+FileName=src\resources\monsterdb.h
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+CompileCpp=1
+
+[Unit231]
+FileName=src\resources\monsterinfo.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit232]
+FileName=src\resources\monsterinfo.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit233]
+FileName=src\resources\itemdb.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit234]
+FileName=src\resources\itemdb.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit235]
+FileName=src\gui\viewport.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit236]
+FileName=src\gui\viewport.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit237]
+FileName=src\winver.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit238]
+FileName=src\resources\action.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit239]
+FileName=src\resources\action.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit240]
+FileName=src\resources\animation.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit241]
+FileName=src\resources\animation.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit242]
+FileName=src\utils\base64.cpp
+CompileCpp=1
+Folder=utils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit243]
+FileName=src\utils\base64.h
+CompileCpp=1
+Folder=utils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit244]
+FileName=src\animationparticle.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit245]
+FileName=src\animationparticle.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit246]
+FileName=src\imageparticle.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit247]
+FileName=src\imageparticle.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit248]
+FileName=src\particle.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit249]
+FileName=src\particle.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit250]
+FileName=src\particleemitter.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit251]
+FileName=src\particleemitter.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit252]
+FileName=src\simpleanimation.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit253]
+FileName=src\simpleanimation.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit254]
+FileName=src\textparticle.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit255]
+FileName=src\textparticle.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit256]
+FileName=src\utils\fastsqrt.h
+CompileCpp=1
+Folder=utils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit257]
+FileName=src\utils\minmax.h
+CompileCpp=1
+Folder=utils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit258]
+FileName=src\resources\imageset.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit259]
+FileName=src\resources\imageset.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit260]
+FileName=src\gui\hbox.cpp
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit261]
+FileName=src\gui\hbox.h
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit262]
+FileName=src\gui\linkhandler.h
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit263]
+FileName=src\gui\newskill.cpp
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit264]
+FileName=src\gui\newskill.h
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit265]
+FileName=src\gui\selectionlistener.h
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit266]
+FileName=src\gui\vbox.cpp
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit267]
+FileName=src\gui\vbox.h
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit268]
+FileName=src\gui\widgets\resizegrip.cpp
+CompileCpp=1
+Folder=header/widgets
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit269]
+FileName=src\gui\widgets\resizegrip.h
+CompileCpp=1
+Folder=header/widgets
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit270]
+FileName=src\keyboardconfig.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit271]
+FileName=src\keyboardconfig.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit272]
+FileName=src\gui\setup_keyboard.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit273]
+FileName=src\gui\setup_keyboard.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit274]
+FileName=src\resources\imageloader.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit275]
+FileName=src\resources\imageloader.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit276]
+FileName=src\resources\dye.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit277]
+FileName=src\resources\dye.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit278]
+FileName=src\keyboardconfig.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit279]
+FileName=src\keyboardconfig.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit280]
+FileName=src\gui\setup_keyboard.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit281]
+FileName=src\gui\setup_keyboard.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
diff --git a/The Mana World.dev b/The Mana World.dev
deleted file mode 100644
index 76728f25..00000000
--- a/The Mana World.dev	
+++ /dev/null
@@ -1,2869 +0,0 @@
-[Project]
-FileName=The Mana World.dev
-Name=tmw
-UnitCount=277
-Type=0
-Ver=1
-ObjFiles=
-Includes=
-Libs=
-PrivateResource=The_Mana_World_private.rc
-ResourceIncludes=
-MakeIncludes=
-Compiler=
-CppCompiler=-DUSE_OPENGL_@@_-Wall_@@_
-Linker=-lguichan_@@_-lguichan_sdl_@@_-lguichan_opengl_@@_-lwsock32_@@_-lSDL_image.dll_@@_-lSDL_mixer.dll_@@_-lSDL_net.dll_@@_-lmingw32_@@_-lSDLmain_@@_-lSDL.dll_@@_-lxml2.dll_@@_-lopengl32_@@_-lpng12.dll_@@_-lz.dll_@@_-lphysfs_@@_-lcurl.dll_@@_
-IsCpp=1
-Icon=
-ExeOutput=
-ObjectOutput=obj
-OverrideOutput=1
-OverrideOutputName=tmw.exe
-HostApplication=
-Folders=gui,gui/header,gui/source,header,header/widgets,net,net/header,net/source,resources,utils
-CommandLine=
-UseCustomMakefile=0
-CustomMakefile=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=0010001001000001001101
-
-[VersionInfo]
-Major=0
-Minor=0
-Release=0
-Build=0
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=
-FileDescription=
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=
-AutoIncBuildNr=0
-
-[Unit8]
-FileName=src\floor_item.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit13]
-FileName=src\graphics.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit17]
-FileName=src\main.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit22]
-FileName=src\gui\buddywindow.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit25]
-FileName=src\gui\button.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit29]
-FileName=src\gui\buysell.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit30]
-FileName=src\gui\char_select.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit32]
-FileName=src\gui\char_server.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit6]
-FileName=src\engine.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit7]
-FileName=src\engine.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit3]
-FileName=src\being.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit4]
-FileName=src\configuration.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit5]
-FileName=src\configuration.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit14]
-FileName=src\log.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit43]
-FileName=src\gui\confirm_dialog.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit44]
-FileName=src\gui\equipmentwindow.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit46]
-FileName=src\gui\gui.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit45]
-FileName=src\gui\equipmentwindow.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit49]
-FileName=src\gui\item_amount.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit50]
-FileName=src\gui\itemcontainer.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit55]
-FileName=src\gui\minimap.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit56]
-FileName=src\gui\npc_text.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit60]
-FileName=src\gui\passwordfield.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit69]
-FileName=src\gui\scrollarea.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit70]
-FileName=src\gui\sell.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit71]
-FileName=src\gui\sell.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit72]
-FileName=src\gui\setup.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit73]
-FileName=src\gui\setup.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit74]
-FileName=src\gui\shop.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit41]
-FileName=src\gui\checkbox.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit77]
-FileName=src\gui\skill.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit78]
-FileName=src\gui\slider.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit79]
-FileName=src\gui\slider.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit80]
-FileName=src\gui\status.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit81]
-FileName=src\gui\status.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit82]
-FileName=src\gui\textbox.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit84]
-FileName=src\gui\textfield.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit85]
-FileName=src\gui\textfield.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit86]
-FileName=src\gui\trade.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit89]
-FileName=src\gui\window.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit90]
-FileName=src\gui\windowcontainer.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit91]
-FileName=src\net\network.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit92]
-FileName=src\net\network.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit93]
-FileName=src\net\protocol.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit94]
-FileName=src\net\protocol.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit95]
-FileName=src\resources\soundeffect.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit96]
-FileName=src\resources\buddylist.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit42]
-FileName=src\gui\confirm_dialog.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit97]
-FileName=src\resources\buddylist.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit98]
-FileName=src\resources\image.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit99]
-FileName=src\resources\image.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit100]
-FileName=src\resources\iteminfo.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit101]
-FileName=src\resources\mapreader.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit102]
-FileName=src\resources\mapreader.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit103]
-FileName=src\resources\music.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit104]
-FileName=src\resources\music.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit106]
-FileName=src\resources\resource.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit109]
-FileName=src\resources\soundeffect.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit113]
-FileName=src\gui\item_amount.h
-CompileCpp=1
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit111]
-FileName=src\gui\help.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit112]
-FileName=src\gui\inttextbox.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit113]
-FileName=src\gui\inttextbox.h
-CompileCpp=1
-Folder=gui/header
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-Compile=1
-
-[Unit114]
-FileName=src\gui\focushandler.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit115]
-FileName=src\gui\focushandler.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit116]
-FileName=src\gui\popupmenu.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit117]
-FileName=src\gui\popupmenu.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit118]
-FileName=src\gui\browserbox.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit119]
-FileName=src\gui\browserbox.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit120]
-FileName=src\gui\updatewindow.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit121]
-FileName=src\gui\updatewindow.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit122]
-FileName=src\gui\box.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit124]
-FileName=src\item.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit125]
-FileName=src\equipment.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit126]
-FileName=src\equipment.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit127]
-FileName=src\item.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit128]
-FileName=src\gui\inventorywindow.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit1]
-FileName=src\sound.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit2]
-FileName=src\being.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit9]
-FileName=src\floor_item.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit10]
-FileName=src\game.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit11]
-FileName=src\game.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit12]
-FileName=src\graphics.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit15]
-FileName=src\log.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit16]
-FileName=src\main.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit18]
-FileName=src\map.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit19]
-FileName=src\map.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit20]
-FileName=src\sound.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit21]
-FileName=src\gui\windowcontainer.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit23]
-FileName=src\gui\buddywindow.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit24]
-FileName=src\gui\button.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit26]
-FileName=src\gui\buy.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit27]
-FileName=src\gui\buy.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit28]
-FileName=src\gui\buysell.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit31]
-FileName=src\gui\char_select.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit33]
-FileName=src\gui\char_server.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit34]
-FileName=src\gui\chargedialog.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit35]
-FileName=src\gui\chargedialog.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit36]
-FileName=src\gui\chat.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit37]
-FileName=src\gui\chat.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit38]
-FileName=src\gui\chatinput.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit39]
-FileName=src\gui\chatinput.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit40]
-FileName=src\gui\checkbox.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit47]
-FileName=src\gui\gui.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit48]
-FileName=src\gui\item_amount.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit51]
-FileName=src\gui\itemcontainer.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit53]
-FileName=src\gui\listbox.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit54]
-FileName=src\gui\minimap.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit57]
-FileName=src\gui\npc_text.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit61]
-FileName=src\gui\passwordfield.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit63]
-FileName=src\gui\playerbox.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit64]
-FileName=src\gui\progressbar.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit65]
-FileName=src\gui\progressbar.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit66]
-FileName=src\gui\radiobutton.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit67]
-FileName=src\gui\radiobutton.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit68]
-FileName=src\gui\scrollarea.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit75]
-FileName=src\gui\shop.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit76]
-FileName=src\gui\skill.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit83]
-FileName=src\gui\textbox.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit87]
-FileName=src\gui\trade.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit88]
-FileName=src\gui\window.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit107]
-FileName=src\resources\resourcemanager.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit108]
-FileName=src\resources\resourcemanager.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit123]
-FileName=src\gui\box.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit129]
-FileName=src\gui\inventorywindow.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit130]
-FileName=src\inventory.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit131]
-FileName=src\inventory.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit132]
-FileName=src\configlistener.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit133]
-FileName=src\guichanfwd.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit134]
-FileName=src\serverinfo.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit135]
-FileName=src\openglgraphics.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit138]
-FileName=src\gui\tabbedcontainer.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit139]
-FileName=src\net\messageout.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit140]
-FileName=src\net\messageout.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit141]
-FileName=src\net\messagein.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit142]
-FileName=src\net\messagein.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit143]
-FileName=src\gui\menuwindow.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit144]
-FileName=src\gui\menuwindow.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit145]
-FileName=src\gui\ministatus.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit146]
-FileName=src\gui\ministatus.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit147]
-FileName=src\resources\imagewriter.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit148]
-FileName=src\resources\imagewriter.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit149]
-FileName=src\gui\debugwindow.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit52]
-FileName=src\gui\listbox.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit150]
-FileName=src\gui\debugwindow.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit151]
-FileName=src\gui\connection.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit152]
-FileName=src\gui\connection.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit153]
-FileName=src\gui\gccontainer.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit154]
-FileName=src\gui\gccontainer.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit155]
-FileName=src\gui\login.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit156]
-FileName=src\gui\login.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit157]
-FileName=src\gui\register.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit158]
-FileName=src\gui\register.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit166]
-FileName=src\gui\npclistdialog.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit167]
-FileName=src\gui\npclistdialog.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit160]
-FileName=src\properties.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit161]
-FileName=src\sprite.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit105]
-FileName=src\resources\resource.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit110]
-FileName=src\gui\help.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit159]
-FileName=src\tileset.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit162]
-FileName=src\beingmanager.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit163]
-FileName=src\beingmanager.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit164]
-FileName=src\localplayer.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit165]
-FileName=src\localplayer.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit168]
-FileName=src\npc.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit169]
-FileName=src\npc.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit170]
-FileName=src\lockedarray.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit171]
-FileName=src\logindata.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit172]
-FileName=src\monster.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit173]
-FileName=src\monster.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit174]
-FileName=src\player.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit176]
-FileName=src\net\beinghandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit177]
-FileName=src\net\beinghandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit178]
-FileName=src\net\buysellhandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit136]
-FileName=src\openglgraphics.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit137]
-FileName=src\gui\tabbedcontainer.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit62]
-FileName=src\gui\playerbox.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit175]
-FileName=src\player.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit58]
-FileName=src\gui\ok_dialog.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit59]
-FileName=src\gui\ok_dialog.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit179]
-FileName=src\net\buysellhandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit180]
-FileName=src\net\charserverhandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit181]
-FileName=src\net\charserverhandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit182]
-FileName=src\net\chathandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit183]
-FileName=src\net\chathandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit184]
-FileName=src\net\equipmenthandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit185]
-FileName=src\net\equipmenthandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit186]
-FileName=src\net\inventoryhandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit187]
-FileName=src\net\inventoryhandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit188]
-FileName=src\net\itemhandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit189]
-FileName=src\net\itemhandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit190]
-FileName=src\net\loginhandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit191]
-FileName=src\net\loginhandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit192]
-FileName=src\net\maploginhandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit193]
-FileName=src\net\maploginhandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit194]
-FileName=src\net\messagehandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit195]
-FileName=src\net\messagehandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit196]
-FileName=src\net\npchandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit197]
-FileName=src\net\npchandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit198]
-FileName=src\net\playerhandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit199]
-FileName=src\net\playerhandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit200]
-FileName=src\net\skillhandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit201]
-FileName=src\net\skillhandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit202]
-FileName=src\net\tradehandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit203]
-FileName=src\net\tradehandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit204]
-FileName=src\joystick.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit205]
-FileName=src\flooritemmanager.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit206]
-FileName=src\flooritemmanager.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit207]
-FileName=src\joystick.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit208]
-FileName=src\gui\setup_video.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit209]
-FileName=src\gui\setup_audio.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit210]
-FileName=src\gui\setup_joystick.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit211]
-FileName=src\gui\setup_video.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit212]
-FileName=src\gui\setup_audio.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit213]
-FileName=src\gui\setup_joystick.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit214]
-FileName=src\gui\setuptab.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit215]
-FileName=src\utils\dtor.h
-CompileCpp=1
-Folder=utils
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit216]
-FileName=src\utils\tostring.h
-CompileCpp=1
-Folder=utils
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit217]
-FileName=src\tmw.rc
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=0
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit218]
-FileName=src\animatedsprite.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit219]
-FileName=src\animatedsprite.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit220]
-FileName=src\resources\iteminfo.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit221]
-FileName=src\resources\ambientoverlay.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit222]
-FileName=src\resources\ambientoverlay.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit223]
-FileName=src\gui\shoplistbox.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit224]
-FileName=src\gui\shoplistbox.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit225]
-FileName=src\utils\xml.cpp
-CompileCpp=1
-Folder=utils
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit226]
-FileName=src\utils\xml.h
-CompileCpp=1
-Folder=utils
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit227]
-FileName=src\resources\spritedef.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit228]
-FileName=src\resources\spritedef.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit229]
-FileName=src\resources\monsterdb.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit230]
-FileName=src\resources\monsterdb.h
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-CompileCpp=1
-
-[Unit231]
-FileName=src\resources\monsterinfo.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit232]
-FileName=src\resources\monsterinfo.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit233]
-FileName=src\resources\itemdb.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit234]
-FileName=src\resources\itemdb.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit235]
-FileName=src\gui\viewport.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit236]
-FileName=src\gui\viewport.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit237]
-FileName=src\winver.h
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit238]
-FileName=src\resources\action.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit239]
-FileName=src\resources\action.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit240]
-FileName=src\resources\animation.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit241]
-FileName=src\resources\animation.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit242]
-FileName=src\utils\base64.cpp
-CompileCpp=1
-Folder=utils
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit243]
-FileName=src\utils\base64.h
-CompileCpp=1
-Folder=utils
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit244]
-FileName=src\animationparticle.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit245]
-FileName=src\animationparticle.h
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit246]
-FileName=src\imageparticle.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit247]
-FileName=src\imageparticle.h
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit248]
-FileName=src\particle.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit249]
-FileName=src\particle.h
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit250]
-FileName=src\particleemitter.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit251]
-FileName=src\particleemitter.h
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit252]
-FileName=src\simpleanimation.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit253]
-FileName=src\simpleanimation.h
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit254]
-FileName=src\textparticle.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit255]
-FileName=src\textparticle.h
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit256]
-FileName=src\utils\fastsqrt.h
-CompileCpp=1
-Folder=utils
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit257]
-FileName=src\utils\minmax.h
-CompileCpp=1
-Folder=utils
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit258]
-FileName=src\resources\imageset.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit259]
-FileName=src\resources\imageset.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit260]
-FileName=src\gui\hbox.cpp
-CompileCpp=1
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit261]
-FileName=src\gui\hbox.h
-CompileCpp=1
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit262]
-FileName=src\gui\linkhandler.h
-CompileCpp=1
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit263]
-FileName=src\gui\newskill.cpp
-CompileCpp=1
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit264]
-FileName=src\gui\newskill.h
-CompileCpp=1
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit265]
-FileName=src\gui\selectionlistener.h
-CompileCpp=1
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit266]
-FileName=src\gui\vbox.cpp
-CompileCpp=1
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit267]
-FileName=src\gui\vbox.h
-CompileCpp=1
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit268]
-FileName=src\gui\widgets\resizegrip.cpp
-CompileCpp=1
-Folder=header/widgets
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit269]
-FileName=src\gui\widgets\resizegrip.h
-CompileCpp=1
-Folder=header/widgets
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit270]
-FileName=src\keyboardconfig.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit271]
-FileName=src\keyboardconfig.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit272]
-FileName=src\gui\setup_keyboard.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit273]
-FileName=src\gui\setup_keyboard.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit274]
-FileName=src\resources\imageloader.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit275]
-FileName=src\resources\imageloader.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit276]
-FileName=src\resources\dye.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit277]
-FileName=src\resources\dye.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit278]
-FileName=src\keyboardconfig.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit279]
-FileName=src\keyboardconfig.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit280]
-FileName=src\gui\setup_keyboard.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit281]
-FileName=src\gui\setup_keyboard.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
diff --git a/configure.ac b/configure.ac
index b85683ff..dcc1eeeb 100755
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,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 tme should use an OpenGL display])
 fi
 
 # Search for sdl-config
@@ -92,10 +92,10 @@ if test -n "$LIBSDL_CONFIG"; then
   AC_SUBST(LIBSDL_CFLAGS)
 
   AC_DEFINE_UNQUOTED(HAVE_LIBSDL, 1,
-                     [Defines if your system has the LIBSDL library])
+		     [Defines if your system has the LIBSDL library])
 else
   AC_DEFINE_UNQUOTED(HAVE_LIBSDL, 0,
-                     [Defines if your system has the LIBSDL library])
+		     [Defines if your system has the LIBSDL library])
   AC_MSG_ERROR([Could not find sdl-config, check http://www.libsdl.org])
 fi
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 5a28f7c1..86ae612d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
 
 SUBDIRS = graphics help icons
 
-tmwdatadir = $(pkgdatadir)/data
+tmedatadir = $(pkgdatadir)/data
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 375edef7..5d7adee9 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,14 +1,14 @@
 
 iconsdir = $(pkgdatadir)/data/icons
 
-icons_DATA = tmw.png
+icons_DATA = tme.png
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
-	$(INSTALL) $(srcdir)/tmw.png $(DESTDIR)$(datadir)/pixmaps/tmw.png
+	$(INSTALL) $(srcdir)/tme.png $(DESTDIR)$(datadir)/pixmaps/tme.png
 
 uninstall-local:
-	rm -f $(DESTDIR)$(datadir)/pixmaps/tmw.png
+	rm -f $(DESTDIR)$(datadir)/pixmaps/tme.png
 
 EXTRA_DIST =		\
 	$(icons_DATA)
diff --git a/data/icons/The Mana Experiment.icns b/data/icons/The Mana Experiment.icns
new file mode 100644
index 00000000..7230a099
Binary files /dev/null and b/data/icons/The Mana Experiment.icns differ
diff --git a/data/icons/The Mana World.icns b/data/icons/The Mana World.icns
deleted file mode 100644
index 7230a099..00000000
Binary files a/data/icons/The Mana World.icns and /dev/null differ
diff --git a/data/icons/tme.ico b/data/icons/tme.ico
new file mode 100644
index 00000000..61d559a3
Binary files /dev/null and b/data/icons/tme.ico differ
diff --git a/data/icons/tme.png b/data/icons/tme.png
new file mode 100644
index 00000000..93e6c9ae
Binary files /dev/null and b/data/icons/tme.png differ
diff --git a/data/icons/tme.xpm b/data/icons/tme.xpm
new file mode 100644
index 00000000..06ec2865
--- /dev/null
+++ b/data/icons/tme.xpm
@@ -0,0 +1,784 @@
+/* XPM */
+static char * tmw_xpm[] = {
+"32 32 749 2",
+"  	c None",
+". 	c #E4EB6D",
+"+ 	c #EFF271",
+"@ 	c #E7EF65",
+"# 	c #DDED61",
+"$ 	c #D6E955",
+"% 	c #DAED4D",
+"& 	c #F6F5A0",
+"* 	c #EFEF89",
+"= 	c #ECF084",
+"- 	c #EDF077",
+"; 	c #EAF075",
+"> 	c #E0E960",
+", 	c #D9E757",
+"' 	c #D4EA52",
+") 	c #CFE74D",
+"! 	c #BEE140",
+"~ 	c #C2E43E",
+"{ 	c #B6DF33",
+"] 	c #F8F7C2",
+"^ 	c #F9F7AB",
+"/ 	c #F2F099",
+"( 	c #EEEF80",
+"_ 	c #F3F077",
+": 	c #F8F8B1",
+"< 	c #E8EE6F",
+"[ 	c #E1EB69",
+"} 	c #DBEB5E",
+"| 	c #D5E852",
+"1 	c #CDE445",
+"2 	c #CEE843",
+"3 	c #B6DC34",
+"4 	c #A9DA2F",
+"5 	c #B3E02F",
+"6 	c #B6E630",
+"7 	c #F1F2E2",
+"8 	c #F9F9D4",
+"9 	c #F9F8C5",
+"0 	c #F8F8CE",
+"a 	c #F9F8D6",
+"b 	c #F9F7CB",
+"c 	c #F9F7B1",
+"d 	c #F9F7A7",
+"e 	c #E7EE73",
+"f 	c #E4EC69",
+"g 	c #DEEB60",
+"h 	c #D8E755",
+"i 	c #D5EB55",
+"j 	c #C2E33F",
+"k 	c #BEE33C",
+"l 	c #B5E339",
+"m 	c #A7DF2E",
+"n 	c #9BDA28",
+"o 	c #95DA24",
+"p 	c #8DD724",
+"q 	c #F9F9F5",
+"r 	c #F9F9EA",
+"s 	c #F9F9E1",
+"t 	c #F9F9F4",
+"u 	c #F9F7DF",
+"v 	c #F9F7D1",
+"w 	c #F9F7C9",
+"x 	c #F9F7B6",
+"y 	c #F9F7AE",
+"z 	c #D7E363",
+"A 	c #E1EC6B",
+"B 	c #DDEC60",
+"C 	c #D8EC61",
+"D 	c #CDE552",
+"E 	c #C6E543",
+"F 	c #BCE440",
+"G 	c #BEE73E",
+"H 	c #ABDF30",
+"I 	c #ACE230",
+"J 	c #8FD720",
+"K 	c #80D01C",
+"L 	c #80D51A",
+"M 	c #F9F9F7",
+"N 	c #F9F9EB",
+"O 	c #F9F9F9",
+"P 	c #F9F7E6",
+"Q 	c #F9F7D3",
+"R 	c #F9F7CE",
+"S 	c #F9F7BF",
+"T 	c #F9F8B9",
+"U 	c #E6EF8F",
+"V 	c #E1EB65",
+"W 	c #E0ED63",
+"X 	c #D1E452",
+"Y 	c #D3E84D",
+"Z 	c #C3E340",
+"` 	c #BBE13E",
+" .	c #B0DD35",
+"..	c #ABDD2E",
+"+.	c #A0DB2A",
+"@.	c #95D923",
+"#.	c #7ED31C",
+"$.	c #7ED31A",
+"%.	c #80DA18",
+"&.	c #F4F3EF",
+"*.	c #F9F9F6",
+"=.	c #F9F8F5",
+"-.	c #F9F7EE",
+";.	c #F9F7E2",
+">.	c #F9F7D5",
+",.	c #F9F6C2",
+"'.	c #F8F69C",
+").	c #D4E56D",
+"!.	c #E4ED73",
+"~.	c #DBEA60",
+"{.	c #DDE961",
+"].	c #C9E54E",
+"^.	c #BFE242",
+"/.	c #BEE33E",
+"(.	c #B1DE34",
+"_.	c #ABDE33",
+":.	c #95D826",
+"<.	c #8DD620",
+"[.	c #8DDB20",
+"}.	c #91DD1E",
+"|.	c #71D116",
+"1.	c #50B910",
+"2.	c #F9F8F7",
+"3.	c #F9F8F4",
+"4.	c #F9F7EB",
+"5.	c #F9F7E1",
+"6.	c #F9F5CF",
+"7.	c #F9F6C9",
+"8.	c #F9F6BF",
+"9.	c #D6E471",
+"0.	c #E9F075",
+"a.	c #E3EC6B",
+"b.	c #D9E96D",
+"c.	c #CEE558",
+"d.	c #CBE44E",
+"e.	c #BEDE3E",
+"f.	c #ACDA37",
+"g.	c #BCE639",
+"h.	c #AEE135",
+"i.	c #9EDB2A",
+"j.	c #8FD822",
+"k.	c #7CD31B",
+"l.	c #82DA1C",
+"m.	c #63CE13",
+"n.	c #61CE12",
+"o.	c #F9F9F8",
+"p.	c #F9F7F5",
+"q.	c #F9F4DD",
+"r.	c #F9F5D7",
+"s.	c #F9F5C9",
+"t.	c #F9F5B6",
+"u.	c #E3ED8D",
+"v.	c #DEE865",
+"w.	c #E3ED6D",
+"x.	c #DDEB5E",
+"y.	c #D3E755",
+"z.	c #CAE349",
+"A.	c #CFEB4D",
+"B.	c #C1E33B",
+"C.	c #BCE743",
+"D.	c #B0E02D",
+"E.	c #95DB28",
+"F.	c #95DB26",
+"G.	c #C6E627",
+"H.	c #E8F433",
+"I.	c #CAED26",
+"J.	c #60CD0F",
+"K.	c #58CD0E",
+"L.	c #F9F7EC",
+"M.	c #F9F7F1",
+"N.	c #F9F4E4",
+"O.	c #F9F3D7",
+"P.	c #F9F3CA",
+"Q.	c #F9F5CA",
+"R.	c #F9F5BB",
+"S.	c #F9F8B6",
+"T.	c #F6F89E",
+"U.	c #DFEB5C",
+"V.	c #CEE453",
+"W.	c #D0E753",
+"X.	c #CDE543",
+"Y.	c #C7E842",
+"Z.	c #C1E53C",
+"`.	c #A7DC30",
+" +	c #E6F453",
+".+	c #E2F448",
+"++	c #D8F03C",
+"@+	c #D1ED2E",
+"#+	c #D0F033",
+"$+	c #CAED2C",
+"%+	c #ACE51F",
+"&+	c #55CF0F",
+"*+	c #F5F6EF",
+"=+	c #F9F9F2",
+"-+	c #F9F9F1",
+";+	c #F9F8F0",
+">+	c #F9F7E7",
+",+	c #F9F5F0",
+"'+	c #F9F3E1",
+")+	c #F9F5DB",
+"!+	c #F9F6DB",
+"~+	c #F9F6BE",
+"{+	c #F8F59B",
+"]+	c #F9F5A2",
+"^+	c #F8F68D",
+"/+	c #F7F689",
+"(+	c #D7EC65",
+"_+	c #CEE84E",
+":+	c #BBE23F",
+"<+	c #B6E238",
+"[+	c #A2DC30",
+"}+	c #EBF553",
+"|+	c #E4F443",
+"1+	c #DCF340",
+"2+	c #D4F033",
+"3+	c #CEEF2D",
+"4+	c #C2E926",
+"5+	c #BEEB20",
+"6+	c #5CD50E",
+"7+	c #53CE0D",
+"8+	c #F9F7D9",
+"9+	c #F9F6F2",
+"0+	c #F9F5EB",
+"a+	c #F9F3DA",
+"b+	c #F9F6DF",
+"c+	c #F9F7D0",
+"d+	c #F9F7C2",
+"e+	c #F9F7BB",
+"f+	c #F8F68F",
+"g+	c #F7F58D",
+"h+	c #F6F58B",
+"i+	c #EEF68B",
+"j+	c #BFDF43",
+"k+	c #B5DE37",
+"l+	c #B5E234",
+"m+	c #A7DD30",
+"n+	c #E7F248",
+"o+	c #D6EF40",
+"p+	c #DBF239",
+"q+	c #D0ED2F",
+"r+	c #C3EB2A",
+"s+	c #BCEB26",
+"t+	c #B5E81E",
+"u+	c #52CE0F",
+"v+	c #4ECB0B",
+"w+	c #F9F9D9",
+"x+	c #F9F9D7",
+"y+	c #F9F8F8",
+"z+	c #F9F7E9",
+"A+	c #F9F6E9",
+"B+	c #F9F5E0",
+"C+	c #F8F2D6",
+"D+	c #F9F3CE",
+"E+	c #F9F7CA",
+"F+	c #F9F8B5",
+"G+	c #F6F691",
+"H+	c #F9F699",
+"I+	c #F5F68F",
+"J+	c #F3F579",
+"K+	c #E8F575",
+"L+	c #C7E646",
+"M+	c #B5DF37",
+"N+	c #B9E438",
+"O+	c #9CD928",
+"P+	c #D7F348",
+"Q+	c #DBEF3B",
+"R+	c #D1EF35",
+"S+	c #D7F230",
+"T+	c #C1EA25",
+"U+	c #B5E91F",
+"V+	c #63DC1E",
+"W+	c #48CA0C",
+"X+	c #F4F4DC",
+"Y+	c #F9F9C3",
+"Z+	c #F9F9C5",
+"`+	c #F9F9C7",
+" @	c #F9F9E8",
+".@	c #F9F6DD",
+"+@	c #F9F6D6",
+"@@	c #F9F3C1",
+"#@	c #F9F3BF",
+"$@	c #F9F5B8",
+"%@	c #F8F8A6",
+"&@	c #F6F68F",
+"*@	c #F4F791",
+"=@	c #ABD746",
+"-@	c #C5E449",
+";@	c #C1E448",
+">@	c #BBE23E",
+",@	c #BBE237",
+"'@	c #A9DC30",
+")@	c #99D927",
+"!@	c #D3E32C",
+"~@	c #E2F340",
+"{@	c #D3ED2D",
+"]@	c #CAED2B",
+"^@	c #CDF028",
+"/@	c #C5EB27",
+"(@	c #B0E51C",
+"_@	c #91DC13",
+":@	c #49CA08",
+"<@	c #25B305",
+"[@	c #F5F6BE",
+"}@	c #F5F5A9",
+"|@	c #F3F4B0",
+"1@	c #F6F6B0",
+"2@	c #F7F8B5",
+"3@	c #EDF097",
+"4@	c #F5F18F",
+"5@	c #F9F7B8",
+"6@	c #F9F4B0",
+"7@	c #F9F3AE",
+"8@	c #F9F3A4",
+"9@	c #F9F7A4",
+"0@	c #F7F7A0",
+"a@	c #F5F682",
+"b@	c #D3E75E",
+"c@	c #CAE646",
+"d@	c #CBE846",
+"e@	c #EDF05A",
+"f@	c #C6E432",
+"g@	c #A9E02E",
+"h@	c #99DA27",
+"i@	c #B9DB20",
+"j@	c #E1F33F",
+"k@	c #CEEB2E",
+"l@	c #C7EB27",
+"m@	c #BBEA26",
+"n@	c #B9E722",
+"o@	c #A6DF19",
+"p@	c #ABE815",
+"q@	c #48CB09",
+"r@	c #3ECA08",
+"s@	c #F8F7A7",
+"t@	c #F3F4A0",
+"u@	c #F4F59C",
+"v@	c #F0F49C",
+"w@	c #F2F5A4",
+"x@	c #F5F6A0",
+"y@	c #EFF28F",
+"z@	c #F9F8CD",
+"A@	c #F9F6A7",
+"B@	c #F9F3A0",
+"C@	c #F8F399",
+"D@	c #F8F493",
+"E@	c #F8F693",
+"F@	c #F7F58B",
+"G@	c #E8EF65",
+"H@	c #C7E445",
+"I@	c #C7DB30",
+"J@	c #E1ED48",
+"K@	c #E8F353",
+"L@	c #C3E227",
+"M@	c #D9EB2E",
+"N@	c #E7F549",
+"O@	c #D3EE3B",
+"P@	c #CBED2D",
+"Q@	c #CDEF27",
+"R@	c #BFEC23",
+"S@	c #B6E81E",
+"T@	c #A9E518",
+"U@	c #B1EB1B",
+"V@	c #35BE06",
+"W@	c #38C306",
+"X@	c #F9F9A7",
+"Y@	c #F2F38F",
+"Z@	c #F2F495",
+"`@	c #F3F38D",
+" #	c #F9F9E9",
+".#	c #F7F8C5",
+"+#	c #F8F7D1",
+"@#	c #F8F6A2",
+"##	c #F9F7A9",
+"$#	c #F8F59C",
+"%#	c #F8F291",
+"&#	c #F8F58F",
+"*#	c #F6F789",
+"=#	c #F2F477",
+"-#	c #F0F571",
+";#	c #EAEE52",
+">#	c #DCEA45",
+",#	c #EBEF43",
+"'#	c #E4F04D",
+")#	c #DEEF45",
+"!#	c #E1F246",
+"~#	c #E4F448",
+"{#	c #DBF039",
+"]#	c #D9F235",
+"^#	c #C9ED2B",
+"/#	c #CAEF2C",
+"(#	c #CEF22B",
+"_#	c #B6E91E",
+":#	c #B1EB21",
+"<#	c #A9E815",
+"[#	c #48CF09",
+"}#	c #40CD06",
+"|#	c #EDEF6B",
+"1#	c #EBF07C",
+"2#	c #E7EB71",
+"3#	c #E8E865",
+"4#	c #F8F79E",
+"5#	c #F8F7A4",
+"6#	c #F9F69E",
+"7#	c #F8F48F",
+"8#	c #F6F280",
+"9#	c #F6F482",
+"0#	c #F3F473",
+"a#	c #EFF169",
+"b#	c #EDF467",
+"c#	c #EAF35C",
+"d#	c #EAF258",
+"e#	c #E4F052",
+"f#	c #E4F046",
+"g#	c #E0F03F",
+"h#	c #D5EE3B",
+"i#	c #DFF23E",
+"j#	c #D7F137",
+"k#	c #CEED2E",
+"l#	c #C9EF28",
+"m#	c #CAF025",
+"n#	c #B9EA1E",
+"o#	c #B3E91D",
+"p#	c #B1EB1A",
+"q#	c #A6E817",
+"r#	c #39C506",
+"s#	c #35C505",
+"t#	c #B3BC3E",
+"u#	c #E9F07C",
+"v#	c #DEE867",
+"w#	c #F9F79E",
+"x#	c #F8F793",
+"y#	c #F8F78F",
+"z#	c #F7F684",
+"A#	c #F5F27E",
+"B#	c #F4F26D",
+"C#	c #F4F36F",
+"D#	c #EDF061",
+"E#	c #EEF363",
+"F#	c #EDF35C",
+"G#	c #EEF45C",
+"H#	c #EAF357",
+"I#	c #E8F34B",
+"J#	c #DCEE43",
+"K#	c #E1F03F",
+"L#	c #D6ED37",
+"M#	c #D5EE33",
+"N#	c #D5F134",
+"O#	c #D9F232",
+"P#	c #CEF22D",
+"Q#	c #C7F22A",
+"R#	c #9BDB18",
+"S#	c #A7E518",
+"T#	c #AEEB1B",
+"U#	c #95E514",
+"V#	c #37C306",
+"W#	c #3CC705",
+"X#	c #E0EC60",
+"Y#	c #D1E455",
+"Z#	c #F7F78F",
+"`#	c #F7F891",
+" $	c #F8F78B",
+".$	c #F5F782",
+"+$	c #F8F791",
+"@$	c #EFF06B",
+"#$	c #F3F36D",
+"$$	c #EFF36D",
+"%$	c #F1F56F",
+"&$	c #EDF260",
+"*$	c #EDF461",
+"=$	c #E7F150",
+"-$	c #E9F355",
+";$	c #E8F349",
+">$	c #E8F442",
+",$	c #DDF13E",
+"'$	c #DAF038",
+")$	c #CEEB26",
+"!$	c #D0EE2C",
+"~$	c #B9E82A",
+"{$	c #C1ED26",
+"]$	c #A0E41C",
+"^$	c #ABE71B",
+"/$	c #99E315",
+"($	c #99E415",
+"_$	c #33B306",
+":$	c #2BBB05",
+"<$	c #D9EB5E",
+"[$	c #CDE44E",
+"}$	c #F6F579",
+"|$	c #F4F577",
+"1$	c #F3F571",
+"2$	c #F4F57C",
+"3$	c #F3F363",
+"4$	c #F2F475",
+"5$	c #F0F567",
+"6$	c #A2D93F",
+"7$	c #C3E43F",
+"8$	c #B6D92E",
+"9$	c #A7CD1F",
+"0$	c #E4F042",
+"a$	c #E4F248",
+"b$	c #E5F348",
+"c$	c #D7EC39",
+"d$	c #DBF33C",
+"e$	c #DDF23E",
+"f$	c #D1EF2D",
+"g$	c #C1E825",
+"h$	c #BFEB26",
+"i$	c #AEE61B",
+"j$	c #A7E318",
+"k$	c #B0E818",
+"l$	c #9EE615",
+"m$	c #6DD30D",
+"n$	c #27A603",
+"o$	c #2CBE05",
+"p$	c #E2ED50",
+"q$	c #CBE348",
+"r$	c #F6F780",
+"s$	c #F5F577",
+"t$	c #F3F56F",
+"u$	c #EFF469",
+"v$	c #F3F471",
+"w$	c #F3F46F",
+"x$	c #EFF461",
+"y$	c #E7F053",
+"z$	c #C6E83F",
+"A$	c #A4D733",
+"B$	c #ABDD2F",
+"C$	c #B0DF2E",
+"D$	c #A7DD2B",
+"E$	c #E4F240",
+"F$	c #E8F555",
+"G$	c #DDF33C",
+"H$	c #E1F53E",
+"I$	c #D4F032",
+"J$	c #CEF02E",
+"K$	c #CAEF2D",
+"L$	c #C2EF28",
+"M$	c #B5E91B",
+"N$	c #93DD13",
+"O$	c #93E215",
+"P$	c #93E213",
+"Q$	c #80DB0D",
+"R$	c #45CA05",
+"S$	c #2FC204",
+"T$	c #CEE743",
+"U$	c #C1E23E",
+"V$	c #F0F365",
+"W$	c #F5F473",
+"X$	c #F2F269",
+"Y$	c #E9EF57",
+"Z$	c #EFF363",
+"`$	c #E8F052",
+" %	c #EBF358",
+".%	c #B8E439",
+"+%	c #BCE839",
+"@%	c #A4DC2A",
+"#%	c #ABE22D",
+"$%	c #95D822",
+"%%	c #E1F240",
+"&%	c #D6ED32",
+"*%	c #CFEC2C",
+"=%	c #D4F02F",
+"-%	c #CAEE2B",
+";%	c #C3EB27",
+">%	c #C6EE25",
+",%	c #C3EE21",
+"'%	c #B8ED21",
+")%	c #AEEA16",
+"!%	c #79D90F",
+"~%	c #2EB106",
+"{%	c #26B808",
+"]%	c #2CBF05",
+"^%	c #C9E73B",
+"/%	c #C5E63C",
+"(%	c #F0F56B",
+"_%	c #EEF258",
+":%	c #F0F265",
+"<%	c #EFF155",
+"[%	c #EDF358",
+"}%	c #EBF550",
+"|%	c #EBF54D",
+"1%	c #C9E83B",
+"2%	c #A4DB28",
+"3%	c #9EDC2B",
+"4%	c #8FD622",
+"5%	c #82D01E",
+"6%	c #7EC512",
+"7%	c #C9E827",
+"8%	c #D0EE2E",
+"9%	c #C7ED2C",
+"0%	c #C7EE27",
+"a%	c #C1EE2A",
+"b%	c #C2EF24",
+"c%	c #BEED22",
+"d%	c #A9E718",
+"e%	c #3EC307",
+"f%	c #39C306",
+"g%	c #38C606",
+"h%	c #23B603",
+"i%	c #ACDB2F",
+"j%	c #B0DF34",
+"k%	c #EDF35A",
+"l%	c #EDF553",
+"m%	c #E2F045",
+"n%	c #E6F350",
+"o%	c #E6F448",
+"p%	c #9CD01E",
+"q%	c #8BC916",
+"r%	c #B8DC1B",
+"s%	c #7CBC0F",
+"t%	c #95D618",
+"u%	c #7ED319",
+"v%	c #BFE118",
+"w%	c #C6ED2A",
+"x%	c #C1EA21",
+"y%	c #C1ED22",
+"z%	c #B8EA1D",
+"A%	c #B6EB1D",
+"B%	c #BCEF1F",
+"C%	c #53CA07",
+"D%	c #3FC708",
+"E%	c #2EBC05",
+"F%	c #2FBE04",
+"G%	c #2DBF04",
+"H%	c #A2CF1F",
+"I%	c #B1E12F",
+"J%	c #B5E32E",
+"K%	c #E8F243",
+"L%	c #D7EB45",
+"M%	c #E8F245",
+"N%	c #DDEF40",
+"O%	c #E2F342",
+"P%	c #DFF33E",
+"Q%	c #E4F542",
+"R%	c #DAF138",
+"S%	c #D8F230",
+"T%	c #CBEB28",
+"U%	c #D1F02E",
+"V%	c #C6EC24",
+"W%	c #CAEF25",
+"X%	c #BCEB21",
+"Y%	c #B6EB1E",
+"Z%	c #ABE91B",
+"`%	c #A2E616",
+" &	c #3CC508",
+".&	c #3EC906",
+"+&	c #37C305",
+"@&	c #27B903",
+"#&	c #209B02",
+"$&	c #A9DF27",
+"%&	c #A4DD27",
+"&&	c #91D623",
+"*&	c #E3F13C",
+"=&	c #E4F340",
+"-&	c #E4F33F",
+";&	c #E4F43E",
+">&	c #E2F439",
+",&	c #D6F033",
+"'&	c #D5F034",
+")&	c #CEEF2E",
+"!&	c #CBED26",
+"~&	c #CFEF27",
+"{&	c #D5F22E",
+"]&	c #B5E620",
+"^&	c #B9EA1F",
+"/&	c #84E620",
+"(&	c #3EB508",
+"_&	c #58CE0D",
+":&	c #39CA11",
+"<&	c #3EC607",
+"[&	c #3BCA08",
+"}&	c #28BB04",
+"|&	c #28BC03",
+"1&	c #8FD620",
+"2&	c #97D823",
+"3&	c #A6E22B",
+"4&	c #69CB1D",
+"5&	c #86D61F",
+"6&	c #E5F740",
+"7&	c #DCF338",
+"8&	c #CAEC2D",
+"9&	c #CDED2B",
+"0&	c #D1F02C",
+"a&	c #CDEE27",
+"b&	c #C1EB22",
+"c&	c #CFF228",
+"d&	c #BCE922",
+"e&	c #3CBB09",
+"f&	c #50CD0C",
+"g&	c #4BCD0B",
+"h&	c #3CC207",
+"i&	c #42CD09",
+"j&	c #2EBB04",
+"k&	c #28B905",
+"l&	c #28B903",
+"m&	c #61B113",
+"n&	c #7ED41A",
+"o&	c #89D71B",
+"p&	c #8DDB1A",
+"q&	c #7CD518",
+"r&	c #8FDA1B",
+"s&	c #71D314",
+"t&	c #7CDA18",
+"u&	c #BEF232",
+"v&	c #8BD715",
+"w&	c #63C207",
+"x&	c #55C108",
+"y&	c #5AD111",
+"z&	c #4BC90B",
+"A&	c #3EC108",
+"B&	c #46C908",
+"C&	c #40CB08",
+"D&	c #34C205",
+"E&	c #32C505",
+"F&	c #22A003",
+"G&	c #79D818",
+"H&	c #75D314",
+"I&	c #67D012",
+"J&	c #69D313",
+"K&	c #71D613",
+"L&	c #67D413",
+"M&	c #4BC20C",
+"N&	c #4DCB0E",
+"O&	c #5AD510",
+"P&	c #50CA0B",
+"Q&	c #4BC909",
+"R&	c #3CC708",
+"S&	c #42C906",
+"T&	c #35C206",
+"U&	c #33C306",
+"V&	c #30C504",
+"W&	c #49C30E",
+"X&	c #71D913",
+"Y&	c #84E318",
+"Z&	c #5ECF0E",
+"`&	c #58D00D",
+" *	c #5ED40D",
+".*	c #48C70A",
+"+*	c #57D40B",
+"@*	c #37BE06",
+"#*	c #39C707",
+"$*	c #37C505",
+"%*	c #34C705",
+"&*	c #49BE0B",
+"**	c #4BD00C",
+"=*	c #46C609",
+"-*	c #46D00A",
+";*	c #33BE06",
+">*	c #20A904",
+"                          . + @ # $ %                           ",
+"                    & * = - ; > , ' ) ! ~ {                     ",
+"                ] ^ / ( _ : < [ } | 1 2 3 4 5 6                 ",
+"            7 8 9 0 a b c d e f g h i j k l m n o p             ",
+"          q r s t u v w x y z A B C D E F G H I J K L           ",
+"        M M N O P u Q R S T U V W X Y Z `  ...+.@.#.$.%.        ",
+"      &.O *.O =.-.;.>.R ,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.      ",
+"      O O O 2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.      ",
+"    o.O *.p.p.3.-.q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.    ",
+"    O o.q L.p.M.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+    ",
+"  *+=+-+;+>+p.,+'+)+!+~+8.{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+  ",
+"  r N N 8+p.9+0+a+b+c+d+e+d f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+  ",
+"  w+x+w+y+z+A+B+C+D+E+S F+G+H+I+J+K+L+M+N+O+P+Q+R+S+$+T+U+V+W+  ",
+"X+Y+Z+`+ @.@+@6.@@#@$@^ %@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@",
+"[@}@|@1@2@3@4@5@6@7@8@9@0@a@b@) c@d@e@f@g@h@i@j@k@l@m@n@o@p@q@r@",
+"s@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@>@I@J@K@L@M@N@O@P@Q@R@S@T@U@V@W@",
+"X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_#:#<#[#}#",
+"|#1#2#3#4###5#'.6#7#8#9#0#a#b#c#d#e#f#g#h#i#j#k#l#m#n#o#p#q#r#s#",
+"t#u#v#w#s@x#y#z#a@A#B#C#D#E#F#G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#",
+"  X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$I#;$>$,$'$)$!$~${$]$^$/$($_$:$  ",
+"  <$[$}$|$*#1$2$3$4$5$6$7$8$9$0$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$  ",
+"  p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O$P$Q$R$S$  ",
+"    T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%>%,%'%)%!%~%{%]%    ",
+"    ^%/%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8%9%0%a%b%c%d%($e%f%g%h%    ",
+"      i%j%k%l%a$m%n%o%p%q%r%s%t%u%v%w%x%y%z%A%B%C%D%E%F%G%      ",
+"      H%I%J%K%L%M%N%O%P%Q%G$R%S%T%U%V%W%X%Y%Z%`% &.&+&@&#&      ",
+"        $&%&&&*&=&-&;&>&,&'&)&!&~&{&]&^&/&(&_&:&<&[&}&|&        ",
+"          1&2&3&4&5&6&7&8&9&0&a&b&c&d&e&f&g&h&i&j&k&l&          ",
+"            m&n&o&p&q&r&s&t&u&v&w&x&y&z&A&B&C&D&E&F&            ",
+"                G&H&I&J&K&L&M&N&O&P&Q&R&S&T&U&V&                ",
+"                    W&X&Y&Z&`& *.*+*@*#*$*%*                    ",
+"                          &***=*-*;*>*                          "};
diff --git a/data/icons/tmw.ico b/data/icons/tmw.ico
deleted file mode 100644
index 61d559a3..00000000
Binary files a/data/icons/tmw.ico and /dev/null differ
diff --git a/data/icons/tmw.png b/data/icons/tmw.png
deleted file mode 100644
index 93e6c9ae..00000000
Binary files a/data/icons/tmw.png and /dev/null differ
diff --git a/data/icons/tmw.xpm b/data/icons/tmw.xpm
deleted file mode 100644
index 06ec2865..00000000
--- a/data/icons/tmw.xpm
+++ /dev/null
@@ -1,784 +0,0 @@
-/* XPM */
-static char * tmw_xpm[] = {
-"32 32 749 2",
-"  	c None",
-". 	c #E4EB6D",
-"+ 	c #EFF271",
-"@ 	c #E7EF65",
-"# 	c #DDED61",
-"$ 	c #D6E955",
-"% 	c #DAED4D",
-"& 	c #F6F5A0",
-"* 	c #EFEF89",
-"= 	c #ECF084",
-"- 	c #EDF077",
-"; 	c #EAF075",
-"> 	c #E0E960",
-", 	c #D9E757",
-"' 	c #D4EA52",
-") 	c #CFE74D",
-"! 	c #BEE140",
-"~ 	c #C2E43E",
-"{ 	c #B6DF33",
-"] 	c #F8F7C2",
-"^ 	c #F9F7AB",
-"/ 	c #F2F099",
-"( 	c #EEEF80",
-"_ 	c #F3F077",
-": 	c #F8F8B1",
-"< 	c #E8EE6F",
-"[ 	c #E1EB69",
-"} 	c #DBEB5E",
-"| 	c #D5E852",
-"1 	c #CDE445",
-"2 	c #CEE843",
-"3 	c #B6DC34",
-"4 	c #A9DA2F",
-"5 	c #B3E02F",
-"6 	c #B6E630",
-"7 	c #F1F2E2",
-"8 	c #F9F9D4",
-"9 	c #F9F8C5",
-"0 	c #F8F8CE",
-"a 	c #F9F8D6",
-"b 	c #F9F7CB",
-"c 	c #F9F7B1",
-"d 	c #F9F7A7",
-"e 	c #E7EE73",
-"f 	c #E4EC69",
-"g 	c #DEEB60",
-"h 	c #D8E755",
-"i 	c #D5EB55",
-"j 	c #C2E33F",
-"k 	c #BEE33C",
-"l 	c #B5E339",
-"m 	c #A7DF2E",
-"n 	c #9BDA28",
-"o 	c #95DA24",
-"p 	c #8DD724",
-"q 	c #F9F9F5",
-"r 	c #F9F9EA",
-"s 	c #F9F9E1",
-"t 	c #F9F9F4",
-"u 	c #F9F7DF",
-"v 	c #F9F7D1",
-"w 	c #F9F7C9",
-"x 	c #F9F7B6",
-"y 	c #F9F7AE",
-"z 	c #D7E363",
-"A 	c #E1EC6B",
-"B 	c #DDEC60",
-"C 	c #D8EC61",
-"D 	c #CDE552",
-"E 	c #C6E543",
-"F 	c #BCE440",
-"G 	c #BEE73E",
-"H 	c #ABDF30",
-"I 	c #ACE230",
-"J 	c #8FD720",
-"K 	c #80D01C",
-"L 	c #80D51A",
-"M 	c #F9F9F7",
-"N 	c #F9F9EB",
-"O 	c #F9F9F9",
-"P 	c #F9F7E6",
-"Q 	c #F9F7D3",
-"R 	c #F9F7CE",
-"S 	c #F9F7BF",
-"T 	c #F9F8B9",
-"U 	c #E6EF8F",
-"V 	c #E1EB65",
-"W 	c #E0ED63",
-"X 	c #D1E452",
-"Y 	c #D3E84D",
-"Z 	c #C3E340",
-"` 	c #BBE13E",
-" .	c #B0DD35",
-"..	c #ABDD2E",
-"+.	c #A0DB2A",
-"@.	c #95D923",
-"#.	c #7ED31C",
-"$.	c #7ED31A",
-"%.	c #80DA18",
-"&.	c #F4F3EF",
-"*.	c #F9F9F6",
-"=.	c #F9F8F5",
-"-.	c #F9F7EE",
-";.	c #F9F7E2",
-">.	c #F9F7D5",
-",.	c #F9F6C2",
-"'.	c #F8F69C",
-").	c #D4E56D",
-"!.	c #E4ED73",
-"~.	c #DBEA60",
-"{.	c #DDE961",
-"].	c #C9E54E",
-"^.	c #BFE242",
-"/.	c #BEE33E",
-"(.	c #B1DE34",
-"_.	c #ABDE33",
-":.	c #95D826",
-"<.	c #8DD620",
-"[.	c #8DDB20",
-"}.	c #91DD1E",
-"|.	c #71D116",
-"1.	c #50B910",
-"2.	c #F9F8F7",
-"3.	c #F9F8F4",
-"4.	c #F9F7EB",
-"5.	c #F9F7E1",
-"6.	c #F9F5CF",
-"7.	c #F9F6C9",
-"8.	c #F9F6BF",
-"9.	c #D6E471",
-"0.	c #E9F075",
-"a.	c #E3EC6B",
-"b.	c #D9E96D",
-"c.	c #CEE558",
-"d.	c #CBE44E",
-"e.	c #BEDE3E",
-"f.	c #ACDA37",
-"g.	c #BCE639",
-"h.	c #AEE135",
-"i.	c #9EDB2A",
-"j.	c #8FD822",
-"k.	c #7CD31B",
-"l.	c #82DA1C",
-"m.	c #63CE13",
-"n.	c #61CE12",
-"o.	c #F9F9F8",
-"p.	c #F9F7F5",
-"q.	c #F9F4DD",
-"r.	c #F9F5D7",
-"s.	c #F9F5C9",
-"t.	c #F9F5B6",
-"u.	c #E3ED8D",
-"v.	c #DEE865",
-"w.	c #E3ED6D",
-"x.	c #DDEB5E",
-"y.	c #D3E755",
-"z.	c #CAE349",
-"A.	c #CFEB4D",
-"B.	c #C1E33B",
-"C.	c #BCE743",
-"D.	c #B0E02D",
-"E.	c #95DB28",
-"F.	c #95DB26",
-"G.	c #C6E627",
-"H.	c #E8F433",
-"I.	c #CAED26",
-"J.	c #60CD0F",
-"K.	c #58CD0E",
-"L.	c #F9F7EC",
-"M.	c #F9F7F1",
-"N.	c #F9F4E4",
-"O.	c #F9F3D7",
-"P.	c #F9F3CA",
-"Q.	c #F9F5CA",
-"R.	c #F9F5BB",
-"S.	c #F9F8B6",
-"T.	c #F6F89E",
-"U.	c #DFEB5C",
-"V.	c #CEE453",
-"W.	c #D0E753",
-"X.	c #CDE543",
-"Y.	c #C7E842",
-"Z.	c #C1E53C",
-"`.	c #A7DC30",
-" +	c #E6F453",
-".+	c #E2F448",
-"++	c #D8F03C",
-"@+	c #D1ED2E",
-"#+	c #D0F033",
-"$+	c #CAED2C",
-"%+	c #ACE51F",
-"&+	c #55CF0F",
-"*+	c #F5F6EF",
-"=+	c #F9F9F2",
-"-+	c #F9F9F1",
-";+	c #F9F8F0",
-">+	c #F9F7E7",
-",+	c #F9F5F0",
-"'+	c #F9F3E1",
-")+	c #F9F5DB",
-"!+	c #F9F6DB",
-"~+	c #F9F6BE",
-"{+	c #F8F59B",
-"]+	c #F9F5A2",
-"^+	c #F8F68D",
-"/+	c #F7F689",
-"(+	c #D7EC65",
-"_+	c #CEE84E",
-":+	c #BBE23F",
-"<+	c #B6E238",
-"[+	c #A2DC30",
-"}+	c #EBF553",
-"|+	c #E4F443",
-"1+	c #DCF340",
-"2+	c #D4F033",
-"3+	c #CEEF2D",
-"4+	c #C2E926",
-"5+	c #BEEB20",
-"6+	c #5CD50E",
-"7+	c #53CE0D",
-"8+	c #F9F7D9",
-"9+	c #F9F6F2",
-"0+	c #F9F5EB",
-"a+	c #F9F3DA",
-"b+	c #F9F6DF",
-"c+	c #F9F7D0",
-"d+	c #F9F7C2",
-"e+	c #F9F7BB",
-"f+	c #F8F68F",
-"g+	c #F7F58D",
-"h+	c #F6F58B",
-"i+	c #EEF68B",
-"j+	c #BFDF43",
-"k+	c #B5DE37",
-"l+	c #B5E234",
-"m+	c #A7DD30",
-"n+	c #E7F248",
-"o+	c #D6EF40",
-"p+	c #DBF239",
-"q+	c #D0ED2F",
-"r+	c #C3EB2A",
-"s+	c #BCEB26",
-"t+	c #B5E81E",
-"u+	c #52CE0F",
-"v+	c #4ECB0B",
-"w+	c #F9F9D9",
-"x+	c #F9F9D7",
-"y+	c #F9F8F8",
-"z+	c #F9F7E9",
-"A+	c #F9F6E9",
-"B+	c #F9F5E0",
-"C+	c #F8F2D6",
-"D+	c #F9F3CE",
-"E+	c #F9F7CA",
-"F+	c #F9F8B5",
-"G+	c #F6F691",
-"H+	c #F9F699",
-"I+	c #F5F68F",
-"J+	c #F3F579",
-"K+	c #E8F575",
-"L+	c #C7E646",
-"M+	c #B5DF37",
-"N+	c #B9E438",
-"O+	c #9CD928",
-"P+	c #D7F348",
-"Q+	c #DBEF3B",
-"R+	c #D1EF35",
-"S+	c #D7F230",
-"T+	c #C1EA25",
-"U+	c #B5E91F",
-"V+	c #63DC1E",
-"W+	c #48CA0C",
-"X+	c #F4F4DC",
-"Y+	c #F9F9C3",
-"Z+	c #F9F9C5",
-"`+	c #F9F9C7",
-" @	c #F9F9E8",
-".@	c #F9F6DD",
-"+@	c #F9F6D6",
-"@@	c #F9F3C1",
-"#@	c #F9F3BF",
-"$@	c #F9F5B8",
-"%@	c #F8F8A6",
-"&@	c #F6F68F",
-"*@	c #F4F791",
-"=@	c #ABD746",
-"-@	c #C5E449",
-";@	c #C1E448",
-">@	c #BBE23E",
-",@	c #BBE237",
-"'@	c #A9DC30",
-")@	c #99D927",
-"!@	c #D3E32C",
-"~@	c #E2F340",
-"{@	c #D3ED2D",
-"]@	c #CAED2B",
-"^@	c #CDF028",
-"/@	c #C5EB27",
-"(@	c #B0E51C",
-"_@	c #91DC13",
-":@	c #49CA08",
-"<@	c #25B305",
-"[@	c #F5F6BE",
-"}@	c #F5F5A9",
-"|@	c #F3F4B0",
-"1@	c #F6F6B0",
-"2@	c #F7F8B5",
-"3@	c #EDF097",
-"4@	c #F5F18F",
-"5@	c #F9F7B8",
-"6@	c #F9F4B0",
-"7@	c #F9F3AE",
-"8@	c #F9F3A4",
-"9@	c #F9F7A4",
-"0@	c #F7F7A0",
-"a@	c #F5F682",
-"b@	c #D3E75E",
-"c@	c #CAE646",
-"d@	c #CBE846",
-"e@	c #EDF05A",
-"f@	c #C6E432",
-"g@	c #A9E02E",
-"h@	c #99DA27",
-"i@	c #B9DB20",
-"j@	c #E1F33F",
-"k@	c #CEEB2E",
-"l@	c #C7EB27",
-"m@	c #BBEA26",
-"n@	c #B9E722",
-"o@	c #A6DF19",
-"p@	c #ABE815",
-"q@	c #48CB09",
-"r@	c #3ECA08",
-"s@	c #F8F7A7",
-"t@	c #F3F4A0",
-"u@	c #F4F59C",
-"v@	c #F0F49C",
-"w@	c #F2F5A4",
-"x@	c #F5F6A0",
-"y@	c #EFF28F",
-"z@	c #F9F8CD",
-"A@	c #F9F6A7",
-"B@	c #F9F3A0",
-"C@	c #F8F399",
-"D@	c #F8F493",
-"E@	c #F8F693",
-"F@	c #F7F58B",
-"G@	c #E8EF65",
-"H@	c #C7E445",
-"I@	c #C7DB30",
-"J@	c #E1ED48",
-"K@	c #E8F353",
-"L@	c #C3E227",
-"M@	c #D9EB2E",
-"N@	c #E7F549",
-"O@	c #D3EE3B",
-"P@	c #CBED2D",
-"Q@	c #CDEF27",
-"R@	c #BFEC23",
-"S@	c #B6E81E",
-"T@	c #A9E518",
-"U@	c #B1EB1B",
-"V@	c #35BE06",
-"W@	c #38C306",
-"X@	c #F9F9A7",
-"Y@	c #F2F38F",
-"Z@	c #F2F495",
-"`@	c #F3F38D",
-" #	c #F9F9E9",
-".#	c #F7F8C5",
-"+#	c #F8F7D1",
-"@#	c #F8F6A2",
-"##	c #F9F7A9",
-"$#	c #F8F59C",
-"%#	c #F8F291",
-"&#	c #F8F58F",
-"*#	c #F6F789",
-"=#	c #F2F477",
-"-#	c #F0F571",
-";#	c #EAEE52",
-">#	c #DCEA45",
-",#	c #EBEF43",
-"'#	c #E4F04D",
-")#	c #DEEF45",
-"!#	c #E1F246",
-"~#	c #E4F448",
-"{#	c #DBF039",
-"]#	c #D9F235",
-"^#	c #C9ED2B",
-"/#	c #CAEF2C",
-"(#	c #CEF22B",
-"_#	c #B6E91E",
-":#	c #B1EB21",
-"<#	c #A9E815",
-"[#	c #48CF09",
-"}#	c #40CD06",
-"|#	c #EDEF6B",
-"1#	c #EBF07C",
-"2#	c #E7EB71",
-"3#	c #E8E865",
-"4#	c #F8F79E",
-"5#	c #F8F7A4",
-"6#	c #F9F69E",
-"7#	c #F8F48F",
-"8#	c #F6F280",
-"9#	c #F6F482",
-"0#	c #F3F473",
-"a#	c #EFF169",
-"b#	c #EDF467",
-"c#	c #EAF35C",
-"d#	c #EAF258",
-"e#	c #E4F052",
-"f#	c #E4F046",
-"g#	c #E0F03F",
-"h#	c #D5EE3B",
-"i#	c #DFF23E",
-"j#	c #D7F137",
-"k#	c #CEED2E",
-"l#	c #C9EF28",
-"m#	c #CAF025",
-"n#	c #B9EA1E",
-"o#	c #B3E91D",
-"p#	c #B1EB1A",
-"q#	c #A6E817",
-"r#	c #39C506",
-"s#	c #35C505",
-"t#	c #B3BC3E",
-"u#	c #E9F07C",
-"v#	c #DEE867",
-"w#	c #F9F79E",
-"x#	c #F8F793",
-"y#	c #F8F78F",
-"z#	c #F7F684",
-"A#	c #F5F27E",
-"B#	c #F4F26D",
-"C#	c #F4F36F",
-"D#	c #EDF061",
-"E#	c #EEF363",
-"F#	c #EDF35C",
-"G#	c #EEF45C",
-"H#	c #EAF357",
-"I#	c #E8F34B",
-"J#	c #DCEE43",
-"K#	c #E1F03F",
-"L#	c #D6ED37",
-"M#	c #D5EE33",
-"N#	c #D5F134",
-"O#	c #D9F232",
-"P#	c #CEF22D",
-"Q#	c #C7F22A",
-"R#	c #9BDB18",
-"S#	c #A7E518",
-"T#	c #AEEB1B",
-"U#	c #95E514",
-"V#	c #37C306",
-"W#	c #3CC705",
-"X#	c #E0EC60",
-"Y#	c #D1E455",
-"Z#	c #F7F78F",
-"`#	c #F7F891",
-" $	c #F8F78B",
-".$	c #F5F782",
-"+$	c #F8F791",
-"@$	c #EFF06B",
-"#$	c #F3F36D",
-"$$	c #EFF36D",
-"%$	c #F1F56F",
-"&$	c #EDF260",
-"*$	c #EDF461",
-"=$	c #E7F150",
-"-$	c #E9F355",
-";$	c #E8F349",
-">$	c #E8F442",
-",$	c #DDF13E",
-"'$	c #DAF038",
-")$	c #CEEB26",
-"!$	c #D0EE2C",
-"~$	c #B9E82A",
-"{$	c #C1ED26",
-"]$	c #A0E41C",
-"^$	c #ABE71B",
-"/$	c #99E315",
-"($	c #99E415",
-"_$	c #33B306",
-":$	c #2BBB05",
-"<$	c #D9EB5E",
-"[$	c #CDE44E",
-"}$	c #F6F579",
-"|$	c #F4F577",
-"1$	c #F3F571",
-"2$	c #F4F57C",
-"3$	c #F3F363",
-"4$	c #F2F475",
-"5$	c #F0F567",
-"6$	c #A2D93F",
-"7$	c #C3E43F",
-"8$	c #B6D92E",
-"9$	c #A7CD1F",
-"0$	c #E4F042",
-"a$	c #E4F248",
-"b$	c #E5F348",
-"c$	c #D7EC39",
-"d$	c #DBF33C",
-"e$	c #DDF23E",
-"f$	c #D1EF2D",
-"g$	c #C1E825",
-"h$	c #BFEB26",
-"i$	c #AEE61B",
-"j$	c #A7E318",
-"k$	c #B0E818",
-"l$	c #9EE615",
-"m$	c #6DD30D",
-"n$	c #27A603",
-"o$	c #2CBE05",
-"p$	c #E2ED50",
-"q$	c #CBE348",
-"r$	c #F6F780",
-"s$	c #F5F577",
-"t$	c #F3F56F",
-"u$	c #EFF469",
-"v$	c #F3F471",
-"w$	c #F3F46F",
-"x$	c #EFF461",
-"y$	c #E7F053",
-"z$	c #C6E83F",
-"A$	c #A4D733",
-"B$	c #ABDD2F",
-"C$	c #B0DF2E",
-"D$	c #A7DD2B",
-"E$	c #E4F240",
-"F$	c #E8F555",
-"G$	c #DDF33C",
-"H$	c #E1F53E",
-"I$	c #D4F032",
-"J$	c #CEF02E",
-"K$	c #CAEF2D",
-"L$	c #C2EF28",
-"M$	c #B5E91B",
-"N$	c #93DD13",
-"O$	c #93E215",
-"P$	c #93E213",
-"Q$	c #80DB0D",
-"R$	c #45CA05",
-"S$	c #2FC204",
-"T$	c #CEE743",
-"U$	c #C1E23E",
-"V$	c #F0F365",
-"W$	c #F5F473",
-"X$	c #F2F269",
-"Y$	c #E9EF57",
-"Z$	c #EFF363",
-"`$	c #E8F052",
-" %	c #EBF358",
-".%	c #B8E439",
-"+%	c #BCE839",
-"@%	c #A4DC2A",
-"#%	c #ABE22D",
-"$%	c #95D822",
-"%%	c #E1F240",
-"&%	c #D6ED32",
-"*%	c #CFEC2C",
-"=%	c #D4F02F",
-"-%	c #CAEE2B",
-";%	c #C3EB27",
-">%	c #C6EE25",
-",%	c #C3EE21",
-"'%	c #B8ED21",
-")%	c #AEEA16",
-"!%	c #79D90F",
-"~%	c #2EB106",
-"{%	c #26B808",
-"]%	c #2CBF05",
-"^%	c #C9E73B",
-"/%	c #C5E63C",
-"(%	c #F0F56B",
-"_%	c #EEF258",
-":%	c #F0F265",
-"<%	c #EFF155",
-"[%	c #EDF358",
-"}%	c #EBF550",
-"|%	c #EBF54D",
-"1%	c #C9E83B",
-"2%	c #A4DB28",
-"3%	c #9EDC2B",
-"4%	c #8FD622",
-"5%	c #82D01E",
-"6%	c #7EC512",
-"7%	c #C9E827",
-"8%	c #D0EE2E",
-"9%	c #C7ED2C",
-"0%	c #C7EE27",
-"a%	c #C1EE2A",
-"b%	c #C2EF24",
-"c%	c #BEED22",
-"d%	c #A9E718",
-"e%	c #3EC307",
-"f%	c #39C306",
-"g%	c #38C606",
-"h%	c #23B603",
-"i%	c #ACDB2F",
-"j%	c #B0DF34",
-"k%	c #EDF35A",
-"l%	c #EDF553",
-"m%	c #E2F045",
-"n%	c #E6F350",
-"o%	c #E6F448",
-"p%	c #9CD01E",
-"q%	c #8BC916",
-"r%	c #B8DC1B",
-"s%	c #7CBC0F",
-"t%	c #95D618",
-"u%	c #7ED319",
-"v%	c #BFE118",
-"w%	c #C6ED2A",
-"x%	c #C1EA21",
-"y%	c #C1ED22",
-"z%	c #B8EA1D",
-"A%	c #B6EB1D",
-"B%	c #BCEF1F",
-"C%	c #53CA07",
-"D%	c #3FC708",
-"E%	c #2EBC05",
-"F%	c #2FBE04",
-"G%	c #2DBF04",
-"H%	c #A2CF1F",
-"I%	c #B1E12F",
-"J%	c #B5E32E",
-"K%	c #E8F243",
-"L%	c #D7EB45",
-"M%	c #E8F245",
-"N%	c #DDEF40",
-"O%	c #E2F342",
-"P%	c #DFF33E",
-"Q%	c #E4F542",
-"R%	c #DAF138",
-"S%	c #D8F230",
-"T%	c #CBEB28",
-"U%	c #D1F02E",
-"V%	c #C6EC24",
-"W%	c #CAEF25",
-"X%	c #BCEB21",
-"Y%	c #B6EB1E",
-"Z%	c #ABE91B",
-"`%	c #A2E616",
-" &	c #3CC508",
-".&	c #3EC906",
-"+&	c #37C305",
-"@&	c #27B903",
-"#&	c #209B02",
-"$&	c #A9DF27",
-"%&	c #A4DD27",
-"&&	c #91D623",
-"*&	c #E3F13C",
-"=&	c #E4F340",
-"-&	c #E4F33F",
-";&	c #E4F43E",
-">&	c #E2F439",
-",&	c #D6F033",
-"'&	c #D5F034",
-")&	c #CEEF2E",
-"!&	c #CBED26",
-"~&	c #CFEF27",
-"{&	c #D5F22E",
-"]&	c #B5E620",
-"^&	c #B9EA1F",
-"/&	c #84E620",
-"(&	c #3EB508",
-"_&	c #58CE0D",
-":&	c #39CA11",
-"<&	c #3EC607",
-"[&	c #3BCA08",
-"}&	c #28BB04",
-"|&	c #28BC03",
-"1&	c #8FD620",
-"2&	c #97D823",
-"3&	c #A6E22B",
-"4&	c #69CB1D",
-"5&	c #86D61F",
-"6&	c #E5F740",
-"7&	c #DCF338",
-"8&	c #CAEC2D",
-"9&	c #CDED2B",
-"0&	c #D1F02C",
-"a&	c #CDEE27",
-"b&	c #C1EB22",
-"c&	c #CFF228",
-"d&	c #BCE922",
-"e&	c #3CBB09",
-"f&	c #50CD0C",
-"g&	c #4BCD0B",
-"h&	c #3CC207",
-"i&	c #42CD09",
-"j&	c #2EBB04",
-"k&	c #28B905",
-"l&	c #28B903",
-"m&	c #61B113",
-"n&	c #7ED41A",
-"o&	c #89D71B",
-"p&	c #8DDB1A",
-"q&	c #7CD518",
-"r&	c #8FDA1B",
-"s&	c #71D314",
-"t&	c #7CDA18",
-"u&	c #BEF232",
-"v&	c #8BD715",
-"w&	c #63C207",
-"x&	c #55C108",
-"y&	c #5AD111",
-"z&	c #4BC90B",
-"A&	c #3EC108",
-"B&	c #46C908",
-"C&	c #40CB08",
-"D&	c #34C205",
-"E&	c #32C505",
-"F&	c #22A003",
-"G&	c #79D818",
-"H&	c #75D314",
-"I&	c #67D012",
-"J&	c #69D313",
-"K&	c #71D613",
-"L&	c #67D413",
-"M&	c #4BC20C",
-"N&	c #4DCB0E",
-"O&	c #5AD510",
-"P&	c #50CA0B",
-"Q&	c #4BC909",
-"R&	c #3CC708",
-"S&	c #42C906",
-"T&	c #35C206",
-"U&	c #33C306",
-"V&	c #30C504",
-"W&	c #49C30E",
-"X&	c #71D913",
-"Y&	c #84E318",
-"Z&	c #5ECF0E",
-"`&	c #58D00D",
-" *	c #5ED40D",
-".*	c #48C70A",
-"+*	c #57D40B",
-"@*	c #37BE06",
-"#*	c #39C707",
-"$*	c #37C505",
-"%*	c #34C705",
-"&*	c #49BE0B",
-"**	c #4BD00C",
-"=*	c #46C609",
-"-*	c #46D00A",
-";*	c #33BE06",
-">*	c #20A904",
-"                          . + @ # $ %                           ",
-"                    & * = - ; > , ' ) ! ~ {                     ",
-"                ] ^ / ( _ : < [ } | 1 2 3 4 5 6                 ",
-"            7 8 9 0 a b c d e f g h i j k l m n o p             ",
-"          q r s t u v w x y z A B C D E F G H I J K L           ",
-"        M M N O P u Q R S T U V W X Y Z `  ...+.@.#.$.%.        ",
-"      &.O *.O =.-.;.>.R ,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.      ",
-"      O O O 2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.      ",
-"    o.O *.p.p.3.-.q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.    ",
-"    O o.q L.p.M.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+    ",
-"  *+=+-+;+>+p.,+'+)+!+~+8.{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+  ",
-"  r N N 8+p.9+0+a+b+c+d+e+d f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+  ",
-"  w+x+w+y+z+A+B+C+D+E+S F+G+H+I+J+K+L+M+N+O+P+Q+R+S+$+T+U+V+W+  ",
-"X+Y+Z+`+ @.@+@6.@@#@$@^ %@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@",
-"[@}@|@1@2@3@4@5@6@7@8@9@0@a@b@) c@d@e@f@g@h@i@j@k@l@m@n@o@p@q@r@",
-"s@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@>@I@J@K@L@M@N@O@P@Q@R@S@T@U@V@W@",
-"X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_#:#<#[#}#",
-"|#1#2#3#4###5#'.6#7#8#9#0#a#b#c#d#e#f#g#h#i#j#k#l#m#n#o#p#q#r#s#",
-"t#u#v#w#s@x#y#z#a@A#B#C#D#E#F#G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#",
-"  X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$I#;$>$,$'$)$!$~${$]$^$/$($_$:$  ",
-"  <$[$}$|$*#1$2$3$4$5$6$7$8$9$0$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$  ",
-"  p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O$P$Q$R$S$  ",
-"    T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%>%,%'%)%!%~%{%]%    ",
-"    ^%/%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8%9%0%a%b%c%d%($e%f%g%h%    ",
-"      i%j%k%l%a$m%n%o%p%q%r%s%t%u%v%w%x%y%z%A%B%C%D%E%F%G%      ",
-"      H%I%J%K%L%M%N%O%P%Q%G$R%S%T%U%V%W%X%Y%Z%`% &.&+&@&#&      ",
-"        $&%&&&*&=&-&;&>&,&'&)&!&~&{&]&^&/&(&_&:&<&[&}&|&        ",
-"          1&2&3&4&5&6&7&8&9&0&a&b&c&d&e&f&g&h&i&j&k&l&          ",
-"            m&n&o&p&q&r&s&t&u&v&w&x&y&z&A&B&C&D&E&F&            ",
-"                G&H&I&J&K&L&M&N&O&P&Q&R&S&T&U&V&                ",
-"                    W&X&Y&Z&`& *.*+*@*#*$*%*                    ",
-"                          &***=*-*;*>*                          "};
diff --git a/debian/control b/debian/control
index 4372aaea..2a77f351 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,16 @@
 Source: tmw
 Section: games
 Priority: optional
-Homepage: http://www.themanaworld.org/
+Homepage: http://209.168.213.109
 Maintainer: Patrick Matthäi <patrick.matthaei@web.de>
 Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), dpatch, autotools-dev, libcurl4-gnutls-dev, libgl1-mesa-dev, libguichan2-dev (>= 0.7.1), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev, libphysfs-dev, libpng12-dev, libxml2-dev, zlib1g-dev
 Standards-Version: 3.7.3
 
-Package: tmw
+Package: tme
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tmw-data (= ${source:Version})
-Recommends: tmw-music
-Description: The Mana World is a great Online Rolegame
+Depends: ${shlibs:Depends}, ${misc:Depends}, tme-data (= ${source:Version})
+Recommends: tme-music
+Description: The Mana Experiment is a great Online Rolegame
  based upon the Seiken Densetsu serie. It has its own universe, and its own
  character management system, which will give you the opportunity to play in a
  2D heroic-fantasy world forever.
diff --git a/debian/rules b/debian/rules
index 614ee701..68dd9400 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ binary-arch: build install
 	dh_install -a
 	dh_desktop -a
 	dh_installmenu -a
-	dh_strip -a --dbg-package=tmw-dbg
+	dh_strip -a --dbg-package=tme-dbg
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a
diff --git a/debian/tme-data.install b/debian/tme-data.install
new file mode 100644
index 00000000..a836ce3d
--- /dev/null
+++ b/debian/tme-data.install
@@ -0,0 +1,5 @@
+data/graphics/gui/*.png usr/share/games/tme/data/graphics/gui
+data/graphics/images/*.png usr/share/games/tme/data/graphics/images
+data/graphics/images/ambient/*.png usr/share/games/tme/data/graphics/images/ambient
+data/graphics/tiles/*.png usr/share/games/tme/data/graphics/tiles
+data/help/*.txt usr/share/games/tme/data/help
diff --git a/debian/tme.docs b/debian/tme.docs
new file mode 100644
index 00000000..d622a527
--- /dev/null
+++ b/debian/tme.docs
@@ -0,0 +1,6 @@
+AUTHORS
+NEWS
+README
+ChangeLog
+docs/progression.txt
+docs/FAQ.txt
diff --git a/debian/tme.install b/debian/tme.install
new file mode 100644
index 00000000..6c9ced58
--- /dev/null
+++ b/debian/tme.install
@@ -0,0 +1,5 @@
+debian/tme.desktop usr/share/applications
+debian/tme.xpm usr/share/pixmaps
+data/icons/tme.png usr/share/icons
+docs/tme.6 usr/share/man/man6
+src/tme usr/games
diff --git a/debian/tme.menu b/debian/tme.menu
new file mode 100644
index 00000000..4af5ad0a
--- /dev/null
+++ b/debian/tme.menu
@@ -0,0 +1,4 @@
+?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"
diff --git a/debian/tme.sgml b/debian/tme.sgml
new file mode 100644
index 00000000..0ed18199
--- /dev/null
+++ b/debian/tme.sgml
@@ -0,0 +1,149 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>FERREIRA</firstname>">
+  <!ENTITY dhsurname   "<surname>Yohann</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>avril 13, 2005</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>6</manvolnum>">
+  <!ENTITY dhemail     "<email>bertram@cegetel.net</email>">
+  <!ENTITY dhusername  "FERREIRA Yohann">
+  <!ENTITY dhucpackage "<refentrytitle>TMW</refentrytitle>">
+  <!ENTITY dhpackage   "tmw">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2003</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>tmw is the abreviation of The Mana World : A Fantasy Online Game</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> ingame
+      commands.</para>
+    <para><command>&dhpackage;</command> is a Great Online Game based upon the Seiken Densetsu Serie.
+It has its own universe, and and its own character management system, which will
+give you the opportunity to play in a 2D heroic-fantasy world forever.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>COMMON KEYS</title>
+
+    <para>Arrow Keys, Key Pad Keys (Diagonals Supported).
+Move your character around.
+
+Left Ctrl : 
+Make your character attack.
+
+G : 
+Get Items on the ground or in a chest.
+
+Alt + 1...9 : 
+Shows an Emoticon above your character.
+
+Alt + I : 
+Shows / Hide Inventory Window.
+
+Alt + K : 
+Shows / Hide Skills Window.
+
+Alt + E : 
+Shows / Hide Equipment Window.
+
+Alt + C : 
+Shows Configuration Window.
+</para>
+
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>libguichan (2).</para>
+
+    <para>The program is documented fully by <citetitle>The Mana World Team</citetitle> available via the
+      website http://www.manaworld.org/</para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the &gnu; General Public License, Version 2 any 
+	  later version published by the Free Software Foundation.
+    </para>
+	<para>
+	  On Debian systems, the complete text of the GNU General Public
+	  License can be found in /usr/share/common-licenses/GPL.
+	</para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
+
+
diff --git a/debian/tme.xpm b/debian/tme.xpm
new file mode 100644
index 00000000..e7c2222a
--- /dev/null
+++ b/debian/tme.xpm
@@ -0,0 +1,776 @@
+/* XPM */
+static char * tme_xpm[] = {
+"32 32 741 2",
+"	c None",
+".	c #E8ED72",
+"+	c #E7ED6A",
+"@	c #E1EB62",
+"#	c #D4E758",
+"$	c #D2E750",
+"%	c #CDE748",
+"&	c #F5F4A1",
+"*	c #F3F294",
+"=	c #EBEE81",
+"-	c #EAEE77",
+";	c #E6ED6F",
+">	c #E1EB68",
+",	c #D9E859",
+"'	c #D3E851",
+")	c #CCE549",
+"!	c #C7E643",
+"~	c #BEE239",
+"{	c #B3DF32",
+"]	c #F8F8C4",
+"^	c #F9F7B3",
+"/	c #F4F3A2",
+"(	c #F4F397",
+"_	c #F5F39A",
+":	c #F2F399",
+"<	c #E2EA6D",
+"[	c #DFEA66",
+"}	c #DAE95C",
+"|	c #D3E753",
+"1	c #CAE54B",
+"2	c #C7E545",
+"3	c #BFE23C",
+"4	c #B7E034",
+"5	c #B1E130",
+"6	c #A5DC28",
+"7	c #F9F9DA",
+"8	c #F9F8CA",
+"9	c #F8F7C9",
+"0	c #F8F7CD",
+"a	c #F9F7C7",
+"b	c #F9F7B8",
+"c	c #F7F5A8",
+"d	c #E6EC73",
+"e	c #E0EA68",
+"f	c #DBE95D",
+"g	c #D8E956",
+"h	c #D2E850",
+"i	c #C4E343",
+"j	c #BEE23D",
+"k	c #B2E036",
+"l	c #A9DE2E",
+"m	c #A0DC29",
+"n	c #91D823",
+"o	c #F9F9F5",
+"p	c #F9F9EA",
+"q	c #F9F9E2",
+"r	c #F9F8E9",
+"s	c #F9F8E1",
+"t	c #F9F7D3",
+"u	c #F9F7BC",
+"v	c #F9F7AF",
+"w	c #E8EE80",
+"x	c #E2EC6F",
+"y	c #DBEA61",
+"z	c #D3E755",
+"A	c #CAE44C",
+"B	c #C6E446",
+"C	c #BDE441",
+"D	c #B8E337",
+"E	c #AADE30",
+"F	c #9DDA2A",
+"G	c #91D722",
+"H	c #87D61F",
+"I	c #7FD61B",
+"J	c #F9F9F8",
+"K	c #F9F9F7",
+"L	c #F9F9F0",
+"M	c #F9F8EC",
+"N	c #F9F7E1",
+"O	c #F9F7D7",
+"P	c #F9F7C9",
+"Q	c #F9F7B4",
+"R	c #EBF092",
+"S	c #E1EB69",
+"T	c #DBE95F",
+"U	c #D3E654",
+"V	c #CCE44A",
+"W	c #C9E647",
+"X	c #BDE13D",
+"Y	c #B1DE35",
+"Z	c #A8DD30",
+"`	c #9BDA29",
+" .	c #94D823",
+"..	c #8CD921",
+"+.	c #82D71C",
+"@.	c #7CD716",
+"#.	c #F9F9F9",
+"$.	c #F9F8F5",
+"%.	c #F9F7EE",
+"&.	c #F9F7E4",
+"*.	c #F9F7D5",
+"=.	c #F9F7CB",
+"-.	c #F9F7BF",
+";.	c #F4F39E",
+">.	c #E1EA76",
+",.	c #E0EA69",
+"'.	c #D9E85D",
+").	c #D7E859",
+"!.	c #CCE64E",
+"~.	c #C1E343",
+"{.	c #BBE23C",
+"].	c #B0DF34",
+"^.	c #A9DD2F",
+"/.	c #9AD928",
+"(.	c #90D822",
+"_.	c #8AD81F",
+":.	c #81D81B",
+"<.	c #76D517",
+"[.	c #F9F7F6",
+"}.	c #F9F7F4",
+"|.	c #F9F5D3",
+"1.	c #F9F6C7",
+"2.	c #F9F6B9",
+"3.	c #E6EC86",
+"4.	c #E6ED72",
+"5.	c #E3ED6C",
+"6.	c #D6E75E",
+"7.	c #D1E655",
+"8.	c #C7E34A",
+"9.	c #C1E141",
+"0.	c #B2DD39",
+"a.	c #B3E135",
+"b.	c #A6DE30",
+"c.	c #9BDB29",
+"d.	c #97DA24",
+"e.	c #87D71E",
+"f.	c #82D71B",
+"g.	c #87DA1F",
+"h.	c #63CF12",
+"i.	c #F8F8F8",
+"j.	c #F9F7F5",
+"k.	c #F9F5E3",
+"l.	c #F9F5D4",
+"m.	c #F9F6B8",
+"n.	c #EDF198",
+"o.	c #E1EB6F",
+"p.	c #E1EC68",
+"q.	c #D8E95C",
+"r.	c #D3E752",
+"s.	c #C9E44A",
+"t.	c #C7E746",
+"u.	c #BEE43D",
+"v.	c #B0E138",
+"w.	c #A8E02D",
+"x.	c #A3DF29",
+"y.	c #B4E226",
+"z.	c #CDEB2C",
+"A.	c #B9E925",
+"B.	c #6DD213",
+"C.	c #56C90F",
+"D.	c #F9F8F4",
+"E.	c #F9F7EB",
+"F.	c #F9F7F2",
+"G.	c #F9F5EA",
+"H.	c #F9F3DE",
+"I.	c #F9F4CF",
+"J.	c #F9F5C5",
+"K.	c #F9F5B8",
+"L.	c #F8F7B2",
+"M.	c #F1F495",
+"N.	c #E3EC6B",
+"O.	c #D8E859",
+"P.	c #CEE650",
+"Q.	c #C8E449",
+"R.	c #C2E441",
+"S.	c #BAE139",
+"T.	c #E7F24F",
+"U.	c #E3F347",
+"V.	c #DCF13E",
+"W.	c #D9F137",
+"X.	c #CDEE30",
+"Y.	c #C3EB27",
+"Z.	c #85D919",
+"`.	c #4FC90E",
+" +	c #F7F7F2",
+".+	c #F9F9F2",
+"++	c #F9F8ED",
+"@+	c #F9F5EE",
+"#+	c #F9F4E4",
+"$+	c #F9F5DC",
+"%+	c #F9F6D1",
+"&+	c #F9F6C2",
+"*+	c #F9F6B7",
+"=+	c #F9F6A6",
+"-+	c #F8F599",
+";+	c #F7F591",
+">+	c #F4F584",
+",+	c #D7EB61",
+"'+	c #C5E447",
+")+	c #BAE13E",
+"!+	c #B8E23A",
+"~+	c #B8E132",
+"{+	c #E6F349",
+"]+	c #E1F343",
+"^+	c #DAF13B",
+"/+	c #D2EF33",
+"(+	c #CBEE2E",
+"_+	c #C1EA25",
+":+	c #A9E61F",
+"<+	c #55CE10",
+"[+	c #4FC60D",
+"}+	c #F8F8E9",
+"|+	c #F9F9E8",
+"1+	c #F9F9E7",
+"2+	c #F9F8E4",
+"3+	c #F9F7F0",
+"4+	c #F9F6EF",
+"5+	c #F9F5E7",
+"6+	c #F9F3DB",
+"7+	c #F9F5D6",
+"8+	c #F9F7CE",
+"9+	c #F9F7BE",
+"0+	c #F9F7B7",
+"a+	c #F9F7A5",
+"b+	c #F7F691",
+"c+	c #F6F588",
+"d+	c #F5F580",
+"e+	c #DBEE6B",
+"f+	c #BAE13D",
+"g+	c #B5E137",
+"h+	c #A5DB2E",
+"i+	c #E0F041",
+"j+	c #DBF140",
+"k+	c #DAF138",
+"l+	c #D1EE32",
+"m+	c #C6EB2B",
+"n+	c #C0EC27",
+"o+	c #BAEB22",
+"p+	c #65D517",
+"q+	c #4FCC0B",
+"r+	c #F9F9D7",
+"s+	c #F9F9D6",
+"t+	c #F9F8EA",
+"u+	c #F9F7E8",
+"v+	c #F9F5E5",
+"w+	c #F9F5DD",
+"x+	c #F9F2D2",
+"y+	c #F9F3CA",
+"z+	c #F9F6C3",
+"A+	c #F9F7BA",
+"B+	c #F9F8B2",
+"C+	c #F8F89E",
+"D+	c #F8F58E",
+"E+	c #F5F583",
+"F+	c #EFF479",
+"G+	c #C5E557",
+"H+	c #C5E543",
+"I+	c #B9E13B",
+"J+	c #9FDA2A",
+"K+	c #CEEC3B",
+"L+	c #D9EF38",
+"M+	c #D4EE32",
+"N+	c #D1EF30",
+"O+	c #C8ED2A",
+"P+	c #C2EB26",
+"Q+	c #B5E81E",
+"R+	c #80DC1C",
+"S+	c #46C80B",
+"T+	c #F0F1C0",
+"U+	c #F9F8C7",
+"V+	c #F9F9C6",
+"W+	c #F9F8D5",
+"X+	c #F9F7DF",
+"Y+	c #F9F6D6",
+"Z+	c #F9F5D0",
+"`+	c #F9F3C4",
+" @	c #F9F3BC",
+".@	c #F9F5B5",
+"+@	c #F9F7B0",
+"@@	c #F9F8A4",
+"#@	c #F7F796",
+"$@	c #EFF386",
+"%@	c #D3E865",
+"&@	c #C7E450",
+"*@	c #C0E242",
+"=@	c #BEE33F",
+"-@	c #B5E036",
+";@	c #A7DB2F",
+">@	c #A0DC2B",
+",@	c #C4E32F",
+"'@	c #DCF139",
+")@	c #D2ED2E",
+"!@	c #CAEC2A",
+"~@	c #CBEF2B",
+"{@	c #BEEA22",
+"]@	c #B2E81E",
+"^@	c #8FDD17",
+"/@	c #3DC209",
+"(@	c #33BC07",
+"_@	c #F5F5B4",
+":@	c #F6F6AE",
+"<@	c #F6F6B1",
+"[@	c #F7F7B3",
+"}@	c #F2F3AB",
+"|@	c #F3F198",
+"1@	c #F8F5BA",
+"2@	c #F9F4B6",
+"3@	c #F9F3AF",
+"4@	c #F9F4A4",
+"5@	c #F8F7A2",
+"6@	c #F7F799",
+"7@	c #F6F68A",
+"8@	c #DDEC69",
+"9@	c #CEE74F",
+"0@	c #C0E03C",
+"a@	c #D5EA4C",
+"b@	c #BEE23A",
+"c@	c #A9DF2F",
+"d@	c #9EDD2A",
+"e@	c #BEE22A",
+"f@	c #DCF23A",
+"g@	c #D4F033",
+"h@	c #CBED2A",
+"i@	c #C5ED29",
+"j@	c #BDEB22",
+"k@	c #B4E81E",
+"l@	c #A5E618",
+"m@	c #41C209",
+"n@	c #3ABF07",
+"o@	c #DCDC8A",
+"p@	c #F3F49B",
+"q@	c #F3F49D",
+"r@	c #F2F49D",
+"s@	c #F4F59F",
+"t@	c #F4F59D",
+"u@	c #F1F498",
+"v@	c #F8F7BF",
+"w@	c #F9F6AF",
+"x@	c #F8F39A",
+"y@	c #F8F594",
+"z@	c #F5F57D",
+"A@	c #DDEC66",
+"B@	c #C2E144",
+"C@	c #BDE13F",
+"D@	c #BFD82E",
+"E@	c #E6EF4E",
+"F@	c #E1F04A",
+"G@	c #C2E433",
+"H@	c #CDEA34",
+"I@	c #DDF03F",
+"J@	c #D4EF36",
+"K@	c #CFEF30",
+"L@	c #CBEE2A",
+"M@	c #C2EC26",
+"N@	c #B7E91F",
+"O@	c #ADE71C",
+"P@	c #A0E517",
+"Q@	c #3FC008",
+"R@	c #33BD06",
+"S@	c #DDD97B",
+"T@	c #F2F392",
+"U@	c #F0F28F",
+"V@	c #F1F38C",
+"W@	c #F6F7BE",
+"X@	c #F5F6B7",
+"Y@	c #F5F5B2",
+"Z@	c #F9F6A7",
+"`@	c #F9F6A3",
+" #	c #F8F59C",
+".#	c #F8F38D",
+"+#	c #F7F58C",
+"@#	c #F5F687",
+"##	c #F3F576",
+"$#	c #F0F575",
+"%#	c #DDEC57",
+"&#	c #D8EA49",
+"*#	c #DDE946",
+"=#	c #E8F14F",
+"-#	c #E3F148",
+";#	c #E2F346",
+">#	c #E1F345",
+",#	c #D8F039",
+"'#	c #D1EF31",
+")#	c #CAED2C",
+"!#	c #C4EC27",
+"~#	c #C1ED24",
+"{#	c #B6EA1F",
+"]#	c #AFEA1C",
+"^#	c #A4E717",
+"/#	c #3EBF08",
+"(#	c #37C206",
+"_#	c #E8EB6C",
+":#	c #E6ED76",
+"<#	c #E4EC73",
+"[#	c #ECEF86",
+"}#	c #F8F7A7",
+"|#	c #F9F7A7",
+"1#	c #F8F7A3",
+"2#	c #F8F69D",
+"3#	c #F8F69A",
+"4#	c #F7F48A",
+"5#	c #F6F27B",
+"6#	c #F6F482",
+"7#	c #F3F57B",
+"8#	c #F1F574",
+"9#	c #F0F46C",
+"0#	c #EBF25E",
+"a#	c #EBF259",
+"b#	c #E7F152",
+"c#	c #E1EF44",
+"d#	c #DFEF40",
+"e#	c #D7EE3B",
+"f#	c #DAF039",
+"g#	c #D7F137",
+"h#	c #D1F032",
+"i#	c #CCEF2C",
+"j#	c #C6EE26",
+"k#	c #B7EA1F",
+"l#	c #AAE81A",
+"m#	c #97E415",
+"n#	c #37BE07",
+"o#	c #2CAF05",
+"p#	c #D5DC5B",
+"q#	c #E4ED6F",
+"r#	c #E9F082",
+"s#	c #F8F7A1",
+"t#	c #F8F79D",
+"u#	c #F7F696",
+"v#	c #F6F68B",
+"w#	c #F5F37B",
+"x#	c #F5F378",
+"y#	c #F3F372",
+"z#	c #F1F36C",
+"A#	c #EEF468",
+"B#	c #ECF35D",
+"C#	c #EAF256",
+"D#	c #E7F151",
+"E#	c #E4F148",
+"F#	c #E0F043",
+"G#	c #E1F143",
+"H#	c #D9EF39",
+"I#	c #D2ED31",
+"J#	c #CEF030",
+"K#	c #C9EF2A",
+"L#	c #C0ED25",
+"M#	c #ADE61C",
+"N#	c #A7E619",
+"O#	c #A5E818",
+"P#	c #80D913",
+"Q#	c #34BE06",
+"R#	c #35BF05",
+"S#	c #E0EC61",
+"T#	c #E4ED72",
+"U#	c #F7F792",
+"V#	c #F7F791",
+"W#	c #F8F78F",
+"X#	c #F6F687",
+"Y#	c #F6F688",
+"Z#	c #F3F377",
+"`#	c #F4F474",
+" $	c #F1F472",
+".$	c #EEF46D",
+"+$	c #DEEB59",
+"@$	c #E7F059",
+"#$	c #E9F356",
+"$$	c #E9F255",
+"%$	c #E7F24D",
+"&$	c #E6F245",
+"*$	c #E4F243",
+"=$	c #DFF240",
+"-$	c #D7EF36",
+";$	c #CCEB2B",
+">$	c #CDEE2C",
+",$	c #C5ED2A",
+"'$	c #BDEB25",
+")$	c #ADE71E",
+"!$	c #A6E51A",
+"~$	c #9AE316",
+"{$	c #93E214",
+"]$	c #5CC30B",
+"^$	c #34BD05",
+"/$	c #DDEC59",
+"($	c #D6E858",
+"_$	c #F5F57C",
+":$	c #F5F680",
+"<$	c #F5F67E",
+"[$	c #F5F67C",
+"}$	c #F4F574",
+"|$	c #F1F26A",
+"1$	c #F2F46F",
+"2$	c #EFF468",
+"3$	c #BCE24A",
+"4$	c #BBDF38",
+"5$	c #B9DB30",
+"6$	c #C3DF33",
+"7$	c #DDED42",
+"8$	c #E5F249",
+"9$	c #DEF03D",
+"0$	c #D5EF35",
+"a$	c #CEEE2E",
+"b$	c #C1E925",
+"c$	c #B9E923",
+"d$	c #B1E71E",
+"e$	c #ABE619",
+"f$	c #A8E517",
+"g$	c #94E113",
+"h$	c #83DE11",
+"i$	c #35AD06",
+"j$	c #2FBB04",
+"k$	c #CEE249",
+"l$	c #CFE54B",
+"m$	c #E8F16F",
+"n$	c #F5F578",
+"o$	c #F4F674",
+"p$	c #F1F46D",
+"q$	c #F2F268",
+"r$	c #F1F366",
+"s$	c #EFF462",
+"t$	c #DEEF5B",
+"u$	c #B3E039",
+"v$	c #B4E037",
+"w$	c #AEDE31",
+"x$	c #A6DB2B",
+"y$	c #BBE331",
+"z$	c #E3F243",
+"A$	c #DFF141",
+"B$	c #D9F038",
+"C$	c #D9F136",
+"D$	c #CDEF2E",
+"E$	c #C7EE2A",
+"F$	c #BDEB24",
+"G$	c #B7EA1D",
+"H$	c #A0E316",
+"I$	c #96E214",
+"J$	c #93E212",
+"K$	c #6DD10D",
+"L$	c #2CAD04",
+"M$	c #2AB303",
+"N$	c #CDE746",
+"O$	c #CDE74B",
+"P$	c #F0F56D",
+"Q$	c #F2F46A",
+"R$	c #F0F264",
+"S$	c #ECF15A",
+"T$	c #EFF361",
+"U$	c #EDF45A",
+"V$	c #EBF45C",
+"W$	c #B9E239",
+"X$	c #B6E335",
+"Y$	c #ADE02E",
+"Z$	c #A9E02B",
+"`$	c #A4DE28",
+" %	c #DFF243",
+".%	c #D7EF35",
+"+%	c #D5EF31",
+"@%	c #D4F031",
+"#%	c #CDEF2C",
+"$%	c #C7ED28",
+"%%	c #C6EE27",
+"&%	c #C1EE23",
+"*%	c #B6EC1F",
+"=%	c #A7E818",
+"-%	c #67CC0E",
+";%	c #47C208",
+">%	c #34B906",
+",%	c #2DBD04",
+"'%	c #C1E23C",
+")%	c #C3E53E",
+"!%	c #D7EB4F",
+"~%	c #EEF257",
+"{%	c #ECF057",
+"]%	c #EAF051",
+"^%	c #EBF255",
+"/%	c #EBF452",
+"(%	c #E9F450",
+"_%	c #B8E137",
+":%	c #A3DB2A",
+"<%	c #A5DF2B",
+"[%	c #98DA26",
+"}%	c #8CD621",
+"|%	c #90D41D",
+"1%	c #BFE326",
+"2%	c #D0EE2D",
+"3%	c #CEEF2E",
+"4%	c #C8EE28",
+"5%	c #C1ED26",
+"6%	c #BCEC22",
+"7%	c #B9ED20",
+"8%	c #9FE419",
+"9%	c #70CD0F",
+"0%	c #35B906",
+"a%	c #34C005",
+"b%	c #30C005",
+"c%	c #26B503",
+"d%	c #B7E036",
+"e%	c #B7E239",
+"f%	c #E2EF4B",
+"g%	c #EBF451",
+"h%	c #E5F14B",
+"i%	c #E4F04B",
+"j%	c #E7F451",
+"k%	c #E6F44B",
+"l%	c #B6DD2C",
+"m%	c #ABDC25",
+"n%	c #B4DF23",
+"o%	c #A3D61D",
+"p%	c #96D91D",
+"q%	c #86D218",
+"r%	c #B3DE21",
+"s%	c #CAED2B",
+"t%	c #C6EC25",
+"u%	c #BEEB22",
+"v%	c #BDEC20",
+"w%	c #B3EA1D",
+"x%	c #9AE017",
+"y%	c #46BC07",
+"z%	c #40C107",
+"A%	c #35C206",
+"B%	c #2EBE05",
+"C%	c #2BBD04",
+"D%	c #B2E130",
+"E%	c #B5E334",
+"F%	c #DFF042",
+"G%	c #E4F147",
+"H%	c #E5F348",
+"I%	c #E2F246",
+"J%	c #E4F445",
+"K%	c #DFF33F",
+"L%	c #E0F33D",
+"M%	c #DCF238",
+"N%	c #D8F034",
+"O%	c #D2EF2E",
+"P%	c #CBEB29",
+"Q%	c #D1EF2D",
+"R%	c #C7ED26",
+"S%	c #C5EE26",
+"T%	c #B7EA20",
+"U%	c #B5EA1D",
+"V%	c #AEEA1B",
+"W%	c #85D813",
+"X%	c #3FC208",
+"Y%	c #3AC507",
+"Z%	c #33C005",
+"`%	c #2BBB04",
+" &	c #26A903",
+".&	c #A9E029",
+"+&	c #A5DF29",
+"@&	c #A5DE29",
+"#&	c #D8EE3D",
+"$&	c #E4F341",
+"%&	c #E2F340",
+"&&	c #E0F33C",
+"*&	c #DDF239",
+"=&	c #D9F236",
+"-&	c #D6F133",
+";&	c #D3F131",
+">&	c #CEEE2A",
+",&	c #CEEF28",
+"'&	c #CBEF29",
+")&	c #BFEB22",
+"!&	c #B2EB23",
+"~&	c #81DD1D",
+"{&	c #6DCF11",
+"]&	c #68D10F",
+"^&	c #4CCB0E",
+"/&	c #39C407",
+"(&	c #33C106",
+"_&	c #2ABB04",
+":&	c #27B803",
+"<&	c #97DA23",
+"[&	c #98DC24",
+"}&	c #95DC23",
+"|&	c #93DB25",
+"1&	c #99DF2A",
+"2&	c #C6EC31",
+"3&	c #C6EB2E",
+"4&	c #ADE026",
+"5&	c #C1E928",
+"6&	c #CCEE29",
+"7&	c #C9ED26",
+"8&	c #B9EA21",
+"9&	c #8FD718",
+"0&	c #4FC30C",
+"a&	c #4DCB0B",
+"b&	c #49CB0A",
+"c&	c #3DC508",
+"d&	c #3DC808",
+"e&	c #34C306",
+"f&	c #2DBC04",
+"g&	c #2CBF04",
+"h&	c #88D81D",
+"i&	c #87D81A",
+"j&	c #86D81A",
+"k&	c #7ED518",
+"l&	c #75D015",
+"m&	c #71D113",
+"n&	c #84DB1A",
+"o&	c #9DE524",
+"p&	c #7CD316",
+"q&	c #62CA0E",
+"r&	c #5AC80B",
+"s&	c #55C90B",
+"t&	c #46CA0A",
+"u&	c #41C708",
+"v&	c #3DC907",
+"w&	c #36C406",
+"x&	c #30C205",
+"y&	c #27AA04",
+"z&	c #75D016",
+"A&	c #79D516",
+"B&	c #73D515",
+"C&	c #6AD113",
+"D&	c #6CD413",
+"E&	c #65D211",
+"F&	c #5BCD0F",
+"G&	c #56CD0E",
+"H&	c #58D10E",
+"I&	c #50CC0C",
+"J&	c #48C809",
+"K&	c #40C708",
+"L&	c #3FC607",
+"M&	c #40C907",
+"N&	c #38C706",
+"O&	c #32C105",
+"P&	c #57BE0F",
+"Q&	c #61D111",
+"R&	c #66D411",
+"S&	c #62D20F",
+"T&	c #57CD0D",
+"U&	c #57D00C",
+"V&	c #4DCC0C",
+"W&	c #4BCD0A",
+"X&	c #40C608",
+"Y&	c #3DC807",
+"Z&	c #30B505",
+"`&	c #4BBC0B",
+" *	c #4CC20A",
+".*	c #48BF0A",
+"+*	c #45C109",
+"@*	c #38B507",
+"#*	c #31B506",
+"                          . + @ # $ %                           ",
+"                    & * = - ; > , ' ) ! ~ {                     ",
+"                ] ^ / ( _ : < [ } | 1 2 3 4 5 6                 ",
+"              7 8 9 0 a b c d e f g h i j k l m n               ",
+"          o p q r s t a u v w x y z A B C D E F G H I           ",
+"        J K L o M N O P u Q R S T U V W X Y Z `  ...+.@.        ",
+"        #.K J $.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.        ",
+"      #.#.J [.}.%.&.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.      ",
+"    i.#.K [.j.}.%.k.l.1.m.n.o.p.q.r.s.t.u.v.E w.x.y.z.A.B.C.    ",
+"    #.K D.E.}.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.D T.U.V.W.X.Y.Z.`.    ",
+"   +.+.+++&.F.@+#+$+%+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+  ",
+"  }+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+9.f+g+h+i+j+k+l+m+n+o+p+q+  ",
+"  r+r+s+t+u+v+w+x+y+z+A+B+C+D+E+F+G+H+I+].J+K+L+M+N+O+P+Q+R+S+  ",
+"T+U+V+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@",
+"_@:@<@[@[@}@|@1@2@3@4@5@6@7@8@9@W 0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@",
+"o@p@q@r@s@t@u@v@w@4@x@y@b+z@A@B@C@D@E@F@G@H@I@J@K@L@M@N@O@P@Q@R@",
+"S@T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#",
+"_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h#i#j#k#O@l#m#n#o#",
+"p#q#r#5@s#t#u#b+v#w#x#y#z#A#B#C#D#E#F#G#H#I#'#J#K#L#M#N#O#P#Q#R#",
+"  S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$;$>$,$'$)$!$~${$]$^$  ",
+"  /$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$G#9$k+0$a$b$c$d$e$f$g$h$i$j$  ",
+"  k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$'#D$E$F$G$H$I$J$K$L$M$  ",
+"    N$O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%>%,%    ",
+"    '%)%!%~%{%]%^%/%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8%9%0%a%b%c%    ",
+"      d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v%w%x%y%z%A%B%C%      ",
+"        D%E%F%G%H%I%J%K%L%M%N%O%P%Q%R%S%T%U%V%W%X%Y%Z%`% &      ",
+"        .&+&@&#&$&%&&&*&=&-&;&>&,&'&)&!&~&{&]&^&/&(&_&:&        ",
+"          <&[&}&|&1&2&3&4&5&6&7&{@8&9&0&a&b&c&d&e&f&g&          ",
+"              h&i&j&k&l&m&n&o&p&q&r&s&a&t&u&v&w&x&y&            ",
+"                z&A&B&C&D&E&F&G&H&I&J&K&L&M&N&O&                ",
+"                    P&Q&R&S&T&U&V&W&X&Y&v&Z&                    ",
+"                          `& *.*+*@*#*                          "};
diff --git a/debian/tmw-data.install b/debian/tmw-data.install
deleted file mode 100644
index c9f6cb7b..00000000
--- a/debian/tmw-data.install
+++ /dev/null
@@ -1,5 +0,0 @@
-data/graphics/gui/*.png usr/share/games/tmw/data/graphics/gui
-data/graphics/images/*.png usr/share/games/tmw/data/graphics/images
-data/graphics/images/ambient/*.png usr/share/games/tmw/data/graphics/images/ambient
-data/graphics/tiles/*.png usr/share/games/tmw/data/graphics/tiles
-data/help/*.txt usr/share/games/tmw/data/help
diff --git a/debian/tmw.desktop b/debian/tmw.desktop
deleted file mode 100644
index f094f668..00000000
--- a/debian/tmw.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=The Mana World
-Name[fr]=Le Monde de Mana
-Comment=An online fantasy role playing game
-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
-Exec=tmw
-StartupNotify=false
-Terminal=false
-Type=Game
-Icon=tmw.png
-Categories=Game
diff --git a/debian/tmw.docs b/debian/tmw.docs
deleted file mode 100644
index d622a527..00000000
--- a/debian/tmw.docs
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTHORS
-NEWS
-README
-ChangeLog
-docs/progression.txt
-docs/FAQ.txt
diff --git a/debian/tmw.install b/debian/tmw.install
deleted file mode 100644
index 037ccf54..00000000
--- a/debian/tmw.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmw.desktop usr/share/applications
-debian/tmw.xpm usr/share/pixmaps
-data/icons/tmw.png usr/share/icons
-docs/tmw.6 usr/share/man/man6
-src/tmw usr/games
diff --git a/debian/tmw.menu b/debian/tmw.menu
deleted file mode 100644
index 4af5ad0a..00000000
--- a/debian/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"
diff --git a/debian/tmw.sgml b/debian/tmw.sgml
deleted file mode 100644
index 0ed18199..00000000
--- a/debian/tmw.sgml
+++ /dev/null
@@ -1,149 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>FERREIRA</firstname>">
-  <!ENTITY dhsurname   "<surname>Yohann</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>avril 13, 2005</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>6</manvolnum>">
-  <!ENTITY dhemail     "<email>bertram@cegetel.net</email>">
-  <!ENTITY dhusername  "FERREIRA Yohann">
-  <!ENTITY dhucpackage "<refentrytitle>TMW</refentrytitle>">
-  <!ENTITY dhpackage   "tmw">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2003</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>tmw is the abreviation of The Mana World : A Fantasy Online Game</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> ingame
-      commands.</para>
-    <para><command>&dhpackage;</command> is a Great Online Game based upon the Seiken Densetsu Serie.
-It has its own universe, and and its own character management system, which will
-give you the opportunity to play in a 2D heroic-fantasy world forever.</para>
-
-  </refsect1>
-  <refsect1>
-    <title>COMMON KEYS</title>
-
-    <para>Arrow Keys, Key Pad Keys (Diagonals Supported).
-Move your character around.
-
-Left Ctrl : 
-Make your character attack.
-
-G : 
-Get Items on the ground or in a chest.
-
-Alt + 1...9 : 
-Shows an Emoticon above your character.
-
-Alt + I : 
-Shows / Hide Inventory Window.
-
-Alt + K : 
-Shows / Hide Skills Window.
-
-Alt + E : 
-Shows / Hide Equipment Window.
-
-Alt + C : 
-Shows Configuration Window.
-</para>
-
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>libguichan (2).</para>
-
-    <para>The program is documented fully by <citetitle>The Mana World Team</citetitle> available via the
-      website http://www.manaworld.org/</para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-
diff --git a/debian/tmw.xpm b/debian/tmw.xpm
deleted file mode 100644
index 46ce5c87..00000000
--- a/debian/tmw.xpm
+++ /dev/null
@@ -1,776 +0,0 @@
-/* XPM */
-static char * tmw_xpm[] = {
-"32 32 741 2",
-"  	c None",
-". 	c #E8ED72",
-"+ 	c #E7ED6A",
-"@ 	c #E1EB62",
-"# 	c #D4E758",
-"$ 	c #D2E750",
-"% 	c #CDE748",
-"& 	c #F5F4A1",
-"* 	c #F3F294",
-"= 	c #EBEE81",
-"- 	c #EAEE77",
-"; 	c #E6ED6F",
-"> 	c #E1EB68",
-", 	c #D9E859",
-"' 	c #D3E851",
-") 	c #CCE549",
-"! 	c #C7E643",
-"~ 	c #BEE239",
-"{ 	c #B3DF32",
-"] 	c #F8F8C4",
-"^ 	c #F9F7B3",
-"/ 	c #F4F3A2",
-"( 	c #F4F397",
-"_ 	c #F5F39A",
-": 	c #F2F399",
-"< 	c #E2EA6D",
-"[ 	c #DFEA66",
-"} 	c #DAE95C",
-"| 	c #D3E753",
-"1 	c #CAE54B",
-"2 	c #C7E545",
-"3 	c #BFE23C",
-"4 	c #B7E034",
-"5 	c #B1E130",
-"6 	c #A5DC28",
-"7 	c #F9F9DA",
-"8 	c #F9F8CA",
-"9 	c #F8F7C9",
-"0 	c #F8F7CD",
-"a 	c #F9F7C7",
-"b 	c #F9F7B8",
-"c 	c #F7F5A8",
-"d 	c #E6EC73",
-"e 	c #E0EA68",
-"f 	c #DBE95D",
-"g 	c #D8E956",
-"h 	c #D2E850",
-"i 	c #C4E343",
-"j 	c #BEE23D",
-"k 	c #B2E036",
-"l 	c #A9DE2E",
-"m 	c #A0DC29",
-"n 	c #91D823",
-"o 	c #F9F9F5",
-"p 	c #F9F9EA",
-"q 	c #F9F9E2",
-"r 	c #F9F8E9",
-"s 	c #F9F8E1",
-"t 	c #F9F7D3",
-"u 	c #F9F7BC",
-"v 	c #F9F7AF",
-"w 	c #E8EE80",
-"x 	c #E2EC6F",
-"y 	c #DBEA61",
-"z 	c #D3E755",
-"A 	c #CAE44C",
-"B 	c #C6E446",
-"C 	c #BDE441",
-"D 	c #B8E337",
-"E 	c #AADE30",
-"F 	c #9DDA2A",
-"G 	c #91D722",
-"H 	c #87D61F",
-"I 	c #7FD61B",
-"J 	c #F9F9F8",
-"K 	c #F9F9F7",
-"L 	c #F9F9F0",
-"M 	c #F9F8EC",
-"N 	c #F9F7E1",
-"O 	c #F9F7D7",
-"P 	c #F9F7C9",
-"Q 	c #F9F7B4",
-"R 	c #EBF092",
-"S 	c #E1EB69",
-"T 	c #DBE95F",
-"U 	c #D3E654",
-"V 	c #CCE44A",
-"W 	c #C9E647",
-"X 	c #BDE13D",
-"Y 	c #B1DE35",
-"Z 	c #A8DD30",
-"` 	c #9BDA29",
-" .	c #94D823",
-"..	c #8CD921",
-"+.	c #82D71C",
-"@.	c #7CD716",
-"#.	c #F9F9F9",
-"$.	c #F9F8F5",
-"%.	c #F9F7EE",
-"&.	c #F9F7E4",
-"*.	c #F9F7D5",
-"=.	c #F9F7CB",
-"-.	c #F9F7BF",
-";.	c #F4F39E",
-">.	c #E1EA76",
-",.	c #E0EA69",
-"'.	c #D9E85D",
-").	c #D7E859",
-"!.	c #CCE64E",
-"~.	c #C1E343",
-"{.	c #BBE23C",
-"].	c #B0DF34",
-"^.	c #A9DD2F",
-"/.	c #9AD928",
-"(.	c #90D822",
-"_.	c #8AD81F",
-":.	c #81D81B",
-"<.	c #76D517",
-"[.	c #F9F7F6",
-"}.	c #F9F7F4",
-"|.	c #F9F5D3",
-"1.	c #F9F6C7",
-"2.	c #F9F6B9",
-"3.	c #E6EC86",
-"4.	c #E6ED72",
-"5.	c #E3ED6C",
-"6.	c #D6E75E",
-"7.	c #D1E655",
-"8.	c #C7E34A",
-"9.	c #C1E141",
-"0.	c #B2DD39",
-"a.	c #B3E135",
-"b.	c #A6DE30",
-"c.	c #9BDB29",
-"d.	c #97DA24",
-"e.	c #87D71E",
-"f.	c #82D71B",
-"g.	c #87DA1F",
-"h.	c #63CF12",
-"i.	c #F8F8F8",
-"j.	c #F9F7F5",
-"k.	c #F9F5E3",
-"l.	c #F9F5D4",
-"m.	c #F9F6B8",
-"n.	c #EDF198",
-"o.	c #E1EB6F",
-"p.	c #E1EC68",
-"q.	c #D8E95C",
-"r.	c #D3E752",
-"s.	c #C9E44A",
-"t.	c #C7E746",
-"u.	c #BEE43D",
-"v.	c #B0E138",
-"w.	c #A8E02D",
-"x.	c #A3DF29",
-"y.	c #B4E226",
-"z.	c #CDEB2C",
-"A.	c #B9E925",
-"B.	c #6DD213",
-"C.	c #56C90F",
-"D.	c #F9F8F4",
-"E.	c #F9F7EB",
-"F.	c #F9F7F2",
-"G.	c #F9F5EA",
-"H.	c #F9F3DE",
-"I.	c #F9F4CF",
-"J.	c #F9F5C5",
-"K.	c #F9F5B8",
-"L.	c #F8F7B2",
-"M.	c #F1F495",
-"N.	c #E3EC6B",
-"O.	c #D8E859",
-"P.	c #CEE650",
-"Q.	c #C8E449",
-"R.	c #C2E441",
-"S.	c #BAE139",
-"T.	c #E7F24F",
-"U.	c #E3F347",
-"V.	c #DCF13E",
-"W.	c #D9F137",
-"X.	c #CDEE30",
-"Y.	c #C3EB27",
-"Z.	c #85D919",
-"`.	c #4FC90E",
-" +	c #F7F7F2",
-".+	c #F9F9F2",
-"++	c #F9F8ED",
-"@+	c #F9F5EE",
-"#+	c #F9F4E4",
-"$+	c #F9F5DC",
-"%+	c #F9F6D1",
-"&+	c #F9F6C2",
-"*+	c #F9F6B7",
-"=+	c #F9F6A6",
-"-+	c #F8F599",
-";+	c #F7F591",
-">+	c #F4F584",
-",+	c #D7EB61",
-"'+	c #C5E447",
-")+	c #BAE13E",
-"!+	c #B8E23A",
-"~+	c #B8E132",
-"{+	c #E6F349",
-"]+	c #E1F343",
-"^+	c #DAF13B",
-"/+	c #D2EF33",
-"(+	c #CBEE2E",
-"_+	c #C1EA25",
-":+	c #A9E61F",
-"<+	c #55CE10",
-"[+	c #4FC60D",
-"}+	c #F8F8E9",
-"|+	c #F9F9E8",
-"1+	c #F9F9E7",
-"2+	c #F9F8E4",
-"3+	c #F9F7F0",
-"4+	c #F9F6EF",
-"5+	c #F9F5E7",
-"6+	c #F9F3DB",
-"7+	c #F9F5D6",
-"8+	c #F9F7CE",
-"9+	c #F9F7BE",
-"0+	c #F9F7B7",
-"a+	c #F9F7A5",
-"b+	c #F7F691",
-"c+	c #F6F588",
-"d+	c #F5F580",
-"e+	c #DBEE6B",
-"f+	c #BAE13D",
-"g+	c #B5E137",
-"h+	c #A5DB2E",
-"i+	c #E0F041",
-"j+	c #DBF140",
-"k+	c #DAF138",
-"l+	c #D1EE32",
-"m+	c #C6EB2B",
-"n+	c #C0EC27",
-"o+	c #BAEB22",
-"p+	c #65D517",
-"q+	c #4FCC0B",
-"r+	c #F9F9D7",
-"s+	c #F9F9D6",
-"t+	c #F9F8EA",
-"u+	c #F9F7E8",
-"v+	c #F9F5E5",
-"w+	c #F9F5DD",
-"x+	c #F9F2D2",
-"y+	c #F9F3CA",
-"z+	c #F9F6C3",
-"A+	c #F9F7BA",
-"B+	c #F9F8B2",
-"C+	c #F8F89E",
-"D+	c #F8F58E",
-"E+	c #F5F583",
-"F+	c #EFF479",
-"G+	c #C5E557",
-"H+	c #C5E543",
-"I+	c #B9E13B",
-"J+	c #9FDA2A",
-"K+	c #CEEC3B",
-"L+	c #D9EF38",
-"M+	c #D4EE32",
-"N+	c #D1EF30",
-"O+	c #C8ED2A",
-"P+	c #C2EB26",
-"Q+	c #B5E81E",
-"R+	c #80DC1C",
-"S+	c #46C80B",
-"T+	c #F0F1C0",
-"U+	c #F9F8C7",
-"V+	c #F9F9C6",
-"W+	c #F9F8D5",
-"X+	c #F9F7DF",
-"Y+	c #F9F6D6",
-"Z+	c #F9F5D0",
-"`+	c #F9F3C4",
-" @	c #F9F3BC",
-".@	c #F9F5B5",
-"+@	c #F9F7B0",
-"@@	c #F9F8A4",
-"#@	c #F7F796",
-"$@	c #EFF386",
-"%@	c #D3E865",
-"&@	c #C7E450",
-"*@	c #C0E242",
-"=@	c #BEE33F",
-"-@	c #B5E036",
-";@	c #A7DB2F",
-">@	c #A0DC2B",
-",@	c #C4E32F",
-"'@	c #DCF139",
-")@	c #D2ED2E",
-"!@	c #CAEC2A",
-"~@	c #CBEF2B",
-"{@	c #BEEA22",
-"]@	c #B2E81E",
-"^@	c #8FDD17",
-"/@	c #3DC209",
-"(@	c #33BC07",
-"_@	c #F5F5B4",
-":@	c #F6F6AE",
-"<@	c #F6F6B1",
-"[@	c #F7F7B3",
-"}@	c #F2F3AB",
-"|@	c #F3F198",
-"1@	c #F8F5BA",
-"2@	c #F9F4B6",
-"3@	c #F9F3AF",
-"4@	c #F9F4A4",
-"5@	c #F8F7A2",
-"6@	c #F7F799",
-"7@	c #F6F68A",
-"8@	c #DDEC69",
-"9@	c #CEE74F",
-"0@	c #C0E03C",
-"a@	c #D5EA4C",
-"b@	c #BEE23A",
-"c@	c #A9DF2F",
-"d@	c #9EDD2A",
-"e@	c #BEE22A",
-"f@	c #DCF23A",
-"g@	c #D4F033",
-"h@	c #CBED2A",
-"i@	c #C5ED29",
-"j@	c #BDEB22",
-"k@	c #B4E81E",
-"l@	c #A5E618",
-"m@	c #41C209",
-"n@	c #3ABF07",
-"o@	c #DCDC8A",
-"p@	c #F3F49B",
-"q@	c #F3F49D",
-"r@	c #F2F49D",
-"s@	c #F4F59F",
-"t@	c #F4F59D",
-"u@	c #F1F498",
-"v@	c #F8F7BF",
-"w@	c #F9F6AF",
-"x@	c #F8F39A",
-"y@	c #F8F594",
-"z@	c #F5F57D",
-"A@	c #DDEC66",
-"B@	c #C2E144",
-"C@	c #BDE13F",
-"D@	c #BFD82E",
-"E@	c #E6EF4E",
-"F@	c #E1F04A",
-"G@	c #C2E433",
-"H@	c #CDEA34",
-"I@	c #DDF03F",
-"J@	c #D4EF36",
-"K@	c #CFEF30",
-"L@	c #CBEE2A",
-"M@	c #C2EC26",
-"N@	c #B7E91F",
-"O@	c #ADE71C",
-"P@	c #A0E517",
-"Q@	c #3FC008",
-"R@	c #33BD06",
-"S@	c #DDD97B",
-"T@	c #F2F392",
-"U@	c #F0F28F",
-"V@	c #F1F38C",
-"W@	c #F6F7BE",
-"X@	c #F5F6B7",
-"Y@	c #F5F5B2",
-"Z@	c #F9F6A7",
-"`@	c #F9F6A3",
-" #	c #F8F59C",
-".#	c #F8F38D",
-"+#	c #F7F58C",
-"@#	c #F5F687",
-"##	c #F3F576",
-"$#	c #F0F575",
-"%#	c #DDEC57",
-"&#	c #D8EA49",
-"*#	c #DDE946",
-"=#	c #E8F14F",
-"-#	c #E3F148",
-";#	c #E2F346",
-">#	c #E1F345",
-",#	c #D8F039",
-"'#	c #D1EF31",
-")#	c #CAED2C",
-"!#	c #C4EC27",
-"~#	c #C1ED24",
-"{#	c #B6EA1F",
-"]#	c #AFEA1C",
-"^#	c #A4E717",
-"/#	c #3EBF08",
-"(#	c #37C206",
-"_#	c #E8EB6C",
-":#	c #E6ED76",
-"<#	c #E4EC73",
-"[#	c #ECEF86",
-"}#	c #F8F7A7",
-"|#	c #F9F7A7",
-"1#	c #F8F7A3",
-"2#	c #F8F69D",
-"3#	c #F8F69A",
-"4#	c #F7F48A",
-"5#	c #F6F27B",
-"6#	c #F6F482",
-"7#	c #F3F57B",
-"8#	c #F1F574",
-"9#	c #F0F46C",
-"0#	c #EBF25E",
-"a#	c #EBF259",
-"b#	c #E7F152",
-"c#	c #E1EF44",
-"d#	c #DFEF40",
-"e#	c #D7EE3B",
-"f#	c #DAF039",
-"g#	c #D7F137",
-"h#	c #D1F032",
-"i#	c #CCEF2C",
-"j#	c #C6EE26",
-"k#	c #B7EA1F",
-"l#	c #AAE81A",
-"m#	c #97E415",
-"n#	c #37BE07",
-"o#	c #2CAF05",
-"p#	c #D5DC5B",
-"q#	c #E4ED6F",
-"r#	c #E9F082",
-"s#	c #F8F7A1",
-"t#	c #F8F79D",
-"u#	c #F7F696",
-"v#	c #F6F68B",
-"w#	c #F5F37B",
-"x#	c #F5F378",
-"y#	c #F3F372",
-"z#	c #F1F36C",
-"A#	c #EEF468",
-"B#	c #ECF35D",
-"C#	c #EAF256",
-"D#	c #E7F151",
-"E#	c #E4F148",
-"F#	c #E0F043",
-"G#	c #E1F143",
-"H#	c #D9EF39",
-"I#	c #D2ED31",
-"J#	c #CEF030",
-"K#	c #C9EF2A",
-"L#	c #C0ED25",
-"M#	c #ADE61C",
-"N#	c #A7E619",
-"O#	c #A5E818",
-"P#	c #80D913",
-"Q#	c #34BE06",
-"R#	c #35BF05",
-"S#	c #E0EC61",
-"T#	c #E4ED72",
-"U#	c #F7F792",
-"V#	c #F7F791",
-"W#	c #F8F78F",
-"X#	c #F6F687",
-"Y#	c #F6F688",
-"Z#	c #F3F377",
-"`#	c #F4F474",
-" $	c #F1F472",
-".$	c #EEF46D",
-"+$	c #DEEB59",
-"@$	c #E7F059",
-"#$	c #E9F356",
-"$$	c #E9F255",
-"%$	c #E7F24D",
-"&$	c #E6F245",
-"*$	c #E4F243",
-"=$	c #DFF240",
-"-$	c #D7EF36",
-";$	c #CCEB2B",
-">$	c #CDEE2C",
-",$	c #C5ED2A",
-"'$	c #BDEB25",
-")$	c #ADE71E",
-"!$	c #A6E51A",
-"~$	c #9AE316",
-"{$	c #93E214",
-"]$	c #5CC30B",
-"^$	c #34BD05",
-"/$	c #DDEC59",
-"($	c #D6E858",
-"_$	c #F5F57C",
-":$	c #F5F680",
-"<$	c #F5F67E",
-"[$	c #F5F67C",
-"}$	c #F4F574",
-"|$	c #F1F26A",
-"1$	c #F2F46F",
-"2$	c #EFF468",
-"3$	c #BCE24A",
-"4$	c #BBDF38",
-"5$	c #B9DB30",
-"6$	c #C3DF33",
-"7$	c #DDED42",
-"8$	c #E5F249",
-"9$	c #DEF03D",
-"0$	c #D5EF35",
-"a$	c #CEEE2E",
-"b$	c #C1E925",
-"c$	c #B9E923",
-"d$	c #B1E71E",
-"e$	c #ABE619",
-"f$	c #A8E517",
-"g$	c #94E113",
-"h$	c #83DE11",
-"i$	c #35AD06",
-"j$	c #2FBB04",
-"k$	c #CEE249",
-"l$	c #CFE54B",
-"m$	c #E8F16F",
-"n$	c #F5F578",
-"o$	c #F4F674",
-"p$	c #F1F46D",
-"q$	c #F2F268",
-"r$	c #F1F366",
-"s$	c #EFF462",
-"t$	c #DEEF5B",
-"u$	c #B3E039",
-"v$	c #B4E037",
-"w$	c #AEDE31",
-"x$	c #A6DB2B",
-"y$	c #BBE331",
-"z$	c #E3F243",
-"A$	c #DFF141",
-"B$	c #D9F038",
-"C$	c #D9F136",
-"D$	c #CDEF2E",
-"E$	c #C7EE2A",
-"F$	c #BDEB24",
-"G$	c #B7EA1D",
-"H$	c #A0E316",
-"I$	c #96E214",
-"J$	c #93E212",
-"K$	c #6DD10D",
-"L$	c #2CAD04",
-"M$	c #2AB303",
-"N$	c #CDE746",
-"O$	c #CDE74B",
-"P$	c #F0F56D",
-"Q$	c #F2F46A",
-"R$	c #F0F264",
-"S$	c #ECF15A",
-"T$	c #EFF361",
-"U$	c #EDF45A",
-"V$	c #EBF45C",
-"W$	c #B9E239",
-"X$	c #B6E335",
-"Y$	c #ADE02E",
-"Z$	c #A9E02B",
-"`$	c #A4DE28",
-" %	c #DFF243",
-".%	c #D7EF35",
-"+%	c #D5EF31",
-"@%	c #D4F031",
-"#%	c #CDEF2C",
-"$%	c #C7ED28",
-"%%	c #C6EE27",
-"&%	c #C1EE23",
-"*%	c #B6EC1F",
-"=%	c #A7E818",
-"-%	c #67CC0E",
-";%	c #47C208",
-">%	c #34B906",
-",%	c #2DBD04",
-"'%	c #C1E23C",
-")%	c #C3E53E",
-"!%	c #D7EB4F",
-"~%	c #EEF257",
-"{%	c #ECF057",
-"]%	c #EAF051",
-"^%	c #EBF255",
-"/%	c #EBF452",
-"(%	c #E9F450",
-"_%	c #B8E137",
-":%	c #A3DB2A",
-"<%	c #A5DF2B",
-"[%	c #98DA26",
-"}%	c #8CD621",
-"|%	c #90D41D",
-"1%	c #BFE326",
-"2%	c #D0EE2D",
-"3%	c #CEEF2E",
-"4%	c #C8EE28",
-"5%	c #C1ED26",
-"6%	c #BCEC22",
-"7%	c #B9ED20",
-"8%	c #9FE419",
-"9%	c #70CD0F",
-"0%	c #35B906",
-"a%	c #34C005",
-"b%	c #30C005",
-"c%	c #26B503",
-"d%	c #B7E036",
-"e%	c #B7E239",
-"f%	c #E2EF4B",
-"g%	c #EBF451",
-"h%	c #E5F14B",
-"i%	c #E4F04B",
-"j%	c #E7F451",
-"k%	c #E6F44B",
-"l%	c #B6DD2C",
-"m%	c #ABDC25",
-"n%	c #B4DF23",
-"o%	c #A3D61D",
-"p%	c #96D91D",
-"q%	c #86D218",
-"r%	c #B3DE21",
-"s%	c #CAED2B",
-"t%	c #C6EC25",
-"u%	c #BEEB22",
-"v%	c #BDEC20",
-"w%	c #B3EA1D",
-"x%	c #9AE017",
-"y%	c #46BC07",
-"z%	c #40C107",
-"A%	c #35C206",
-"B%	c #2EBE05",
-"C%	c #2BBD04",
-"D%	c #B2E130",
-"E%	c #B5E334",
-"F%	c #DFF042",
-"G%	c #E4F147",
-"H%	c #E5F348",
-"I%	c #E2F246",
-"J%	c #E4F445",
-"K%	c #DFF33F",
-"L%	c #E0F33D",
-"M%	c #DCF238",
-"N%	c #D8F034",
-"O%	c #D2EF2E",
-"P%	c #CBEB29",
-"Q%	c #D1EF2D",
-"R%	c #C7ED26",
-"S%	c #C5EE26",
-"T%	c #B7EA20",
-"U%	c #B5EA1D",
-"V%	c #AEEA1B",
-"W%	c #85D813",
-"X%	c #3FC208",
-"Y%	c #3AC507",
-"Z%	c #33C005",
-"`%	c #2BBB04",
-" &	c #26A903",
-".&	c #A9E029",
-"+&	c #A5DF29",
-"@&	c #A5DE29",
-"#&	c #D8EE3D",
-"$&	c #E4F341",
-"%&	c #E2F340",
-"&&	c #E0F33C",
-"*&	c #DDF239",
-"=&	c #D9F236",
-"-&	c #D6F133",
-";&	c #D3F131",
-">&	c #CEEE2A",
-",&	c #CEEF28",
-"'&	c #CBEF29",
-")&	c #BFEB22",
-"!&	c #B2EB23",
-"~&	c #81DD1D",
-"{&	c #6DCF11",
-"]&	c #68D10F",
-"^&	c #4CCB0E",
-"/&	c #39C407",
-"(&	c #33C106",
-"_&	c #2ABB04",
-":&	c #27B803",
-"<&	c #97DA23",
-"[&	c #98DC24",
-"}&	c #95DC23",
-"|&	c #93DB25",
-"1&	c #99DF2A",
-"2&	c #C6EC31",
-"3&	c #C6EB2E",
-"4&	c #ADE026",
-"5&	c #C1E928",
-"6&	c #CCEE29",
-"7&	c #C9ED26",
-"8&	c #B9EA21",
-"9&	c #8FD718",
-"0&	c #4FC30C",
-"a&	c #4DCB0B",
-"b&	c #49CB0A",
-"c&	c #3DC508",
-"d&	c #3DC808",
-"e&	c #34C306",
-"f&	c #2DBC04",
-"g&	c #2CBF04",
-"h&	c #88D81D",
-"i&	c #87D81A",
-"j&	c #86D81A",
-"k&	c #7ED518",
-"l&	c #75D015",
-"m&	c #71D113",
-"n&	c #84DB1A",
-"o&	c #9DE524",
-"p&	c #7CD316",
-"q&	c #62CA0E",
-"r&	c #5AC80B",
-"s&	c #55C90B",
-"t&	c #46CA0A",
-"u&	c #41C708",
-"v&	c #3DC907",
-"w&	c #36C406",
-"x&	c #30C205",
-"y&	c #27AA04",
-"z&	c #75D016",
-"A&	c #79D516",
-"B&	c #73D515",
-"C&	c #6AD113",
-"D&	c #6CD413",
-"E&	c #65D211",
-"F&	c #5BCD0F",
-"G&	c #56CD0E",
-"H&	c #58D10E",
-"I&	c #50CC0C",
-"J&	c #48C809",
-"K&	c #40C708",
-"L&	c #3FC607",
-"M&	c #40C907",
-"N&	c #38C706",
-"O&	c #32C105",
-"P&	c #57BE0F",
-"Q&	c #61D111",
-"R&	c #66D411",
-"S&	c #62D20F",
-"T&	c #57CD0D",
-"U&	c #57D00C",
-"V&	c #4DCC0C",
-"W&	c #4BCD0A",
-"X&	c #40C608",
-"Y&	c #3DC807",
-"Z&	c #30B505",
-"`&	c #4BBC0B",
-" *	c #4CC20A",
-".*	c #48BF0A",
-"+*	c #45C109",
-"@*	c #38B507",
-"#*	c #31B506",
-"                          . + @ # $ %                           ",
-"                    & * = - ; > , ' ) ! ~ {                     ",
-"                ] ^ / ( _ : < [ } | 1 2 3 4 5 6                 ",
-"              7 8 9 0 a b c d e f g h i j k l m n               ",
-"          o p q r s t a u v w x y z A B C D E F G H I           ",
-"        J K L o M N O P u Q R S T U V W X Y Z `  ...+.@.        ",
-"        #.K J $.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.        ",
-"      #.#.J [.}.%.&.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.      ",
-"    i.#.K [.j.}.%.k.l.1.m.n.o.p.q.r.s.t.u.v.E w.x.y.z.A.B.C.    ",
-"    #.K D.E.}.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.D T.U.V.W.X.Y.Z.`.    ",
-"   +.+.+++&.F.@+#+$+%+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+  ",
-"  }+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+9.f+g+h+i+j+k+l+m+n+o+p+q+  ",
-"  r+r+s+t+u+v+w+x+y+z+A+B+C+D+E+F+G+H+I+].J+K+L+M+N+O+P+Q+R+S+  ",
-"T+U+V+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@",
-"_@:@<@[@[@}@|@1@2@3@4@5@6@7@8@9@W 0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@",
-"o@p@q@r@s@t@u@v@w@4@x@y@b+z@A@B@C@D@E@F@G@H@I@J@K@L@M@N@O@P@Q@R@",
-"S@T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#",
-"_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h#i#j#k#O@l#m#n#o#",
-"p#q#r#5@s#t#u#b+v#w#x#y#z#A#B#C#D#E#F#G#H#I#'#J#K#L#M#N#O#P#Q#R#",
-"  S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$;$>$,$'$)$!$~${$]$^$  ",
-"  /$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$G#9$k+0$a$b$c$d$e$f$g$h$i$j$  ",
-"  k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$'#D$E$F$G$H$I$J$K$L$M$  ",
-"    N$O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%>%,%    ",
-"    '%)%!%~%{%]%^%/%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8%9%0%a%b%c%    ",
-"      d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v%w%x%y%z%A%B%C%      ",
-"        D%E%F%G%H%I%J%K%L%M%N%O%P%Q%R%S%T%U%V%W%X%Y%Z%`% &      ",
-"        .&+&@&#&$&%&&&*&=&-&;&>&,&'&)&!&~&{&]&^&/&(&_&:&        ",
-"          <&[&}&|&1&2&3&4&5&6&7&{@8&9&0&a&b&c&d&e&f&g&          ",
-"              h&i&j&k&l&m&n&o&p&q&r&s&a&t&u&v&w&x&y&            ",
-"                z&A&B&C&D&E&F&G&H&I&J&K&L&M&N&O&                ",
-"                    P&Q&R&S&T&U&V&W&X&Y&v&Z&                    ",
-"                          `& *.*+*@*#*                          "};
diff --git a/docs/FAQ.txt b/docs/FAQ.txt
index 6055513c..db3eb491 100644
--- a/docs/FAQ.txt
+++ b/docs/FAQ.txt
@@ -7,10 +7,10 @@ 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: #themanaworld.
+   irc.freenode.net Channel: #themanaexperiment.
    If you don't like IRC just come to our forums:
-   http://forums.themanaworld.org. Ok, do you think forums are evil? Don't
-   worry, send me an e-mail at elvenprogrammer@gmail.com and you're done.
+   http://tme.onlinegamecore.com/forums. Ok, do you think forums are evil?
+   Don't worry, send me an e-mail at elvenprogrammer@gmail.com and you're done.
    That's not enough? No, I won't give you my phone number! ;P
    
 GAME
@@ -36,15 +36,6 @@ A: Did you read README? Are you really sure? If not go read it and you'll find
    README/ingame help is not up to date/wrong, please report it to the
    developers.
 
-Q: I just typed /<command> in the chat window and then I saw "Your account has
-   been banished until ..." and TMW closed. Now when I try to log in nothing
-   happens?
-
-A: That's because /<commands> are not implemented at the moment of writing.
-   Please avoid using such commands (i.e. /help) until they're added.
-   Anyway the ban is temp, just wait some minutes and you should be able to
-   connect again.
-
 Q: I can't recover HP anymore.
 
 A: Check your inventory, if you've got lots of stuff probably you're
@@ -77,14 +68,10 @@ 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. Send an e-mail to
      elvenprogrammer@gmail.com explaining what you want to do, or join our irc
-     channel: #themanaworld @ irc.freenode.net.
-   
-   - You can donate money. Follow the link on the project page:
-	http://sourceforge.net/projects/themanaworld.
+     channel: #themanaexperiment @ irc.freenode.net.
    
-   - You can be a beta tester. Just play with The Mana World and report every
-     error to the tracker. Read for more infos on the project page:
-	http://themanaworld.org.
+   - You can be a beta tester. Just play with The Mana Experiment and report
+     every error on the forum.
    
-   - Play with The Mana World: more players, more fun! Simple as that! ;-)
+   - Play with The Mana Experiment: more players, more fun! Simple as that! ;-)
 
diff --git a/docs/HACKING.txt b/docs/HACKING.txt
index f2ae8b2b..fdec32a6 100644
--- a/docs/HACKING.txt
+++ b/docs/HACKING.txt
@@ -1,6 +1,6 @@
-----------------------------
-The Mana World Hacking Guide
-----------------------------
+---------------------------------
+The Mana Experiment Hacking Guide
+---------------------------------
 
 With multiple coders working on the same source files, there needs to be a
 standard specifying how code is written down. Not doing so can cause quite some
diff --git a/docs/INSTALL/debian.txt b/docs/INSTALL/debian.txt
index 9a74d91b..59e2376e 100644
--- a/docs/INSTALL/debian.txt
+++ b/docs/INSTALL/debian.txt
@@ -1,24 +1,24 @@
-How to install TMW on my GNU/Debian Box
+How to install TME on my GNU/Debian Box
 ==================================================
 
 Author:   FERREIRA Yohann (Bertram)
 Email:    Bertram@cegetel.net
 
-The Mana World project
+The Mana Experiment project
 ======================
-Homepage: http://themanaworld.org/
-IRC:      irc.freenode.net / #themanaworld
+Homepage: http://209.168.213.109/
+IRC:      irc.freenode.net / #themanaexperiment
 
-1) Installing The Mana World and dependencies
+1) Installing The Mana Experiment and dependencies
 2) Creating a Debian Package using DebHelper Tools
 3) Notes
 
 
-1. Installing The Mana World and Dependencies
+1. Installing The Mana Experiment and Dependencies
 =============================================
 
-The Mana World Debian Package can be installed under the Debian Testing and
-Unstable (Sarge/Sid). In order to have Mana World working, you'll need
+The Mana Experiment Debian Package can be installed under the Debian Testing and
+Unstable (Sarge/Sid). In order to have Mana Experiment working, you'll need
 packages for SDL, SDL_mixer, SDL_image, libxml2, libphysfs and libguichan0.
 
 To install the dependencies, you can do type (as root):
@@ -41,9 +41,9 @@ And the debhelper tools:
 Download tmw from Subversion using the command (You'll need Subversion
 installed on your system):
 
-   svn https://svn.sourceforge.net/svnroot/themanaworld/tmw/trunk tmw
+   svn svn://209.168.213.109 tme
 
-Rename the tmw folder into tmw-XXX and open a console in it.
+Rename the tme folder into tme-XXX and open a console in it.
 You can now type:
 
     fakeroot dpkg-buildpackage
@@ -53,16 +53,16 @@ file.
 
 Install it:
 
-    dpkg -i tmw_XXXXXX_i386.deb
+    dpkg -i tme_XXXXXX_i386.deb
 
 (If you've got a previous one already installed with the same version number,
 don't forget to remove it with :)
 
-    apt-get remove tmw
+    apt-get remove tme
 
 (Don't worry, you configuration files are not removed...)
 
-And now the final step: type 'tmw' as a normal user in a shell and you're in!
+And now the final step: type 'tme' as a normal user in a shell and you're in!
 
 KDE/GNOME menu entries are created in Arcade Games upon installation.
 
@@ -79,9 +79,9 @@ Simply add in your /etc/apt/sources.list file:
 Then, as root, do:
 
     apt-get update
-    apt-get install tmw
+    apt-get install tme
 
 and you're done!
 
-N.B.: The tmw-music, libguichan0, and libguichan0-dev packages are also
+N.B.: The tme-music, libguichan0, and libguichan0-dev packages are also
 provided in this repository.
diff --git a/docs/INSTALL/win32.txt b/docs/INSTALL/win32.txt
index 1a1e527f..88f47034 100644
--- a/docs/INSTALL/win32.txt
+++ b/docs/INSTALL/win32.txt
@@ -1,10 +1,10 @@
-How setup Dev-C++ to compile TMW on a Win32 Box
+How setup Dev-C++ to compile TME on a Win32 Box
 ===============================================
 
-The Mana World project
-======================
-Homepage: themanaworld.sourceforge.net
-IRC:      irc.freenode.net / #themanaworld
+The Mana Experiment project
+===========================
+Homepage: http://209.168.213.109
+IRC:      irc.freenode.net / #themanaexperiment
 
 
 0. Index
@@ -12,7 +12,7 @@ IRC:      irc.freenode.net / #themanaworld
 1. Requirements
 2. Installing Dev-C++
 3. Installing the required libraries
-4. Compiling The Mana World
+4. Compiling The Mana Experiment
 
 
 1. Requirements
@@ -23,7 +23,7 @@ free IDE for Win32 built around GCC. Remember, Win32 was not meant for GCC and
 stuff so you will probably run into trouble unless you really know what you're
 doing, so best stick with Dev-C++.
 
-Besides a C++ compiler, TMW depends on the following libraries:
+Besides a C++ compiler, TME depends on the following libraries:
 
 1) SDL
 2) SDL_mixer
@@ -95,36 +95,36 @@ Install them all through the Dev-C++ package manager.
         iconv-1.9.1.win32.zip
 
      From each file, copy the headers to your include directory, the libs to
-     the lib direcotry and the dlls (in bin direcotry) to your tmw directory.
+     the lib direcotry and the dlls (in bin direcotry) to your tme directory.
 
 **) For PhysFS copy the headers to your include directory, the libs to
-    the lib directory and the dlls (in bin direcotry) to your tmw directory.
+    the lib directory and the dlls (in bin direcotry) to your tme directory.
 
 ***) Download developer files and put headers and libs in to include and lib
-     directories of Dev-Cpp. Download binaries and place the dll inside tmw
+     directories of Dev-Cpp. Download binaries and place the dll inside tme
      folder.
 
 ****) Get latest win32 - mingw package and install as usual.
 
-You should now be fully equipped for compiling the latest TMW development
+You should now be fully equipped for compiling the latest TME development
 code!
 
 
-4. Compiling The Mana World
-===========================
+4. Compiling The Mana Experiment
+================================
 
-Check out The Mana World from Subversion using either the command line svn
+Check out The Mana Experiment from Subversion using either the command line svn
 tool or TortoiseSVN, pick what you like to use most and install that. Next,
 check out the following directory from our repository:
 
-  https://svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
+  svn://209.168.213.109/client/trunk
 
-Open "The Mana World.dev" in Dev-C++. From there on you should be able to
-start compilition with Excute -> Compile. A file called tmw.exe should appear
+Open "The Mana Experiment.dev" in Dev-C++. From there on you should be able to
+start compilition with Excute -> Compile. A file called tme.exe should appear
 in the same directory as where you opened the .dev from.
 
 Before you can actually run the executable be sure to copy over the following
-DLLs from your Dev-Cpp/dll directory to the directory containing tmw.exe (or 
+DLLs from your Dev-Cpp/dll directory to the directory containing tme.exe (or 
 alternatively into your c:\windows\system\ for a more universal solution):
 
  SDL.dll
@@ -143,7 +143,7 @@ And also make sure you have:
  zlib1.dll
 
 Additionally don't forget to copy any updated .dll (when libs are updated,
-the dll are usually updated too) to the folder containing tmw.exe (or to the
+the dll are usually updated too) to the folder containing tme.exe (or to the
 c:\windows\system\).
 
-Have fun hacking The Mana World!
+Have fun hacking The Mana Experiment!
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 43c0f6cc..4ea96959 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -4,8 +4,8 @@ EXTRA_DIST = $(man6_MANS) \
 	     packages.txt \
 	     FAQ.txt \
 	     HACKING.txt \
-	     SOURCE/tmwdox.sh \
-	     SOURCE/tmw.doxcfg \
+	     SOURCE/tmedox.sh \
+	     SOURCE/tme.doxcfg \
 	     items.txt \
 	     progression.txt \
 	     INSTALL/debian.txt \
diff --git a/docs/SOURCE/tme.doxcfg b/docs/SOURCE/tme.doxcfg
new file mode 100644
index 00000000..f3f90af9
--- /dev/null
+++ b/docs/SOURCE/tme.doxcfg
@@ -0,0 +1,1153 @@
+# Doxyfile 1.3.8
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = The Mana Experiment
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER         =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = ../docs/SOURCE/
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of source
+# files, where putting all generated files in the same directory would otherwise
+# cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish,
+# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese,
+# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish,
+# Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# This tag can be used to specify the encoding used in the generated output.
+# The encoding is not always determined by the language that is chosen,
+# but also whether or not the output is meant for Windows or non-Windows users.
+# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
+# forces the Windows encoding (this is the default for the Windows binary),
+# whereas setting the tag to NO uses a Unix-style encoding (the default for
+# all platforms other than Windows).
+
+USE_WINDOWS_ENCODING   = NO
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is used
+# as the annotated text. Otherwise, the brief description is used as-is. If left
+# blank, the following values are used ("$name" is automatically replaced with the
+# name of the entity): "The $name class" "The $name widget" "The $name file"
+# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited
+# members of a class in the documentation of that class as if those members were
+# ordinary class members. Constructors, destructors and assignment operators of
+# the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like the Qt-style comments (thus requiring an
+# explicit @brief command for a brief description.
+
+JAVADOC_AUTOBRIEF      = YES
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member
+# documentation.
+
+DETAILS_AT_TOP         = YES
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources
+# only. Doxygen will then generate output that is more tailored for Java.
+# For instance, namespaces will be presented as packages, qualified scopes
+# will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = YES
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = YES
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT                  =
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
+# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
+
+FILE_PATTERNS          =
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
+# that are symbolic links (a Unix filesystem feature) are excluded from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+
+EXCLUDE_PATTERNS       =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.  Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.  The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# is applied to all files.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default)
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES (the default)
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        =
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE               = tme.chm
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20])
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
+# probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA             =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD                =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.  This is useful
+# if you want to understand what is going on.  On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse the
+# parser if not removed.
+
+SKIP_FUNCTION_MACROS   = NO
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+#   TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#   TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or
+# super classes. Setting the tag to NO turns the diagrams off. Note that this
+# option is superseded by the HAVE_DOT option below. This is only a fallback. It is
+# recommended to install and use dot, since it yields more powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK               = YES
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will
+# generate a call dependency graph for every global function or class method.
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found on the path.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS           =
+
+# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than
+# this value, doxygen will try to truncate the graph, so that it fits within
+# the specified constraint. Beware that most browsers cannot cope with very
+# large images.
+
+MAX_DOT_GRAPH_WIDTH    = 1024
+
+# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than
+# this value, doxygen will try to truncate the graph, so that it fits within
+# the specified constraint. Beware that most browsers cannot cope with very
+# large images.
+
+MAX_DOT_GRAPH_HEIGHT   = 1024
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes that
+# lay further from the root node will be omitted. Note that setting this option to
+# 1 or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that a graph may be further truncated if the graph's image dimensions are
+# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT).
+# If 0 is used for the depth value (the default), the graph is not depth-constrained.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = YES
diff --git a/docs/SOURCE/tmedox.sh b/docs/SOURCE/tmedox.sh
new file mode 100644
index 00000000..7ab9ea74
--- /dev/null
+++ b/docs/SOURCE/tmedox.sh
@@ -0,0 +1 @@
+cd ../../src/ && doxygen ../docs/SOURCE/tme.doxcfg
diff --git a/docs/SOURCE/tmw.doxcfg b/docs/SOURCE/tmw.doxcfg
deleted file mode 100644
index fe5039fb..00000000
--- a/docs/SOURCE/tmw.doxcfg
+++ /dev/null
@@ -1,1153 +0,0 @@
-# Doxyfile 1.3.8
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = The Mana World
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER         =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = ../docs/SOURCE/
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of source
-# files, where putting all generated files in the same directory would otherwise
-# cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish,
-# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese,
-# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish,
-# Swedish, and Ukrainian.
-
-OUTPUT_LANGUAGE        = English
-
-# This tag can be used to specify the encoding used in the generated output.
-# The encoding is not always determined by the language that is chosen,
-# but also whether or not the output is meant for Windows or non-Windows users.
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
-# forces the Windows encoding (this is the default for the Windows binary),
-# whereas setting the tag to NO uses a Unix-style encoding (the default for
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING   = NO
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is used
-# as the annotated text. Otherwise, the brief description is used as-is. If left
-# blank, the following values are used ("$name" is automatically replaced with the
-# name of the entity): "The $name class" "The $name widget" "The $name file"
-# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited
-# members of a class in the documentation of that class as if those members were
-# ordinary class members. Constructors, destructors and assignment operators of
-# the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like the Qt-style comments (thus requiring an
-# explicit @brief command for a brief description.
-
-JAVADOC_AUTOBRIEF      = YES
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member
-# documentation.
-
-DETAILS_AT_TOP         = YES
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources
-# only. Doxygen will then generate output that is more tailored for Java.
-# For instance, namespaces will be presented as packages, qualified scopes
-# will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = YES
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = YES
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = YES
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT                  =
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
-
-FILE_PATTERNS          =
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
-# that are symbolic links (a Unix filesystem feature) are excluded from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-
-EXCLUDE_PATTERNS       =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.  If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.  Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.  The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER         = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES (the default)
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = NO
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        =
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
-CHM_FILE               = tmw.chm
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = NO
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
-
-DISABLE_INDEX          = NO
-
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
-# probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW      = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = NO
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD                =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.  This is useful
-# if you want to understand what is going on.  On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse the
-# parser if not removed.
-
-SKIP_FUNCTION_MACROS   = NO
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-#   TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#   TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or
-# super classes. Setting the tag to NO turns the diagrams off. Note that this
-# option is superseded by the HAVE_DOT option below. This is only a fallback. It is
-# recommended to install and use dot, since it yields more powerful graphs.
-
-CLASS_DIAGRAMS         = YES
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = NO
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-
-UML_LOOK               = YES
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will
-# generate a call dependency graph for every global function or class method.
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
-
-CALL_GRAPH             = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT       = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found on the path.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS           =
-
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
-# large images.
-
-MAX_DOT_GRAPH_WIDTH    = 1024
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
-# large images.
-
-MAX_DOT_GRAPH_HEIGHT   = 1024
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes that
-# lay further from the root node will be omitted. Note that setting this option to
-# 1 or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that a graph may be further truncated if the graph's image dimensions are
-# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT).
-# If 0 is used for the depth value (the default), the graph is not depth-constrained.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = YES
diff --git a/docs/SOURCE/tmwdox.sh b/docs/SOURCE/tmwdox.sh
deleted file mode 100644
index 541f8bee..00000000
--- a/docs/SOURCE/tmwdox.sh
+++ /dev/null
@@ -1 +0,0 @@
-cd ../../src/ && doxygen ../docs/SOURCE/tmw.doxcfg
diff --git a/docs/packages.txt b/docs/packages.txt
index 40ade7f9..46c35f51 100644
--- a/docs/packages.txt
+++ b/docs/packages.txt
@@ -1,6 +1,6 @@
------------------------------
-THE MANA WORLD PACKAGE SYSTEM
------------------------------
+----------------------------------
+THE MANA EXPERIMENT PACKAGE SYSTEM
+----------------------------------
 
 1. INTRODUCTION
 2. LOCATION OF DATA
@@ -13,36 +13,38 @@ THE MANA WORLD PACKAGE SYSTEM
 
 1. INTRODUCTION
 
-The Mana World is expected to grow continuously with updates to the game world
-occurring relatively frequently. More often so than for example new releases
-of the game client. To make sure players don't have to update their data
-manually all the time, by for example downloading the latest from the website,
-the TMW client should be able to automatically obtain new data packages from
-the server.
+The Mana Experiment is expected to grow continuously with updates to the game
+world occurring relatively frequently. More often so than for example new
+releases of the game client. To make sure players don't have to update their
+data manually all the time, by for example downloading the latest from the
+website, the TME client should be able to automatically obtain new data
+packages from the server.
 
  Note: To reduce the load on the server (which isn't expected to have huge
  free uploading resources), the idea is that the server will only send a
  torrent file to the client and that the file is subsequently downloaded from
- several locations that have volunteered to spread TMW data files. Ultimately
+ several locations that have volunteered to spread TME data files. Ultimately
  a simple option on the client will even allow players to contribute their
  excess bandwidth to help other players get the updates faster.
 
 
 2. LOCATION OF DATA
 
-There are two locations where TMW can look for game data. The install data
+There are two locations where TME can look for game data. The install data
 directory and the data directory in the user's home directory. The latter one
 doesn't have to be used for Windows users, but is required for dynamic updates
 for UNIX users, who generally won't have write permissions to the install
 data directory. So for UNIX the two locations are:
 
- /usr/local/share/manaworld/data/*
+ /usr/local/share/tme/data/*
 
- ~/.manaworld/data/*
+ ~/.tme/updates/*
+
+ ~/.tme/customdata
 
 While for Windows all the data will be located at:
 
- C:\Program Files\The Mana World\data\*
+ C:\Program Files\The Mana Experiment\data\*
 
 In the UNIX case it doesn't matter in which order the data directories are
 examined.
@@ -83,7 +85,7 @@ package is irrelevant. An example of the contents is given by:
 
 5. INITIALIZING PACKAGE MANAGEMENT
 
-When TMW starts it will scan its data directories for both packages (archives)
+When TME starts it will scan its data directories for both packages (archives)
 and directories. When a directory is found with the same name as a package, the
 directory is the preferred location to load data from as it is assumed to be
 more up to date.
@@ -127,7 +129,7 @@ The resource management technique is critical to the overall success of the
 package management system as a whole.  Resources are loaded at runtime as they
 are needed, and unloaded as they become unused.  In order to ensure the 
 autonomous functioning of this process reference counting is the agreed upon 
-technique for managing loaded resources in TMW.  
+technique for managing loaded resources in TME.  
 
 For those unfamiliar with the practice of reference counting, it involves 
 every resource object having a variable containing the number of references to
diff --git a/docs/sounddev.txt b/docs/sounddev.txt
index 149150ba..ed2ae71e 100644
--- a/docs/sounddev.txt
+++ b/docs/sounddev.txt
@@ -1,6 +1,6 @@
---------------------------------
-THE MANA WORLD SOUND DEVELOPMENT
---------------------------------
+-------------------------------------
+THE MANA EXPERIMENT SOUND DEVELOPMENT
+-------------------------------------
 
 1. INTRODUCTION
 2. SPECS
@@ -9,7 +9,7 @@ THE MANA WORLD SOUND DEVELOPMENT
 
 1. INTRODUCTION
 
-In The Mana World we plan to have both background music and sound effects
+In The Mana Experiment we plan to have both background music and sound effects
 linked to beings actions.
 
 2. SPECS
@@ -35,4 +35,4 @@ all.
 
 4. SUGGESTIONS
 
-As placeholders we could use Wesnoth SFX/BGM to test the sound engine.
\ No newline at end of file
+As placeholders we could use Wesnoth SFX/BGM to test the sound engine.
diff --git a/docs/win32-release.txt b/docs/win32-release.txt
index a8696897..1c0577df 100644
--- a/docs/win32-release.txt
+++ b/docs/win32-release.txt
@@ -1,6 +1,6 @@
---------------------------------------
-THE MANA WORLD WIN32 RELEASE CHECKLIST
---------------------------------------
+-------------------------------------------
+THE MANA EXPERIMENT WIN32 RELEASE CHECKLIST
+-------------------------------------------
 
 Every Win32 releaser should follow this checklist when creating a new package.
 
@@ -11,7 +11,7 @@ Every Win32 releaser should follow this checklist when creating a new package.
     * Eventually Legal Copyright
 - Update README and ChangeLog if not already
 - Compile OpenGL version (Using -DUSE_OPENGL option) and rename the executable
-  from tmw.exe to tmw_opengl.exe
+  from tme.exe to tme_opengl.exe
 - Compile normal version (Do not use special flags as __DEBUG or USE_OPENGL)
 - Check if the dlls were compressed (SDL.dll, SDL_Image.dll, SDL_Mixer.dll)
 - Check config.xml for default values:
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0c2ef4cd..d7dcbc7a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,7 +8,7 @@ FIND_PACKAGE(PhysFS REQUIRED)
 FIND_PACKAGE(PNG REQUIRED)
 
 SET(FLAGS "-DPACKAGE_VERSION=\\\"${VERSION}\\\"")
-SET(FLAGS "${FLAGS} -DTMW_DATADIR=\\\"${PKG_DATADIR}/\\\"")
+SET(FLAGS "${FLAGS} -DTME_DATADIR=\\\"${PKG_DATADIR}/\\\"")
 
 SET(GUICHAN_COMPONENTS "SDL")
 IF (WITH_OPENGL)
@@ -339,9 +339,9 @@ SET(SRCS
     vector.h
     )
 
-ADD_EXECUTABLE(tmw ${SRCS})
+ADD_EXECUTABLE(tme ${SRCS})
 
-TARGET_LINK_LIBRARIES(tmw
+TARGET_LINK_LIBRARIES(tme
     ${SDL_LIBRARY}
     ${SDLIMAGE_LIBRARY}
     ${SDLMIXER_LIBRARY}
@@ -354,6 +354,6 @@ TARGET_LINK_LIBRARIES(tmw
     ${OPENGL_LIBRARIES}
     )
 
-INSTALL(TARGETS tmw RUNTIME DESTINATION ${PKG_BINDIR})
+INSTALL(TARGETS tme RUNTIME DESTINATION ${PKG_BINDIR})
 
-SET_TARGET_PROPERTIES(tmw PROPERTIES COMPILE_FLAGS "${FLAGS}")
+SET_TARGET_PROPERTIES(tme PROPERTIES COMPILE_FLAGS "${FLAGS}")
diff --git a/src/Makefile.am b/src/Makefile.am
index f1352f9e..e750e214 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,8 +3,8 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
               gui/widgets/dropdown.h \
               gui/widgets/resizegrip.cpp \
 	      gui/widgets/resizegrip.h \
-	      gui/box.h \
 	      gui/box.cpp \
+	      gui/box.h \
 	      gui/browserbox.cpp \
 	      gui/browserbox.h \
 	      gui/button.cpp \
@@ -17,10 +17,10 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/buysell.h \
 	      gui/chargedialog.cpp \
 	      gui/chargedialog.h \
-	      gui/char_server.cpp \
-	      gui/char_server.h \
 	      gui/char_select.cpp \
 	      gui/char_select.h \
+	      gui/char_server.cpp \
+	      gui/char_server.h \
 	      gui/chat.cpp \
 	      gui/chat.h \
 	      gui/chatinput.cpp \
@@ -41,8 +41,8 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/gccontainer.h \
 	      gui/gui.cpp \
 	      gui/gui.h \
-	      gui/hbox.h \
 	      gui/hbox.cpp \
+	      gui/hbox.h \
 	      gui/help.cpp \
 	      gui/help.h \
 	      gui/inttextbox.h \
@@ -117,10 +117,10 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/status.h \
 	      gui/tabbedcontainer.cpp \
 	      gui/tabbedcontainer.h \
-	      gui/table.h \
 	      gui/table.cpp \
-	      gui/table_model.h \
+	      gui/table.h \
 	      gui/table_model.cpp \
+	      gui/table_model.h \
 	      gui/textbox.cpp \
 	      gui/textbox.h \
 	      gui/textfield.cpp \
@@ -181,6 +181,8 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 	      resources/ambientoverlay.h \
 	      resources/animation.cpp \
 	      resources/animation.h \
+	      resources/buddylist.cpp \
+	      resources/buddylist.h \
 	      resources/dye.cpp \
 	      resources/dye.h \
 	      resources/image.cpp \
@@ -213,8 +215,6 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 	      resources/soundeffect.cpp \
 	      resources/spritedef.h \
 	      resources/spritedef.cpp \
-	      resources/buddylist.h \
-	      resources/buddylist.cpp \
 	      utils/base64.cpp \
 	      utils/base64.h \
 	      utils/dtor.h \
@@ -311,7 +311,7 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 # set the include path found by configure
 INCLUDES =					\
 	$(all_includes)				\
-	-DTMW_DATADIR=\""$(pkgdatadir)/"\"
+	-DTME_DATADIR=\""$(pkgdatadir)/"\"
 
 # the library search path.
 tme_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) `pkg-config --libs libxml-2.0`
diff --git a/src/main.cpp b/src/main.cpp
index 213e2939..cc30ec0a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -205,7 +205,7 @@ void init_engine(const Options &options)
 #elif defined __APPLE__
     // Use Application Directory instead of .tme
     homeDir = std::string(PHYSFS_getUserDir()) +
-        "/Library/Application Support/The Mana World";
+        "/Library/Application Support/The Mana Experiment";
     if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) &&
             (errno != EEXIST))
 #else
@@ -224,9 +224,9 @@ void init_engine(const Options &options)
     logger->setLogFile(homeDir + std::string("/tme.log"));
 
     #ifdef PACKAGE_VERSION
-        logger->log("Starting The Mana World Version %s", PACKAGE_VERSION);
+        logger->log("Starting The Mana Experiment Version %s", PACKAGE_VERSION);
     #else
-        logger->log("Starting The Mana World - Version not defined");
+        logger->log("Starting The Mana Experiment - Version not defined");
     #endif
 
     // Initialize SDL
@@ -268,7 +268,7 @@ void init_engine(const Options &options)
     strncat(path, "/data", PATH_MAX - 1);
     resman->addToSearchPath(path, true);
 #else
-    resman->addToSearchPath(TMW_DATADIR "data", true);
+    resman->addToSearchPath(TME_DATADIR "data", true);
 #endif
 
     // Fill configuration with defaults
@@ -294,24 +294,24 @@ void init_engine(const Options &options)
 
     // Checking if the configuration file exists... otherwise creates it with
     // default options !
-    FILE *tmwFile = 0;
+    FILE *tmeFile = 0;
     std::string configPath = options.configPath;
 
     if (configPath.empty())
         configPath = homeDir + "/config.xml";
 
-    tmwFile = fopen(configPath.c_str(), "r");
+    tmeFile = fopen(configPath.c_str(), "r");
 
     // If we can't read it, it doesn't exist !
-    if (tmwFile == NULL) {
+    if (tmeFile == NULL) {
         // We reopen the file in write mode and we create it
-        tmwFile = fopen(configPath.c_str(), "wt");
+        tmeFile = fopen(configPath.c_str(), "wt");
     }
-    if (tmwFile == NULL) {
+    if (tmeFile == NULL) {
         std::cout << "Can't create " << configPath << ". "
             "Using Defaults." << std::endl;
     } else {
-        fclose(tmwFile);
+        fclose(tmeFile);
         config.init(configPath);
     }
 
@@ -325,7 +325,7 @@ void init_engine(const Options &options)
         SetClassLong(pInfo.window, GCL_HICON, (LONG) icon);
     }
 #else
-    SDL_Surface *icon = IMG_Load(TMW_DATADIR "data/icons/tmw.png");
+    SDL_Surface *icon = IMG_Load(TME_DATADIR "data/icons/tme.png");
     if (icon)
     {
         SDL_SetAlpha(icon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
@@ -422,7 +422,7 @@ void exit_engine()
 void printHelp()
 {
     std::cout
-        << "tmw" << std::endl << std::endl
+        << "tme" << std::endl << std::endl
         << "Options: " << std::endl
         << "  -h --help       : Display this help" << std::endl
         << "  -v --version    : Display the version" << std::endl
@@ -439,9 +439,10 @@ void printHelp()
 void printVersion()
 {
 #ifdef PACKAGE_VERSION
-    std::cout << "The Mana World version " << PACKAGE_VERSION << std::endl;
+    std::cout << "The Mana Experiment version " << PACKAGE_VERSION <<
+        std::endl;
 #else
-    std::cout << "The Mana World version " <<
+    std::cout << "The Mana Experiment version " <<
              "(local build?, PACKAGE_VERSION is not defined)" << std::endl;
 #endif
 }
diff --git a/src/main.h b/src/main.h
index af59ea26..1f9aa9d0 100644
--- a/src/main.h
+++ b/src/main.h
@@ -32,8 +32,8 @@
 #include "winver.h"
 #endif
 
-#ifndef TMW_DATADIR
-#define TMW_DATADIR ""
+#ifndef TME_DATADIR
+#define TME_DATADIR ""
 #endif
 
 /*
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 6b45c9d7..ae255144 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -210,7 +210,7 @@ ResourceManager::getPath(const std::string &file)
     // get the real path to the file
     const char* tmp = PHYSFS_getRealDir(file.c_str());
     std::string path;
-    
+
     // if the file is not in the search path, then its NULL
     if (tmp)
     {
@@ -219,9 +219,9 @@ ResourceManager::getPath(const std::string &file)
     else
     {
         // if not found in search path return the default path
-        path = std::string(TMW_DATADIR) + std::string("data") + "/" + file;
+        path = std::string(TME_DATADIR) + std::string("data") + "/" + file;
     }
-    
+
     return path;
 }
 
diff --git a/src/tme.rc b/src/tme.rc
new file mode 100644
index 00000000..495d0675
--- /dev/null
+++ b/src/tme.rc
@@ -0,0 +1,23 @@
+#include <windows.h> // include for version info constants
+
+#include "winver.h"
+
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tme.ico"
+
+1 VERSIONINFO
+FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
+PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
+FILETYPE VFT_APP {
+    BLOCK "StringFileInfo" {
+        BLOCK "040904E4" {
+            VALUE "CompanyName", "The Mana Experiment Development Team"
+            VALUE "FileVersion", PACKAGE_VERSION
+            VALUE "FileDescription", "The Mana Experiment"
+            VALUE "LegalCopyright", "2008 (C)"
+            VALUE "OriginalFilename", "tme.exe"
+            VALUE "ProductName", "The Mana Experiment MMORPG"
+            VALUE "ProductVersion", PACKAGE_VERSION
+        }
+    }
+}
+
diff --git a/src/tmw.rc b/src/tmw.rc
deleted file mode 100644
index 673b2387..00000000
--- a/src/tmw.rc
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <windows.h> // include for version info constants
-
-#include "winver.h"
-
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw.ico"
-
-1 VERSIONINFO
-FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
-PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
-FILETYPE VFT_APP {
-    BLOCK "StringFileInfo" {
-        BLOCK "040904E4" {
-            VALUE "CompanyName", "The Mana World Development Team"
-            VALUE "FileVersion", PACKAGE_VERSION
-            VALUE "FileDescription", "The Mana World"
-            VALUE "LegalCopyright", "2004-2006 (C)"
-            VALUE "OriginalFilename", "tmw.exe"
-            VALUE "ProductName", "The Mana World MMORPG"
-            VALUE "ProductVersion", PACKAGE_VERSION
-        }
-    }
-}
-
diff --git a/tme.cbp b/tme.cbp
new file mode 100644
index 00000000..e51141a2
--- /dev/null
+++ b/tme.cbp
@@ -0,0 +1,383 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="The Mana Experiment" />
+		<Option pch_mode="0" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="default">
+				<Option output="tme.exe" prefix_auto="0" extension_auto="0" />
+				<Option type="0" />
+				<Option compiler="gcc" />
+				<Option projectResourceIncludeDirsRelation="0" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-DUSE_OPENGL" />
+					<Add option="-DNOGDI" />
+				</Compiler>
+				<Linker>
+					<Add library="guichan" />
+					<Add library="guichan_sdl" />
+					<Add library="guichan_opengl" />
+					<Add library="wsock32" />
+					<Add library="SDL_image" />
+					<Add library="SDL_mixer" />
+					<Add library="SDL_net" />
+					<Add library="mingw32" />
+					<Add library="SDLmain" />
+					<Add library="SDL.dll" />
+					<Add library="xml2.dll" />
+					<Add library="opengl32" />
+					<Add library="png12.dll" />
+					<Add library="z.dll" />
+					<Add library="physfs" />
+					<Add library="curl.dll" />
+				</Linker>
+			</Target>
+			<Target title="unix">
+				<Option platforms="Unix;" />
+				<Option output="tme" prefix_auto="1" extension_auto="1" />
+				<Option type="0" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add option="`sdl-config --cflags`" />
+					<Add directory="/usr/local/include/libxml2" />
+				</Compiler>
+				<Linker>
+					<Add option="`sdl-config --libs`" />
+					<Add library="guichan" />
+					<Add library="guichan_sdl" />
+					<Add library="guichan_opengl" />
+					<Add library="GL" />
+					<Add library="physfs" />
+					<Add library="curl" />
+					<Add library="xml2" />
+					<Add library="SDL_mixer" />
+					<Add library="SDL_net" />
+					<Add library="SDL_image" />
+					<Add library="png" />
+				</Linker>
+			</Target>
+		</Build>
+		<VirtualTargets>
+			<Add alias="All" targets="default;" />
+		</VirtualTargets>
+		<Compiler>
+			<Add directory="../../../../../../mingw/include/SDL" />
+		</Compiler>
+		<Unit filename="src/animatedsprite.cpp" />
+		<Unit filename="src/animatedsprite.h" />
+		<Unit filename="src/animationparticle.cpp" />
+		<Unit filename="src/animationparticle.h" />
+		<Unit filename="src/being.cpp" />
+		<Unit filename="src/being.h" />
+		<Unit filename="src/beingmanager.cpp" />
+		<Unit filename="src/beingmanager.h" />
+		<Unit filename="src/configlistener.h" />
+		<Unit filename="src/configuration.cpp" />
+		<Unit filename="src/configuration.h" />
+		<Unit filename="src/engine.cpp" />
+		<Unit filename="src/engine.h" />
+		<Unit filename="src/equipment.cpp" />
+		<Unit filename="src/equipment.h" />
+		<Unit filename="src/floor_item.cpp" />
+		<Unit filename="src/floor_item.h" />
+		<Unit filename="src/flooritemmanager.cpp" />
+		<Unit filename="src/flooritemmanager.h" />
+		<Unit filename="src/game.cpp" />
+		<Unit filename="src/game.h" />
+		<Unit filename="src/graphics.cpp" />
+		<Unit filename="src/graphics.h" />
+		<Unit filename="src/gui/box.cpp" />
+		<Unit filename="src/gui/box.h" />
+		<Unit filename="src/gui/browserbox.cpp" />
+		<Unit filename="src/gui/browserbox.h" />
+		<Unit filename="src/gui/button.cpp" />
+		<Unit filename="src/gui/button.h" />
+		<Unit filename="src/gui/buy.cpp" />
+		<Unit filename="src/gui/buy.h" />
+		<Unit filename="src/gui/buysell.cpp" />
+		<Unit filename="src/gui/buysell.h" />
+		<Unit filename="src/gui/chargedialog.cpp" />
+		<Unit filename="src/gui/chargedialog.h" />
+		<Unit filename="src/gui/char_select.cpp" />
+		<Unit filename="src/gui/char_select.h" />
+		<Unit filename="src/gui/char_server.cpp" />
+		<Unit filename="src/gui/char_server.h" />
+		<Unit filename="src/gui/chat.cpp" />
+		<Unit filename="src/gui/chat.h" />
+		<Unit filename="src/gui/chatinput.cpp" />
+		<Unit filename="src/gui/chatinput.h" />
+		<Unit filename="src/gui/checkbox.cpp" />
+		<Unit filename="src/gui/checkbox.h" />
+		<Unit filename="src/gui/confirm_dialog.cpp" />
+		<Unit filename="src/gui/confirm_dialog.h" />
+		<Unit filename="src/gui/connection.cpp" />
+		<Unit filename="src/gui/connection.h" />
+		<Unit filename="src/gui/debugwindow.cpp" />
+		<Unit filename="src/gui/debugwindow.h" />
+		<Unit filename="src/gui/equipmentwindow.cpp" />
+		<Unit filename="src/gui/equipmentwindow.h" />
+		<Unit filename="src/gui/focushandler.cpp" />
+		<Unit filename="src/gui/focushandler.h" />
+		<Unit filename="src/gui/gccontainer.cpp" />
+		<Unit filename="src/gui/gccontainer.h" />
+		<Unit filename="src/gui/gui.cpp" />
+		<Unit filename="src/gui/gui.h" />
+		<Unit filename="src/gui/hbox.cpp" />
+		<Unit filename="src/gui/hbox.h" />
+		<Unit filename="src/gui/help.cpp" />
+		<Unit filename="src/gui/help.h" />
+		<Unit filename="src/gui/inttextbox.cpp" />
+		<Unit filename="src/gui/inttextbox.h" />
+		<Unit filename="src/gui/inventorywindow.cpp" />
+		<Unit filename="src/gui/inventorywindow.h" />
+		<Unit filename="src/gui/itemcontainer.cpp" />
+		<Unit filename="src/gui/itemcontainer.h" />
+		<Unit filename="src/gui/itemshortcutcontainer.cpp" />
+		<Unit filename="src/gui/itemshortcutcontainer.h" />
+		<Unit filename="src/gui/itemshortcutwindow.cpp" />
+		<Unit filename="src/gui/itemshortcutwindow.h" />
+		<Unit filename="src/gui/item_amount.cpp" />
+		<Unit filename="src/gui/item_amount.h" />
+		<Unit filename="src/gui/linkhandler.h" />
+		<Unit filename="src/gui/listbox.cpp" />
+		<Unit filename="src/gui/listbox.h" />
+		<Unit filename="src/gui/login.cpp" />
+		<Unit filename="src/gui/login.h" />
+		<Unit filename="src/gui/menuwindow.cpp" />
+		<Unit filename="src/gui/menuwindow.h" />
+		<Unit filename="src/gui/minimap.cpp" />
+		<Unit filename="src/gui/minimap.h" />
+		<Unit filename="src/gui/ministatus.cpp" />
+		<Unit filename="src/gui/ministatus.h" />
+		<Unit filename="src/gui/npc_text.cpp" />
+		<Unit filename="src/gui/npc_text.h" />
+		<Unit filename="src/gui/npclistdialog.cpp" />
+		<Unit filename="src/gui/npclistdialog.h" />
+		<Unit filename="src/gui/ok_dialog.cpp" />
+		<Unit filename="src/gui/ok_dialog.h" />
+		<Unit filename="src/gui/passwordfield.cpp" />
+		<Unit filename="src/gui/passwordfield.h" />
+		<Unit filename="src/gui/playerbox.cpp" />
+		<Unit filename="src/gui/playerbox.h" />
+		<Unit filename="src/gui/popupmenu.cpp" />
+		<Unit filename="src/gui/popupmenu.h" />
+		<Unit filename="src/gui/progressbar.cpp" />
+		<Unit filename="src/gui/progressbar.h" />
+		<Unit filename="src/gui/radiobutton.cpp" />
+		<Unit filename="src/gui/radiobutton.h" />
+		<Unit filename="src/gui/register.cpp" />
+		<Unit filename="src/gui/register.h" />
+		<Unit filename="src/gui/scrollarea.cpp" />
+		<Unit filename="src/gui/scrollarea.h" />
+		<Unit filename="src/gui/sell.cpp" />
+		<Unit filename="src/gui/sell.h" />
+		<Unit filename="src/gui/setup.cpp" />
+		<Unit filename="src/gui/setup.h" />
+		<Unit filename="src/gui/setup_audio.cpp" />
+		<Unit filename="src/gui/setup_audio.h" />
+		<Unit filename="src/gui/setup_joystick.cpp" />
+		<Unit filename="src/gui/setup_joystick.h" />
+		<Unit filename="src/gui/setup_keyboard.cpp" />
+		<Unit filename="src/gui/setup_keyboard.h" />
+		<Unit filename="src/gui/setup_players.cpp" />
+		<Unit filename="src/gui/setup_players.h" />
+		<Unit filename="src/gui/setup_video.cpp" />
+		<Unit filename="src/gui/setup_video.h" />
+		<Unit filename="src/gui/setuptab.h" />
+		<Unit filename="src/gui/shop.cpp" />
+		<Unit filename="src/gui/shop.h" />
+		<Unit filename="src/gui/shoplistbox.cpp" />
+		<Unit filename="src/gui/shoplistbox.h" />
+		<Unit filename="src/gui/skill.cpp" />
+		<Unit filename="src/gui/skill.h" />
+		<Unit filename="src/gui/slider.cpp" />
+		<Unit filename="src/gui/slider.h" />
+		<Unit filename="src/gui/status.cpp" />
+		<Unit filename="src/gui/status.h" />
+		<Unit filename="src/gui/tabbedcontainer.cpp" />
+		<Unit filename="src/gui/tabbedcontainer.h" />
+		<Unit filename="src/gui/table.cpp" />
+		<Unit filename="src/gui/table.h" />
+		<Unit filename="src/gui/table_model.cpp" />
+		<Unit filename="src/gui/table_model.h" />
+		<Unit filename="src/gui/textbox.cpp" />
+		<Unit filename="src/gui/textbox.h" />
+		<Unit filename="src/gui/textfield.cpp" />
+		<Unit filename="src/gui/textfield.h" />
+		<Unit filename="src/gui/trade.cpp" />
+		<Unit filename="src/gui/trade.h" />
+		<Unit filename="src/gui/updatewindow.cpp" />
+		<Unit filename="src/gui/updatewindow.h" />
+		<Unit filename="src/gui/vbox.cpp" />
+		<Unit filename="src/gui/vbox.h" />
+		<Unit filename="src/gui/viewport.cpp" />
+		<Unit filename="src/gui/viewport.h" />
+		<Unit filename="src/gui/widgets/dropdown.cpp"/>
+		<Unit filename="src/gui/widgets/dropdown.h" />
+		<Unit filename="src/gui/widgets/resizegrip.cpp" />
+		<Unit filename="src/gui/widgets/resizegrip.h" />
+		<Unit filename="src/gui/window.cpp" />
+		<Unit filename="src/gui/window.h" />
+		<Unit filename="src/gui/windowcontainer.cpp" />
+		<Unit filename="src/gui/windowcontainer.h" />
+		<Unit filename="src/guichanfwd.h" />
+		<Unit filename="src/imageparticle.cpp" />
+		<Unit filename="src/imageparticle.h" />
+		<Unit filename="src/inventory.cpp" />
+		<Unit filename="src/inventory.h" />
+		<Unit filename="src/item.cpp" />
+		<Unit filename="src/item.h" />
+		<Unit filename="src/itemshortcut.cpp" />
+		<Unit filename="src/itemshortcut.h" />
+		<Unit filename="src/joystick.cpp" />
+		<Unit filename="src/joystick.h" />
+		<Unit filename="src/keyboardconfig.cpp" />
+		<Unit filename="src/keyboardconfig.h" />
+		<Unit filename="src/localplayer.cpp" />
+		<Unit filename="src/localplayer.h" />
+		<Unit filename="src/lockedarray.h" />
+		<Unit filename="src/log.cpp" />
+		<Unit filename="src/log.h" />
+		<Unit filename="src/logindata.h" />
+		<Unit filename="src/main.cpp" />
+		<Unit filename="src/main.h" />
+		<Unit filename="src/map.cpp" />
+		<Unit filename="src/map.h" />
+		<Unit filename="src/monster.cpp" />
+		<Unit filename="src/monster.h" />
+		<Unit filename="src/net/beinghandler.cpp" />
+		<Unit filename="src/net/beinghandler.h" />
+		<Unit filename="src/net/buysellhandler.cpp" />
+		<Unit filename="src/net/buysellhandler.h" />
+		<Unit filename="src/net/charserverhandler.cpp" />
+		<Unit filename="src/net/charserverhandler.h" />
+		<Unit filename="src/net/chathandler.cpp" />
+		<Unit filename="src/net/chathandler.h" />
+		<Unit filename="src/net/equipmenthandler.cpp" />
+		<Unit filename="src/net/equipmenthandler.h" />
+		<Unit filename="src/net/inventoryhandler.cpp" />
+		<Unit filename="src/net/inventoryhandler.h" />
+		<Unit filename="src/net/itemhandler.cpp" />
+		<Unit filename="src/net/itemhandler.h" />
+		<Unit filename="src/net/loginhandler.cpp" />
+		<Unit filename="src/net/loginhandler.h" />
+		<Unit filename="src/net/maploginhandler.cpp" />
+		<Unit filename="src/net/maploginhandler.h" />
+		<Unit filename="src/net/messagehandler.cpp" />
+		<Unit filename="src/net/messagehandler.h" />
+		<Unit filename="src/net/messagein.cpp" />
+		<Unit filename="src/net/messagein.h" />
+		<Unit filename="src/net/messageout.cpp" />
+		<Unit filename="src/net/messageout.h" />
+		<Unit filename="src/net/network.cpp" />
+		<Unit filename="src/net/network.h" />
+		<Unit filename="src/net/npchandler.cpp" />
+		<Unit filename="src/net/npchandler.h" />
+		<Unit filename="src/net/partyhandler.cpp"/>
+		<Unit filename="src/net/partyhandler.h" />
+		<Unit filename="src/net/playerhandler.cpp" />
+		<Unit filename="src/net/playerhandler.h" />
+		<Unit filename="src/net/protocol.cpp" />
+		<Unit filename="src/net/protocol.h" />
+		<Unit filename="src/net/skillhandler.cpp" />
+		<Unit filename="src/net/skillhandler.h" />
+		<Unit filename="src/net/tradehandler.cpp" />
+		<Unit filename="src/net/tradehandler.h" />
+		<Unit filename="src/npc.cpp" />
+		<Unit filename="src/npc.h" />
+		<Unit filename="src/openglgraphics.cpp" />
+		<Unit filename="src/openglgraphics.h" />
+		<Unit filename="src/particle.cpp" />
+		<Unit filename="src/particle.h" />
+		<Unit filename="src/particleemitter.cpp" />
+		<Unit filename="src/particleemitter.h" />
+                <Unit filename="src/party.cpp" />
+		<Unit filename="src/party.h" />
+		<Unit filename="src/player.cpp" />
+		<Unit filename="src/player.h" />
+		<Unit filename="src/player_relations.cpp" />
+		<Unit filename="src/player_relations.h" />
+		<Unit filename="src/properties.h" />
+		<Unit filename="src/recorder.cpp" />
+		<Unit filename="src/recorder.h" />
+		<Unit filename="src/resources/action.cpp" />
+		<Unit filename="src/resources/action.h" />
+		<Unit filename="src/resources/ambientoverlay.cpp" />
+		<Unit filename="src/resources/ambientoverlay.h" />
+		<Unit filename="src/resources/animation.cpp" />
+		<Unit filename="src/resources/animation.h" />
+		<Unit filename="src/resources/buddylist.cpp"/>
+		<Unit filename="src/resources/buddylist.h" />
+		<Unit filename="src/resources/dye.cpp" />
+		<Unit filename="src/resources/dye.h" />
+		<Unit filename="src/resources/image.cpp" />
+		<Unit filename="src/resources/image.h" />
+		<Unit filename="src/resources/imageloader.cpp" />
+		<Unit filename="src/resources/imageloader.h" />
+		<Unit filename="src/resources/imageset.cpp" />
+		<Unit filename="src/resources/imageset.h" />
+		<Unit filename="src/resources/imagewriter.cpp" />
+		<Unit filename="src/resources/imagewriter.h" />
+		<Unit filename="src/resources/itemdb.cpp" />
+		<Unit filename="src/resources/itemdb.h" />
+		<Unit filename="src/resources/iteminfo.cpp" />
+		<Unit filename="src/resources/iteminfo.h" />
+		<Unit filename="src/resources/mapreader.cpp" />
+		<Unit filename="src/resources/mapreader.h" />
+		<Unit filename="src/resources/monsterdb.cpp" />
+		<Unit filename="src/resources/monsterdb.h" />
+		<Unit filename="src/resources/monsterinfo.cpp" />
+		<Unit filename="src/resources/monsterinfo.h" />
+		<Unit filename="src/resources/music.cpp" />
+		<Unit filename="src/resources/music.h" />
+		<Unit filename="src/resources/npcdb.cpp" />
+		<Unit filename="src/resources/npcdb.h" />
+		<Unit filename="src/resources/resource.cpp" />
+		<Unit filename="src/resources/resource.h" />
+		<Unit filename="src/resources/resourcemanager.cpp" />
+		<Unit filename="src/resources/resourcemanager.h" />
+		<Unit filename="src/resources/soundeffect.cpp" />
+		<Unit filename="src/resources/soundeffect.h" />
+		<Unit filename="src/resources/spritedef.cpp" />
+		<Unit filename="src/resources/spritedef.h" />
+		<Unit filename="src/serverinfo.h" />
+		<Unit filename="src/simpleanimation.cpp" />
+		<Unit filename="src/simpleanimation.h" />
+		<Unit filename="src/sound.cpp" />
+		<Unit filename="src/sound.h" />
+		<Unit filename="src/sprite.h" />
+		<Unit filename="src/text.cpp" />
+		<Unit filename="src/text.h" />
+		<Unit filename="src/textmanager.cpp" />
+		<Unit filename="src/textmanager.h" />
+		<Unit filename="src/textparticle.cpp" />
+		<Unit filename="src/textparticle.h" />
+		<Unit filename="src/tileset.h" />
+		<Unit filename="src/tme.rc">
+			<Option compilerVar="WINDRES" />
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
+		<Unit filename="src/utils/base64.cpp" />
+		<Unit filename="src/utils/base64.h" />
+		<Unit filename="src/utils/dtor.h" />
+		<Unit filename="src/utils/fastsqrt.h" />
+		<Unit filename="src/utils/strprintf.cpp" />
+		<Unit filename="src/utils/strprintf.h" />
+		<Unit filename="src/utils/tostring.h" />
+		<Unit filename="src/utils/xml.cpp" />
+		<Unit filename="src/utils/xml.h" />
+		<Unit filename="src/winver.h">
+			<Option target="unix" />
+		</Unit>
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/tmw.cbp b/tmw.cbp
deleted file mode 100644
index ba49b449..00000000
--- a/tmw.cbp
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="The Mana World" />
-		<Option pch_mode="0" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="default">
-				<Option output="tme.exe" prefix_auto="0" extension_auto="0" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Option projectResourceIncludeDirsRelation="0" />
-				<Compiler>
-					<Add option="-Wall" />
-					<Add option="-DUSE_OPENGL" />
-					<Add option="-DNOGDI" />
-				</Compiler>
-				<Linker>
-					<Add library="guichan" />
-					<Add library="guichan_sdl" />
-					<Add library="guichan_opengl" />
-					<Add library="wsock32" />
-					<Add library="SDL_image" />
-					<Add library="SDL_mixer" />
-					<Add library="SDL_net" />
-					<Add library="mingw32" />
-					<Add library="SDLmain" />
-					<Add library="SDL.dll" />
-					<Add library="xml2.dll" />
-					<Add library="opengl32" />
-					<Add library="png12.dll" />
-					<Add library="z.dll" />
-					<Add library="physfs" />
-					<Add library="curl.dll" />
-				</Linker>
-			</Target>
-			<Target title="unix">
-				<Option platforms="Unix;" />
-				<Option output="tmw" prefix_auto="1" extension_auto="1" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="`sdl-config --cflags`" />
-					<Add directory="/usr/local/include/libxml2" />
-				</Compiler>
-				<Linker>
-					<Add option="`sdl-config --libs`" />
-					<Add library="guichan" />
-					<Add library="guichan_sdl" />
-					<Add library="guichan_opengl" />
-					<Add library="GL" />
-					<Add library="physfs" />
-					<Add library="curl" />
-					<Add library="xml2" />
-					<Add library="SDL_mixer" />
-					<Add library="SDL_net" />
-					<Add library="SDL_image" />
-					<Add library="png" />
-				</Linker>
-			</Target>
-		</Build>
-		<VirtualTargets>
-			<Add alias="All" targets="default;" />
-		</VirtualTargets>
-		<Compiler>
-			<Add directory="../../../../../../mingw/include/SDL" />
-		</Compiler>
-		<Unit filename="src/animatedsprite.cpp" />
-		<Unit filename="src/animatedsprite.h" />
-		<Unit filename="src/animationparticle.cpp" />
-		<Unit filename="src/animationparticle.h" />
-		<Unit filename="src/being.cpp" />
-		<Unit filename="src/being.h" />
-		<Unit filename="src/beingmanager.cpp" />
-		<Unit filename="src/beingmanager.h" />
-		<Unit filename="src/configlistener.h" />
-		<Unit filename="src/configuration.cpp" />
-		<Unit filename="src/configuration.h" />
-		<Unit filename="src/engine.cpp" />
-		<Unit filename="src/engine.h" />
-		<Unit filename="src/equipment.cpp" />
-		<Unit filename="src/equipment.h" />
-		<Unit filename="src/floor_item.cpp" />
-		<Unit filename="src/floor_item.h" />
-		<Unit filename="src/flooritemmanager.cpp" />
-		<Unit filename="src/flooritemmanager.h" />
-		<Unit filename="src/game.cpp" />
-		<Unit filename="src/game.h" />
-		<Unit filename="src/graphics.cpp" />
-		<Unit filename="src/graphics.h" />
-		<Unit filename="src/gui/box.cpp" />
-		<Unit filename="src/gui/box.h" />
-		<Unit filename="src/gui/browserbox.cpp" />
-		<Unit filename="src/gui/browserbox.h" />
-		<Unit filename="src/gui/button.cpp" />
-		<Unit filename="src/gui/button.h" />
-		<Unit filename="src/gui/buy.cpp" />
-		<Unit filename="src/gui/buy.h" />
-		<Unit filename="src/gui/buysell.cpp" />
-		<Unit filename="src/gui/buysell.h" />
-		<Unit filename="src/gui/char_select.cpp" />
-		<Unit filename="src/gui/char_select.h" />
-		<Unit filename="src/gui/char_server.cpp" />
-		<Unit filename="src/gui/char_server.h" />
-		<Unit filename="src/gui/chat.cpp" />
-		<Unit filename="src/gui/chat.h" />
-		<Unit filename="src/gui/chatinput.cpp" />
-		<Unit filename="src/gui/chatinput.h" />
-		<Unit filename="src/gui/checkbox.cpp" />
-		<Unit filename="src/gui/checkbox.h" />
-		<Unit filename="src/gui/confirm_dialog.cpp" />
-		<Unit filename="src/gui/confirm_dialog.h" />
-		<Unit filename="src/gui/connection.cpp" />
-		<Unit filename="src/gui/connection.h" />
-		<Unit filename="src/gui/debugwindow.cpp" />
-		<Unit filename="src/gui/debugwindow.h" />
-		<Unit filename="src/gui/equipmentwindow.cpp" />
-		<Unit filename="src/gui/equipmentwindow.h" />
-		<Unit filename="src/gui/focushandler.cpp" />
-		<Unit filename="src/gui/focushandler.h" />
-		<Unit filename="src/gui/gccontainer.cpp" />
-		<Unit filename="src/gui/gccontainer.h" />
-		<Unit filename="src/gui/gui.cpp" />
-		<Unit filename="src/gui/gui.h" />
-		<Unit filename="src/gui/hbox.cpp" />
-		<Unit filename="src/gui/hbox.h" />
-		<Unit filename="src/gui/help.cpp" />
-		<Unit filename="src/gui/help.h" />
-		<Unit filename="src/gui/inttextbox.cpp" />
-		<Unit filename="src/gui/inttextbox.h" />
-		<Unit filename="src/gui/inventorywindow.cpp" />
-		<Unit filename="src/gui/inventorywindow.h" />
-		<Unit filename="src/gui/item_amount.cpp" />
-		<Unit filename="src/gui/item_amount.h" />
-		<Unit filename="src/gui/itemcontainer.cpp" />
-		<Unit filename="src/gui/itemcontainer.h" />
-		<Unit filename="src/gui/itemshortcutcontainer.cpp" />
-		<Unit filename="src/gui/itemshortcutcontainer.h" />
-		<Unit filename="src/gui/itemshortcutwindow.cpp" />
-		<Unit filename="src/gui/itemshortcutwindow.h" />
-		<Unit filename="src/gui/linkhandler.h" />
-		<Unit filename="src/gui/listbox.cpp" />
-		<Unit filename="src/gui/listbox.h" />
-		<Unit filename="src/gui/login.cpp" />
-		<Unit filename="src/gui/login.h" />
-		<Unit filename="src/gui/menuwindow.cpp" />
-		<Unit filename="src/gui/menuwindow.h" />
-		<Unit filename="src/gui/minimap.cpp" />
-		<Unit filename="src/gui/minimap.h" />
-		<Unit filename="src/gui/ministatus.cpp" />
-		<Unit filename="src/gui/ministatus.h" />
-		<Unit filename="src/gui/npc_text.cpp" />
-		<Unit filename="src/gui/npc_text.h" />
-		<Unit filename="src/gui/npclistdialog.cpp" />
-		<Unit filename="src/gui/npclistdialog.h" />
-		<Unit filename="src/gui/ok_dialog.cpp" />
-		<Unit filename="src/gui/ok_dialog.h" />
-		<Unit filename="src/gui/passwordfield.cpp" />
-		<Unit filename="src/gui/passwordfield.h" />
-		<Unit filename="src/gui/playerbox.cpp" />
-		<Unit filename="src/gui/playerbox.h" />
-		<Unit filename="src/gui/popup_box.cpp" />
-		<Unit filename="src/gui/popup_box.h" />
-		<Unit filename="src/gui/popupmenu.cpp" />
-		<Unit filename="src/gui/popupmenu.h" />
-		<Unit filename="src/gui/progressbar.cpp" />
-		<Unit filename="src/gui/progressbar.h" />
-		<Unit filename="src/gui/radiobutton.cpp" />
-		<Unit filename="src/gui/radiobutton.h" />
-		<Unit filename="src/gui/register.cpp" />
-		<Unit filename="src/gui/register.h" />
-		<Unit filename="src/gui/scrollarea.cpp" />
-		<Unit filename="src/gui/scrollarea.h" />
-		<Unit filename="src/gui/sell.cpp" />
-		<Unit filename="src/gui/sell.h" />
-		<Unit filename="src/gui/setup.cpp" />
-		<Unit filename="src/gui/setup.h" />
-		<Unit filename="src/gui/setup_audio.cpp" />
-		<Unit filename="src/gui/setup_audio.h" />
-		<Unit filename="src/gui/setup_joystick.cpp" />
-		<Unit filename="src/gui/setup_joystick.h" />
-		<Unit filename="src/gui/setup_keyboard.cpp" />
-		<Unit filename="src/gui/setup_keyboard.h" />
-		<Unit filename="src/gui/setup_players.cpp" />
-		<Unit filename="src/gui/setup_players.h" />
-		<Unit filename="src/gui/setup_video.cpp" />
-		<Unit filename="src/gui/setup_video.h" />
-		<Unit filename="src/gui/setuptab.h" />
-		<Unit filename="src/gui/shop.cpp" />
-		<Unit filename="src/gui/shop.h" />
-		<Unit filename="src/gui/shoplistbox.cpp" />
-		<Unit filename="src/gui/shoplistbox.h" />
-		<Unit filename="src/gui/skill.cpp" />
-		<Unit filename="src/gui/skill.h" />
-		<Unit filename="src/gui/slider.cpp" />
-		<Unit filename="src/gui/slider.h" />
-		<Unit filename="src/gui/status.cpp" />
-		<Unit filename="src/gui/status.h" />
-		<Unit filename="src/gui/tabbedcontainer.cpp" />
-		<Unit filename="src/gui/tabbedcontainer.h" />
-		<Unit filename="src/gui/table.cpp" />
-		<Unit filename="src/gui/table.h" />
-		<Unit filename="src/gui/table_model.cpp" />
-		<Unit filename="src/gui/table_model.h" />
-		<Unit filename="src/gui/textbox.cpp" />
-		<Unit filename="src/gui/textbox.h" />
-		<Unit filename="src/gui/textfield.cpp" />
-		<Unit filename="src/gui/textfield.h" />
-		<Unit filename="src/gui/trade.cpp" />
-		<Unit filename="src/gui/trade.h" />
-		<Unit filename="src/gui/updatewindow.cpp" />
-		<Unit filename="src/gui/updatewindow.h" />
-		<Unit filename="src/gui/vbox.cpp" />
-		<Unit filename="src/gui/vbox.h" />
-		<Unit filename="src/gui/viewport.cpp" />
-		<Unit filename="src/gui/viewport.h" />
-		<Unit filename="src/gui/widgets/resizegrip.cpp" />
-		<Unit filename="src/gui/widgets/resizegrip.h" />
-		<Unit filename="src/gui/window.cpp" />
-		<Unit filename="src/gui/window.h" />
-		<Unit filename="src/gui/windowcontainer.cpp" />
-		<Unit filename="src/gui/windowcontainer.h" />
-		<Unit filename="src/guichanfwd.h" />
-		<Unit filename="src/imageparticle.cpp" />
-		<Unit filename="src/imageparticle.h" />
-		<Unit filename="src/inventory.cpp" />
-		<Unit filename="src/inventory.h" />
-		<Unit filename="src/item.cpp" />
-		<Unit filename="src/item.h" />
-		<Unit filename="src/itemshortcut.cpp" />
-		<Unit filename="src/itemshortcut.h" />
-		<Unit filename="src/joystick.cpp" />
-		<Unit filename="src/joystick.h" />
-		<Unit filename="src/keyboardconfig.cpp" />
-		<Unit filename="src/keyboardconfig.h" />
-		<Unit filename="src/localplayer.cpp" />
-		<Unit filename="src/localplayer.h" />
-		<Unit filename="src/lockedarray.h" />
-		<Unit filename="src/log.cpp" />
-		<Unit filename="src/log.h" />
-		<Unit filename="src/logindata.h" />
-		<Unit filename="src/main.cpp" />
-		<Unit filename="src/main.h" />
-		<Unit filename="src/map.cpp" />
-		<Unit filename="src/map.h" />
-		<Unit filename="src/monster.cpp" />
-		<Unit filename="src/monster.h" />
-		<Unit filename="src/net/beinghandler.cpp" />
-		<Unit filename="src/net/beinghandler.h" />
-		<Unit filename="src/net/buysellhandler.cpp" />
-		<Unit filename="src/net/buysellhandler.h" />
-		<Unit filename="src/net/charserverhandler.cpp" />
-		<Unit filename="src/net/charserverhandler.h" />
-		<Unit filename="src/net/chathandler.cpp" />
-		<Unit filename="src/net/chathandler.h" />
-		<Unit filename="src/net/equipmenthandler.cpp" />
-		<Unit filename="src/net/equipmenthandler.h" />
-		<Unit filename="src/net/inventoryhandler.cpp" />
-		<Unit filename="src/net/inventoryhandler.h" />
-		<Unit filename="src/net/itemhandler.cpp" />
-		<Unit filename="src/net/itemhandler.h" />
-		<Unit filename="src/net/loginhandler.cpp" />
-		<Unit filename="src/net/loginhandler.h" />
-		<Unit filename="src/net/maploginhandler.cpp" />
-		<Unit filename="src/net/maploginhandler.h" />
-		<Unit filename="src/net/messagehandler.cpp" />
-		<Unit filename="src/net/messagehandler.h" />
-		<Unit filename="src/net/messagein.cpp" />
-		<Unit filename="src/net/messagein.h" />
-		<Unit filename="src/net/messageout.cpp" />
-		<Unit filename="src/net/messageout.h" />
-		<Unit filename="src/net/network.cpp" />
-		<Unit filename="src/net/network.h" />
-		<Unit filename="src/net/npchandler.cpp" />
-		<Unit filename="src/net/npchandler.h" />
-		<Unit filename="src/net/playerhandler.cpp" />
-		<Unit filename="src/net/playerhandler.h" />
-		<Unit filename="src/net/protocol.cpp" />
-		<Unit filename="src/net/protocol.h" />
-		<Unit filename="src/net/skillhandler.cpp" />
-		<Unit filename="src/net/skillhandler.h" />
-		<Unit filename="src/net/tradehandler.cpp" />
-		<Unit filename="src/net/tradehandler.h" />
-		<Unit filename="src/npc.cpp" />
-		<Unit filename="src/npc.h" />
-		<Unit filename="src/openglgraphics.cpp" />
-		<Unit filename="src/openglgraphics.h" />
-		<Unit filename="src/particle.cpp" />
-		<Unit filename="src/particle.h" />
-		<Unit filename="src/particleemitter.cpp" />
-		<Unit filename="src/particleemitter.h" />
-		<Unit filename="src/player.cpp" />
-		<Unit filename="src/player.h" />
-		<Unit filename="src/player_relations.cpp" />
-		<Unit filename="src/player_relations.h" />
-		<Unit filename="src/properties.h" />
-		<Unit filename="src/resources/action.cpp" />
-		<Unit filename="src/resources/action.h" />
-		<Unit filename="src/resources/ambientoverlay.cpp" />
-		<Unit filename="src/resources/ambientoverlay.h" />
-		<Unit filename="src/resources/animation.cpp" />
-		<Unit filename="src/resources/animation.h" />
-		<Unit filename="src/resources/dye.cpp" />
-		<Unit filename="src/resources/dye.h" />
-		<Unit filename="src/resources/image.cpp" />
-		<Unit filename="src/resources/image.h" />
-		<Unit filename="src/resources/imageloader.cpp" />
-		<Unit filename="src/resources/imageloader.h" />
-		<Unit filename="src/resources/imageset.cpp" />
-		<Unit filename="src/resources/imageset.h" />
-		<Unit filename="src/resources/imagewriter.cpp" />
-		<Unit filename="src/resources/imagewriter.h" />
-		<Unit filename="src/resources/itemdb.cpp" />
-		<Unit filename="src/resources/itemdb.h" />
-		<Unit filename="src/resources/iteminfo.cpp" />
-		<Unit filename="src/resources/iteminfo.h" />
-		<Unit filename="src/resources/mapreader.cpp" />
-		<Unit filename="src/resources/mapreader.h" />
-		<Unit filename="src/resources/monsterdb.cpp" />
-		<Unit filename="src/resources/monsterdb.h" />
-		<Unit filename="src/resources/monsterinfo.cpp" />
-		<Unit filename="src/resources/monsterinfo.h" />
-		<Unit filename="src/resources/music.cpp" />
-		<Unit filename="src/resources/music.h" />
-		<Unit filename="src/resources/resource.cpp" />
-		<Unit filename="src/resources/resource.h" />
-		<Unit filename="src/resources/resourcemanager.cpp" />
-		<Unit filename="src/resources/resourcemanager.h" />
-		<Unit filename="src/resources/soundeffect.cpp" />
-		<Unit filename="src/resources/soundeffect.h" />
-		<Unit filename="src/resources/spritedef.cpp" />
-		<Unit filename="src/resources/spritedef.h" />
-		<Unit filename="src/serverinfo.h" />
-		<Unit filename="src/simpleanimation.cpp" />
-		<Unit filename="src/simpleanimation.h" />
-		<Unit filename="src/sound.cpp" />
-		<Unit filename="src/sound.h" />
-		<Unit filename="src/sprite.h" />
-		<Unit filename="src/textparticle.cpp" />
-		<Unit filename="src/textparticle.h" />
-		<Unit filename="src/tileset.h" />
-		<Unit filename="src/tmw.rc">
-			<Option compilerVar="WINDRES" />
-			<Option target="&lt;{~None~}&gt;" />
-		</Unit>
-		<Unit filename="src/utils/base64.cpp" />
-		<Unit filename="src/utils/base64.h" />
-		<Unit filename="src/utils/dtor.h" />
-		<Unit filename="src/utils/tostring.h" />
-		<Unit filename="src/utils/xml.cpp" />
-		<Unit filename="src/utils/xml.h" />
-		<Unit filename="src/winver.h">
-			<Option target="unix" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
-- 
cgit v1.2.3-70-g09d2


From c9294154cc1a53b12f11806548370b4e7e36b34b Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Mon, 28 Jul 2008 16:23:06 +0000
Subject: Added npc scripts for new eAthena

---
 AUTHORS | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index d3349490..a4181b7b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
 ---------------------------
-The Mana xperiment Dev Team
+The Mana Experiment Dev Team
 ---------------------------
 
  Blameu aka Kevin Day (blame582@gmail.com)
@@ -11,12 +11,19 @@ The Mana xperiment Dev Team
  Kraant
 
 == Artists ==
-
+ 
+ Frictor
+ Angeliex
+ Tametomo
 
 == Map Designers ==
 
  Ichigo Black
 
+== Inactive ==
+
+ Sertraline
+
 -----------------------
 The Mana World Dev Team
 -----------------------
-- 
cgit v1.2.3-70-g09d2


From 2852d5695820e4ff8598ec4cf391f7049907d527 Mon Sep 17 00:00:00 2001
From: Kraant <kraant@gmail.com>
Date: Wed, 30 Jul 2008 09:11:08 +0000
Subject: Adding patch the stops a segfault from occuring in beinghandler when
 a targeted player runs off screen. -- Daniel Thomas

---
 src/net/beinghandler.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 00053083..c76d0515 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -200,6 +200,11 @@ void BeingHandler::handleMessage(MessageIn *msg)
             if (!dstBeing)
                 break;
 
+            if (dstBeing == player_node->getTarget())
+            {
+                player_node->stopAttack();
+            }
+
             if (msg->readInt8() == 1)
             {
                 dstBeing->setAction(Being::DEAD);
@@ -209,10 +214,6 @@ void BeingHandler::handleMessage(MessageIn *msg)
                 beingManager->destroyBeing(dstBeing);
             }
 
-            if (dstBeing == player_node->getTarget())
-            {
-                player_node->stopAttack();
-            }
             break;
 
         case SMSG_BEING_ACTION:
-- 
cgit v1.2.3-70-g09d2


From fcf54cb8827e84b608ef49dd98697ccfbf25319f Mon Sep 17 00:00:00 2001
From: Kraant <kraant@gmail.com>
Date: Sun, 3 Aug 2008 14:25:20 +0000
Subject: Changed the default server in the dropdown menu in the login screen
 to the new server

---
 src/gui/login.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 526a8e8f..1420575d 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -51,7 +51,7 @@ LoginDialog::LoginDialog(LoginData *loginData):
     gcn::Label *serverLabel = new gcn::Label("Server:");
     gcn::Label *portLabel = new gcn::Label("Port:");
     mServerList = new DropDownList("MostRecent00",
-                                   "216.139.126.36",
+                                   "209.168.213.109",
                                    "6901",
                                    MAX_SERVER_LIST_SIZE);
     mServerListBox = new gcn::ListBox(mServerList);
-- 
cgit v1.2.3-70-g09d2


From d7dd3eb44cc9a339851715fcd13435e1cce3e4d7 Mon Sep 17 00:00:00 2001
From: Douglas Boffey <DougABoffey@netscape.net>
Date: Mon, 4 Aug 2008 17:38:36 +0000
Subject: Aligned text boxes in video setup dialog

---
 src/gui/setup_video.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index bc38f1f9..1b619b9a 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -192,7 +192,7 @@ Setup_Video::Setup_Video():
     mScrollRadiusSlider->setDimension(gcn::Rectangle(10, 120, 75, 10));
     gcn::Label *scrollRadiusLabel = new gcn::Label("Scroll radius");
     scrollRadiusLabel->setPosition(90, 120);
-    mScrollRadiusField->setPosition(180, 120);
+    mScrollRadiusField->setPosition(mFpsField->getX(), 120);
     mScrollRadiusField->setWidth(30);
     mScrollRadiusField->setText(toString(mOriginalScrollRadius));
     mScrollRadiusSlider->setValue(mOriginalScrollRadius);
@@ -200,7 +200,7 @@ Setup_Video::Setup_Video():
     mScrollLazinessSlider->setDimension(gcn::Rectangle(10, 140, 75, 10));
     gcn::Label *scrollLazinessLabel = new gcn::Label("Scroll laziness");
     scrollLazinessLabel->setPosition(90, 140);
-    mScrollLazinessField->setPosition(180, 140);
+    mScrollLazinessField->setPosition(mFpsField->getX(), 140);
     mScrollLazinessField->setWidth(30);
     mScrollLazinessField->setText(toString(mOriginalScrollLaziness));
     mScrollLazinessSlider->setValue(mOriginalScrollLaziness);
-- 
cgit v1.2.3-70-g09d2


From 128afe364bf797d02424b6e7191bb4bd4c1df21d Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Wed, 6 Aug 2008 14:12:34 +0000
Subject: totally killed the stop walking packet handler

---
 src/net/beinghandler.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index c76d0515..a8591fce 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -467,24 +467,24 @@ void BeingHandler::handleMessage(MessageIn *msg)
 
         case SMSG_PLAYER_STOP:
             // Instruction from server to stop walking at x, y.
+            /*
+             * Deactivated - it drives people on the TMW server nuts
+             *
             id = msg->readInt32();
             dstBeing = beingManager->findBeing(id);
 
             if (dstBeing) {
                 dstBeing->mX = msg->readInt16();
                 dstBeing->mY = msg->readInt16();
-                /*
-                 * I'm deactivating this - players are reporting that
-                 * this makes things *worse*, not better.
                 if (dstBeing->mAction == Being::WALK) {
                      dstBeing->mFrame = 0;
                      dstBeing->setAction(Being::STAND);
                 }
-                */
+
             } else {
                 logger->log("0x0088: Non-existent being %d", id);
             }
-
+            */
             break;
 
         case SMSG_PLAYER_MOVE_TO_ATTACK:
-- 
cgit v1.2.3-70-g09d2


From d63aff470f914d711b92af12ceb7944e8a6e24f4 Mon Sep 17 00:00:00 2001
From: Kraant <kraant@gmail.com>
Date: Thu, 7 Aug 2008 21:36:18 +0000
Subject: Rebranding TME to Aethyra

---
 AUTHORS                             |    2 +-
 Aethyra.dev                         | 2859 +++++++++++++++++++++++++++++++++++
 Aethyra.vcproj                      |  876 +++++++++++
 CMakeLists.txt                      |    6 +-
 INSTALL                             |   22 +-
 Makefile.am                         |    2 +-
 ManaExperiment.vcproj               |  876 -----------
 README                              |    2 +-
 The Mana Experiment.dev             | 2859 -----------------------------------
 aethyra.cbp                         |  383 +++++
 aethyra.desktop                     |   16 +
 aethyra.png                         |  Bin 0 -> 18176 bytes
 configure.ac                        |    4 +-
 data/Makefile.am                    |    2 +-
 data/icons/Aethyra.icns             |  Bin 0 -> 65136 bytes
 data/icons/Makefile.am              |    6 +-
 data/icons/The Mana Experiment.icns |  Bin 65136 -> 0 bytes
 data/icons/aethyra.ico              |  Bin 0 -> 22382 bytes
 data/icons/aethyra.png              |  Bin 0 -> 18176 bytes
 data/icons/aethyra.xpm              |  784 ++++++++++
 data/icons/tme.ico                  |  Bin 22382 -> 0 bytes
 data/icons/tme.png                  |  Bin 18176 -> 0 bytes
 data/icons/tme.xpm                  |  784 ----------
 debian/aethyra-data.install         |    5 +
 debian/aethyra.docs                 |    6 +
 debian/aethyra.install              |    5 +
 debian/aethyra.menu                 |    4 +
 debian/aethyra.sgml                 |  149 ++
 debian/aethyra.xpm                  |  776 ++++++++++
 debian/control                      |   32 +-
 debian/rules                        |    2 +-
 debian/tme-data.install             |    5 -
 debian/tme.docs                     |    6 -
 debian/tme.install                  |    5 -
 debian/tme.menu                     |    4 -
 debian/tme.sgml                     |  149 --
 debian/tme.xpm                      |  776 ----------
 docs/FAQ.txt                        |   20 +-
 docs/HACKING.txt                    |    2 +-
 docs/INSTALL/debian.txt             |   50 +-
 docs/INSTALL/win32.txt              |   34 +-
 docs/Makefile.am                    |    6 +-
 docs/SOURCE/aethyra.doxcfg          | 1153 ++++++++++++++
 docs/SOURCE/aethyradox.sh           |    1 +
 docs/SOURCE/tme.doxcfg              | 1153 --------------
 docs/SOURCE/tmedox.sh               |    1 -
 docs/aethyra.6                      |   97 ++
 docs/packages.txt                   |   27 +-
 docs/sounddev.txt                   |    4 +-
 docs/tme.6                          |   97 --
 docs/win32-release.txt              |    9 +-
 src/CMakeLists.txt                  |   10 +-
 src/Makefile.am                     |   14 +-
 src/aethyra.rc                      |   23 +
 src/game.cpp                        |    4 +-
 src/main.cpp                        |   38 +-
 src/main.h                          |    4 +-
 src/resources/resourcemanager.cpp   |    2 +-
 src/text.h                          |    4 +-
 src/textmanager.h                   |    4 +-
 src/tme.rc                          |   23 -
 tme.cbp                             |  383 -----
 tme.desktop                         |   16 -
 63 files changed, 7308 insertions(+), 7278 deletions(-)
 create mode 100644 Aethyra.dev
 create mode 100644 Aethyra.vcproj
 delete mode 100644 ManaExperiment.vcproj
 delete mode 100644 The Mana Experiment.dev
 create mode 100644 aethyra.cbp
 create mode 100644 aethyra.desktop
 create mode 100644 aethyra.png
 create mode 100644 data/icons/Aethyra.icns
 delete mode 100644 data/icons/The Mana Experiment.icns
 create mode 100644 data/icons/aethyra.ico
 create mode 100644 data/icons/aethyra.png
 create mode 100644 data/icons/aethyra.xpm
 delete mode 100644 data/icons/tme.ico
 delete mode 100644 data/icons/tme.png
 delete mode 100644 data/icons/tme.xpm
 create mode 100644 debian/aethyra-data.install
 create mode 100644 debian/aethyra.docs
 create mode 100644 debian/aethyra.install
 create mode 100644 debian/aethyra.menu
 create mode 100644 debian/aethyra.sgml
 create mode 100644 debian/aethyra.xpm
 delete mode 100644 debian/tme-data.install
 delete mode 100644 debian/tme.docs
 delete mode 100644 debian/tme.install
 delete mode 100644 debian/tme.menu
 delete mode 100644 debian/tme.sgml
 delete mode 100644 debian/tme.xpm
 create mode 100644 docs/SOURCE/aethyra.doxcfg
 create mode 100644 docs/SOURCE/aethyradox.sh
 delete mode 100644 docs/SOURCE/tme.doxcfg
 delete mode 100644 docs/SOURCE/tmedox.sh
 create mode 100644 docs/aethyra.6
 delete mode 100644 docs/tme.6
 create mode 100644 src/aethyra.rc
 delete mode 100644 src/tme.rc
 delete mode 100644 tme.cbp
 delete mode 100644 tme.desktop

diff --git a/AUTHORS b/AUTHORS
index a4181b7b..a876c194 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
 ---------------------------
-The Mana Experiment Dev Team
+Aethyra Dev Team
 ---------------------------
 
  Blameu aka Kevin Day (blame582@gmail.com)
diff --git a/Aethyra.dev b/Aethyra.dev
new file mode 100644
index 00000000..6bfb1bfa
--- /dev/null
+++ b/Aethyra.dev
@@ -0,0 +1,2859 @@
+[Project]
+FileName=Aethyra.dev
+Name=aethyra
+UnitCount=277
+Type=0
+Ver=1
+ObjFiles=
+Includes=
+Libs=
+PrivateResource=Aethyra_private.rc
+ResourceIncludes=
+MakeIncludes=
+Compiler=
+CppCompiler=-DUSE_OPENGL_@@_-Wall_@@_
+Linker=-lguichan_@@_-lguichan_sdl_@@_-lguichan_opengl_@@_-lwsock32_@@_-lSDL_image.dll_@@_-lSDL_mixer.dll_@@_-lSDL_net.dll_@@_-lmingw32_@@_-lSDLmain_@@_-lSDL.dll_@@_-lxml2.dll_@@_-lopengl32_@@_-lpng12.dll_@@_-lz.dll_@@_-lphysfs_@@_-lcurl.dll_@@_
+IsCpp=1
+Icon=
+ExeOutput=
+ObjectOutput=obj
+OverrideOutput=1
+OverrideOutputName=aethyra.exe
+HostApplication=
+Folders=gui,gui/header,gui/source,header,header/widgets,net,net/header,net/source,resources,utils
+CommandLine=
+UseCustomMakefile=0
+CustomMakefile=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=0010001001000001001101
+
+[VersionInfo]
+Major=0
+Minor=0
+Release=0
+Build=0
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=
+FileDescription=
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=
+AutoIncBuildNr=0
+
+[Unit8]
+FileName=src\floor_item.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit13]
+FileName=src\graphics.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit17]
+FileName=src\main.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit25]
+FileName=src\gui\button.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit29]
+FileName=src\gui\buysell.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit30]
+FileName=src\gui\char_select.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit32]
+FileName=src\gui\char_server.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit6]
+FileName=src\engine.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit7]
+FileName=src\engine.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit3]
+FileName=src\being.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit4]
+FileName=src\configuration.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit5]
+FileName=src\configuration.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit14]
+FileName=src\log.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit43]
+FileName=src\gui\confirm_dialog.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit44]
+FileName=src\gui\equipmentwindow.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit46]
+FileName=src\gui\gui.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit45]
+FileName=src\gui\equipmentwindow.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit49]
+FileName=src\gui\item_amount.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit50]
+FileName=src\gui\itemcontainer.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit55]
+FileName=src\gui\minimap.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit56]
+FileName=src\gui\npc_text.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit60]
+FileName=src\gui\passwordfield.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit69]
+FileName=src\gui\scrollarea.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit70]
+FileName=src\gui\sell.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit71]
+FileName=src\gui\sell.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit72]
+FileName=src\gui\setup.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit73]
+FileName=src\gui\setup.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit74]
+FileName=src\gui\shop.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit41]
+FileName=src\gui\checkbox.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit77]
+FileName=src\gui\skill.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit78]
+FileName=src\gui\slider.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit79]
+FileName=src\gui\slider.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit80]
+FileName=src\gui\status.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit81]
+FileName=src\gui\status.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit82]
+FileName=src\gui\textbox.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit84]
+FileName=src\gui\textfield.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit85]
+FileName=src\gui\textfield.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit86]
+FileName=src\gui\trade.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit89]
+FileName=src\gui\window.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit90]
+FileName=src\gui\windowcontainer.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit91]
+FileName=src\net\network.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit92]
+FileName=src\net\network.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit93]
+FileName=src\net\protocol.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit94]
+FileName=src\net\protocol.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit95]
+FileName=src\resources\soundeffect.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit96]
+FileName=src\resources\buddylist.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit42]
+FileName=src\gui\confirm_dialog.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit97]
+FileName=src\resources\buddylist.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit98]
+FileName=src\resources\image.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit99]
+FileName=src\resources\image.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit100]
+FileName=src\resources\iteminfo.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit101]
+FileName=src\resources\mapreader.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit102]
+FileName=src\resources\mapreader.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit103]
+FileName=src\resources\music.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit104]
+FileName=src\resources\music.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit106]
+FileName=src\resources\resource.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit109]
+FileName=src\resources\soundeffect.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit113]
+FileName=src\gui\item_amount.h
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit111]
+FileName=src\gui\help.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit112]
+FileName=src\gui\inttextbox.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit113]
+FileName=src\gui\inttextbox.h
+CompileCpp=1
+Folder=gui/header
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+Compile=1
+
+[Unit114]
+FileName=src\gui\focushandler.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit115]
+FileName=src\gui\focushandler.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit116]
+FileName=src\gui\popupmenu.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit117]
+FileName=src\gui\popupmenu.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit118]
+FileName=src\gui\browserbox.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit119]
+FileName=src\gui\browserbox.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit120]
+FileName=src\gui\updatewindow.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit121]
+FileName=src\gui\updatewindow.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit122]
+FileName=src\gui\box.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit124]
+FileName=src\item.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit125]
+FileName=src\equipment.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit126]
+FileName=src\equipment.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit127]
+FileName=src\item.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit128]
+FileName=src\gui\inventorywindow.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit1]
+FileName=src\sound.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit2]
+FileName=src\being.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit9]
+FileName=src\floor_item.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit10]
+FileName=src\game.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit11]
+FileName=src\game.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit12]
+FileName=src\graphics.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit15]
+FileName=src\log.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit16]
+FileName=src\main.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit18]
+FileName=src\map.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit19]
+FileName=src\map.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit20]
+FileName=src\sound.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit21]
+FileName=src\gui\windowcontainer.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit23]
+FileName=src\gui\buddywindow.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit24]
+FileName=src\gui\button.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit26]
+FileName=src\gui\buy.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit27]
+FileName=src\gui\buy.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit28]
+FileName=src\gui\buysell.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit31]
+FileName=src\gui\char_select.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit33]
+FileName=src\gui\char_server.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit34]
+FileName=src\gui\chargedialog.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit35]
+FileName=src\gui\chargedialog.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit36]
+FileName=src\gui\chat.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit37]
+FileName=src\gui\chat.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit38]
+FileName=src\gui\chatinput.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit39]
+FileName=src\gui\chatinput.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit40]
+FileName=src\gui\checkbox.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit47]
+FileName=src\gui\gui.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit48]
+FileName=src\gui\item_amount.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit51]
+FileName=src\gui\itemcontainer.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit53]
+FileName=src\gui\listbox.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit54]
+FileName=src\gui\minimap.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit57]
+FileName=src\gui\npc_text.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit61]
+FileName=src\gui\passwordfield.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit63]
+FileName=src\gui\playerbox.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit64]
+FileName=src\gui\progressbar.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit65]
+FileName=src\gui\progressbar.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit66]
+FileName=src\gui\radiobutton.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit67]
+FileName=src\gui\radiobutton.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit68]
+FileName=src\gui\scrollarea.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit75]
+FileName=src\gui\shop.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit76]
+FileName=src\gui\skill.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit83]
+FileName=src\gui\textbox.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit87]
+FileName=src\gui\trade.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit88]
+FileName=src\gui\window.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit107]
+FileName=src\resources\resourcemanager.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit108]
+FileName=src\resources\resourcemanager.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit123]
+FileName=src\gui\box.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit129]
+FileName=src\gui\inventorywindow.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit130]
+FileName=src\inventory.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit131]
+FileName=src\inventory.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit132]
+FileName=src\configlistener.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit133]
+FileName=src\guichanfwd.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit134]
+FileName=src\serverinfo.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit135]
+FileName=src\openglgraphics.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit138]
+FileName=src\gui\tabbedcontainer.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit139]
+FileName=src\net\messageout.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit140]
+FileName=src\net\messageout.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit141]
+FileName=src\net\messagein.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit142]
+FileName=src\net\messagein.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit143]
+FileName=src\gui\menuwindow.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit144]
+FileName=src\gui\menuwindow.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit145]
+FileName=src\gui\ministatus.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit146]
+FileName=src\gui\ministatus.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit147]
+FileName=src\resources\imagewriter.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit148]
+FileName=src\resources\imagewriter.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit149]
+FileName=src\gui\debugwindow.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit52]
+FileName=src\gui\listbox.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit150]
+FileName=src\gui\debugwindow.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit151]
+FileName=src\gui\connection.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit152]
+FileName=src\gui\connection.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit153]
+FileName=src\gui\gccontainer.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit154]
+FileName=src\gui\gccontainer.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit155]
+FileName=src\gui\login.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit156]
+FileName=src\gui\login.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit157]
+FileName=src\gui\register.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit158]
+FileName=src\gui\register.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit166]
+FileName=src\gui\npclistdialog.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit167]
+FileName=src\gui\npclistdialog.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit160]
+FileName=src\properties.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit161]
+FileName=src\sprite.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit105]
+FileName=src\resources\resource.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit110]
+FileName=src\gui\help.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit159]
+FileName=src\tileset.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit162]
+FileName=src\beingmanager.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit163]
+FileName=src\beingmanager.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit164]
+FileName=src\localplayer.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit165]
+FileName=src\localplayer.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit168]
+FileName=src\npc.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit169]
+FileName=src\npc.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit170]
+FileName=src\lockedarray.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit171]
+FileName=src\logindata.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit172]
+FileName=src\monster.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit173]
+FileName=src\monster.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit174]
+FileName=src\player.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit176]
+FileName=src\net\beinghandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit177]
+FileName=src\net\beinghandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit178]
+FileName=src\net\buysellhandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit136]
+FileName=src\openglgraphics.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit137]
+FileName=src\gui\tabbedcontainer.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit62]
+FileName=src\gui\playerbox.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit175]
+FileName=src\player.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit58]
+FileName=src\gui\ok_dialog.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit59]
+FileName=src\gui\ok_dialog.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit179]
+FileName=src\net\buysellhandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit180]
+FileName=src\net\charserverhandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit181]
+FileName=src\net\charserverhandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit182]
+FileName=src\net\chathandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit183]
+FileName=src\net\chathandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit184]
+FileName=src\net\equipmenthandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit185]
+FileName=src\net\equipmenthandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit186]
+FileName=src\net\inventoryhandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit187]
+FileName=src\net\inventoryhandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit188]
+FileName=src\net\itemhandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit189]
+FileName=src\net\itemhandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit190]
+FileName=src\net\loginhandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit191]
+FileName=src\net\loginhandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit192]
+FileName=src\net\maploginhandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit193]
+FileName=src\net\maploginhandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit194]
+FileName=src\net\messagehandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit195]
+FileName=src\net\messagehandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit196]
+FileName=src\net\npchandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit197]
+FileName=src\net\npchandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit198]
+FileName=src\net\playerhandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit199]
+FileName=src\net\playerhandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit200]
+FileName=src\net\skillhandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit201]
+FileName=src\net\skillhandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit202]
+FileName=src\net\tradehandler.cpp
+CompileCpp=1
+Folder=net/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit203]
+FileName=src\net\tradehandler.h
+CompileCpp=1
+Folder=net/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit204]
+FileName=src\joystick.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit205]
+FileName=src\flooritemmanager.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit206]
+FileName=src\flooritemmanager.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit207]
+FileName=src\joystick.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit208]
+FileName=src\gui\setup_video.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit209]
+FileName=src\gui\setup_audio.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit210]
+FileName=src\gui\setup_joystick.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit211]
+FileName=src\gui\setup_video.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit212]
+FileName=src\gui\setup_audio.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit213]
+FileName=src\gui\setup_joystick.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit214]
+FileName=src\gui\setuptab.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit215]
+FileName=src\utils\dtor.h
+CompileCpp=1
+Folder=utils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit216]
+FileName=src\utils\tostring.h
+CompileCpp=1
+Folder=utils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit217]
+FileName=src\tmw.rc
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit218]
+FileName=src\animatedsprite.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit219]
+FileName=src\animatedsprite.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit220]
+FileName=src\resources\iteminfo.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit221]
+FileName=src\resources\ambientoverlay.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit222]
+FileName=src\resources\ambientoverlay.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit223]
+FileName=src\gui\shoplistbox.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit224]
+FileName=src\gui\shoplistbox.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit225]
+FileName=src\utils\xml.cpp
+CompileCpp=1
+Folder=utils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit226]
+FileName=src\utils\xml.h
+CompileCpp=1
+Folder=utils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit227]
+FileName=src\resources\spritedef.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit228]
+FileName=src\resources\spritedef.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit229]
+FileName=src\resources\monsterdb.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit230]
+FileName=src\resources\monsterdb.h
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+CompileCpp=1
+
+[Unit231]
+FileName=src\resources\monsterinfo.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit232]
+FileName=src\resources\monsterinfo.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit233]
+FileName=src\resources\itemdb.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit234]
+FileName=src\resources\itemdb.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit235]
+FileName=src\gui\viewport.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit236]
+FileName=src\gui\viewport.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit237]
+FileName=src\winver.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit238]
+FileName=src\resources\action.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit239]
+FileName=src\resources\action.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit240]
+FileName=src\resources\animation.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit241]
+FileName=src\resources\animation.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit242]
+FileName=src\utils\base64.cpp
+CompileCpp=1
+Folder=utils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit243]
+FileName=src\utils\base64.h
+CompileCpp=1
+Folder=utils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit244]
+FileName=src\animationparticle.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit245]
+FileName=src\animationparticle.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit246]
+FileName=src\imageparticle.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit247]
+FileName=src\imageparticle.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit248]
+FileName=src\particle.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit249]
+FileName=src\particle.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit250]
+FileName=src\particleemitter.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit251]
+FileName=src\particleemitter.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit252]
+FileName=src\simpleanimation.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit253]
+FileName=src\simpleanimation.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit254]
+FileName=src\textparticle.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit255]
+FileName=src\textparticle.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit256]
+FileName=src\utils\fastsqrt.h
+CompileCpp=1
+Folder=utils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit257]
+FileName=src\utils\minmax.h
+CompileCpp=1
+Folder=utils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit258]
+FileName=src\resources\imageset.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit259]
+FileName=src\resources\imageset.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit260]
+FileName=src\gui\hbox.cpp
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit261]
+FileName=src\gui\hbox.h
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit262]
+FileName=src\gui\linkhandler.h
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit263]
+FileName=src\gui\newskill.cpp
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit264]
+FileName=src\gui\newskill.h
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit265]
+FileName=src\gui\selectionlistener.h
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit266]
+FileName=src\gui\vbox.cpp
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit267]
+FileName=src\gui\vbox.h
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit268]
+FileName=src\gui\widgets\resizegrip.cpp
+CompileCpp=1
+Folder=header/widgets
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit269]
+FileName=src\gui\widgets\resizegrip.h
+CompileCpp=1
+Folder=header/widgets
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit270]
+FileName=src\keyboardconfig.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit271]
+FileName=src\keyboardconfig.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit272]
+FileName=src\gui\setup_keyboard.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit273]
+FileName=src\gui\setup_keyboard.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit274]
+FileName=src\resources\imageloader.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit275]
+FileName=src\resources\imageloader.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit276]
+FileName=src\resources\dye.h
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit277]
+FileName=src\resources\dye.cpp
+CompileCpp=1
+Folder=resources
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit278]
+FileName=src\keyboardconfig.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit279]
+FileName=src\keyboardconfig.h
+CompileCpp=1
+Folder=header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit280]
+FileName=src\gui\setup_keyboard.cpp
+CompileCpp=1
+Folder=gui/source
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit281]
+FileName=src\gui\setup_keyboard.h
+CompileCpp=1
+Folder=gui/header
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
diff --git a/Aethyra.vcproj b/Aethyra.vcproj
new file mode 100644
index 00000000..6612e1a1
--- /dev/null
+++ b/Aethyra.vcproj
@@ -0,0 +1,876 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="ManaExperiment"
+	ProjectGUID="{DE31E83E-62BD-460E-8E6A-648CF98CC5A4}"
+	RootNamespace="ManaExperimet"
+	Keyword="Win32Proj"
+	SignManifests="true"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="physfs.lib sdl.lib sdlmain.lib sdl_image.lib sdl_mixer.lib guichan.lib guichan_sdl.lib ws2_32.lib libxml2.lib iconv.lib zlib.lib libcurl.lib"
+				OutputFile="$(OutDir)/ManaExperiment.exe"
+				LinkIncremental="2"
+				IgnoreDefaultLibraryNames="libc.lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/ManaExperiment.pdb"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;D:\Programming\Libraries\LibXml\libxml2-2.6.17.win32\lib&quot;;&quot;D:\Programming\Libraries\LibXml\libxml2-2.6.17.win32\include&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="physfs.lib alleg.lib guichan.lib guichan_sdl.lib sdl.lib sdlmain.lib sdl_mixer.lib sdl_image.lib ws2_32.lib libxml2.lib iconv.lib zlib.lib libcurl.lib"
+				OutputFile="tmw.exe"
+				LinkIncremental="1"
+				IgnoreDefaultLibraryNames="LIBC.lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Profile|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="UpgradeFromVC71.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				RuntimeLibrary="2"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="SDL.lib"
+				AdditionalDependencies="allp.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\src\base64.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\base64.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\being.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\being.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\configuration.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\configuration.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\engine.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\engine.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\floor_item.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\floor_item.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\game.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\game.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\graphics.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\graphics.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\log.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\log.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\main.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\main.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\map.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\map.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\sound.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\sound.h"
+				>
+			</File>
+			<Filter
+				Name="graphic"
+				>
+				<File
+					RelativePath=".\src\graphic\spriteset.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\graphic\spriteset.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="net"
+				>
+				<File
+					RelativePath=".\src\net\network.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\network.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\protocol.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\protocol.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\win2linux.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\win2mac.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\win2mac.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="gui"
+				>
+				<File
+					RelativePath=".\src\gui\box.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\box.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\browserbox.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\browserbox.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\buddywindow.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\buddywindow.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\button.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\button.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\buy.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\buy.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\buysell.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\buysell.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\char_select.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\char_select.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\char_server.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\char_server.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\chargedialog.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\chargedialog.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\chat.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\chat.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\chatinput.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\chatinput.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\checkbox.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\checkbox.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\confirm_dialog.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\confirm_dialog.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\equipment.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\equipment.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\focushandler.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\focushandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\gui.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\gui.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\hbox.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\hbox.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\help.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\help.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\inttextbox.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\inttextbox.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\inventory.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\inventory.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\item_amount.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\item_amount.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\itemcontainer.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\itemcontainer.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\linkhandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\listbox.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\listbox.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\login.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\login.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\minimap.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\minimap.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\newskill.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\newskill.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\npc.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\npc.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\npc_text.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\npc_text.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\ok_dialog.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\ok_dialog.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\passwordfield.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\passwordfield.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\playerbox.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\playerbox.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\popupmenu.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\popupmenu.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\progressbar.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\progressbar.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\radiobutton.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\radiobutton.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\requesttrade.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\requesttrade.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\scrollarea.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\scrollarea.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\sell.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\sell.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\setup.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\setup.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\shop.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\shop.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\skill.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\skill.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\slider.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\slider.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\stats.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\stats.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\status.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\status.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\textbox.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\textbox.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\textfield.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\textfield.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\trade.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\trade.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\updatewindow.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\updatewindow.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\vbox.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\vbox.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\window.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\window.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\windowcontainer.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\windowcontainer.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="resources"
+				>
+				<File
+					RelativePath=".\src\resources\buddylist.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\buddylist.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\image.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\image.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\iteminfo.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\iteminfo.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\itemmanager.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\itemmanager.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\mapreader.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\mapreader.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\music.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\music.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\resource.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\resource.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\resourcemanager.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\resourcemanager.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\soundeffect.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\soundeffect.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8181f6b4..df745a7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(TME)
+PROJECT(AETHYRA)
 
 SET(VERSION 0.0.24.1)
 
@@ -11,11 +11,11 @@ IF (WIN32)
     SET(PKG_DATADIR ".")
     SET(PKG_BINDIR ".")
 ELSE (WIN32)
-    SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/tme)
+    SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/aethyra)
     SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin)
 ENDIF (WIN32)
 
 ADD_SUBDIRECTORY(data)
 ADD_SUBDIRECTORY(src)
 
-INSTALL(FILES tme.desktop DESTINATION share/applications)
+INSTALL(FILES aethyra.desktop DESTINATION share/applications)
diff --git a/INSTALL b/INSTALL
index aeb81213..5688451b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,19 +1,19 @@
-How to compile and run TME on your GNU/Linux Box
+How to compile and run Aethyra on your GNU/Linux Box
 ================================================
 
-Homepage:  http://209.168.213.109/
-IRC:       irc.freenode.net / #themanaexperiment
+Homepage:  http://www.aethyra.com/
+IRC:       irc.freenode.net / #aethyra
 
 1) Requirements
-2) Compiling The Mana Experiment
+2) Compiling Aethyra
 3) Notes
 
 
 1. Requirements
 ===============
 
-You are expected to have either checked out TME from CVS or you have downloaded
-a source release. To get The Mana Experiment to compile, you need a compiler
+You are expected to have either checked out Aethyra from CVS or you have downloaded
+a source release. To get Aethyra to compile, you need a compiler
 (GCC) and some libraries. The required libraries are:
 
 * SDL               http://www.libsdl.org/
@@ -26,7 +26,7 @@ a source release. To get The Mana Experiment to compile, you need a compiler
 * zlib 1.2.x        http://www.gzip.org/zlib/
 * libcurl           http://curl.haxx.se/libcurl/
 
-If you checked TME out from Subversion you will also need these tools to
+If you checked Aethyra out from Subversion you will also need these tools to
 compile:
 
 * GNU automake 1.9  http://www.gnu.org/software/automake/
@@ -36,7 +36,7 @@ Installing these dependencies is distributions-specific, and we'll leave it to
 you to figure this out.
 
 
-2. Compiling And Installing The Mana Experiment
+2. Compiling And Installing Aethyra
 ===============================================
 
 1) Go to the directory you have extracted the source to.
@@ -45,12 +45,12 @@ you to figure this out.
 4) Run "make"
 5) Run "make install" as root
 
-It should have installed The Mana Experiment on your system now, and you can
-run it with "tme". By default all files are installed to /usr/local, you can
+It should have installed Aethyra on your system now, and you can
+run it with "aethyra". By default all files are installed to /usr/local, you can
 pass a different prefix to configure as usual.
 
 
-  NOTE: It is possible to compile TME without support for OpenGL rendering.
+  NOTE: It is possible to compile Aethyra without support for OpenGL rendering.
   To do this perform step 3 as follows:
 
     ./configure --without-opengl
diff --git a/Makefile.am b/Makefile.am
index c7f45241..f399eb3c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = data docs src
 
 desktopdir = $(datadir)/applications
 
-desktop_DATA = tme.desktop
+desktop_DATA = aethyra.desktop
 
 # Extra files to include
 EXTRA_DIST = $(desktop_DATA)
diff --git a/ManaExperiment.vcproj b/ManaExperiment.vcproj
deleted file mode 100644
index 6612e1a1..00000000
--- a/ManaExperiment.vcproj
+++ /dev/null
@@ -1,876 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="ManaExperiment"
-	ProjectGUID="{DE31E83E-62BD-460E-8E6A-648CF98CC5A4}"
-	RootNamespace="ManaExperimet"
-	Keyword="Win32Proj"
-	SignManifests="true"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="physfs.lib sdl.lib sdlmain.lib sdl_image.lib sdl_mixer.lib guichan.lib guichan_sdl.lib ws2_32.lib libxml2.lib iconv.lib zlib.lib libcurl.lib"
-				OutputFile="$(OutDir)/ManaExperiment.exe"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="libc.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/ManaExperiment.pdb"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;D:\Programming\Libraries\LibXml\libxml2-2.6.17.win32\lib&quot;;&quot;D:\Programming\Libraries\LibXml\libxml2-2.6.17.win32\include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="physfs.lib alleg.lib guichan.lib guichan_sdl.lib sdl.lib sdlmain.lib sdl_mixer.lib sdl_image.lib ws2_32.lib libxml2.lib iconv.lib zlib.lib libcurl.lib"
-				OutputFile="tmw.exe"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="LIBC.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Profile|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC71.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				RuntimeLibrary="2"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="SDL.lib"
-				AdditionalDependencies="allp.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\src\base64.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\base64.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\being.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\being.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\configuration.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\configuration.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\engine.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\engine.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\floor_item.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\floor_item.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\game.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\game.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\graphics.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\graphics.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\log.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\log.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\main.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\main.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\map.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\map.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\sound.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\sound.h"
-				>
-			</File>
-			<Filter
-				Name="graphic"
-				>
-				<File
-					RelativePath=".\src\graphic\spriteset.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\graphic\spriteset.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="net"
-				>
-				<File
-					RelativePath=".\src\net\network.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\net\network.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\net\protocol.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\net\protocol.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\net\win2linux.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\net\win2mac.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\net\win2mac.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="gui"
-				>
-				<File
-					RelativePath=".\src\gui\box.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\box.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\browserbox.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\browserbox.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\buddywindow.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\buddywindow.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\button.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\button.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\buy.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\buy.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\buysell.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\buysell.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\char_select.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\char_select.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\char_server.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\char_server.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\chargedialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\chargedialog.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\chat.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\chat.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\chatinput.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\chatinput.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\checkbox.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\checkbox.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\confirm_dialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\confirm_dialog.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\equipment.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\equipment.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\focushandler.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\focushandler.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\gui.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\gui.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\hbox.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\hbox.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\help.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\help.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\inttextbox.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\inttextbox.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\inventory.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\inventory.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\item_amount.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\item_amount.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\itemcontainer.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\itemcontainer.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\linkhandler.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\listbox.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\listbox.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\login.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\login.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\minimap.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\minimap.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\newskill.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\newskill.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\npc.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\npc.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\npc_text.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\npc_text.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\ok_dialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\ok_dialog.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\passwordfield.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\passwordfield.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\playerbox.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\playerbox.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\popupmenu.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\popupmenu.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\progressbar.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\progressbar.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\radiobutton.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\radiobutton.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\requesttrade.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\requesttrade.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\scrollarea.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\scrollarea.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\sell.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\sell.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\setup.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\setup.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\shop.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\shop.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\skill.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\skill.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\slider.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\slider.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\stats.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\stats.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\status.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\status.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\textbox.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\textbox.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\textfield.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\textfield.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\trade.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\trade.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\updatewindow.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\updatewindow.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\vbox.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\vbox.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\window.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\window.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\windowcontainer.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\gui\windowcontainer.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="resources"
-				>
-				<File
-					RelativePath=".\src\resources\buddylist.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\buddylist.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\image.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\image.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\iteminfo.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\iteminfo.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\itemmanager.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\itemmanager.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\mapreader.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\mapreader.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\music.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\music.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\resource.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\resource.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\resourcemanager.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\resourcemanager.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\soundeffect.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\src\resources\soundeffect.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/README b/README
index 88da7d97..517b4a9d 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-THE MANA EXPERIMENT
+AETHYRA
 ===================
 
  Version: 0.0.24.1    Date: 7/4/2007
diff --git a/The Mana Experiment.dev b/The Mana Experiment.dev
deleted file mode 100644
index 0a0acf8a..00000000
--- a/The Mana Experiment.dev	
+++ /dev/null
@@ -1,2859 +0,0 @@
-[Project]
-FileName=The Mana Experiment.dev
-Name=tme
-UnitCount=277
-Type=0
-Ver=1
-ObjFiles=
-Includes=
-Libs=
-PrivateResource=The_Mana_Experiment_private.rc
-ResourceIncludes=
-MakeIncludes=
-Compiler=
-CppCompiler=-DUSE_OPENGL_@@_-Wall_@@_
-Linker=-lguichan_@@_-lguichan_sdl_@@_-lguichan_opengl_@@_-lwsock32_@@_-lSDL_image.dll_@@_-lSDL_mixer.dll_@@_-lSDL_net.dll_@@_-lmingw32_@@_-lSDLmain_@@_-lSDL.dll_@@_-lxml2.dll_@@_-lopengl32_@@_-lpng12.dll_@@_-lz.dll_@@_-lphysfs_@@_-lcurl.dll_@@_
-IsCpp=1
-Icon=
-ExeOutput=
-ObjectOutput=obj
-OverrideOutput=1
-OverrideOutputName=tme.exe
-HostApplication=
-Folders=gui,gui/header,gui/source,header,header/widgets,net,net/header,net/source,resources,utils
-CommandLine=
-UseCustomMakefile=0
-CustomMakefile=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=0010001001000001001101
-
-[VersionInfo]
-Major=0
-Minor=0
-Release=0
-Build=0
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=
-FileDescription=
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=
-AutoIncBuildNr=0
-
-[Unit8]
-FileName=src\floor_item.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit13]
-FileName=src\graphics.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit17]
-FileName=src\main.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit25]
-FileName=src\gui\button.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit29]
-FileName=src\gui\buysell.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit30]
-FileName=src\gui\char_select.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit32]
-FileName=src\gui\char_server.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit6]
-FileName=src\engine.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit7]
-FileName=src\engine.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit3]
-FileName=src\being.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit4]
-FileName=src\configuration.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit5]
-FileName=src\configuration.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit14]
-FileName=src\log.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit43]
-FileName=src\gui\confirm_dialog.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit44]
-FileName=src\gui\equipmentwindow.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit46]
-FileName=src\gui\gui.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit45]
-FileName=src\gui\equipmentwindow.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit49]
-FileName=src\gui\item_amount.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit50]
-FileName=src\gui\itemcontainer.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit55]
-FileName=src\gui\minimap.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit56]
-FileName=src\gui\npc_text.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit60]
-FileName=src\gui\passwordfield.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit69]
-FileName=src\gui\scrollarea.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit70]
-FileName=src\gui\sell.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit71]
-FileName=src\gui\sell.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit72]
-FileName=src\gui\setup.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit73]
-FileName=src\gui\setup.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit74]
-FileName=src\gui\shop.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit41]
-FileName=src\gui\checkbox.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit77]
-FileName=src\gui\skill.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit78]
-FileName=src\gui\slider.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit79]
-FileName=src\gui\slider.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit80]
-FileName=src\gui\status.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit81]
-FileName=src\gui\status.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit82]
-FileName=src\gui\textbox.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit84]
-FileName=src\gui\textfield.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit85]
-FileName=src\gui\textfield.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit86]
-FileName=src\gui\trade.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit89]
-FileName=src\gui\window.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit90]
-FileName=src\gui\windowcontainer.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit91]
-FileName=src\net\network.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit92]
-FileName=src\net\network.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit93]
-FileName=src\net\protocol.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit94]
-FileName=src\net\protocol.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit95]
-FileName=src\resources\soundeffect.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit96]
-FileName=src\resources\buddylist.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit42]
-FileName=src\gui\confirm_dialog.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit97]
-FileName=src\resources\buddylist.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit98]
-FileName=src\resources\image.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit99]
-FileName=src\resources\image.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit100]
-FileName=src\resources\iteminfo.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit101]
-FileName=src\resources\mapreader.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit102]
-FileName=src\resources\mapreader.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit103]
-FileName=src\resources\music.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit104]
-FileName=src\resources\music.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit106]
-FileName=src\resources\resource.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit109]
-FileName=src\resources\soundeffect.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit113]
-FileName=src\gui\item_amount.h
-CompileCpp=1
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit111]
-FileName=src\gui\help.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit112]
-FileName=src\gui\inttextbox.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit113]
-FileName=src\gui\inttextbox.h
-CompileCpp=1
-Folder=gui/header
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-Compile=1
-
-[Unit114]
-FileName=src\gui\focushandler.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit115]
-FileName=src\gui\focushandler.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit116]
-FileName=src\gui\popupmenu.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit117]
-FileName=src\gui\popupmenu.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit118]
-FileName=src\gui\browserbox.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit119]
-FileName=src\gui\browserbox.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit120]
-FileName=src\gui\updatewindow.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit121]
-FileName=src\gui\updatewindow.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit122]
-FileName=src\gui\box.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit124]
-FileName=src\item.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit125]
-FileName=src\equipment.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit126]
-FileName=src\equipment.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit127]
-FileName=src\item.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit128]
-FileName=src\gui\inventorywindow.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit1]
-FileName=src\sound.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit2]
-FileName=src\being.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit9]
-FileName=src\floor_item.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit10]
-FileName=src\game.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit11]
-FileName=src\game.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit12]
-FileName=src\graphics.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit15]
-FileName=src\log.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit16]
-FileName=src\main.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit18]
-FileName=src\map.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit19]
-FileName=src\map.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit20]
-FileName=src\sound.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit21]
-FileName=src\gui\windowcontainer.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit23]
-FileName=src\gui\buddywindow.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit24]
-FileName=src\gui\button.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit26]
-FileName=src\gui\buy.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit27]
-FileName=src\gui\buy.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit28]
-FileName=src\gui\buysell.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit31]
-FileName=src\gui\char_select.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit33]
-FileName=src\gui\char_server.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit34]
-FileName=src\gui\chargedialog.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit35]
-FileName=src\gui\chargedialog.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit36]
-FileName=src\gui\chat.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit37]
-FileName=src\gui\chat.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit38]
-FileName=src\gui\chatinput.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit39]
-FileName=src\gui\chatinput.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit40]
-FileName=src\gui\checkbox.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit47]
-FileName=src\gui\gui.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit48]
-FileName=src\gui\item_amount.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit51]
-FileName=src\gui\itemcontainer.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit53]
-FileName=src\gui\listbox.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit54]
-FileName=src\gui\minimap.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit57]
-FileName=src\gui\npc_text.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit61]
-FileName=src\gui\passwordfield.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit63]
-FileName=src\gui\playerbox.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit64]
-FileName=src\gui\progressbar.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit65]
-FileName=src\gui\progressbar.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit66]
-FileName=src\gui\radiobutton.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit67]
-FileName=src\gui\radiobutton.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit68]
-FileName=src\gui\scrollarea.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit75]
-FileName=src\gui\shop.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit76]
-FileName=src\gui\skill.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit83]
-FileName=src\gui\textbox.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit87]
-FileName=src\gui\trade.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit88]
-FileName=src\gui\window.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit107]
-FileName=src\resources\resourcemanager.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit108]
-FileName=src\resources\resourcemanager.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit123]
-FileName=src\gui\box.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit129]
-FileName=src\gui\inventorywindow.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit130]
-FileName=src\inventory.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit131]
-FileName=src\inventory.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit132]
-FileName=src\configlistener.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit133]
-FileName=src\guichanfwd.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit134]
-FileName=src\serverinfo.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit135]
-FileName=src\openglgraphics.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit138]
-FileName=src\gui\tabbedcontainer.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit139]
-FileName=src\net\messageout.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit140]
-FileName=src\net\messageout.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit141]
-FileName=src\net\messagein.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit142]
-FileName=src\net\messagein.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit143]
-FileName=src\gui\menuwindow.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit144]
-FileName=src\gui\menuwindow.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit145]
-FileName=src\gui\ministatus.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit146]
-FileName=src\gui\ministatus.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit147]
-FileName=src\resources\imagewriter.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit148]
-FileName=src\resources\imagewriter.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit149]
-FileName=src\gui\debugwindow.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit52]
-FileName=src\gui\listbox.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit150]
-FileName=src\gui\debugwindow.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit151]
-FileName=src\gui\connection.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit152]
-FileName=src\gui\connection.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit153]
-FileName=src\gui\gccontainer.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit154]
-FileName=src\gui\gccontainer.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit155]
-FileName=src\gui\login.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit156]
-FileName=src\gui\login.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit157]
-FileName=src\gui\register.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit158]
-FileName=src\gui\register.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit166]
-FileName=src\gui\npclistdialog.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit167]
-FileName=src\gui\npclistdialog.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit160]
-FileName=src\properties.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit161]
-FileName=src\sprite.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit105]
-FileName=src\resources\resource.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit110]
-FileName=src\gui\help.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit159]
-FileName=src\tileset.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit162]
-FileName=src\beingmanager.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit163]
-FileName=src\beingmanager.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit164]
-FileName=src\localplayer.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit165]
-FileName=src\localplayer.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit168]
-FileName=src\npc.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit169]
-FileName=src\npc.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit170]
-FileName=src\lockedarray.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit171]
-FileName=src\logindata.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit172]
-FileName=src\monster.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit173]
-FileName=src\monster.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit174]
-FileName=src\player.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit176]
-FileName=src\net\beinghandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit177]
-FileName=src\net\beinghandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit178]
-FileName=src\net\buysellhandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit136]
-FileName=src\openglgraphics.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit137]
-FileName=src\gui\tabbedcontainer.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit62]
-FileName=src\gui\playerbox.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit175]
-FileName=src\player.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit58]
-FileName=src\gui\ok_dialog.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit59]
-FileName=src\gui\ok_dialog.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit179]
-FileName=src\net\buysellhandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit180]
-FileName=src\net\charserverhandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit181]
-FileName=src\net\charserverhandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit182]
-FileName=src\net\chathandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit183]
-FileName=src\net\chathandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit184]
-FileName=src\net\equipmenthandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit185]
-FileName=src\net\equipmenthandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit186]
-FileName=src\net\inventoryhandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit187]
-FileName=src\net\inventoryhandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit188]
-FileName=src\net\itemhandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit189]
-FileName=src\net\itemhandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit190]
-FileName=src\net\loginhandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit191]
-FileName=src\net\loginhandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit192]
-FileName=src\net\maploginhandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit193]
-FileName=src\net\maploginhandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit194]
-FileName=src\net\messagehandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit195]
-FileName=src\net\messagehandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit196]
-FileName=src\net\npchandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit197]
-FileName=src\net\npchandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit198]
-FileName=src\net\playerhandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit199]
-FileName=src\net\playerhandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit200]
-FileName=src\net\skillhandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit201]
-FileName=src\net\skillhandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit202]
-FileName=src\net\tradehandler.cpp
-CompileCpp=1
-Folder=net/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit203]
-FileName=src\net\tradehandler.h
-CompileCpp=1
-Folder=net/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit204]
-FileName=src\joystick.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit205]
-FileName=src\flooritemmanager.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit206]
-FileName=src\flooritemmanager.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit207]
-FileName=src\joystick.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit208]
-FileName=src\gui\setup_video.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit209]
-FileName=src\gui\setup_audio.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit210]
-FileName=src\gui\setup_joystick.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit211]
-FileName=src\gui\setup_video.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit212]
-FileName=src\gui\setup_audio.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit213]
-FileName=src\gui\setup_joystick.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit214]
-FileName=src\gui\setuptab.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit215]
-FileName=src\utils\dtor.h
-CompileCpp=1
-Folder=utils
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit216]
-FileName=src\utils\tostring.h
-CompileCpp=1
-Folder=utils
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit217]
-FileName=src\tmw.rc
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=0
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit218]
-FileName=src\animatedsprite.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit219]
-FileName=src\animatedsprite.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit220]
-FileName=src\resources\iteminfo.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit221]
-FileName=src\resources\ambientoverlay.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit222]
-FileName=src\resources\ambientoverlay.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit223]
-FileName=src\gui\shoplistbox.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit224]
-FileName=src\gui\shoplistbox.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit225]
-FileName=src\utils\xml.cpp
-CompileCpp=1
-Folder=utils
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit226]
-FileName=src\utils\xml.h
-CompileCpp=1
-Folder=utils
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit227]
-FileName=src\resources\spritedef.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit228]
-FileName=src\resources\spritedef.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit229]
-FileName=src\resources\monsterdb.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit230]
-FileName=src\resources\monsterdb.h
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-CompileCpp=1
-
-[Unit231]
-FileName=src\resources\monsterinfo.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit232]
-FileName=src\resources\monsterinfo.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit233]
-FileName=src\resources\itemdb.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit234]
-FileName=src\resources\itemdb.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit235]
-FileName=src\gui\viewport.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit236]
-FileName=src\gui\viewport.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit237]
-FileName=src\winver.h
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit238]
-FileName=src\resources\action.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit239]
-FileName=src\resources\action.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit240]
-FileName=src\resources\animation.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit241]
-FileName=src\resources\animation.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit242]
-FileName=src\utils\base64.cpp
-CompileCpp=1
-Folder=utils
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit243]
-FileName=src\utils\base64.h
-CompileCpp=1
-Folder=utils
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit244]
-FileName=src\animationparticle.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit245]
-FileName=src\animationparticle.h
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit246]
-FileName=src\imageparticle.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit247]
-FileName=src\imageparticle.h
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit248]
-FileName=src\particle.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit249]
-FileName=src\particle.h
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit250]
-FileName=src\particleemitter.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit251]
-FileName=src\particleemitter.h
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit252]
-FileName=src\simpleanimation.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit253]
-FileName=src\simpleanimation.h
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit254]
-FileName=src\textparticle.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit255]
-FileName=src\textparticle.h
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit256]
-FileName=src\utils\fastsqrt.h
-CompileCpp=1
-Folder=utils
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit257]
-FileName=src\utils\minmax.h
-CompileCpp=1
-Folder=utils
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit258]
-FileName=src\resources\imageset.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit259]
-FileName=src\resources\imageset.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit260]
-FileName=src\gui\hbox.cpp
-CompileCpp=1
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit261]
-FileName=src\gui\hbox.h
-CompileCpp=1
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit262]
-FileName=src\gui\linkhandler.h
-CompileCpp=1
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit263]
-FileName=src\gui\newskill.cpp
-CompileCpp=1
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit264]
-FileName=src\gui\newskill.h
-CompileCpp=1
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit265]
-FileName=src\gui\selectionlistener.h
-CompileCpp=1
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit266]
-FileName=src\gui\vbox.cpp
-CompileCpp=1
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit267]
-FileName=src\gui\vbox.h
-CompileCpp=1
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit268]
-FileName=src\gui\widgets\resizegrip.cpp
-CompileCpp=1
-Folder=header/widgets
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit269]
-FileName=src\gui\widgets\resizegrip.h
-CompileCpp=1
-Folder=header/widgets
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit270]
-FileName=src\keyboardconfig.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit271]
-FileName=src\keyboardconfig.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit272]
-FileName=src\gui\setup_keyboard.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit273]
-FileName=src\gui\setup_keyboard.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit274]
-FileName=src\resources\imageloader.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit275]
-FileName=src\resources\imageloader.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit276]
-FileName=src\resources\dye.h
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit277]
-FileName=src\resources\dye.cpp
-CompileCpp=1
-Folder=resources
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit278]
-FileName=src\keyboardconfig.cpp
-CompileCpp=1
-Folder=
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit279]
-FileName=src\keyboardconfig.h
-CompileCpp=1
-Folder=header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit280]
-FileName=src\gui\setup_keyboard.cpp
-CompileCpp=1
-Folder=gui/source
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit281]
-FileName=src\gui\setup_keyboard.h
-CompileCpp=1
-Folder=gui/header
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
diff --git a/aethyra.cbp b/aethyra.cbp
new file mode 100644
index 00000000..bcd0398b
--- /dev/null
+++ b/aethyra.cbp
@@ -0,0 +1,383 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="Aethyra" />
+		<Option pch_mode="0" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="default">
+				<Option output="aethyra.exe" prefix_auto="0" extension_auto="0" />
+				<Option type="0" />
+				<Option compiler="gcc" />
+				<Option projectResourceIncludeDirsRelation="0" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-DUSE_OPENGL" />
+					<Add option="-DNOGDI" />
+				</Compiler>
+				<Linker>
+					<Add library="guichan" />
+					<Add library="guichan_sdl" />
+					<Add library="guichan_opengl" />
+					<Add library="wsock32" />
+					<Add library="SDL_image" />
+					<Add library="SDL_mixer" />
+					<Add library="SDL_net" />
+					<Add library="mingw32" />
+					<Add library="SDLmain" />
+					<Add library="SDL.dll" />
+					<Add library="xml2.dll" />
+					<Add library="opengl32" />
+					<Add library="png12.dll" />
+					<Add library="z.dll" />
+					<Add library="physfs" />
+					<Add library="curl.dll" />
+				</Linker>
+			</Target>
+			<Target title="unix">
+				<Option platforms="Unix;" />
+				<Option output="aethyra" prefix_auto="1" extension_auto="1" />
+				<Option type="0" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add option="`sdl-config --cflags`" />
+					<Add directory="/usr/local/include/libxml2" />
+				</Compiler>
+				<Linker>
+					<Add option="`sdl-config --libs`" />
+					<Add library="guichan" />
+					<Add library="guichan_sdl" />
+					<Add library="guichan_opengl" />
+					<Add library="GL" />
+					<Add library="physfs" />
+					<Add library="curl" />
+					<Add library="xml2" />
+					<Add library="SDL_mixer" />
+					<Add library="SDL_net" />
+					<Add library="SDL_image" />
+					<Add library="png" />
+				</Linker>
+			</Target>
+		</Build>
+		<VirtualTargets>
+			<Add alias="All" targets="default;" />
+		</VirtualTargets>
+		<Compiler>
+			<Add directory="../../../../../../mingw/include/SDL" />
+		</Compiler>
+		<Unit filename="src/animatedsprite.cpp" />
+		<Unit filename="src/animatedsprite.h" />
+		<Unit filename="src/animationparticle.cpp" />
+		<Unit filename="src/animationparticle.h" />
+		<Unit filename="src/being.cpp" />
+		<Unit filename="src/being.h" />
+		<Unit filename="src/beingmanager.cpp" />
+		<Unit filename="src/beingmanager.h" />
+		<Unit filename="src/configlistener.h" />
+		<Unit filename="src/configuration.cpp" />
+		<Unit filename="src/configuration.h" />
+		<Unit filename="src/engine.cpp" />
+		<Unit filename="src/engine.h" />
+		<Unit filename="src/equipment.cpp" />
+		<Unit filename="src/equipment.h" />
+		<Unit filename="src/floor_item.cpp" />
+		<Unit filename="src/floor_item.h" />
+		<Unit filename="src/flooritemmanager.cpp" />
+		<Unit filename="src/flooritemmanager.h" />
+		<Unit filename="src/game.cpp" />
+		<Unit filename="src/game.h" />
+		<Unit filename="src/graphics.cpp" />
+		<Unit filename="src/graphics.h" />
+		<Unit filename="src/gui/box.cpp" />
+		<Unit filename="src/gui/box.h" />
+		<Unit filename="src/gui/browserbox.cpp" />
+		<Unit filename="src/gui/browserbox.h" />
+		<Unit filename="src/gui/button.cpp" />
+		<Unit filename="src/gui/button.h" />
+		<Unit filename="src/gui/buy.cpp" />
+		<Unit filename="src/gui/buy.h" />
+		<Unit filename="src/gui/buysell.cpp" />
+		<Unit filename="src/gui/buysell.h" />
+		<Unit filename="src/gui/chargedialog.cpp" />
+		<Unit filename="src/gui/chargedialog.h" />
+		<Unit filename="src/gui/char_select.cpp" />
+		<Unit filename="src/gui/char_select.h" />
+		<Unit filename="src/gui/char_server.cpp" />
+		<Unit filename="src/gui/char_server.h" />
+		<Unit filename="src/gui/chat.cpp" />
+		<Unit filename="src/gui/chat.h" />
+		<Unit filename="src/gui/chatinput.cpp" />
+		<Unit filename="src/gui/chatinput.h" />
+		<Unit filename="src/gui/checkbox.cpp" />
+		<Unit filename="src/gui/checkbox.h" />
+		<Unit filename="src/gui/confirm_dialog.cpp" />
+		<Unit filename="src/gui/confirm_dialog.h" />
+		<Unit filename="src/gui/connection.cpp" />
+		<Unit filename="src/gui/connection.h" />
+		<Unit filename="src/gui/debugwindow.cpp" />
+		<Unit filename="src/gui/debugwindow.h" />
+		<Unit filename="src/gui/equipmentwindow.cpp" />
+		<Unit filename="src/gui/equipmentwindow.h" />
+		<Unit filename="src/gui/focushandler.cpp" />
+		<Unit filename="src/gui/focushandler.h" />
+		<Unit filename="src/gui/gccontainer.cpp" />
+		<Unit filename="src/gui/gccontainer.h" />
+		<Unit filename="src/gui/gui.cpp" />
+		<Unit filename="src/gui/gui.h" />
+		<Unit filename="src/gui/hbox.cpp" />
+		<Unit filename="src/gui/hbox.h" />
+		<Unit filename="src/gui/help.cpp" />
+		<Unit filename="src/gui/help.h" />
+		<Unit filename="src/gui/inttextbox.cpp" />
+		<Unit filename="src/gui/inttextbox.h" />
+		<Unit filename="src/gui/inventorywindow.cpp" />
+		<Unit filename="src/gui/inventorywindow.h" />
+		<Unit filename="src/gui/itemcontainer.cpp" />
+		<Unit filename="src/gui/itemcontainer.h" />
+		<Unit filename="src/gui/itemshortcutcontainer.cpp" />
+		<Unit filename="src/gui/itemshortcutcontainer.h" />
+		<Unit filename="src/gui/itemshortcutwindow.cpp" />
+		<Unit filename="src/gui/itemshortcutwindow.h" />
+		<Unit filename="src/gui/item_amount.cpp" />
+		<Unit filename="src/gui/item_amount.h" />
+		<Unit filename="src/gui/linkhandler.h" />
+		<Unit filename="src/gui/listbox.cpp" />
+		<Unit filename="src/gui/listbox.h" />
+		<Unit filename="src/gui/login.cpp" />
+		<Unit filename="src/gui/login.h" />
+		<Unit filename="src/gui/menuwindow.cpp" />
+		<Unit filename="src/gui/menuwindow.h" />
+		<Unit filename="src/gui/minimap.cpp" />
+		<Unit filename="src/gui/minimap.h" />
+		<Unit filename="src/gui/ministatus.cpp" />
+		<Unit filename="src/gui/ministatus.h" />
+		<Unit filename="src/gui/npc_text.cpp" />
+		<Unit filename="src/gui/npc_text.h" />
+		<Unit filename="src/gui/npclistdialog.cpp" />
+		<Unit filename="src/gui/npclistdialog.h" />
+		<Unit filename="src/gui/ok_dialog.cpp" />
+		<Unit filename="src/gui/ok_dialog.h" />
+		<Unit filename="src/gui/passwordfield.cpp" />
+		<Unit filename="src/gui/passwordfield.h" />
+		<Unit filename="src/gui/playerbox.cpp" />
+		<Unit filename="src/gui/playerbox.h" />
+		<Unit filename="src/gui/popupmenu.cpp" />
+		<Unit filename="src/gui/popupmenu.h" />
+		<Unit filename="src/gui/progressbar.cpp" />
+		<Unit filename="src/gui/progressbar.h" />
+		<Unit filename="src/gui/radiobutton.cpp" />
+		<Unit filename="src/gui/radiobutton.h" />
+		<Unit filename="src/gui/register.cpp" />
+		<Unit filename="src/gui/register.h" />
+		<Unit filename="src/gui/scrollarea.cpp" />
+		<Unit filename="src/gui/scrollarea.h" />
+		<Unit filename="src/gui/sell.cpp" />
+		<Unit filename="src/gui/sell.h" />
+		<Unit filename="src/gui/setup.cpp" />
+		<Unit filename="src/gui/setup.h" />
+		<Unit filename="src/gui/setup_audio.cpp" />
+		<Unit filename="src/gui/setup_audio.h" />
+		<Unit filename="src/gui/setup_joystick.cpp" />
+		<Unit filename="src/gui/setup_joystick.h" />
+		<Unit filename="src/gui/setup_keyboard.cpp" />
+		<Unit filename="src/gui/setup_keyboard.h" />
+		<Unit filename="src/gui/setup_players.cpp" />
+		<Unit filename="src/gui/setup_players.h" />
+		<Unit filename="src/gui/setup_video.cpp" />
+		<Unit filename="src/gui/setup_video.h" />
+		<Unit filename="src/gui/setuptab.h" />
+		<Unit filename="src/gui/shop.cpp" />
+		<Unit filename="src/gui/shop.h" />
+		<Unit filename="src/gui/shoplistbox.cpp" />
+		<Unit filename="src/gui/shoplistbox.h" />
+		<Unit filename="src/gui/skill.cpp" />
+		<Unit filename="src/gui/skill.h" />
+		<Unit filename="src/gui/slider.cpp" />
+		<Unit filename="src/gui/slider.h" />
+		<Unit filename="src/gui/status.cpp" />
+		<Unit filename="src/gui/status.h" />
+		<Unit filename="src/gui/tabbedcontainer.cpp" />
+		<Unit filename="src/gui/tabbedcontainer.h" />
+		<Unit filename="src/gui/table.cpp" />
+		<Unit filename="src/gui/table.h" />
+		<Unit filename="src/gui/table_model.cpp" />
+		<Unit filename="src/gui/table_model.h" />
+		<Unit filename="src/gui/textbox.cpp" />
+		<Unit filename="src/gui/textbox.h" />
+		<Unit filename="src/gui/textfield.cpp" />
+		<Unit filename="src/gui/textfield.h" />
+		<Unit filename="src/gui/trade.cpp" />
+		<Unit filename="src/gui/trade.h" />
+		<Unit filename="src/gui/updatewindow.cpp" />
+		<Unit filename="src/gui/updatewindow.h" />
+		<Unit filename="src/gui/vbox.cpp" />
+		<Unit filename="src/gui/vbox.h" />
+		<Unit filename="src/gui/viewport.cpp" />
+		<Unit filename="src/gui/viewport.h" />
+		<Unit filename="src/gui/widgets/dropdown.cpp"/>
+		<Unit filename="src/gui/widgets/dropdown.h" />
+		<Unit filename="src/gui/widgets/resizegrip.cpp" />
+		<Unit filename="src/gui/widgets/resizegrip.h" />
+		<Unit filename="src/gui/window.cpp" />
+		<Unit filename="src/gui/window.h" />
+		<Unit filename="src/gui/windowcontainer.cpp" />
+		<Unit filename="src/gui/windowcontainer.h" />
+		<Unit filename="src/guichanfwd.h" />
+		<Unit filename="src/imageparticle.cpp" />
+		<Unit filename="src/imageparticle.h" />
+		<Unit filename="src/inventory.cpp" />
+		<Unit filename="src/inventory.h" />
+		<Unit filename="src/item.cpp" />
+		<Unit filename="src/item.h" />
+		<Unit filename="src/itemshortcut.cpp" />
+		<Unit filename="src/itemshortcut.h" />
+		<Unit filename="src/joystick.cpp" />
+		<Unit filename="src/joystick.h" />
+		<Unit filename="src/keyboardconfig.cpp" />
+		<Unit filename="src/keyboardconfig.h" />
+		<Unit filename="src/localplayer.cpp" />
+		<Unit filename="src/localplayer.h" />
+		<Unit filename="src/lockedarray.h" />
+		<Unit filename="src/log.cpp" />
+		<Unit filename="src/log.h" />
+		<Unit filename="src/logindata.h" />
+		<Unit filename="src/main.cpp" />
+		<Unit filename="src/main.h" />
+		<Unit filename="src/map.cpp" />
+		<Unit filename="src/map.h" />
+		<Unit filename="src/monster.cpp" />
+		<Unit filename="src/monster.h" />
+		<Unit filename="src/net/beinghandler.cpp" />
+		<Unit filename="src/net/beinghandler.h" />
+		<Unit filename="src/net/buysellhandler.cpp" />
+		<Unit filename="src/net/buysellhandler.h" />
+		<Unit filename="src/net/charserverhandler.cpp" />
+		<Unit filename="src/net/charserverhandler.h" />
+		<Unit filename="src/net/chathandler.cpp" />
+		<Unit filename="src/net/chathandler.h" />
+		<Unit filename="src/net/equipmenthandler.cpp" />
+		<Unit filename="src/net/equipmenthandler.h" />
+		<Unit filename="src/net/inventoryhandler.cpp" />
+		<Unit filename="src/net/inventoryhandler.h" />
+		<Unit filename="src/net/itemhandler.cpp" />
+		<Unit filename="src/net/itemhandler.h" />
+		<Unit filename="src/net/loginhandler.cpp" />
+		<Unit filename="src/net/loginhandler.h" />
+		<Unit filename="src/net/maploginhandler.cpp" />
+		<Unit filename="src/net/maploginhandler.h" />
+		<Unit filename="src/net/messagehandler.cpp" />
+		<Unit filename="src/net/messagehandler.h" />
+		<Unit filename="src/net/messagein.cpp" />
+		<Unit filename="src/net/messagein.h" />
+		<Unit filename="src/net/messageout.cpp" />
+		<Unit filename="src/net/messageout.h" />
+		<Unit filename="src/net/network.cpp" />
+		<Unit filename="src/net/network.h" />
+		<Unit filename="src/net/npchandler.cpp" />
+		<Unit filename="src/net/npchandler.h" />
+		<Unit filename="src/net/partyhandler.cpp"/>
+		<Unit filename="src/net/partyhandler.h" />
+		<Unit filename="src/net/playerhandler.cpp" />
+		<Unit filename="src/net/playerhandler.h" />
+		<Unit filename="src/net/protocol.cpp" />
+		<Unit filename="src/net/protocol.h" />
+		<Unit filename="src/net/skillhandler.cpp" />
+		<Unit filename="src/net/skillhandler.h" />
+		<Unit filename="src/net/tradehandler.cpp" />
+		<Unit filename="src/net/tradehandler.h" />
+		<Unit filename="src/npc.cpp" />
+		<Unit filename="src/npc.h" />
+		<Unit filename="src/openglgraphics.cpp" />
+		<Unit filename="src/openglgraphics.h" />
+		<Unit filename="src/particle.cpp" />
+		<Unit filename="src/particle.h" />
+		<Unit filename="src/particleemitter.cpp" />
+		<Unit filename="src/particleemitter.h" />
+                <Unit filename="src/party.cpp" />
+		<Unit filename="src/party.h" />
+		<Unit filename="src/player.cpp" />
+		<Unit filename="src/player.h" />
+		<Unit filename="src/player_relations.cpp" />
+		<Unit filename="src/player_relations.h" />
+		<Unit filename="src/properties.h" />
+		<Unit filename="src/recorder.cpp" />
+		<Unit filename="src/recorder.h" />
+		<Unit filename="src/resources/action.cpp" />
+		<Unit filename="src/resources/action.h" />
+		<Unit filename="src/resources/ambientoverlay.cpp" />
+		<Unit filename="src/resources/ambientoverlay.h" />
+		<Unit filename="src/resources/animation.cpp" />
+		<Unit filename="src/resources/animation.h" />
+		<Unit filename="src/resources/buddylist.cpp"/>
+		<Unit filename="src/resources/buddylist.h" />
+		<Unit filename="src/resources/dye.cpp" />
+		<Unit filename="src/resources/dye.h" />
+		<Unit filename="src/resources/image.cpp" />
+		<Unit filename="src/resources/image.h" />
+		<Unit filename="src/resources/imageloader.cpp" />
+		<Unit filename="src/resources/imageloader.h" />
+		<Unit filename="src/resources/imageset.cpp" />
+		<Unit filename="src/resources/imageset.h" />
+		<Unit filename="src/resources/imagewriter.cpp" />
+		<Unit filename="src/resources/imagewriter.h" />
+		<Unit filename="src/resources/itemdb.cpp" />
+		<Unit filename="src/resources/itemdb.h" />
+		<Unit filename="src/resources/iteminfo.cpp" />
+		<Unit filename="src/resources/iteminfo.h" />
+		<Unit filename="src/resources/mapreader.cpp" />
+		<Unit filename="src/resources/mapreader.h" />
+		<Unit filename="src/resources/monsterdb.cpp" />
+		<Unit filename="src/resources/monsterdb.h" />
+		<Unit filename="src/resources/monsterinfo.cpp" />
+		<Unit filename="src/resources/monsterinfo.h" />
+		<Unit filename="src/resources/music.cpp" />
+		<Unit filename="src/resources/music.h" />
+		<Unit filename="src/resources/npcdb.cpp" />
+		<Unit filename="src/resources/npcdb.h" />
+		<Unit filename="src/resources/resource.cpp" />
+		<Unit filename="src/resources/resource.h" />
+		<Unit filename="src/resources/resourcemanager.cpp" />
+		<Unit filename="src/resources/resourcemanager.h" />
+		<Unit filename="src/resources/soundeffect.cpp" />
+		<Unit filename="src/resources/soundeffect.h" />
+		<Unit filename="src/resources/spritedef.cpp" />
+		<Unit filename="src/resources/spritedef.h" />
+		<Unit filename="src/serverinfo.h" />
+		<Unit filename="src/simpleanimation.cpp" />
+		<Unit filename="src/simpleanimation.h" />
+		<Unit filename="src/sound.cpp" />
+		<Unit filename="src/sound.h" />
+		<Unit filename="src/sprite.h" />
+		<Unit filename="src/text.cpp" />
+		<Unit filename="src/text.h" />
+		<Unit filename="src/textmanager.cpp" />
+		<Unit filename="src/textmanager.h" />
+		<Unit filename="src/textparticle.cpp" />
+		<Unit filename="src/textparticle.h" />
+		<Unit filename="src/tileset.h" />
+		<Unit filename="src/aethyra.rc">
+			<Option compilerVar="WINDRES" />
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
+		<Unit filename="src/utils/base64.cpp" />
+		<Unit filename="src/utils/base64.h" />
+		<Unit filename="src/utils/dtor.h" />
+		<Unit filename="src/utils/fastsqrt.h" />
+		<Unit filename="src/utils/strprintf.cpp" />
+		<Unit filename="src/utils/strprintf.h" />
+		<Unit filename="src/utils/tostring.h" />
+		<Unit filename="src/utils/xml.cpp" />
+		<Unit filename="src/utils/xml.h" />
+		<Unit filename="src/winver.h">
+			<Option target="unix" />
+		</Unit>
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/aethyra.desktop b/aethyra.desktop
new file mode 100644
index 00000000..eb75b5cf
--- /dev/null
+++ b/aethyra.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Aethyra
+Name[fr]=Aethyra
+Comment=An on-line fantasy role playing game
+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
+Exec=aethyra
+StartupNotify=false
+Terminal=false
+Type=Application
+Icon=aethyra.png
+Categories=Application;Game
diff --git a/aethyra.png b/aethyra.png
new file mode 100644
index 00000000..93e6c9ae
Binary files /dev/null and b/aethyra.png differ
diff --git a/configure.ac b/configure.ac
index dcc1eeeb..92672b8b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([The Mana Experiment], [Tme SVN 0.0.25], [blame582@gmail.com], [tme])
+AC_INIT([Aethyra], [Aethyra SVN 0.0.25], [blame582@gmail.com], [aethyra])
 AC_CONFIG_HEADERS([config.h:config.h.in])
 AC_LANG_CPLUSPLUS
 
@@ -79,7 +79,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 tme should use an OpenGL display])
+    AC_DEFINE(USE_OPENGL, 1, [Defines if aethyra should use an OpenGL display])
 fi
 
 # Search for sdl-config
diff --git a/data/Makefile.am b/data/Makefile.am
index 86ae612d..508e6e0e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
 
 SUBDIRS = graphics help icons
 
-tmedatadir = $(pkgdatadir)/data
+aethyradatadir = $(pkgdatadir)/data
diff --git a/data/icons/Aethyra.icns b/data/icons/Aethyra.icns
new file mode 100644
index 00000000..7230a099
Binary files /dev/null and b/data/icons/Aethyra.icns differ
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 5d7adee9..fee51e4f 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,14 +1,14 @@
 
 iconsdir = $(pkgdatadir)/data/icons
 
-icons_DATA = tme.png
+icons_DATA = aethyra.png
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
-	$(INSTALL) $(srcdir)/tme.png $(DESTDIR)$(datadir)/pixmaps/tme.png
+	$(INSTALL) $(srcdir)/aethyra.png $(DESTDIR)$(datadir)/pixmaps/aethyra.png
 
 uninstall-local:
-	rm -f $(DESTDIR)$(datadir)/pixmaps/tme.png
+	rm -f $(DESTDIR)$(datadir)/pixmaps/aethyra.png
 
 EXTRA_DIST =		\
 	$(icons_DATA)
diff --git a/data/icons/The Mana Experiment.icns b/data/icons/The Mana Experiment.icns
deleted file mode 100644
index 7230a099..00000000
Binary files a/data/icons/The Mana Experiment.icns and /dev/null differ
diff --git a/data/icons/aethyra.ico b/data/icons/aethyra.ico
new file mode 100644
index 00000000..61d559a3
Binary files /dev/null and b/data/icons/aethyra.ico differ
diff --git a/data/icons/aethyra.png b/data/icons/aethyra.png
new file mode 100644
index 00000000..93e6c9ae
Binary files /dev/null and b/data/icons/aethyra.png differ
diff --git a/data/icons/aethyra.xpm b/data/icons/aethyra.xpm
new file mode 100644
index 00000000..06ec2865
--- /dev/null
+++ b/data/icons/aethyra.xpm
@@ -0,0 +1,784 @@
+/* XPM */
+static char * tmw_xpm[] = {
+"32 32 749 2",
+"  	c None",
+". 	c #E4EB6D",
+"+ 	c #EFF271",
+"@ 	c #E7EF65",
+"# 	c #DDED61",
+"$ 	c #D6E955",
+"% 	c #DAED4D",
+"& 	c #F6F5A0",
+"* 	c #EFEF89",
+"= 	c #ECF084",
+"- 	c #EDF077",
+"; 	c #EAF075",
+"> 	c #E0E960",
+", 	c #D9E757",
+"' 	c #D4EA52",
+") 	c #CFE74D",
+"! 	c #BEE140",
+"~ 	c #C2E43E",
+"{ 	c #B6DF33",
+"] 	c #F8F7C2",
+"^ 	c #F9F7AB",
+"/ 	c #F2F099",
+"( 	c #EEEF80",
+"_ 	c #F3F077",
+": 	c #F8F8B1",
+"< 	c #E8EE6F",
+"[ 	c #E1EB69",
+"} 	c #DBEB5E",
+"| 	c #D5E852",
+"1 	c #CDE445",
+"2 	c #CEE843",
+"3 	c #B6DC34",
+"4 	c #A9DA2F",
+"5 	c #B3E02F",
+"6 	c #B6E630",
+"7 	c #F1F2E2",
+"8 	c #F9F9D4",
+"9 	c #F9F8C5",
+"0 	c #F8F8CE",
+"a 	c #F9F8D6",
+"b 	c #F9F7CB",
+"c 	c #F9F7B1",
+"d 	c #F9F7A7",
+"e 	c #E7EE73",
+"f 	c #E4EC69",
+"g 	c #DEEB60",
+"h 	c #D8E755",
+"i 	c #D5EB55",
+"j 	c #C2E33F",
+"k 	c #BEE33C",
+"l 	c #B5E339",
+"m 	c #A7DF2E",
+"n 	c #9BDA28",
+"o 	c #95DA24",
+"p 	c #8DD724",
+"q 	c #F9F9F5",
+"r 	c #F9F9EA",
+"s 	c #F9F9E1",
+"t 	c #F9F9F4",
+"u 	c #F9F7DF",
+"v 	c #F9F7D1",
+"w 	c #F9F7C9",
+"x 	c #F9F7B6",
+"y 	c #F9F7AE",
+"z 	c #D7E363",
+"A 	c #E1EC6B",
+"B 	c #DDEC60",
+"C 	c #D8EC61",
+"D 	c #CDE552",
+"E 	c #C6E543",
+"F 	c #BCE440",
+"G 	c #BEE73E",
+"H 	c #ABDF30",
+"I 	c #ACE230",
+"J 	c #8FD720",
+"K 	c #80D01C",
+"L 	c #80D51A",
+"M 	c #F9F9F7",
+"N 	c #F9F9EB",
+"O 	c #F9F9F9",
+"P 	c #F9F7E6",
+"Q 	c #F9F7D3",
+"R 	c #F9F7CE",
+"S 	c #F9F7BF",
+"T 	c #F9F8B9",
+"U 	c #E6EF8F",
+"V 	c #E1EB65",
+"W 	c #E0ED63",
+"X 	c #D1E452",
+"Y 	c #D3E84D",
+"Z 	c #C3E340",
+"` 	c #BBE13E",
+" .	c #B0DD35",
+"..	c #ABDD2E",
+"+.	c #A0DB2A",
+"@.	c #95D923",
+"#.	c #7ED31C",
+"$.	c #7ED31A",
+"%.	c #80DA18",
+"&.	c #F4F3EF",
+"*.	c #F9F9F6",
+"=.	c #F9F8F5",
+"-.	c #F9F7EE",
+";.	c #F9F7E2",
+">.	c #F9F7D5",
+",.	c #F9F6C2",
+"'.	c #F8F69C",
+").	c #D4E56D",
+"!.	c #E4ED73",
+"~.	c #DBEA60",
+"{.	c #DDE961",
+"].	c #C9E54E",
+"^.	c #BFE242",
+"/.	c #BEE33E",
+"(.	c #B1DE34",
+"_.	c #ABDE33",
+":.	c #95D826",
+"<.	c #8DD620",
+"[.	c #8DDB20",
+"}.	c #91DD1E",
+"|.	c #71D116",
+"1.	c #50B910",
+"2.	c #F9F8F7",
+"3.	c #F9F8F4",
+"4.	c #F9F7EB",
+"5.	c #F9F7E1",
+"6.	c #F9F5CF",
+"7.	c #F9F6C9",
+"8.	c #F9F6BF",
+"9.	c #D6E471",
+"0.	c #E9F075",
+"a.	c #E3EC6B",
+"b.	c #D9E96D",
+"c.	c #CEE558",
+"d.	c #CBE44E",
+"e.	c #BEDE3E",
+"f.	c #ACDA37",
+"g.	c #BCE639",
+"h.	c #AEE135",
+"i.	c #9EDB2A",
+"j.	c #8FD822",
+"k.	c #7CD31B",
+"l.	c #82DA1C",
+"m.	c #63CE13",
+"n.	c #61CE12",
+"o.	c #F9F9F8",
+"p.	c #F9F7F5",
+"q.	c #F9F4DD",
+"r.	c #F9F5D7",
+"s.	c #F9F5C9",
+"t.	c #F9F5B6",
+"u.	c #E3ED8D",
+"v.	c #DEE865",
+"w.	c #E3ED6D",
+"x.	c #DDEB5E",
+"y.	c #D3E755",
+"z.	c #CAE349",
+"A.	c #CFEB4D",
+"B.	c #C1E33B",
+"C.	c #BCE743",
+"D.	c #B0E02D",
+"E.	c #95DB28",
+"F.	c #95DB26",
+"G.	c #C6E627",
+"H.	c #E8F433",
+"I.	c #CAED26",
+"J.	c #60CD0F",
+"K.	c #58CD0E",
+"L.	c #F9F7EC",
+"M.	c #F9F7F1",
+"N.	c #F9F4E4",
+"O.	c #F9F3D7",
+"P.	c #F9F3CA",
+"Q.	c #F9F5CA",
+"R.	c #F9F5BB",
+"S.	c #F9F8B6",
+"T.	c #F6F89E",
+"U.	c #DFEB5C",
+"V.	c #CEE453",
+"W.	c #D0E753",
+"X.	c #CDE543",
+"Y.	c #C7E842",
+"Z.	c #C1E53C",
+"`.	c #A7DC30",
+" +	c #E6F453",
+".+	c #E2F448",
+"++	c #D8F03C",
+"@+	c #D1ED2E",
+"#+	c #D0F033",
+"$+	c #CAED2C",
+"%+	c #ACE51F",
+"&+	c #55CF0F",
+"*+	c #F5F6EF",
+"=+	c #F9F9F2",
+"-+	c #F9F9F1",
+";+	c #F9F8F0",
+">+	c #F9F7E7",
+",+	c #F9F5F0",
+"'+	c #F9F3E1",
+")+	c #F9F5DB",
+"!+	c #F9F6DB",
+"~+	c #F9F6BE",
+"{+	c #F8F59B",
+"]+	c #F9F5A2",
+"^+	c #F8F68D",
+"/+	c #F7F689",
+"(+	c #D7EC65",
+"_+	c #CEE84E",
+":+	c #BBE23F",
+"<+	c #B6E238",
+"[+	c #A2DC30",
+"}+	c #EBF553",
+"|+	c #E4F443",
+"1+	c #DCF340",
+"2+	c #D4F033",
+"3+	c #CEEF2D",
+"4+	c #C2E926",
+"5+	c #BEEB20",
+"6+	c #5CD50E",
+"7+	c #53CE0D",
+"8+	c #F9F7D9",
+"9+	c #F9F6F2",
+"0+	c #F9F5EB",
+"a+	c #F9F3DA",
+"b+	c #F9F6DF",
+"c+	c #F9F7D0",
+"d+	c #F9F7C2",
+"e+	c #F9F7BB",
+"f+	c #F8F68F",
+"g+	c #F7F58D",
+"h+	c #F6F58B",
+"i+	c #EEF68B",
+"j+	c #BFDF43",
+"k+	c #B5DE37",
+"l+	c #B5E234",
+"m+	c #A7DD30",
+"n+	c #E7F248",
+"o+	c #D6EF40",
+"p+	c #DBF239",
+"q+	c #D0ED2F",
+"r+	c #C3EB2A",
+"s+	c #BCEB26",
+"t+	c #B5E81E",
+"u+	c #52CE0F",
+"v+	c #4ECB0B",
+"w+	c #F9F9D9",
+"x+	c #F9F9D7",
+"y+	c #F9F8F8",
+"z+	c #F9F7E9",
+"A+	c #F9F6E9",
+"B+	c #F9F5E0",
+"C+	c #F8F2D6",
+"D+	c #F9F3CE",
+"E+	c #F9F7CA",
+"F+	c #F9F8B5",
+"G+	c #F6F691",
+"H+	c #F9F699",
+"I+	c #F5F68F",
+"J+	c #F3F579",
+"K+	c #E8F575",
+"L+	c #C7E646",
+"M+	c #B5DF37",
+"N+	c #B9E438",
+"O+	c #9CD928",
+"P+	c #D7F348",
+"Q+	c #DBEF3B",
+"R+	c #D1EF35",
+"S+	c #D7F230",
+"T+	c #C1EA25",
+"U+	c #B5E91F",
+"V+	c #63DC1E",
+"W+	c #48CA0C",
+"X+	c #F4F4DC",
+"Y+	c #F9F9C3",
+"Z+	c #F9F9C5",
+"`+	c #F9F9C7",
+" @	c #F9F9E8",
+".@	c #F9F6DD",
+"+@	c #F9F6D6",
+"@@	c #F9F3C1",
+"#@	c #F9F3BF",
+"$@	c #F9F5B8",
+"%@	c #F8F8A6",
+"&@	c #F6F68F",
+"*@	c #F4F791",
+"=@	c #ABD746",
+"-@	c #C5E449",
+";@	c #C1E448",
+">@	c #BBE23E",
+",@	c #BBE237",
+"'@	c #A9DC30",
+")@	c #99D927",
+"!@	c #D3E32C",
+"~@	c #E2F340",
+"{@	c #D3ED2D",
+"]@	c #CAED2B",
+"^@	c #CDF028",
+"/@	c #C5EB27",
+"(@	c #B0E51C",
+"_@	c #91DC13",
+":@	c #49CA08",
+"<@	c #25B305",
+"[@	c #F5F6BE",
+"}@	c #F5F5A9",
+"|@	c #F3F4B0",
+"1@	c #F6F6B0",
+"2@	c #F7F8B5",
+"3@	c #EDF097",
+"4@	c #F5F18F",
+"5@	c #F9F7B8",
+"6@	c #F9F4B0",
+"7@	c #F9F3AE",
+"8@	c #F9F3A4",
+"9@	c #F9F7A4",
+"0@	c #F7F7A0",
+"a@	c #F5F682",
+"b@	c #D3E75E",
+"c@	c #CAE646",
+"d@	c #CBE846",
+"e@	c #EDF05A",
+"f@	c #C6E432",
+"g@	c #A9E02E",
+"h@	c #99DA27",
+"i@	c #B9DB20",
+"j@	c #E1F33F",
+"k@	c #CEEB2E",
+"l@	c #C7EB27",
+"m@	c #BBEA26",
+"n@	c #B9E722",
+"o@	c #A6DF19",
+"p@	c #ABE815",
+"q@	c #48CB09",
+"r@	c #3ECA08",
+"s@	c #F8F7A7",
+"t@	c #F3F4A0",
+"u@	c #F4F59C",
+"v@	c #F0F49C",
+"w@	c #F2F5A4",
+"x@	c #F5F6A0",
+"y@	c #EFF28F",
+"z@	c #F9F8CD",
+"A@	c #F9F6A7",
+"B@	c #F9F3A0",
+"C@	c #F8F399",
+"D@	c #F8F493",
+"E@	c #F8F693",
+"F@	c #F7F58B",
+"G@	c #E8EF65",
+"H@	c #C7E445",
+"I@	c #C7DB30",
+"J@	c #E1ED48",
+"K@	c #E8F353",
+"L@	c #C3E227",
+"M@	c #D9EB2E",
+"N@	c #E7F549",
+"O@	c #D3EE3B",
+"P@	c #CBED2D",
+"Q@	c #CDEF27",
+"R@	c #BFEC23",
+"S@	c #B6E81E",
+"T@	c #A9E518",
+"U@	c #B1EB1B",
+"V@	c #35BE06",
+"W@	c #38C306",
+"X@	c #F9F9A7",
+"Y@	c #F2F38F",
+"Z@	c #F2F495",
+"`@	c #F3F38D",
+" #	c #F9F9E9",
+".#	c #F7F8C5",
+"+#	c #F8F7D1",
+"@#	c #F8F6A2",
+"##	c #F9F7A9",
+"$#	c #F8F59C",
+"%#	c #F8F291",
+"&#	c #F8F58F",
+"*#	c #F6F789",
+"=#	c #F2F477",
+"-#	c #F0F571",
+";#	c #EAEE52",
+">#	c #DCEA45",
+",#	c #EBEF43",
+"'#	c #E4F04D",
+")#	c #DEEF45",
+"!#	c #E1F246",
+"~#	c #E4F448",
+"{#	c #DBF039",
+"]#	c #D9F235",
+"^#	c #C9ED2B",
+"/#	c #CAEF2C",
+"(#	c #CEF22B",
+"_#	c #B6E91E",
+":#	c #B1EB21",
+"<#	c #A9E815",
+"[#	c #48CF09",
+"}#	c #40CD06",
+"|#	c #EDEF6B",
+"1#	c #EBF07C",
+"2#	c #E7EB71",
+"3#	c #E8E865",
+"4#	c #F8F79E",
+"5#	c #F8F7A4",
+"6#	c #F9F69E",
+"7#	c #F8F48F",
+"8#	c #F6F280",
+"9#	c #F6F482",
+"0#	c #F3F473",
+"a#	c #EFF169",
+"b#	c #EDF467",
+"c#	c #EAF35C",
+"d#	c #EAF258",
+"e#	c #E4F052",
+"f#	c #E4F046",
+"g#	c #E0F03F",
+"h#	c #D5EE3B",
+"i#	c #DFF23E",
+"j#	c #D7F137",
+"k#	c #CEED2E",
+"l#	c #C9EF28",
+"m#	c #CAF025",
+"n#	c #B9EA1E",
+"o#	c #B3E91D",
+"p#	c #B1EB1A",
+"q#	c #A6E817",
+"r#	c #39C506",
+"s#	c #35C505",
+"t#	c #B3BC3E",
+"u#	c #E9F07C",
+"v#	c #DEE867",
+"w#	c #F9F79E",
+"x#	c #F8F793",
+"y#	c #F8F78F",
+"z#	c #F7F684",
+"A#	c #F5F27E",
+"B#	c #F4F26D",
+"C#	c #F4F36F",
+"D#	c #EDF061",
+"E#	c #EEF363",
+"F#	c #EDF35C",
+"G#	c #EEF45C",
+"H#	c #EAF357",
+"I#	c #E8F34B",
+"J#	c #DCEE43",
+"K#	c #E1F03F",
+"L#	c #D6ED37",
+"M#	c #D5EE33",
+"N#	c #D5F134",
+"O#	c #D9F232",
+"P#	c #CEF22D",
+"Q#	c #C7F22A",
+"R#	c #9BDB18",
+"S#	c #A7E518",
+"T#	c #AEEB1B",
+"U#	c #95E514",
+"V#	c #37C306",
+"W#	c #3CC705",
+"X#	c #E0EC60",
+"Y#	c #D1E455",
+"Z#	c #F7F78F",
+"`#	c #F7F891",
+" $	c #F8F78B",
+".$	c #F5F782",
+"+$	c #F8F791",
+"@$	c #EFF06B",
+"#$	c #F3F36D",
+"$$	c #EFF36D",
+"%$	c #F1F56F",
+"&$	c #EDF260",
+"*$	c #EDF461",
+"=$	c #E7F150",
+"-$	c #E9F355",
+";$	c #E8F349",
+">$	c #E8F442",
+",$	c #DDF13E",
+"'$	c #DAF038",
+")$	c #CEEB26",
+"!$	c #D0EE2C",
+"~$	c #B9E82A",
+"{$	c #C1ED26",
+"]$	c #A0E41C",
+"^$	c #ABE71B",
+"/$	c #99E315",
+"($	c #99E415",
+"_$	c #33B306",
+":$	c #2BBB05",
+"<$	c #D9EB5E",
+"[$	c #CDE44E",
+"}$	c #F6F579",
+"|$	c #F4F577",
+"1$	c #F3F571",
+"2$	c #F4F57C",
+"3$	c #F3F363",
+"4$	c #F2F475",
+"5$	c #F0F567",
+"6$	c #A2D93F",
+"7$	c #C3E43F",
+"8$	c #B6D92E",
+"9$	c #A7CD1F",
+"0$	c #E4F042",
+"a$	c #E4F248",
+"b$	c #E5F348",
+"c$	c #D7EC39",
+"d$	c #DBF33C",
+"e$	c #DDF23E",
+"f$	c #D1EF2D",
+"g$	c #C1E825",
+"h$	c #BFEB26",
+"i$	c #AEE61B",
+"j$	c #A7E318",
+"k$	c #B0E818",
+"l$	c #9EE615",
+"m$	c #6DD30D",
+"n$	c #27A603",
+"o$	c #2CBE05",
+"p$	c #E2ED50",
+"q$	c #CBE348",
+"r$	c #F6F780",
+"s$	c #F5F577",
+"t$	c #F3F56F",
+"u$	c #EFF469",
+"v$	c #F3F471",
+"w$	c #F3F46F",
+"x$	c #EFF461",
+"y$	c #E7F053",
+"z$	c #C6E83F",
+"A$	c #A4D733",
+"B$	c #ABDD2F",
+"C$	c #B0DF2E",
+"D$	c #A7DD2B",
+"E$	c #E4F240",
+"F$	c #E8F555",
+"G$	c #DDF33C",
+"H$	c #E1F53E",
+"I$	c #D4F032",
+"J$	c #CEF02E",
+"K$	c #CAEF2D",
+"L$	c #C2EF28",
+"M$	c #B5E91B",
+"N$	c #93DD13",
+"O$	c #93E215",
+"P$	c #93E213",
+"Q$	c #80DB0D",
+"R$	c #45CA05",
+"S$	c #2FC204",
+"T$	c #CEE743",
+"U$	c #C1E23E",
+"V$	c #F0F365",
+"W$	c #F5F473",
+"X$	c #F2F269",
+"Y$	c #E9EF57",
+"Z$	c #EFF363",
+"`$	c #E8F052",
+" %	c #EBF358",
+".%	c #B8E439",
+"+%	c #BCE839",
+"@%	c #A4DC2A",
+"#%	c #ABE22D",
+"$%	c #95D822",
+"%%	c #E1F240",
+"&%	c #D6ED32",
+"*%	c #CFEC2C",
+"=%	c #D4F02F",
+"-%	c #CAEE2B",
+";%	c #C3EB27",
+">%	c #C6EE25",
+",%	c #C3EE21",
+"'%	c #B8ED21",
+")%	c #AEEA16",
+"!%	c #79D90F",
+"~%	c #2EB106",
+"{%	c #26B808",
+"]%	c #2CBF05",
+"^%	c #C9E73B",
+"/%	c #C5E63C",
+"(%	c #F0F56B",
+"_%	c #EEF258",
+":%	c #F0F265",
+"<%	c #EFF155",
+"[%	c #EDF358",
+"}%	c #EBF550",
+"|%	c #EBF54D",
+"1%	c #C9E83B",
+"2%	c #A4DB28",
+"3%	c #9EDC2B",
+"4%	c #8FD622",
+"5%	c #82D01E",
+"6%	c #7EC512",
+"7%	c #C9E827",
+"8%	c #D0EE2E",
+"9%	c #C7ED2C",
+"0%	c #C7EE27",
+"a%	c #C1EE2A",
+"b%	c #C2EF24",
+"c%	c #BEED22",
+"d%	c #A9E718",
+"e%	c #3EC307",
+"f%	c #39C306",
+"g%	c #38C606",
+"h%	c #23B603",
+"i%	c #ACDB2F",
+"j%	c #B0DF34",
+"k%	c #EDF35A",
+"l%	c #EDF553",
+"m%	c #E2F045",
+"n%	c #E6F350",
+"o%	c #E6F448",
+"p%	c #9CD01E",
+"q%	c #8BC916",
+"r%	c #B8DC1B",
+"s%	c #7CBC0F",
+"t%	c #95D618",
+"u%	c #7ED319",
+"v%	c #BFE118",
+"w%	c #C6ED2A",
+"x%	c #C1EA21",
+"y%	c #C1ED22",
+"z%	c #B8EA1D",
+"A%	c #B6EB1D",
+"B%	c #BCEF1F",
+"C%	c #53CA07",
+"D%	c #3FC708",
+"E%	c #2EBC05",
+"F%	c #2FBE04",
+"G%	c #2DBF04",
+"H%	c #A2CF1F",
+"I%	c #B1E12F",
+"J%	c #B5E32E",
+"K%	c #E8F243",
+"L%	c #D7EB45",
+"M%	c #E8F245",
+"N%	c #DDEF40",
+"O%	c #E2F342",
+"P%	c #DFF33E",
+"Q%	c #E4F542",
+"R%	c #DAF138",
+"S%	c #D8F230",
+"T%	c #CBEB28",
+"U%	c #D1F02E",
+"V%	c #C6EC24",
+"W%	c #CAEF25",
+"X%	c #BCEB21",
+"Y%	c #B6EB1E",
+"Z%	c #ABE91B",
+"`%	c #A2E616",
+" &	c #3CC508",
+".&	c #3EC906",
+"+&	c #37C305",
+"@&	c #27B903",
+"#&	c #209B02",
+"$&	c #A9DF27",
+"%&	c #A4DD27",
+"&&	c #91D623",
+"*&	c #E3F13C",
+"=&	c #E4F340",
+"-&	c #E4F33F",
+";&	c #E4F43E",
+">&	c #E2F439",
+",&	c #D6F033",
+"'&	c #D5F034",
+")&	c #CEEF2E",
+"!&	c #CBED26",
+"~&	c #CFEF27",
+"{&	c #D5F22E",
+"]&	c #B5E620",
+"^&	c #B9EA1F",
+"/&	c #84E620",
+"(&	c #3EB508",
+"_&	c #58CE0D",
+":&	c #39CA11",
+"<&	c #3EC607",
+"[&	c #3BCA08",
+"}&	c #28BB04",
+"|&	c #28BC03",
+"1&	c #8FD620",
+"2&	c #97D823",
+"3&	c #A6E22B",
+"4&	c #69CB1D",
+"5&	c #86D61F",
+"6&	c #E5F740",
+"7&	c #DCF338",
+"8&	c #CAEC2D",
+"9&	c #CDED2B",
+"0&	c #D1F02C",
+"a&	c #CDEE27",
+"b&	c #C1EB22",
+"c&	c #CFF228",
+"d&	c #BCE922",
+"e&	c #3CBB09",
+"f&	c #50CD0C",
+"g&	c #4BCD0B",
+"h&	c #3CC207",
+"i&	c #42CD09",
+"j&	c #2EBB04",
+"k&	c #28B905",
+"l&	c #28B903",
+"m&	c #61B113",
+"n&	c #7ED41A",
+"o&	c #89D71B",
+"p&	c #8DDB1A",
+"q&	c #7CD518",
+"r&	c #8FDA1B",
+"s&	c #71D314",
+"t&	c #7CDA18",
+"u&	c #BEF232",
+"v&	c #8BD715",
+"w&	c #63C207",
+"x&	c #55C108",
+"y&	c #5AD111",
+"z&	c #4BC90B",
+"A&	c #3EC108",
+"B&	c #46C908",
+"C&	c #40CB08",
+"D&	c #34C205",
+"E&	c #32C505",
+"F&	c #22A003",
+"G&	c #79D818",
+"H&	c #75D314",
+"I&	c #67D012",
+"J&	c #69D313",
+"K&	c #71D613",
+"L&	c #67D413",
+"M&	c #4BC20C",
+"N&	c #4DCB0E",
+"O&	c #5AD510",
+"P&	c #50CA0B",
+"Q&	c #4BC909",
+"R&	c #3CC708",
+"S&	c #42C906",
+"T&	c #35C206",
+"U&	c #33C306",
+"V&	c #30C504",
+"W&	c #49C30E",
+"X&	c #71D913",
+"Y&	c #84E318",
+"Z&	c #5ECF0E",
+"`&	c #58D00D",
+" *	c #5ED40D",
+".*	c #48C70A",
+"+*	c #57D40B",
+"@*	c #37BE06",
+"#*	c #39C707",
+"$*	c #37C505",
+"%*	c #34C705",
+"&*	c #49BE0B",
+"**	c #4BD00C",
+"=*	c #46C609",
+"-*	c #46D00A",
+";*	c #33BE06",
+">*	c #20A904",
+"                          . + @ # $ %                           ",
+"                    & * = - ; > , ' ) ! ~ {                     ",
+"                ] ^ / ( _ : < [ } | 1 2 3 4 5 6                 ",
+"            7 8 9 0 a b c d e f g h i j k l m n o p             ",
+"          q r s t u v w x y z A B C D E F G H I J K L           ",
+"        M M N O P u Q R S T U V W X Y Z `  ...+.@.#.$.%.        ",
+"      &.O *.O =.-.;.>.R ,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.      ",
+"      O O O 2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.      ",
+"    o.O *.p.p.3.-.q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.    ",
+"    O o.q L.p.M.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+    ",
+"  *+=+-+;+>+p.,+'+)+!+~+8.{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+  ",
+"  r N N 8+p.9+0+a+b+c+d+e+d f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+  ",
+"  w+x+w+y+z+A+B+C+D+E+S F+G+H+I+J+K+L+M+N+O+P+Q+R+S+$+T+U+V+W+  ",
+"X+Y+Z+`+ @.@+@6.@@#@$@^ %@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@",
+"[@}@|@1@2@3@4@5@6@7@8@9@0@a@b@) c@d@e@f@g@h@i@j@k@l@m@n@o@p@q@r@",
+"s@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@>@I@J@K@L@M@N@O@P@Q@R@S@T@U@V@W@",
+"X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_#:#<#[#}#",
+"|#1#2#3#4###5#'.6#7#8#9#0#a#b#c#d#e#f#g#h#i#j#k#l#m#n#o#p#q#r#s#",
+"t#u#v#w#s@x#y#z#a@A#B#C#D#E#F#G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#",
+"  X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$I#;$>$,$'$)$!$~${$]$^$/$($_$:$  ",
+"  <$[$}$|$*#1$2$3$4$5$6$7$8$9$0$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$  ",
+"  p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O$P$Q$R$S$  ",
+"    T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%>%,%'%)%!%~%{%]%    ",
+"    ^%/%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8%9%0%a%b%c%d%($e%f%g%h%    ",
+"      i%j%k%l%a$m%n%o%p%q%r%s%t%u%v%w%x%y%z%A%B%C%D%E%F%G%      ",
+"      H%I%J%K%L%M%N%O%P%Q%G$R%S%T%U%V%W%X%Y%Z%`% &.&+&@&#&      ",
+"        $&%&&&*&=&-&;&>&,&'&)&!&~&{&]&^&/&(&_&:&<&[&}&|&        ",
+"          1&2&3&4&5&6&7&8&9&0&a&b&c&d&e&f&g&h&i&j&k&l&          ",
+"            m&n&o&p&q&r&s&t&u&v&w&x&y&z&A&B&C&D&E&F&            ",
+"                G&H&I&J&K&L&M&N&O&P&Q&R&S&T&U&V&                ",
+"                    W&X&Y&Z&`& *.*+*@*#*$*%*                    ",
+"                          &***=*-*;*>*                          "};
diff --git a/data/icons/tme.ico b/data/icons/tme.ico
deleted file mode 100644
index 61d559a3..00000000
Binary files a/data/icons/tme.ico and /dev/null differ
diff --git a/data/icons/tme.png b/data/icons/tme.png
deleted file mode 100644
index 93e6c9ae..00000000
Binary files a/data/icons/tme.png and /dev/null differ
diff --git a/data/icons/tme.xpm b/data/icons/tme.xpm
deleted file mode 100644
index 06ec2865..00000000
--- a/data/icons/tme.xpm
+++ /dev/null
@@ -1,784 +0,0 @@
-/* XPM */
-static char * tmw_xpm[] = {
-"32 32 749 2",
-"  	c None",
-". 	c #E4EB6D",
-"+ 	c #EFF271",
-"@ 	c #E7EF65",
-"# 	c #DDED61",
-"$ 	c #D6E955",
-"% 	c #DAED4D",
-"& 	c #F6F5A0",
-"* 	c #EFEF89",
-"= 	c #ECF084",
-"- 	c #EDF077",
-"; 	c #EAF075",
-"> 	c #E0E960",
-", 	c #D9E757",
-"' 	c #D4EA52",
-") 	c #CFE74D",
-"! 	c #BEE140",
-"~ 	c #C2E43E",
-"{ 	c #B6DF33",
-"] 	c #F8F7C2",
-"^ 	c #F9F7AB",
-"/ 	c #F2F099",
-"( 	c #EEEF80",
-"_ 	c #F3F077",
-": 	c #F8F8B1",
-"< 	c #E8EE6F",
-"[ 	c #E1EB69",
-"} 	c #DBEB5E",
-"| 	c #D5E852",
-"1 	c #CDE445",
-"2 	c #CEE843",
-"3 	c #B6DC34",
-"4 	c #A9DA2F",
-"5 	c #B3E02F",
-"6 	c #B6E630",
-"7 	c #F1F2E2",
-"8 	c #F9F9D4",
-"9 	c #F9F8C5",
-"0 	c #F8F8CE",
-"a 	c #F9F8D6",
-"b 	c #F9F7CB",
-"c 	c #F9F7B1",
-"d 	c #F9F7A7",
-"e 	c #E7EE73",
-"f 	c #E4EC69",
-"g 	c #DEEB60",
-"h 	c #D8E755",
-"i 	c #D5EB55",
-"j 	c #C2E33F",
-"k 	c #BEE33C",
-"l 	c #B5E339",
-"m 	c #A7DF2E",
-"n 	c #9BDA28",
-"o 	c #95DA24",
-"p 	c #8DD724",
-"q 	c #F9F9F5",
-"r 	c #F9F9EA",
-"s 	c #F9F9E1",
-"t 	c #F9F9F4",
-"u 	c #F9F7DF",
-"v 	c #F9F7D1",
-"w 	c #F9F7C9",
-"x 	c #F9F7B6",
-"y 	c #F9F7AE",
-"z 	c #D7E363",
-"A 	c #E1EC6B",
-"B 	c #DDEC60",
-"C 	c #D8EC61",
-"D 	c #CDE552",
-"E 	c #C6E543",
-"F 	c #BCE440",
-"G 	c #BEE73E",
-"H 	c #ABDF30",
-"I 	c #ACE230",
-"J 	c #8FD720",
-"K 	c #80D01C",
-"L 	c #80D51A",
-"M 	c #F9F9F7",
-"N 	c #F9F9EB",
-"O 	c #F9F9F9",
-"P 	c #F9F7E6",
-"Q 	c #F9F7D3",
-"R 	c #F9F7CE",
-"S 	c #F9F7BF",
-"T 	c #F9F8B9",
-"U 	c #E6EF8F",
-"V 	c #E1EB65",
-"W 	c #E0ED63",
-"X 	c #D1E452",
-"Y 	c #D3E84D",
-"Z 	c #C3E340",
-"` 	c #BBE13E",
-" .	c #B0DD35",
-"..	c #ABDD2E",
-"+.	c #A0DB2A",
-"@.	c #95D923",
-"#.	c #7ED31C",
-"$.	c #7ED31A",
-"%.	c #80DA18",
-"&.	c #F4F3EF",
-"*.	c #F9F9F6",
-"=.	c #F9F8F5",
-"-.	c #F9F7EE",
-";.	c #F9F7E2",
-">.	c #F9F7D5",
-",.	c #F9F6C2",
-"'.	c #F8F69C",
-").	c #D4E56D",
-"!.	c #E4ED73",
-"~.	c #DBEA60",
-"{.	c #DDE961",
-"].	c #C9E54E",
-"^.	c #BFE242",
-"/.	c #BEE33E",
-"(.	c #B1DE34",
-"_.	c #ABDE33",
-":.	c #95D826",
-"<.	c #8DD620",
-"[.	c #8DDB20",
-"}.	c #91DD1E",
-"|.	c #71D116",
-"1.	c #50B910",
-"2.	c #F9F8F7",
-"3.	c #F9F8F4",
-"4.	c #F9F7EB",
-"5.	c #F9F7E1",
-"6.	c #F9F5CF",
-"7.	c #F9F6C9",
-"8.	c #F9F6BF",
-"9.	c #D6E471",
-"0.	c #E9F075",
-"a.	c #E3EC6B",
-"b.	c #D9E96D",
-"c.	c #CEE558",
-"d.	c #CBE44E",
-"e.	c #BEDE3E",
-"f.	c #ACDA37",
-"g.	c #BCE639",
-"h.	c #AEE135",
-"i.	c #9EDB2A",
-"j.	c #8FD822",
-"k.	c #7CD31B",
-"l.	c #82DA1C",
-"m.	c #63CE13",
-"n.	c #61CE12",
-"o.	c #F9F9F8",
-"p.	c #F9F7F5",
-"q.	c #F9F4DD",
-"r.	c #F9F5D7",
-"s.	c #F9F5C9",
-"t.	c #F9F5B6",
-"u.	c #E3ED8D",
-"v.	c #DEE865",
-"w.	c #E3ED6D",
-"x.	c #DDEB5E",
-"y.	c #D3E755",
-"z.	c #CAE349",
-"A.	c #CFEB4D",
-"B.	c #C1E33B",
-"C.	c #BCE743",
-"D.	c #B0E02D",
-"E.	c #95DB28",
-"F.	c #95DB26",
-"G.	c #C6E627",
-"H.	c #E8F433",
-"I.	c #CAED26",
-"J.	c #60CD0F",
-"K.	c #58CD0E",
-"L.	c #F9F7EC",
-"M.	c #F9F7F1",
-"N.	c #F9F4E4",
-"O.	c #F9F3D7",
-"P.	c #F9F3CA",
-"Q.	c #F9F5CA",
-"R.	c #F9F5BB",
-"S.	c #F9F8B6",
-"T.	c #F6F89E",
-"U.	c #DFEB5C",
-"V.	c #CEE453",
-"W.	c #D0E753",
-"X.	c #CDE543",
-"Y.	c #C7E842",
-"Z.	c #C1E53C",
-"`.	c #A7DC30",
-" +	c #E6F453",
-".+	c #E2F448",
-"++	c #D8F03C",
-"@+	c #D1ED2E",
-"#+	c #D0F033",
-"$+	c #CAED2C",
-"%+	c #ACE51F",
-"&+	c #55CF0F",
-"*+	c #F5F6EF",
-"=+	c #F9F9F2",
-"-+	c #F9F9F1",
-";+	c #F9F8F0",
-">+	c #F9F7E7",
-",+	c #F9F5F0",
-"'+	c #F9F3E1",
-")+	c #F9F5DB",
-"!+	c #F9F6DB",
-"~+	c #F9F6BE",
-"{+	c #F8F59B",
-"]+	c #F9F5A2",
-"^+	c #F8F68D",
-"/+	c #F7F689",
-"(+	c #D7EC65",
-"_+	c #CEE84E",
-":+	c #BBE23F",
-"<+	c #B6E238",
-"[+	c #A2DC30",
-"}+	c #EBF553",
-"|+	c #E4F443",
-"1+	c #DCF340",
-"2+	c #D4F033",
-"3+	c #CEEF2D",
-"4+	c #C2E926",
-"5+	c #BEEB20",
-"6+	c #5CD50E",
-"7+	c #53CE0D",
-"8+	c #F9F7D9",
-"9+	c #F9F6F2",
-"0+	c #F9F5EB",
-"a+	c #F9F3DA",
-"b+	c #F9F6DF",
-"c+	c #F9F7D0",
-"d+	c #F9F7C2",
-"e+	c #F9F7BB",
-"f+	c #F8F68F",
-"g+	c #F7F58D",
-"h+	c #F6F58B",
-"i+	c #EEF68B",
-"j+	c #BFDF43",
-"k+	c #B5DE37",
-"l+	c #B5E234",
-"m+	c #A7DD30",
-"n+	c #E7F248",
-"o+	c #D6EF40",
-"p+	c #DBF239",
-"q+	c #D0ED2F",
-"r+	c #C3EB2A",
-"s+	c #BCEB26",
-"t+	c #B5E81E",
-"u+	c #52CE0F",
-"v+	c #4ECB0B",
-"w+	c #F9F9D9",
-"x+	c #F9F9D7",
-"y+	c #F9F8F8",
-"z+	c #F9F7E9",
-"A+	c #F9F6E9",
-"B+	c #F9F5E0",
-"C+	c #F8F2D6",
-"D+	c #F9F3CE",
-"E+	c #F9F7CA",
-"F+	c #F9F8B5",
-"G+	c #F6F691",
-"H+	c #F9F699",
-"I+	c #F5F68F",
-"J+	c #F3F579",
-"K+	c #E8F575",
-"L+	c #C7E646",
-"M+	c #B5DF37",
-"N+	c #B9E438",
-"O+	c #9CD928",
-"P+	c #D7F348",
-"Q+	c #DBEF3B",
-"R+	c #D1EF35",
-"S+	c #D7F230",
-"T+	c #C1EA25",
-"U+	c #B5E91F",
-"V+	c #63DC1E",
-"W+	c #48CA0C",
-"X+	c #F4F4DC",
-"Y+	c #F9F9C3",
-"Z+	c #F9F9C5",
-"`+	c #F9F9C7",
-" @	c #F9F9E8",
-".@	c #F9F6DD",
-"+@	c #F9F6D6",
-"@@	c #F9F3C1",
-"#@	c #F9F3BF",
-"$@	c #F9F5B8",
-"%@	c #F8F8A6",
-"&@	c #F6F68F",
-"*@	c #F4F791",
-"=@	c #ABD746",
-"-@	c #C5E449",
-";@	c #C1E448",
-">@	c #BBE23E",
-",@	c #BBE237",
-"'@	c #A9DC30",
-")@	c #99D927",
-"!@	c #D3E32C",
-"~@	c #E2F340",
-"{@	c #D3ED2D",
-"]@	c #CAED2B",
-"^@	c #CDF028",
-"/@	c #C5EB27",
-"(@	c #B0E51C",
-"_@	c #91DC13",
-":@	c #49CA08",
-"<@	c #25B305",
-"[@	c #F5F6BE",
-"}@	c #F5F5A9",
-"|@	c #F3F4B0",
-"1@	c #F6F6B0",
-"2@	c #F7F8B5",
-"3@	c #EDF097",
-"4@	c #F5F18F",
-"5@	c #F9F7B8",
-"6@	c #F9F4B0",
-"7@	c #F9F3AE",
-"8@	c #F9F3A4",
-"9@	c #F9F7A4",
-"0@	c #F7F7A0",
-"a@	c #F5F682",
-"b@	c #D3E75E",
-"c@	c #CAE646",
-"d@	c #CBE846",
-"e@	c #EDF05A",
-"f@	c #C6E432",
-"g@	c #A9E02E",
-"h@	c #99DA27",
-"i@	c #B9DB20",
-"j@	c #E1F33F",
-"k@	c #CEEB2E",
-"l@	c #C7EB27",
-"m@	c #BBEA26",
-"n@	c #B9E722",
-"o@	c #A6DF19",
-"p@	c #ABE815",
-"q@	c #48CB09",
-"r@	c #3ECA08",
-"s@	c #F8F7A7",
-"t@	c #F3F4A0",
-"u@	c #F4F59C",
-"v@	c #F0F49C",
-"w@	c #F2F5A4",
-"x@	c #F5F6A0",
-"y@	c #EFF28F",
-"z@	c #F9F8CD",
-"A@	c #F9F6A7",
-"B@	c #F9F3A0",
-"C@	c #F8F399",
-"D@	c #F8F493",
-"E@	c #F8F693",
-"F@	c #F7F58B",
-"G@	c #E8EF65",
-"H@	c #C7E445",
-"I@	c #C7DB30",
-"J@	c #E1ED48",
-"K@	c #E8F353",
-"L@	c #C3E227",
-"M@	c #D9EB2E",
-"N@	c #E7F549",
-"O@	c #D3EE3B",
-"P@	c #CBED2D",
-"Q@	c #CDEF27",
-"R@	c #BFEC23",
-"S@	c #B6E81E",
-"T@	c #A9E518",
-"U@	c #B1EB1B",
-"V@	c #35BE06",
-"W@	c #38C306",
-"X@	c #F9F9A7",
-"Y@	c #F2F38F",
-"Z@	c #F2F495",
-"`@	c #F3F38D",
-" #	c #F9F9E9",
-".#	c #F7F8C5",
-"+#	c #F8F7D1",
-"@#	c #F8F6A2",
-"##	c #F9F7A9",
-"$#	c #F8F59C",
-"%#	c #F8F291",
-"&#	c #F8F58F",
-"*#	c #F6F789",
-"=#	c #F2F477",
-"-#	c #F0F571",
-";#	c #EAEE52",
-">#	c #DCEA45",
-",#	c #EBEF43",
-"'#	c #E4F04D",
-")#	c #DEEF45",
-"!#	c #E1F246",
-"~#	c #E4F448",
-"{#	c #DBF039",
-"]#	c #D9F235",
-"^#	c #C9ED2B",
-"/#	c #CAEF2C",
-"(#	c #CEF22B",
-"_#	c #B6E91E",
-":#	c #B1EB21",
-"<#	c #A9E815",
-"[#	c #48CF09",
-"}#	c #40CD06",
-"|#	c #EDEF6B",
-"1#	c #EBF07C",
-"2#	c #E7EB71",
-"3#	c #E8E865",
-"4#	c #F8F79E",
-"5#	c #F8F7A4",
-"6#	c #F9F69E",
-"7#	c #F8F48F",
-"8#	c #F6F280",
-"9#	c #F6F482",
-"0#	c #F3F473",
-"a#	c #EFF169",
-"b#	c #EDF467",
-"c#	c #EAF35C",
-"d#	c #EAF258",
-"e#	c #E4F052",
-"f#	c #E4F046",
-"g#	c #E0F03F",
-"h#	c #D5EE3B",
-"i#	c #DFF23E",
-"j#	c #D7F137",
-"k#	c #CEED2E",
-"l#	c #C9EF28",
-"m#	c #CAF025",
-"n#	c #B9EA1E",
-"o#	c #B3E91D",
-"p#	c #B1EB1A",
-"q#	c #A6E817",
-"r#	c #39C506",
-"s#	c #35C505",
-"t#	c #B3BC3E",
-"u#	c #E9F07C",
-"v#	c #DEE867",
-"w#	c #F9F79E",
-"x#	c #F8F793",
-"y#	c #F8F78F",
-"z#	c #F7F684",
-"A#	c #F5F27E",
-"B#	c #F4F26D",
-"C#	c #F4F36F",
-"D#	c #EDF061",
-"E#	c #EEF363",
-"F#	c #EDF35C",
-"G#	c #EEF45C",
-"H#	c #EAF357",
-"I#	c #E8F34B",
-"J#	c #DCEE43",
-"K#	c #E1F03F",
-"L#	c #D6ED37",
-"M#	c #D5EE33",
-"N#	c #D5F134",
-"O#	c #D9F232",
-"P#	c #CEF22D",
-"Q#	c #C7F22A",
-"R#	c #9BDB18",
-"S#	c #A7E518",
-"T#	c #AEEB1B",
-"U#	c #95E514",
-"V#	c #37C306",
-"W#	c #3CC705",
-"X#	c #E0EC60",
-"Y#	c #D1E455",
-"Z#	c #F7F78F",
-"`#	c #F7F891",
-" $	c #F8F78B",
-".$	c #F5F782",
-"+$	c #F8F791",
-"@$	c #EFF06B",
-"#$	c #F3F36D",
-"$$	c #EFF36D",
-"%$	c #F1F56F",
-"&$	c #EDF260",
-"*$	c #EDF461",
-"=$	c #E7F150",
-"-$	c #E9F355",
-";$	c #E8F349",
-">$	c #E8F442",
-",$	c #DDF13E",
-"'$	c #DAF038",
-")$	c #CEEB26",
-"!$	c #D0EE2C",
-"~$	c #B9E82A",
-"{$	c #C1ED26",
-"]$	c #A0E41C",
-"^$	c #ABE71B",
-"/$	c #99E315",
-"($	c #99E415",
-"_$	c #33B306",
-":$	c #2BBB05",
-"<$	c #D9EB5E",
-"[$	c #CDE44E",
-"}$	c #F6F579",
-"|$	c #F4F577",
-"1$	c #F3F571",
-"2$	c #F4F57C",
-"3$	c #F3F363",
-"4$	c #F2F475",
-"5$	c #F0F567",
-"6$	c #A2D93F",
-"7$	c #C3E43F",
-"8$	c #B6D92E",
-"9$	c #A7CD1F",
-"0$	c #E4F042",
-"a$	c #E4F248",
-"b$	c #E5F348",
-"c$	c #D7EC39",
-"d$	c #DBF33C",
-"e$	c #DDF23E",
-"f$	c #D1EF2D",
-"g$	c #C1E825",
-"h$	c #BFEB26",
-"i$	c #AEE61B",
-"j$	c #A7E318",
-"k$	c #B0E818",
-"l$	c #9EE615",
-"m$	c #6DD30D",
-"n$	c #27A603",
-"o$	c #2CBE05",
-"p$	c #E2ED50",
-"q$	c #CBE348",
-"r$	c #F6F780",
-"s$	c #F5F577",
-"t$	c #F3F56F",
-"u$	c #EFF469",
-"v$	c #F3F471",
-"w$	c #F3F46F",
-"x$	c #EFF461",
-"y$	c #E7F053",
-"z$	c #C6E83F",
-"A$	c #A4D733",
-"B$	c #ABDD2F",
-"C$	c #B0DF2E",
-"D$	c #A7DD2B",
-"E$	c #E4F240",
-"F$	c #E8F555",
-"G$	c #DDF33C",
-"H$	c #E1F53E",
-"I$	c #D4F032",
-"J$	c #CEF02E",
-"K$	c #CAEF2D",
-"L$	c #C2EF28",
-"M$	c #B5E91B",
-"N$	c #93DD13",
-"O$	c #93E215",
-"P$	c #93E213",
-"Q$	c #80DB0D",
-"R$	c #45CA05",
-"S$	c #2FC204",
-"T$	c #CEE743",
-"U$	c #C1E23E",
-"V$	c #F0F365",
-"W$	c #F5F473",
-"X$	c #F2F269",
-"Y$	c #E9EF57",
-"Z$	c #EFF363",
-"`$	c #E8F052",
-" %	c #EBF358",
-".%	c #B8E439",
-"+%	c #BCE839",
-"@%	c #A4DC2A",
-"#%	c #ABE22D",
-"$%	c #95D822",
-"%%	c #E1F240",
-"&%	c #D6ED32",
-"*%	c #CFEC2C",
-"=%	c #D4F02F",
-"-%	c #CAEE2B",
-";%	c #C3EB27",
-">%	c #C6EE25",
-",%	c #C3EE21",
-"'%	c #B8ED21",
-")%	c #AEEA16",
-"!%	c #79D90F",
-"~%	c #2EB106",
-"{%	c #26B808",
-"]%	c #2CBF05",
-"^%	c #C9E73B",
-"/%	c #C5E63C",
-"(%	c #F0F56B",
-"_%	c #EEF258",
-":%	c #F0F265",
-"<%	c #EFF155",
-"[%	c #EDF358",
-"}%	c #EBF550",
-"|%	c #EBF54D",
-"1%	c #C9E83B",
-"2%	c #A4DB28",
-"3%	c #9EDC2B",
-"4%	c #8FD622",
-"5%	c #82D01E",
-"6%	c #7EC512",
-"7%	c #C9E827",
-"8%	c #D0EE2E",
-"9%	c #C7ED2C",
-"0%	c #C7EE27",
-"a%	c #C1EE2A",
-"b%	c #C2EF24",
-"c%	c #BEED22",
-"d%	c #A9E718",
-"e%	c #3EC307",
-"f%	c #39C306",
-"g%	c #38C606",
-"h%	c #23B603",
-"i%	c #ACDB2F",
-"j%	c #B0DF34",
-"k%	c #EDF35A",
-"l%	c #EDF553",
-"m%	c #E2F045",
-"n%	c #E6F350",
-"o%	c #E6F448",
-"p%	c #9CD01E",
-"q%	c #8BC916",
-"r%	c #B8DC1B",
-"s%	c #7CBC0F",
-"t%	c #95D618",
-"u%	c #7ED319",
-"v%	c #BFE118",
-"w%	c #C6ED2A",
-"x%	c #C1EA21",
-"y%	c #C1ED22",
-"z%	c #B8EA1D",
-"A%	c #B6EB1D",
-"B%	c #BCEF1F",
-"C%	c #53CA07",
-"D%	c #3FC708",
-"E%	c #2EBC05",
-"F%	c #2FBE04",
-"G%	c #2DBF04",
-"H%	c #A2CF1F",
-"I%	c #B1E12F",
-"J%	c #B5E32E",
-"K%	c #E8F243",
-"L%	c #D7EB45",
-"M%	c #E8F245",
-"N%	c #DDEF40",
-"O%	c #E2F342",
-"P%	c #DFF33E",
-"Q%	c #E4F542",
-"R%	c #DAF138",
-"S%	c #D8F230",
-"T%	c #CBEB28",
-"U%	c #D1F02E",
-"V%	c #C6EC24",
-"W%	c #CAEF25",
-"X%	c #BCEB21",
-"Y%	c #B6EB1E",
-"Z%	c #ABE91B",
-"`%	c #A2E616",
-" &	c #3CC508",
-".&	c #3EC906",
-"+&	c #37C305",
-"@&	c #27B903",
-"#&	c #209B02",
-"$&	c #A9DF27",
-"%&	c #A4DD27",
-"&&	c #91D623",
-"*&	c #E3F13C",
-"=&	c #E4F340",
-"-&	c #E4F33F",
-";&	c #E4F43E",
-">&	c #E2F439",
-",&	c #D6F033",
-"'&	c #D5F034",
-")&	c #CEEF2E",
-"!&	c #CBED26",
-"~&	c #CFEF27",
-"{&	c #D5F22E",
-"]&	c #B5E620",
-"^&	c #B9EA1F",
-"/&	c #84E620",
-"(&	c #3EB508",
-"_&	c #58CE0D",
-":&	c #39CA11",
-"<&	c #3EC607",
-"[&	c #3BCA08",
-"}&	c #28BB04",
-"|&	c #28BC03",
-"1&	c #8FD620",
-"2&	c #97D823",
-"3&	c #A6E22B",
-"4&	c #69CB1D",
-"5&	c #86D61F",
-"6&	c #E5F740",
-"7&	c #DCF338",
-"8&	c #CAEC2D",
-"9&	c #CDED2B",
-"0&	c #D1F02C",
-"a&	c #CDEE27",
-"b&	c #C1EB22",
-"c&	c #CFF228",
-"d&	c #BCE922",
-"e&	c #3CBB09",
-"f&	c #50CD0C",
-"g&	c #4BCD0B",
-"h&	c #3CC207",
-"i&	c #42CD09",
-"j&	c #2EBB04",
-"k&	c #28B905",
-"l&	c #28B903",
-"m&	c #61B113",
-"n&	c #7ED41A",
-"o&	c #89D71B",
-"p&	c #8DDB1A",
-"q&	c #7CD518",
-"r&	c #8FDA1B",
-"s&	c #71D314",
-"t&	c #7CDA18",
-"u&	c #BEF232",
-"v&	c #8BD715",
-"w&	c #63C207",
-"x&	c #55C108",
-"y&	c #5AD111",
-"z&	c #4BC90B",
-"A&	c #3EC108",
-"B&	c #46C908",
-"C&	c #40CB08",
-"D&	c #34C205",
-"E&	c #32C505",
-"F&	c #22A003",
-"G&	c #79D818",
-"H&	c #75D314",
-"I&	c #67D012",
-"J&	c #69D313",
-"K&	c #71D613",
-"L&	c #67D413",
-"M&	c #4BC20C",
-"N&	c #4DCB0E",
-"O&	c #5AD510",
-"P&	c #50CA0B",
-"Q&	c #4BC909",
-"R&	c #3CC708",
-"S&	c #42C906",
-"T&	c #35C206",
-"U&	c #33C306",
-"V&	c #30C504",
-"W&	c #49C30E",
-"X&	c #71D913",
-"Y&	c #84E318",
-"Z&	c #5ECF0E",
-"`&	c #58D00D",
-" *	c #5ED40D",
-".*	c #48C70A",
-"+*	c #57D40B",
-"@*	c #37BE06",
-"#*	c #39C707",
-"$*	c #37C505",
-"%*	c #34C705",
-"&*	c #49BE0B",
-"**	c #4BD00C",
-"=*	c #46C609",
-"-*	c #46D00A",
-";*	c #33BE06",
-">*	c #20A904",
-"                          . + @ # $ %                           ",
-"                    & * = - ; > , ' ) ! ~ {                     ",
-"                ] ^ / ( _ : < [ } | 1 2 3 4 5 6                 ",
-"            7 8 9 0 a b c d e f g h i j k l m n o p             ",
-"          q r s t u v w x y z A B C D E F G H I J K L           ",
-"        M M N O P u Q R S T U V W X Y Z `  ...+.@.#.$.%.        ",
-"      &.O *.O =.-.;.>.R ,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.      ",
-"      O O O 2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.      ",
-"    o.O *.p.p.3.-.q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.    ",
-"    O o.q L.p.M.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+    ",
-"  *+=+-+;+>+p.,+'+)+!+~+8.{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+  ",
-"  r N N 8+p.9+0+a+b+c+d+e+d f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+  ",
-"  w+x+w+y+z+A+B+C+D+E+S F+G+H+I+J+K+L+M+N+O+P+Q+R+S+$+T+U+V+W+  ",
-"X+Y+Z+`+ @.@+@6.@@#@$@^ %@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@",
-"[@}@|@1@2@3@4@5@6@7@8@9@0@a@b@) c@d@e@f@g@h@i@j@k@l@m@n@o@p@q@r@",
-"s@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@>@I@J@K@L@M@N@O@P@Q@R@S@T@U@V@W@",
-"X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_#:#<#[#}#",
-"|#1#2#3#4###5#'.6#7#8#9#0#a#b#c#d#e#f#g#h#i#j#k#l#m#n#o#p#q#r#s#",
-"t#u#v#w#s@x#y#z#a@A#B#C#D#E#F#G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#",
-"  X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$I#;$>$,$'$)$!$~${$]$^$/$($_$:$  ",
-"  <$[$}$|$*#1$2$3$4$5$6$7$8$9$0$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$  ",
-"  p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O$P$Q$R$S$  ",
-"    T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%>%,%'%)%!%~%{%]%    ",
-"    ^%/%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8%9%0%a%b%c%d%($e%f%g%h%    ",
-"      i%j%k%l%a$m%n%o%p%q%r%s%t%u%v%w%x%y%z%A%B%C%D%E%F%G%      ",
-"      H%I%J%K%L%M%N%O%P%Q%G$R%S%T%U%V%W%X%Y%Z%`% &.&+&@&#&      ",
-"        $&%&&&*&=&-&;&>&,&'&)&!&~&{&]&^&/&(&_&:&<&[&}&|&        ",
-"          1&2&3&4&5&6&7&8&9&0&a&b&c&d&e&f&g&h&i&j&k&l&          ",
-"            m&n&o&p&q&r&s&t&u&v&w&x&y&z&A&B&C&D&E&F&            ",
-"                G&H&I&J&K&L&M&N&O&P&Q&R&S&T&U&V&                ",
-"                    W&X&Y&Z&`& *.*+*@*#*$*%*                    ",
-"                          &***=*-*;*>*                          "};
diff --git a/debian/aethyra-data.install b/debian/aethyra-data.install
new file mode 100644
index 00000000..007bcf7b
--- /dev/null
+++ b/debian/aethyra-data.install
@@ -0,0 +1,5 @@
+data/graphics/gui/*.png usr/share/games/aethyra/data/graphics/gui
+data/graphics/images/*.png usr/share/games/aethyra/data/graphics/images
+data/graphics/images/ambient/*.png usr/share/games/aethyra/data/graphics/images/ambient
+data/graphics/tiles/*.png usr/share/games/aethyra/data/graphics/tiles
+data/help/*.txt usr/share/games/aethyra/data/help
diff --git a/debian/aethyra.docs b/debian/aethyra.docs
new file mode 100644
index 00000000..d622a527
--- /dev/null
+++ b/debian/aethyra.docs
@@ -0,0 +1,6 @@
+AUTHORS
+NEWS
+README
+ChangeLog
+docs/progression.txt
+docs/FAQ.txt
diff --git a/debian/aethyra.install b/debian/aethyra.install
new file mode 100644
index 00000000..66ba5126
--- /dev/null
+++ b/debian/aethyra.install
@@ -0,0 +1,5 @@
+debian/aethyra.desktop usr/share/applications
+debian/aethyra.xpm usr/share/pixmaps
+data/icons/aethyra.png usr/share/icons
+docs/aethyra.6 usr/share/man/man6
+src/aethyra usr/games
diff --git a/debian/aethyra.menu b/debian/aethyra.menu
new file mode 100644
index 00000000..4af5ad0a
--- /dev/null
+++ b/debian/aethyra.menu
@@ -0,0 +1,4 @@
+?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"
diff --git a/debian/aethyra.sgml b/debian/aethyra.sgml
new file mode 100644
index 00000000..0ed18199
--- /dev/null
+++ b/debian/aethyra.sgml
@@ -0,0 +1,149 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>FERREIRA</firstname>">
+  <!ENTITY dhsurname   "<surname>Yohann</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>avril 13, 2005</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>6</manvolnum>">
+  <!ENTITY dhemail     "<email>bertram@cegetel.net</email>">
+  <!ENTITY dhusername  "FERREIRA Yohann">
+  <!ENTITY dhucpackage "<refentrytitle>TMW</refentrytitle>">
+  <!ENTITY dhpackage   "tmw">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2003</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>tmw is the abreviation of The Mana World : A Fantasy Online Game</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> ingame
+      commands.</para>
+    <para><command>&dhpackage;</command> is a Great Online Game based upon the Seiken Densetsu Serie.
+It has its own universe, and and its own character management system, which will
+give you the opportunity to play in a 2D heroic-fantasy world forever.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>COMMON KEYS</title>
+
+    <para>Arrow Keys, Key Pad Keys (Diagonals Supported).
+Move your character around.
+
+Left Ctrl : 
+Make your character attack.
+
+G : 
+Get Items on the ground or in a chest.
+
+Alt + 1...9 : 
+Shows an Emoticon above your character.
+
+Alt + I : 
+Shows / Hide Inventory Window.
+
+Alt + K : 
+Shows / Hide Skills Window.
+
+Alt + E : 
+Shows / Hide Equipment Window.
+
+Alt + C : 
+Shows Configuration Window.
+</para>
+
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>libguichan (2).</para>
+
+    <para>The program is documented fully by <citetitle>The Mana World Team</citetitle> available via the
+      website http://www.manaworld.org/</para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the &gnu; General Public License, Version 2 any 
+	  later version published by the Free Software Foundation.
+    </para>
+	<para>
+	  On Debian systems, the complete text of the GNU General Public
+	  License can be found in /usr/share/common-licenses/GPL.
+	</para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
+
+
diff --git a/debian/aethyra.xpm b/debian/aethyra.xpm
new file mode 100644
index 00000000..a3ab9513
--- /dev/null
+++ b/debian/aethyra.xpm
@@ -0,0 +1,776 @@
+/* XPM */
+static char * aethyra_xpm[] = {
+"32 32 741 2",
+"	c None",
+".	c #E8ED72",
+"+	c #E7ED6A",
+"@	c #E1EB62",
+"#	c #D4E758",
+"$	c #D2E750",
+"%	c #CDE748",
+"&	c #F5F4A1",
+"*	c #F3F294",
+"=	c #EBEE81",
+"-	c #EAEE77",
+";	c #E6ED6F",
+">	c #E1EB68",
+",	c #D9E859",
+"'	c #D3E851",
+")	c #CCE549",
+"!	c #C7E643",
+"~	c #BEE239",
+"{	c #B3DF32",
+"]	c #F8F8C4",
+"^	c #F9F7B3",
+"/	c #F4F3A2",
+"(	c #F4F397",
+"_	c #F5F39A",
+":	c #F2F399",
+"<	c #E2EA6D",
+"[	c #DFEA66",
+"}	c #DAE95C",
+"|	c #D3E753",
+"1	c #CAE54B",
+"2	c #C7E545",
+"3	c #BFE23C",
+"4	c #B7E034",
+"5	c #B1E130",
+"6	c #A5DC28",
+"7	c #F9F9DA",
+"8	c #F9F8CA",
+"9	c #F8F7C9",
+"0	c #F8F7CD",
+"a	c #F9F7C7",
+"b	c #F9F7B8",
+"c	c #F7F5A8",
+"d	c #E6EC73",
+"e	c #E0EA68",
+"f	c #DBE95D",
+"g	c #D8E956",
+"h	c #D2E850",
+"i	c #C4E343",
+"j	c #BEE23D",
+"k	c #B2E036",
+"l	c #A9DE2E",
+"m	c #A0DC29",
+"n	c #91D823",
+"o	c #F9F9F5",
+"p	c #F9F9EA",
+"q	c #F9F9E2",
+"r	c #F9F8E9",
+"s	c #F9F8E1",
+"t	c #F9F7D3",
+"u	c #F9F7BC",
+"v	c #F9F7AF",
+"w	c #E8EE80",
+"x	c #E2EC6F",
+"y	c #DBEA61",
+"z	c #D3E755",
+"A	c #CAE44C",
+"B	c #C6E446",
+"C	c #BDE441",
+"D	c #B8E337",
+"E	c #AADE30",
+"F	c #9DDA2A",
+"G	c #91D722",
+"H	c #87D61F",
+"I	c #7FD61B",
+"J	c #F9F9F8",
+"K	c #F9F9F7",
+"L	c #F9F9F0",
+"M	c #F9F8EC",
+"N	c #F9F7E1",
+"O	c #F9F7D7",
+"P	c #F9F7C9",
+"Q	c #F9F7B4",
+"R	c #EBF092",
+"S	c #E1EB69",
+"T	c #DBE95F",
+"U	c #D3E654",
+"V	c #CCE44A",
+"W	c #C9E647",
+"X	c #BDE13D",
+"Y	c #B1DE35",
+"Z	c #A8DD30",
+"`	c #9BDA29",
+" .	c #94D823",
+"..	c #8CD921",
+"+.	c #82D71C",
+"@.	c #7CD716",
+"#.	c #F9F9F9",
+"$.	c #F9F8F5",
+"%.	c #F9F7EE",
+"&.	c #F9F7E4",
+"*.	c #F9F7D5",
+"=.	c #F9F7CB",
+"-.	c #F9F7BF",
+";.	c #F4F39E",
+">.	c #E1EA76",
+",.	c #E0EA69",
+"'.	c #D9E85D",
+").	c #D7E859",
+"!.	c #CCE64E",
+"~.	c #C1E343",
+"{.	c #BBE23C",
+"].	c #B0DF34",
+"^.	c #A9DD2F",
+"/.	c #9AD928",
+"(.	c #90D822",
+"_.	c #8AD81F",
+":.	c #81D81B",
+"<.	c #76D517",
+"[.	c #F9F7F6",
+"}.	c #F9F7F4",
+"|.	c #F9F5D3",
+"1.	c #F9F6C7",
+"2.	c #F9F6B9",
+"3.	c #E6EC86",
+"4.	c #E6ED72",
+"5.	c #E3ED6C",
+"6.	c #D6E75E",
+"7.	c #D1E655",
+"8.	c #C7E34A",
+"9.	c #C1E141",
+"0.	c #B2DD39",
+"a.	c #B3E135",
+"b.	c #A6DE30",
+"c.	c #9BDB29",
+"d.	c #97DA24",
+"e.	c #87D71E",
+"f.	c #82D71B",
+"g.	c #87DA1F",
+"h.	c #63CF12",
+"i.	c #F8F8F8",
+"j.	c #F9F7F5",
+"k.	c #F9F5E3",
+"l.	c #F9F5D4",
+"m.	c #F9F6B8",
+"n.	c #EDF198",
+"o.	c #E1EB6F",
+"p.	c #E1EC68",
+"q.	c #D8E95C",
+"r.	c #D3E752",
+"s.	c #C9E44A",
+"t.	c #C7E746",
+"u.	c #BEE43D",
+"v.	c #B0E138",
+"w.	c #A8E02D",
+"x.	c #A3DF29",
+"y.	c #B4E226",
+"z.	c #CDEB2C",
+"A.	c #B9E925",
+"B.	c #6DD213",
+"C.	c #56C90F",
+"D.	c #F9F8F4",
+"E.	c #F9F7EB",
+"F.	c #F9F7F2",
+"G.	c #F9F5EA",
+"H.	c #F9F3DE",
+"I.	c #F9F4CF",
+"J.	c #F9F5C5",
+"K.	c #F9F5B8",
+"L.	c #F8F7B2",
+"M.	c #F1F495",
+"N.	c #E3EC6B",
+"O.	c #D8E859",
+"P.	c #CEE650",
+"Q.	c #C8E449",
+"R.	c #C2E441",
+"S.	c #BAE139",
+"T.	c #E7F24F",
+"U.	c #E3F347",
+"V.	c #DCF13E",
+"W.	c #D9F137",
+"X.	c #CDEE30",
+"Y.	c #C3EB27",
+"Z.	c #85D919",
+"`.	c #4FC90E",
+" +	c #F7F7F2",
+".+	c #F9F9F2",
+"++	c #F9F8ED",
+"@+	c #F9F5EE",
+"#+	c #F9F4E4",
+"$+	c #F9F5DC",
+"%+	c #F9F6D1",
+"&+	c #F9F6C2",
+"*+	c #F9F6B7",
+"=+	c #F9F6A6",
+"-+	c #F8F599",
+";+	c #F7F591",
+">+	c #F4F584",
+",+	c #D7EB61",
+"'+	c #C5E447",
+")+	c #BAE13E",
+"!+	c #B8E23A",
+"~+	c #B8E132",
+"{+	c #E6F349",
+"]+	c #E1F343",
+"^+	c #DAF13B",
+"/+	c #D2EF33",
+"(+	c #CBEE2E",
+"_+	c #C1EA25",
+":+	c #A9E61F",
+"<+	c #55CE10",
+"[+	c #4FC60D",
+"}+	c #F8F8E9",
+"|+	c #F9F9E8",
+"1+	c #F9F9E7",
+"2+	c #F9F8E4",
+"3+	c #F9F7F0",
+"4+	c #F9F6EF",
+"5+	c #F9F5E7",
+"6+	c #F9F3DB",
+"7+	c #F9F5D6",
+"8+	c #F9F7CE",
+"9+	c #F9F7BE",
+"0+	c #F9F7B7",
+"a+	c #F9F7A5",
+"b+	c #F7F691",
+"c+	c #F6F588",
+"d+	c #F5F580",
+"e+	c #DBEE6B",
+"f+	c #BAE13D",
+"g+	c #B5E137",
+"h+	c #A5DB2E",
+"i+	c #E0F041",
+"j+	c #DBF140",
+"k+	c #DAF138",
+"l+	c #D1EE32",
+"m+	c #C6EB2B",
+"n+	c #C0EC27",
+"o+	c #BAEB22",
+"p+	c #65D517",
+"q+	c #4FCC0B",
+"r+	c #F9F9D7",
+"s+	c #F9F9D6",
+"t+	c #F9F8EA",
+"u+	c #F9F7E8",
+"v+	c #F9F5E5",
+"w+	c #F9F5DD",
+"x+	c #F9F2D2",
+"y+	c #F9F3CA",
+"z+	c #F9F6C3",
+"A+	c #F9F7BA",
+"B+	c #F9F8B2",
+"C+	c #F8F89E",
+"D+	c #F8F58E",
+"E+	c #F5F583",
+"F+	c #EFF479",
+"G+	c #C5E557",
+"H+	c #C5E543",
+"I+	c #B9E13B",
+"J+	c #9FDA2A",
+"K+	c #CEEC3B",
+"L+	c #D9EF38",
+"M+	c #D4EE32",
+"N+	c #D1EF30",
+"O+	c #C8ED2A",
+"P+	c #C2EB26",
+"Q+	c #B5E81E",
+"R+	c #80DC1C",
+"S+	c #46C80B",
+"T+	c #F0F1C0",
+"U+	c #F9F8C7",
+"V+	c #F9F9C6",
+"W+	c #F9F8D5",
+"X+	c #F9F7DF",
+"Y+	c #F9F6D6",
+"Z+	c #F9F5D0",
+"`+	c #F9F3C4",
+" @	c #F9F3BC",
+".@	c #F9F5B5",
+"+@	c #F9F7B0",
+"@@	c #F9F8A4",
+"#@	c #F7F796",
+"$@	c #EFF386",
+"%@	c #D3E865",
+"&@	c #C7E450",
+"*@	c #C0E242",
+"=@	c #BEE33F",
+"-@	c #B5E036",
+";@	c #A7DB2F",
+">@	c #A0DC2B",
+",@	c #C4E32F",
+"'@	c #DCF139",
+")@	c #D2ED2E",
+"!@	c #CAEC2A",
+"~@	c #CBEF2B",
+"{@	c #BEEA22",
+"]@	c #B2E81E",
+"^@	c #8FDD17",
+"/@	c #3DC209",
+"(@	c #33BC07",
+"_@	c #F5F5B4",
+":@	c #F6F6AE",
+"<@	c #F6F6B1",
+"[@	c #F7F7B3",
+"}@	c #F2F3AB",
+"|@	c #F3F198",
+"1@	c #F8F5BA",
+"2@	c #F9F4B6",
+"3@	c #F9F3AF",
+"4@	c #F9F4A4",
+"5@	c #F8F7A2",
+"6@	c #F7F799",
+"7@	c #F6F68A",
+"8@	c #DDEC69",
+"9@	c #CEE74F",
+"0@	c #C0E03C",
+"a@	c #D5EA4C",
+"b@	c #BEE23A",
+"c@	c #A9DF2F",
+"d@	c #9EDD2A",
+"e@	c #BEE22A",
+"f@	c #DCF23A",
+"g@	c #D4F033",
+"h@	c #CBED2A",
+"i@	c #C5ED29",
+"j@	c #BDEB22",
+"k@	c #B4E81E",
+"l@	c #A5E618",
+"m@	c #41C209",
+"n@	c #3ABF07",
+"o@	c #DCDC8A",
+"p@	c #F3F49B",
+"q@	c #F3F49D",
+"r@	c #F2F49D",
+"s@	c #F4F59F",
+"t@	c #F4F59D",
+"u@	c #F1F498",
+"v@	c #F8F7BF",
+"w@	c #F9F6AF",
+"x@	c #F8F39A",
+"y@	c #F8F594",
+"z@	c #F5F57D",
+"A@	c #DDEC66",
+"B@	c #C2E144",
+"C@	c #BDE13F",
+"D@	c #BFD82E",
+"E@	c #E6EF4E",
+"F@	c #E1F04A",
+"G@	c #C2E433",
+"H@	c #CDEA34",
+"I@	c #DDF03F",
+"J@	c #D4EF36",
+"K@	c #CFEF30",
+"L@	c #CBEE2A",
+"M@	c #C2EC26",
+"N@	c #B7E91F",
+"O@	c #ADE71C",
+"P@	c #A0E517",
+"Q@	c #3FC008",
+"R@	c #33BD06",
+"S@	c #DDD97B",
+"T@	c #F2F392",
+"U@	c #F0F28F",
+"V@	c #F1F38C",
+"W@	c #F6F7BE",
+"X@	c #F5F6B7",
+"Y@	c #F5F5B2",
+"Z@	c #F9F6A7",
+"`@	c #F9F6A3",
+" #	c #F8F59C",
+".#	c #F8F38D",
+"+#	c #F7F58C",
+"@#	c #F5F687",
+"##	c #F3F576",
+"$#	c #F0F575",
+"%#	c #DDEC57",
+"&#	c #D8EA49",
+"*#	c #DDE946",
+"=#	c #E8F14F",
+"-#	c #E3F148",
+";#	c #E2F346",
+">#	c #E1F345",
+",#	c #D8F039",
+"'#	c #D1EF31",
+")#	c #CAED2C",
+"!#	c #C4EC27",
+"~#	c #C1ED24",
+"{#	c #B6EA1F",
+"]#	c #AFEA1C",
+"^#	c #A4E717",
+"/#	c #3EBF08",
+"(#	c #37C206",
+"_#	c #E8EB6C",
+":#	c #E6ED76",
+"<#	c #E4EC73",
+"[#	c #ECEF86",
+"}#	c #F8F7A7",
+"|#	c #F9F7A7",
+"1#	c #F8F7A3",
+"2#	c #F8F69D",
+"3#	c #F8F69A",
+"4#	c #F7F48A",
+"5#	c #F6F27B",
+"6#	c #F6F482",
+"7#	c #F3F57B",
+"8#	c #F1F574",
+"9#	c #F0F46C",
+"0#	c #EBF25E",
+"a#	c #EBF259",
+"b#	c #E7F152",
+"c#	c #E1EF44",
+"d#	c #DFEF40",
+"e#	c #D7EE3B",
+"f#	c #DAF039",
+"g#	c #D7F137",
+"h#	c #D1F032",
+"i#	c #CCEF2C",
+"j#	c #C6EE26",
+"k#	c #B7EA1F",
+"l#	c #AAE81A",
+"m#	c #97E415",
+"n#	c #37BE07",
+"o#	c #2CAF05",
+"p#	c #D5DC5B",
+"q#	c #E4ED6F",
+"r#	c #E9F082",
+"s#	c #F8F7A1",
+"t#	c #F8F79D",
+"u#	c #F7F696",
+"v#	c #F6F68B",
+"w#	c #F5F37B",
+"x#	c #F5F378",
+"y#	c #F3F372",
+"z#	c #F1F36C",
+"A#	c #EEF468",
+"B#	c #ECF35D",
+"C#	c #EAF256",
+"D#	c #E7F151",
+"E#	c #E4F148",
+"F#	c #E0F043",
+"G#	c #E1F143",
+"H#	c #D9EF39",
+"I#	c #D2ED31",
+"J#	c #CEF030",
+"K#	c #C9EF2A",
+"L#	c #C0ED25",
+"M#	c #ADE61C",
+"N#	c #A7E619",
+"O#	c #A5E818",
+"P#	c #80D913",
+"Q#	c #34BE06",
+"R#	c #35BF05",
+"S#	c #E0EC61",
+"T#	c #E4ED72",
+"U#	c #F7F792",
+"V#	c #F7F791",
+"W#	c #F8F78F",
+"X#	c #F6F687",
+"Y#	c #F6F688",
+"Z#	c #F3F377",
+"`#	c #F4F474",
+" $	c #F1F472",
+".$	c #EEF46D",
+"+$	c #DEEB59",
+"@$	c #E7F059",
+"#$	c #E9F356",
+"$$	c #E9F255",
+"%$	c #E7F24D",
+"&$	c #E6F245",
+"*$	c #E4F243",
+"=$	c #DFF240",
+"-$	c #D7EF36",
+";$	c #CCEB2B",
+">$	c #CDEE2C",
+",$	c #C5ED2A",
+"'$	c #BDEB25",
+")$	c #ADE71E",
+"!$	c #A6E51A",
+"~$	c #9AE316",
+"{$	c #93E214",
+"]$	c #5CC30B",
+"^$	c #34BD05",
+"/$	c #DDEC59",
+"($	c #D6E858",
+"_$	c #F5F57C",
+":$	c #F5F680",
+"<$	c #F5F67E",
+"[$	c #F5F67C",
+"}$	c #F4F574",
+"|$	c #F1F26A",
+"1$	c #F2F46F",
+"2$	c #EFF468",
+"3$	c #BCE24A",
+"4$	c #BBDF38",
+"5$	c #B9DB30",
+"6$	c #C3DF33",
+"7$	c #DDED42",
+"8$	c #E5F249",
+"9$	c #DEF03D",
+"0$	c #D5EF35",
+"a$	c #CEEE2E",
+"b$	c #C1E925",
+"c$	c #B9E923",
+"d$	c #B1E71E",
+"e$	c #ABE619",
+"f$	c #A8E517",
+"g$	c #94E113",
+"h$	c #83DE11",
+"i$	c #35AD06",
+"j$	c #2FBB04",
+"k$	c #CEE249",
+"l$	c #CFE54B",
+"m$	c #E8F16F",
+"n$	c #F5F578",
+"o$	c #F4F674",
+"p$	c #F1F46D",
+"q$	c #F2F268",
+"r$	c #F1F366",
+"s$	c #EFF462",
+"t$	c #DEEF5B",
+"u$	c #B3E039",
+"v$	c #B4E037",
+"w$	c #AEDE31",
+"x$	c #A6DB2B",
+"y$	c #BBE331",
+"z$	c #E3F243",
+"A$	c #DFF141",
+"B$	c #D9F038",
+"C$	c #D9F136",
+"D$	c #CDEF2E",
+"E$	c #C7EE2A",
+"F$	c #BDEB24",
+"G$	c #B7EA1D",
+"H$	c #A0E316",
+"I$	c #96E214",
+"J$	c #93E212",
+"K$	c #6DD10D",
+"L$	c #2CAD04",
+"M$	c #2AB303",
+"N$	c #CDE746",
+"O$	c #CDE74B",
+"P$	c #F0F56D",
+"Q$	c #F2F46A",
+"R$	c #F0F264",
+"S$	c #ECF15A",
+"T$	c #EFF361",
+"U$	c #EDF45A",
+"V$	c #EBF45C",
+"W$	c #B9E239",
+"X$	c #B6E335",
+"Y$	c #ADE02E",
+"Z$	c #A9E02B",
+"`$	c #A4DE28",
+" %	c #DFF243",
+".%	c #D7EF35",
+"+%	c #D5EF31",
+"@%	c #D4F031",
+"#%	c #CDEF2C",
+"$%	c #C7ED28",
+"%%	c #C6EE27",
+"&%	c #C1EE23",
+"*%	c #B6EC1F",
+"=%	c #A7E818",
+"-%	c #67CC0E",
+";%	c #47C208",
+">%	c #34B906",
+",%	c #2DBD04",
+"'%	c #C1E23C",
+")%	c #C3E53E",
+"!%	c #D7EB4F",
+"~%	c #EEF257",
+"{%	c #ECF057",
+"]%	c #EAF051",
+"^%	c #EBF255",
+"/%	c #EBF452",
+"(%	c #E9F450",
+"_%	c #B8E137",
+":%	c #A3DB2A",
+"<%	c #A5DF2B",
+"[%	c #98DA26",
+"}%	c #8CD621",
+"|%	c #90D41D",
+"1%	c #BFE326",
+"2%	c #D0EE2D",
+"3%	c #CEEF2E",
+"4%	c #C8EE28",
+"5%	c #C1ED26",
+"6%	c #BCEC22",
+"7%	c #B9ED20",
+"8%	c #9FE419",
+"9%	c #70CD0F",
+"0%	c #35B906",
+"a%	c #34C005",
+"b%	c #30C005",
+"c%	c #26B503",
+"d%	c #B7E036",
+"e%	c #B7E239",
+"f%	c #E2EF4B",
+"g%	c #EBF451",
+"h%	c #E5F14B",
+"i%	c #E4F04B",
+"j%	c #E7F451",
+"k%	c #E6F44B",
+"l%	c #B6DD2C",
+"m%	c #ABDC25",
+"n%	c #B4DF23",
+"o%	c #A3D61D",
+"p%	c #96D91D",
+"q%	c #86D218",
+"r%	c #B3DE21",
+"s%	c #CAED2B",
+"t%	c #C6EC25",
+"u%	c #BEEB22",
+"v%	c #BDEC20",
+"w%	c #B3EA1D",
+"x%	c #9AE017",
+"y%	c #46BC07",
+"z%	c #40C107",
+"A%	c #35C206",
+"B%	c #2EBE05",
+"C%	c #2BBD04",
+"D%	c #B2E130",
+"E%	c #B5E334",
+"F%	c #DFF042",
+"G%	c #E4F147",
+"H%	c #E5F348",
+"I%	c #E2F246",
+"J%	c #E4F445",
+"K%	c #DFF33F",
+"L%	c #E0F33D",
+"M%	c #DCF238",
+"N%	c #D8F034",
+"O%	c #D2EF2E",
+"P%	c #CBEB29",
+"Q%	c #D1EF2D",
+"R%	c #C7ED26",
+"S%	c #C5EE26",
+"T%	c #B7EA20",
+"U%	c #B5EA1D",
+"V%	c #AEEA1B",
+"W%	c #85D813",
+"X%	c #3FC208",
+"Y%	c #3AC507",
+"Z%	c #33C005",
+"`%	c #2BBB04",
+" &	c #26A903",
+".&	c #A9E029",
+"+&	c #A5DF29",
+"@&	c #A5DE29",
+"#&	c #D8EE3D",
+"$&	c #E4F341",
+"%&	c #E2F340",
+"&&	c #E0F33C",
+"*&	c #DDF239",
+"=&	c #D9F236",
+"-&	c #D6F133",
+";&	c #D3F131",
+">&	c #CEEE2A",
+",&	c #CEEF28",
+"'&	c #CBEF29",
+")&	c #BFEB22",
+"!&	c #B2EB23",
+"~&	c #81DD1D",
+"{&	c #6DCF11",
+"]&	c #68D10F",
+"^&	c #4CCB0E",
+"/&	c #39C407",
+"(&	c #33C106",
+"_&	c #2ABB04",
+":&	c #27B803",
+"<&	c #97DA23",
+"[&	c #98DC24",
+"}&	c #95DC23",
+"|&	c #93DB25",
+"1&	c #99DF2A",
+"2&	c #C6EC31",
+"3&	c #C6EB2E",
+"4&	c #ADE026",
+"5&	c #C1E928",
+"6&	c #CCEE29",
+"7&	c #C9ED26",
+"8&	c #B9EA21",
+"9&	c #8FD718",
+"0&	c #4FC30C",
+"a&	c #4DCB0B",
+"b&	c #49CB0A",
+"c&	c #3DC508",
+"d&	c #3DC808",
+"e&	c #34C306",
+"f&	c #2DBC04",
+"g&	c #2CBF04",
+"h&	c #88D81D",
+"i&	c #87D81A",
+"j&	c #86D81A",
+"k&	c #7ED518",
+"l&	c #75D015",
+"m&	c #71D113",
+"n&	c #84DB1A",
+"o&	c #9DE524",
+"p&	c #7CD316",
+"q&	c #62CA0E",
+"r&	c #5AC80B",
+"s&	c #55C90B",
+"t&	c #46CA0A",
+"u&	c #41C708",
+"v&	c #3DC907",
+"w&	c #36C406",
+"x&	c #30C205",
+"y&	c #27AA04",
+"z&	c #75D016",
+"A&	c #79D516",
+"B&	c #73D515",
+"C&	c #6AD113",
+"D&	c #6CD413",
+"E&	c #65D211",
+"F&	c #5BCD0F",
+"G&	c #56CD0E",
+"H&	c #58D10E",
+"I&	c #50CC0C",
+"J&	c #48C809",
+"K&	c #40C708",
+"L&	c #3FC607",
+"M&	c #40C907",
+"N&	c #38C706",
+"O&	c #32C105",
+"P&	c #57BE0F",
+"Q&	c #61D111",
+"R&	c #66D411",
+"S&	c #62D20F",
+"T&	c #57CD0D",
+"U&	c #57D00C",
+"V&	c #4DCC0C",
+"W&	c #4BCD0A",
+"X&	c #40C608",
+"Y&	c #3DC807",
+"Z&	c #30B505",
+"`&	c #4BBC0B",
+" *	c #4CC20A",
+".*	c #48BF0A",
+"+*	c #45C109",
+"@*	c #38B507",
+"#*	c #31B506",
+"                          . + @ # $ %                           ",
+"                    & * = - ; > , ' ) ! ~ {                     ",
+"                ] ^ / ( _ : < [ } | 1 2 3 4 5 6                 ",
+"              7 8 9 0 a b c d e f g h i j k l m n               ",
+"          o p q r s t a u v w x y z A B C D E F G H I           ",
+"        J K L o M N O P u Q R S T U V W X Y Z `  ...+.@.        ",
+"        #.K J $.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.        ",
+"      #.#.J [.}.%.&.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.      ",
+"    i.#.K [.j.}.%.k.l.1.m.n.o.p.q.r.s.t.u.v.E w.x.y.z.A.B.C.    ",
+"    #.K D.E.}.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.D T.U.V.W.X.Y.Z.`.    ",
+"   +.+.+++&.F.@+#+$+%+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+  ",
+"  }+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+9.f+g+h+i+j+k+l+m+n+o+p+q+  ",
+"  r+r+s+t+u+v+w+x+y+z+A+B+C+D+E+F+G+H+I+].J+K+L+M+N+O+P+Q+R+S+  ",
+"T+U+V+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@",
+"_@:@<@[@[@}@|@1@2@3@4@5@6@7@8@9@W 0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@",
+"o@p@q@r@s@t@u@v@w@4@x@y@b+z@A@B@C@D@E@F@G@H@I@J@K@L@M@N@O@P@Q@R@",
+"S@T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#",
+"_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h#i#j#k#O@l#m#n#o#",
+"p#q#r#5@s#t#u#b+v#w#x#y#z#A#B#C#D#E#F#G#H#I#'#J#K#L#M#N#O#P#Q#R#",
+"  S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$;$>$,$'$)$!$~${$]$^$  ",
+"  /$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$G#9$k+0$a$b$c$d$e$f$g$h$i$j$  ",
+"  k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$'#D$E$F$G$H$I$J$K$L$M$  ",
+"    N$O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%>%,%    ",
+"    '%)%!%~%{%]%^%/%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8%9%0%a%b%c%    ",
+"      d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v%w%x%y%z%A%B%C%      ",
+"        D%E%F%G%H%I%J%K%L%M%N%O%P%Q%R%S%T%U%V%W%X%Y%Z%`% &      ",
+"        .&+&@&#&$&%&&&*&=&-&;&>&,&'&)&!&~&{&]&^&/&(&_&:&        ",
+"          <&[&}&|&1&2&3&4&5&6&7&{@8&9&0&a&b&c&d&e&f&g&          ",
+"              h&i&j&k&l&m&n&o&p&q&r&s&a&t&u&v&w&x&y&            ",
+"                z&A&B&C&D&E&F&G&H&I&J&K&L&M&N&O&                ",
+"                    P&Q&R&S&T&U&V&W&X&Y&v&Z&                    ",
+"                          `& *.*+*@*#*                          "};
diff --git a/debian/control b/debian/control
index 2a77f351..4ada3be5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,36 +1,36 @@
-Source: tmw
+Source: aethyra
 Section: games
 Priority: optional
-Homepage: http://209.168.213.109
-Maintainer: Patrick Matthäi <patrick.matthaei@web.de>
+Homepage: http://www.aethyra.com/
+Maintainer: Patrick Matthäi <patrick.matthaei@web.de> (Patrick is TMW maintainer need to change this)
 Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), dpatch, autotools-dev, libcurl4-gnutls-dev, libgl1-mesa-dev, libguichan2-dev (>= 0.7.1), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev, libphysfs-dev, libpng12-dev, libxml2-dev, zlib1g-dev
 Standards-Version: 3.7.3
 
-Package: tme
+Package: aethyra
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tme-data (= ${source:Version})
-Recommends: tme-music
-Description: The Mana Experiment is a great Online Rolegame
- based upon the Seiken Densetsu serie. It has its own universe, and its own
+Depends: ${shlibs:Depends}, ${misc:Depends}, aethyra-data (= ${source:Version})
+Recommends: aethyra-music
+Description: Aethyra is a great Online Rolegame
+ based upon The Mana World 0.0 codebase. It has its own universe, and its own
  character management system, which will give you the opportunity to play in a
  2D heroic-fantasy world forever.
 
-Package: tmw-dbg
+Package: aethyra-dbg
 Architecture: any
 Priority: extra
-Depends: tmw (= ${binary:Version})
-Description: The Mana World is a great Online Rolegame (debugging symbols)
- based upon the Seiken Densetsu serie. It has its own universe, and its own
+Depends: aethyra (= ${binary:Version})
+Description: Aethyra is a great Online Rolegame (debugging symbols)
+ based upon the The Mana World 0.0 codebase. It has its own universe, and its own
  character management system, which will give you the opportunity to play in a
  2D heroic-fantasy world forever.
  .
  This package provides debugging symbols for the tmw package.
 
-Package: tmw-data
+Package: aethyra-data
 Architecture: all
-Recommends: tmw, tmw-music
-Description: The Mana World is a great Online Rolegame (data files)
- based upon the Seiken Densetsu serie. It has its own universe, and its own
+Recommends: aethyra, aethyra-music
+Description: Aethyra is a great Online Rolegame (data files)
+ based upon The Mana World 0.0 codebase. It has its own universe, and its own
  character management system, which will give you the opportunity to play in a
  2D heroic-fantasy world forever.
  .
diff --git a/debian/rules b/debian/rules
index 68dd9400..6ee08a3b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ binary-arch: build install
 	dh_install -a
 	dh_desktop -a
 	dh_installmenu -a
-	dh_strip -a --dbg-package=tme-dbg
+	dh_strip -a --dbg-package=aethyra-dbg
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a
diff --git a/debian/tme-data.install b/debian/tme-data.install
deleted file mode 100644
index a836ce3d..00000000
--- a/debian/tme-data.install
+++ /dev/null
@@ -1,5 +0,0 @@
-data/graphics/gui/*.png usr/share/games/tme/data/graphics/gui
-data/graphics/images/*.png usr/share/games/tme/data/graphics/images
-data/graphics/images/ambient/*.png usr/share/games/tme/data/graphics/images/ambient
-data/graphics/tiles/*.png usr/share/games/tme/data/graphics/tiles
-data/help/*.txt usr/share/games/tme/data/help
diff --git a/debian/tme.docs b/debian/tme.docs
deleted file mode 100644
index d622a527..00000000
--- a/debian/tme.docs
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTHORS
-NEWS
-README
-ChangeLog
-docs/progression.txt
-docs/FAQ.txt
diff --git a/debian/tme.install b/debian/tme.install
deleted file mode 100644
index 6c9ced58..00000000
--- a/debian/tme.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tme.desktop usr/share/applications
-debian/tme.xpm usr/share/pixmaps
-data/icons/tme.png usr/share/icons
-docs/tme.6 usr/share/man/man6
-src/tme usr/games
diff --git a/debian/tme.menu b/debian/tme.menu
deleted file mode 100644
index 4af5ad0a..00000000
--- a/debian/tme.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"
diff --git a/debian/tme.sgml b/debian/tme.sgml
deleted file mode 100644
index 0ed18199..00000000
--- a/debian/tme.sgml
+++ /dev/null
@@ -1,149 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>FERREIRA</firstname>">
-  <!ENTITY dhsurname   "<surname>Yohann</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>avril 13, 2005</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>6</manvolnum>">
-  <!ENTITY dhemail     "<email>bertram@cegetel.net</email>">
-  <!ENTITY dhusername  "FERREIRA Yohann">
-  <!ENTITY dhucpackage "<refentrytitle>TMW</refentrytitle>">
-  <!ENTITY dhpackage   "tmw">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2003</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>tmw is the abreviation of The Mana World : A Fantasy Online Game</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> ingame
-      commands.</para>
-    <para><command>&dhpackage;</command> is a Great Online Game based upon the Seiken Densetsu Serie.
-It has its own universe, and and its own character management system, which will
-give you the opportunity to play in a 2D heroic-fantasy world forever.</para>
-
-  </refsect1>
-  <refsect1>
-    <title>COMMON KEYS</title>
-
-    <para>Arrow Keys, Key Pad Keys (Diagonals Supported).
-Move your character around.
-
-Left Ctrl : 
-Make your character attack.
-
-G : 
-Get Items on the ground or in a chest.
-
-Alt + 1...9 : 
-Shows an Emoticon above your character.
-
-Alt + I : 
-Shows / Hide Inventory Window.
-
-Alt + K : 
-Shows / Hide Skills Window.
-
-Alt + E : 
-Shows / Hide Equipment Window.
-
-Alt + C : 
-Shows Configuration Window.
-</para>
-
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>libguichan (2).</para>
-
-    <para>The program is documented fully by <citetitle>The Mana World Team</citetitle> available via the
-      website http://www.manaworld.org/</para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-
diff --git a/debian/tme.xpm b/debian/tme.xpm
deleted file mode 100644
index e7c2222a..00000000
--- a/debian/tme.xpm
+++ /dev/null
@@ -1,776 +0,0 @@
-/* XPM */
-static char * tme_xpm[] = {
-"32 32 741 2",
-"	c None",
-".	c #E8ED72",
-"+	c #E7ED6A",
-"@	c #E1EB62",
-"#	c #D4E758",
-"$	c #D2E750",
-"%	c #CDE748",
-"&	c #F5F4A1",
-"*	c #F3F294",
-"=	c #EBEE81",
-"-	c #EAEE77",
-";	c #E6ED6F",
-">	c #E1EB68",
-",	c #D9E859",
-"'	c #D3E851",
-")	c #CCE549",
-"!	c #C7E643",
-"~	c #BEE239",
-"{	c #B3DF32",
-"]	c #F8F8C4",
-"^	c #F9F7B3",
-"/	c #F4F3A2",
-"(	c #F4F397",
-"_	c #F5F39A",
-":	c #F2F399",
-"<	c #E2EA6D",
-"[	c #DFEA66",
-"}	c #DAE95C",
-"|	c #D3E753",
-"1	c #CAE54B",
-"2	c #C7E545",
-"3	c #BFE23C",
-"4	c #B7E034",
-"5	c #B1E130",
-"6	c #A5DC28",
-"7	c #F9F9DA",
-"8	c #F9F8CA",
-"9	c #F8F7C9",
-"0	c #F8F7CD",
-"a	c #F9F7C7",
-"b	c #F9F7B8",
-"c	c #F7F5A8",
-"d	c #E6EC73",
-"e	c #E0EA68",
-"f	c #DBE95D",
-"g	c #D8E956",
-"h	c #D2E850",
-"i	c #C4E343",
-"j	c #BEE23D",
-"k	c #B2E036",
-"l	c #A9DE2E",
-"m	c #A0DC29",
-"n	c #91D823",
-"o	c #F9F9F5",
-"p	c #F9F9EA",
-"q	c #F9F9E2",
-"r	c #F9F8E9",
-"s	c #F9F8E1",
-"t	c #F9F7D3",
-"u	c #F9F7BC",
-"v	c #F9F7AF",
-"w	c #E8EE80",
-"x	c #E2EC6F",
-"y	c #DBEA61",
-"z	c #D3E755",
-"A	c #CAE44C",
-"B	c #C6E446",
-"C	c #BDE441",
-"D	c #B8E337",
-"E	c #AADE30",
-"F	c #9DDA2A",
-"G	c #91D722",
-"H	c #87D61F",
-"I	c #7FD61B",
-"J	c #F9F9F8",
-"K	c #F9F9F7",
-"L	c #F9F9F0",
-"M	c #F9F8EC",
-"N	c #F9F7E1",
-"O	c #F9F7D7",
-"P	c #F9F7C9",
-"Q	c #F9F7B4",
-"R	c #EBF092",
-"S	c #E1EB69",
-"T	c #DBE95F",
-"U	c #D3E654",
-"V	c #CCE44A",
-"W	c #C9E647",
-"X	c #BDE13D",
-"Y	c #B1DE35",
-"Z	c #A8DD30",
-"`	c #9BDA29",
-" .	c #94D823",
-"..	c #8CD921",
-"+.	c #82D71C",
-"@.	c #7CD716",
-"#.	c #F9F9F9",
-"$.	c #F9F8F5",
-"%.	c #F9F7EE",
-"&.	c #F9F7E4",
-"*.	c #F9F7D5",
-"=.	c #F9F7CB",
-"-.	c #F9F7BF",
-";.	c #F4F39E",
-">.	c #E1EA76",
-",.	c #E0EA69",
-"'.	c #D9E85D",
-").	c #D7E859",
-"!.	c #CCE64E",
-"~.	c #C1E343",
-"{.	c #BBE23C",
-"].	c #B0DF34",
-"^.	c #A9DD2F",
-"/.	c #9AD928",
-"(.	c #90D822",
-"_.	c #8AD81F",
-":.	c #81D81B",
-"<.	c #76D517",
-"[.	c #F9F7F6",
-"}.	c #F9F7F4",
-"|.	c #F9F5D3",
-"1.	c #F9F6C7",
-"2.	c #F9F6B9",
-"3.	c #E6EC86",
-"4.	c #E6ED72",
-"5.	c #E3ED6C",
-"6.	c #D6E75E",
-"7.	c #D1E655",
-"8.	c #C7E34A",
-"9.	c #C1E141",
-"0.	c #B2DD39",
-"a.	c #B3E135",
-"b.	c #A6DE30",
-"c.	c #9BDB29",
-"d.	c #97DA24",
-"e.	c #87D71E",
-"f.	c #82D71B",
-"g.	c #87DA1F",
-"h.	c #63CF12",
-"i.	c #F8F8F8",
-"j.	c #F9F7F5",
-"k.	c #F9F5E3",
-"l.	c #F9F5D4",
-"m.	c #F9F6B8",
-"n.	c #EDF198",
-"o.	c #E1EB6F",
-"p.	c #E1EC68",
-"q.	c #D8E95C",
-"r.	c #D3E752",
-"s.	c #C9E44A",
-"t.	c #C7E746",
-"u.	c #BEE43D",
-"v.	c #B0E138",
-"w.	c #A8E02D",
-"x.	c #A3DF29",
-"y.	c #B4E226",
-"z.	c #CDEB2C",
-"A.	c #B9E925",
-"B.	c #6DD213",
-"C.	c #56C90F",
-"D.	c #F9F8F4",
-"E.	c #F9F7EB",
-"F.	c #F9F7F2",
-"G.	c #F9F5EA",
-"H.	c #F9F3DE",
-"I.	c #F9F4CF",
-"J.	c #F9F5C5",
-"K.	c #F9F5B8",
-"L.	c #F8F7B2",
-"M.	c #F1F495",
-"N.	c #E3EC6B",
-"O.	c #D8E859",
-"P.	c #CEE650",
-"Q.	c #C8E449",
-"R.	c #C2E441",
-"S.	c #BAE139",
-"T.	c #E7F24F",
-"U.	c #E3F347",
-"V.	c #DCF13E",
-"W.	c #D9F137",
-"X.	c #CDEE30",
-"Y.	c #C3EB27",
-"Z.	c #85D919",
-"`.	c #4FC90E",
-" +	c #F7F7F2",
-".+	c #F9F9F2",
-"++	c #F9F8ED",
-"@+	c #F9F5EE",
-"#+	c #F9F4E4",
-"$+	c #F9F5DC",
-"%+	c #F9F6D1",
-"&+	c #F9F6C2",
-"*+	c #F9F6B7",
-"=+	c #F9F6A6",
-"-+	c #F8F599",
-";+	c #F7F591",
-">+	c #F4F584",
-",+	c #D7EB61",
-"'+	c #C5E447",
-")+	c #BAE13E",
-"!+	c #B8E23A",
-"~+	c #B8E132",
-"{+	c #E6F349",
-"]+	c #E1F343",
-"^+	c #DAF13B",
-"/+	c #D2EF33",
-"(+	c #CBEE2E",
-"_+	c #C1EA25",
-":+	c #A9E61F",
-"<+	c #55CE10",
-"[+	c #4FC60D",
-"}+	c #F8F8E9",
-"|+	c #F9F9E8",
-"1+	c #F9F9E7",
-"2+	c #F9F8E4",
-"3+	c #F9F7F0",
-"4+	c #F9F6EF",
-"5+	c #F9F5E7",
-"6+	c #F9F3DB",
-"7+	c #F9F5D6",
-"8+	c #F9F7CE",
-"9+	c #F9F7BE",
-"0+	c #F9F7B7",
-"a+	c #F9F7A5",
-"b+	c #F7F691",
-"c+	c #F6F588",
-"d+	c #F5F580",
-"e+	c #DBEE6B",
-"f+	c #BAE13D",
-"g+	c #B5E137",
-"h+	c #A5DB2E",
-"i+	c #E0F041",
-"j+	c #DBF140",
-"k+	c #DAF138",
-"l+	c #D1EE32",
-"m+	c #C6EB2B",
-"n+	c #C0EC27",
-"o+	c #BAEB22",
-"p+	c #65D517",
-"q+	c #4FCC0B",
-"r+	c #F9F9D7",
-"s+	c #F9F9D6",
-"t+	c #F9F8EA",
-"u+	c #F9F7E8",
-"v+	c #F9F5E5",
-"w+	c #F9F5DD",
-"x+	c #F9F2D2",
-"y+	c #F9F3CA",
-"z+	c #F9F6C3",
-"A+	c #F9F7BA",
-"B+	c #F9F8B2",
-"C+	c #F8F89E",
-"D+	c #F8F58E",
-"E+	c #F5F583",
-"F+	c #EFF479",
-"G+	c #C5E557",
-"H+	c #C5E543",
-"I+	c #B9E13B",
-"J+	c #9FDA2A",
-"K+	c #CEEC3B",
-"L+	c #D9EF38",
-"M+	c #D4EE32",
-"N+	c #D1EF30",
-"O+	c #C8ED2A",
-"P+	c #C2EB26",
-"Q+	c #B5E81E",
-"R+	c #80DC1C",
-"S+	c #46C80B",
-"T+	c #F0F1C0",
-"U+	c #F9F8C7",
-"V+	c #F9F9C6",
-"W+	c #F9F8D5",
-"X+	c #F9F7DF",
-"Y+	c #F9F6D6",
-"Z+	c #F9F5D0",
-"`+	c #F9F3C4",
-" @	c #F9F3BC",
-".@	c #F9F5B5",
-"+@	c #F9F7B0",
-"@@	c #F9F8A4",
-"#@	c #F7F796",
-"$@	c #EFF386",
-"%@	c #D3E865",
-"&@	c #C7E450",
-"*@	c #C0E242",
-"=@	c #BEE33F",
-"-@	c #B5E036",
-";@	c #A7DB2F",
-">@	c #A0DC2B",
-",@	c #C4E32F",
-"'@	c #DCF139",
-")@	c #D2ED2E",
-"!@	c #CAEC2A",
-"~@	c #CBEF2B",
-"{@	c #BEEA22",
-"]@	c #B2E81E",
-"^@	c #8FDD17",
-"/@	c #3DC209",
-"(@	c #33BC07",
-"_@	c #F5F5B4",
-":@	c #F6F6AE",
-"<@	c #F6F6B1",
-"[@	c #F7F7B3",
-"}@	c #F2F3AB",
-"|@	c #F3F198",
-"1@	c #F8F5BA",
-"2@	c #F9F4B6",
-"3@	c #F9F3AF",
-"4@	c #F9F4A4",
-"5@	c #F8F7A2",
-"6@	c #F7F799",
-"7@	c #F6F68A",
-"8@	c #DDEC69",
-"9@	c #CEE74F",
-"0@	c #C0E03C",
-"a@	c #D5EA4C",
-"b@	c #BEE23A",
-"c@	c #A9DF2F",
-"d@	c #9EDD2A",
-"e@	c #BEE22A",
-"f@	c #DCF23A",
-"g@	c #D4F033",
-"h@	c #CBED2A",
-"i@	c #C5ED29",
-"j@	c #BDEB22",
-"k@	c #B4E81E",
-"l@	c #A5E618",
-"m@	c #41C209",
-"n@	c #3ABF07",
-"o@	c #DCDC8A",
-"p@	c #F3F49B",
-"q@	c #F3F49D",
-"r@	c #F2F49D",
-"s@	c #F4F59F",
-"t@	c #F4F59D",
-"u@	c #F1F498",
-"v@	c #F8F7BF",
-"w@	c #F9F6AF",
-"x@	c #F8F39A",
-"y@	c #F8F594",
-"z@	c #F5F57D",
-"A@	c #DDEC66",
-"B@	c #C2E144",
-"C@	c #BDE13F",
-"D@	c #BFD82E",
-"E@	c #E6EF4E",
-"F@	c #E1F04A",
-"G@	c #C2E433",
-"H@	c #CDEA34",
-"I@	c #DDF03F",
-"J@	c #D4EF36",
-"K@	c #CFEF30",
-"L@	c #CBEE2A",
-"M@	c #C2EC26",
-"N@	c #B7E91F",
-"O@	c #ADE71C",
-"P@	c #A0E517",
-"Q@	c #3FC008",
-"R@	c #33BD06",
-"S@	c #DDD97B",
-"T@	c #F2F392",
-"U@	c #F0F28F",
-"V@	c #F1F38C",
-"W@	c #F6F7BE",
-"X@	c #F5F6B7",
-"Y@	c #F5F5B2",
-"Z@	c #F9F6A7",
-"`@	c #F9F6A3",
-" #	c #F8F59C",
-".#	c #F8F38D",
-"+#	c #F7F58C",
-"@#	c #F5F687",
-"##	c #F3F576",
-"$#	c #F0F575",
-"%#	c #DDEC57",
-"&#	c #D8EA49",
-"*#	c #DDE946",
-"=#	c #E8F14F",
-"-#	c #E3F148",
-";#	c #E2F346",
-">#	c #E1F345",
-",#	c #D8F039",
-"'#	c #D1EF31",
-")#	c #CAED2C",
-"!#	c #C4EC27",
-"~#	c #C1ED24",
-"{#	c #B6EA1F",
-"]#	c #AFEA1C",
-"^#	c #A4E717",
-"/#	c #3EBF08",
-"(#	c #37C206",
-"_#	c #E8EB6C",
-":#	c #E6ED76",
-"<#	c #E4EC73",
-"[#	c #ECEF86",
-"}#	c #F8F7A7",
-"|#	c #F9F7A7",
-"1#	c #F8F7A3",
-"2#	c #F8F69D",
-"3#	c #F8F69A",
-"4#	c #F7F48A",
-"5#	c #F6F27B",
-"6#	c #F6F482",
-"7#	c #F3F57B",
-"8#	c #F1F574",
-"9#	c #F0F46C",
-"0#	c #EBF25E",
-"a#	c #EBF259",
-"b#	c #E7F152",
-"c#	c #E1EF44",
-"d#	c #DFEF40",
-"e#	c #D7EE3B",
-"f#	c #DAF039",
-"g#	c #D7F137",
-"h#	c #D1F032",
-"i#	c #CCEF2C",
-"j#	c #C6EE26",
-"k#	c #B7EA1F",
-"l#	c #AAE81A",
-"m#	c #97E415",
-"n#	c #37BE07",
-"o#	c #2CAF05",
-"p#	c #D5DC5B",
-"q#	c #E4ED6F",
-"r#	c #E9F082",
-"s#	c #F8F7A1",
-"t#	c #F8F79D",
-"u#	c #F7F696",
-"v#	c #F6F68B",
-"w#	c #F5F37B",
-"x#	c #F5F378",
-"y#	c #F3F372",
-"z#	c #F1F36C",
-"A#	c #EEF468",
-"B#	c #ECF35D",
-"C#	c #EAF256",
-"D#	c #E7F151",
-"E#	c #E4F148",
-"F#	c #E0F043",
-"G#	c #E1F143",
-"H#	c #D9EF39",
-"I#	c #D2ED31",
-"J#	c #CEF030",
-"K#	c #C9EF2A",
-"L#	c #C0ED25",
-"M#	c #ADE61C",
-"N#	c #A7E619",
-"O#	c #A5E818",
-"P#	c #80D913",
-"Q#	c #34BE06",
-"R#	c #35BF05",
-"S#	c #E0EC61",
-"T#	c #E4ED72",
-"U#	c #F7F792",
-"V#	c #F7F791",
-"W#	c #F8F78F",
-"X#	c #F6F687",
-"Y#	c #F6F688",
-"Z#	c #F3F377",
-"`#	c #F4F474",
-" $	c #F1F472",
-".$	c #EEF46D",
-"+$	c #DEEB59",
-"@$	c #E7F059",
-"#$	c #E9F356",
-"$$	c #E9F255",
-"%$	c #E7F24D",
-"&$	c #E6F245",
-"*$	c #E4F243",
-"=$	c #DFF240",
-"-$	c #D7EF36",
-";$	c #CCEB2B",
-">$	c #CDEE2C",
-",$	c #C5ED2A",
-"'$	c #BDEB25",
-")$	c #ADE71E",
-"!$	c #A6E51A",
-"~$	c #9AE316",
-"{$	c #93E214",
-"]$	c #5CC30B",
-"^$	c #34BD05",
-"/$	c #DDEC59",
-"($	c #D6E858",
-"_$	c #F5F57C",
-":$	c #F5F680",
-"<$	c #F5F67E",
-"[$	c #F5F67C",
-"}$	c #F4F574",
-"|$	c #F1F26A",
-"1$	c #F2F46F",
-"2$	c #EFF468",
-"3$	c #BCE24A",
-"4$	c #BBDF38",
-"5$	c #B9DB30",
-"6$	c #C3DF33",
-"7$	c #DDED42",
-"8$	c #E5F249",
-"9$	c #DEF03D",
-"0$	c #D5EF35",
-"a$	c #CEEE2E",
-"b$	c #C1E925",
-"c$	c #B9E923",
-"d$	c #B1E71E",
-"e$	c #ABE619",
-"f$	c #A8E517",
-"g$	c #94E113",
-"h$	c #83DE11",
-"i$	c #35AD06",
-"j$	c #2FBB04",
-"k$	c #CEE249",
-"l$	c #CFE54B",
-"m$	c #E8F16F",
-"n$	c #F5F578",
-"o$	c #F4F674",
-"p$	c #F1F46D",
-"q$	c #F2F268",
-"r$	c #F1F366",
-"s$	c #EFF462",
-"t$	c #DEEF5B",
-"u$	c #B3E039",
-"v$	c #B4E037",
-"w$	c #AEDE31",
-"x$	c #A6DB2B",
-"y$	c #BBE331",
-"z$	c #E3F243",
-"A$	c #DFF141",
-"B$	c #D9F038",
-"C$	c #D9F136",
-"D$	c #CDEF2E",
-"E$	c #C7EE2A",
-"F$	c #BDEB24",
-"G$	c #B7EA1D",
-"H$	c #A0E316",
-"I$	c #96E214",
-"J$	c #93E212",
-"K$	c #6DD10D",
-"L$	c #2CAD04",
-"M$	c #2AB303",
-"N$	c #CDE746",
-"O$	c #CDE74B",
-"P$	c #F0F56D",
-"Q$	c #F2F46A",
-"R$	c #F0F264",
-"S$	c #ECF15A",
-"T$	c #EFF361",
-"U$	c #EDF45A",
-"V$	c #EBF45C",
-"W$	c #B9E239",
-"X$	c #B6E335",
-"Y$	c #ADE02E",
-"Z$	c #A9E02B",
-"`$	c #A4DE28",
-" %	c #DFF243",
-".%	c #D7EF35",
-"+%	c #D5EF31",
-"@%	c #D4F031",
-"#%	c #CDEF2C",
-"$%	c #C7ED28",
-"%%	c #C6EE27",
-"&%	c #C1EE23",
-"*%	c #B6EC1F",
-"=%	c #A7E818",
-"-%	c #67CC0E",
-";%	c #47C208",
-">%	c #34B906",
-",%	c #2DBD04",
-"'%	c #C1E23C",
-")%	c #C3E53E",
-"!%	c #D7EB4F",
-"~%	c #EEF257",
-"{%	c #ECF057",
-"]%	c #EAF051",
-"^%	c #EBF255",
-"/%	c #EBF452",
-"(%	c #E9F450",
-"_%	c #B8E137",
-":%	c #A3DB2A",
-"<%	c #A5DF2B",
-"[%	c #98DA26",
-"}%	c #8CD621",
-"|%	c #90D41D",
-"1%	c #BFE326",
-"2%	c #D0EE2D",
-"3%	c #CEEF2E",
-"4%	c #C8EE28",
-"5%	c #C1ED26",
-"6%	c #BCEC22",
-"7%	c #B9ED20",
-"8%	c #9FE419",
-"9%	c #70CD0F",
-"0%	c #35B906",
-"a%	c #34C005",
-"b%	c #30C005",
-"c%	c #26B503",
-"d%	c #B7E036",
-"e%	c #B7E239",
-"f%	c #E2EF4B",
-"g%	c #EBF451",
-"h%	c #E5F14B",
-"i%	c #E4F04B",
-"j%	c #E7F451",
-"k%	c #E6F44B",
-"l%	c #B6DD2C",
-"m%	c #ABDC25",
-"n%	c #B4DF23",
-"o%	c #A3D61D",
-"p%	c #96D91D",
-"q%	c #86D218",
-"r%	c #B3DE21",
-"s%	c #CAED2B",
-"t%	c #C6EC25",
-"u%	c #BEEB22",
-"v%	c #BDEC20",
-"w%	c #B3EA1D",
-"x%	c #9AE017",
-"y%	c #46BC07",
-"z%	c #40C107",
-"A%	c #35C206",
-"B%	c #2EBE05",
-"C%	c #2BBD04",
-"D%	c #B2E130",
-"E%	c #B5E334",
-"F%	c #DFF042",
-"G%	c #E4F147",
-"H%	c #E5F348",
-"I%	c #E2F246",
-"J%	c #E4F445",
-"K%	c #DFF33F",
-"L%	c #E0F33D",
-"M%	c #DCF238",
-"N%	c #D8F034",
-"O%	c #D2EF2E",
-"P%	c #CBEB29",
-"Q%	c #D1EF2D",
-"R%	c #C7ED26",
-"S%	c #C5EE26",
-"T%	c #B7EA20",
-"U%	c #B5EA1D",
-"V%	c #AEEA1B",
-"W%	c #85D813",
-"X%	c #3FC208",
-"Y%	c #3AC507",
-"Z%	c #33C005",
-"`%	c #2BBB04",
-" &	c #26A903",
-".&	c #A9E029",
-"+&	c #A5DF29",
-"@&	c #A5DE29",
-"#&	c #D8EE3D",
-"$&	c #E4F341",
-"%&	c #E2F340",
-"&&	c #E0F33C",
-"*&	c #DDF239",
-"=&	c #D9F236",
-"-&	c #D6F133",
-";&	c #D3F131",
-">&	c #CEEE2A",
-",&	c #CEEF28",
-"'&	c #CBEF29",
-")&	c #BFEB22",
-"!&	c #B2EB23",
-"~&	c #81DD1D",
-"{&	c #6DCF11",
-"]&	c #68D10F",
-"^&	c #4CCB0E",
-"/&	c #39C407",
-"(&	c #33C106",
-"_&	c #2ABB04",
-":&	c #27B803",
-"<&	c #97DA23",
-"[&	c #98DC24",
-"}&	c #95DC23",
-"|&	c #93DB25",
-"1&	c #99DF2A",
-"2&	c #C6EC31",
-"3&	c #C6EB2E",
-"4&	c #ADE026",
-"5&	c #C1E928",
-"6&	c #CCEE29",
-"7&	c #C9ED26",
-"8&	c #B9EA21",
-"9&	c #8FD718",
-"0&	c #4FC30C",
-"a&	c #4DCB0B",
-"b&	c #49CB0A",
-"c&	c #3DC508",
-"d&	c #3DC808",
-"e&	c #34C306",
-"f&	c #2DBC04",
-"g&	c #2CBF04",
-"h&	c #88D81D",
-"i&	c #87D81A",
-"j&	c #86D81A",
-"k&	c #7ED518",
-"l&	c #75D015",
-"m&	c #71D113",
-"n&	c #84DB1A",
-"o&	c #9DE524",
-"p&	c #7CD316",
-"q&	c #62CA0E",
-"r&	c #5AC80B",
-"s&	c #55C90B",
-"t&	c #46CA0A",
-"u&	c #41C708",
-"v&	c #3DC907",
-"w&	c #36C406",
-"x&	c #30C205",
-"y&	c #27AA04",
-"z&	c #75D016",
-"A&	c #79D516",
-"B&	c #73D515",
-"C&	c #6AD113",
-"D&	c #6CD413",
-"E&	c #65D211",
-"F&	c #5BCD0F",
-"G&	c #56CD0E",
-"H&	c #58D10E",
-"I&	c #50CC0C",
-"J&	c #48C809",
-"K&	c #40C708",
-"L&	c #3FC607",
-"M&	c #40C907",
-"N&	c #38C706",
-"O&	c #32C105",
-"P&	c #57BE0F",
-"Q&	c #61D111",
-"R&	c #66D411",
-"S&	c #62D20F",
-"T&	c #57CD0D",
-"U&	c #57D00C",
-"V&	c #4DCC0C",
-"W&	c #4BCD0A",
-"X&	c #40C608",
-"Y&	c #3DC807",
-"Z&	c #30B505",
-"`&	c #4BBC0B",
-" *	c #4CC20A",
-".*	c #48BF0A",
-"+*	c #45C109",
-"@*	c #38B507",
-"#*	c #31B506",
-"                          . + @ # $ %                           ",
-"                    & * = - ; > , ' ) ! ~ {                     ",
-"                ] ^ / ( _ : < [ } | 1 2 3 4 5 6                 ",
-"              7 8 9 0 a b c d e f g h i j k l m n               ",
-"          o p q r s t a u v w x y z A B C D E F G H I           ",
-"        J K L o M N O P u Q R S T U V W X Y Z `  ...+.@.        ",
-"        #.K J $.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.        ",
-"      #.#.J [.}.%.&.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.      ",
-"    i.#.K [.j.}.%.k.l.1.m.n.o.p.q.r.s.t.u.v.E w.x.y.z.A.B.C.    ",
-"    #.K D.E.}.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.D T.U.V.W.X.Y.Z.`.    ",
-"   +.+.+++&.F.@+#+$+%+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+  ",
-"  }+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+9.f+g+h+i+j+k+l+m+n+o+p+q+  ",
-"  r+r+s+t+u+v+w+x+y+z+A+B+C+D+E+F+G+H+I+].J+K+L+M+N+O+P+Q+R+S+  ",
-"T+U+V+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@",
-"_@:@<@[@[@}@|@1@2@3@4@5@6@7@8@9@W 0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@",
-"o@p@q@r@s@t@u@v@w@4@x@y@b+z@A@B@C@D@E@F@G@H@I@J@K@L@M@N@O@P@Q@R@",
-"S@T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#",
-"_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h#i#j#k#O@l#m#n#o#",
-"p#q#r#5@s#t#u#b+v#w#x#y#z#A#B#C#D#E#F#G#H#I#'#J#K#L#M#N#O#P#Q#R#",
-"  S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$;$>$,$'$)$!$~${$]$^$  ",
-"  /$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$G#9$k+0$a$b$c$d$e$f$g$h$i$j$  ",
-"  k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$'#D$E$F$G$H$I$J$K$L$M$  ",
-"    N$O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%>%,%    ",
-"    '%)%!%~%{%]%^%/%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8%9%0%a%b%c%    ",
-"      d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v%w%x%y%z%A%B%C%      ",
-"        D%E%F%G%H%I%J%K%L%M%N%O%P%Q%R%S%T%U%V%W%X%Y%Z%`% &      ",
-"        .&+&@&#&$&%&&&*&=&-&;&>&,&'&)&!&~&{&]&^&/&(&_&:&        ",
-"          <&[&}&|&1&2&3&4&5&6&7&{@8&9&0&a&b&c&d&e&f&g&          ",
-"              h&i&j&k&l&m&n&o&p&q&r&s&a&t&u&v&w&x&y&            ",
-"                z&A&B&C&D&E&F&G&H&I&J&K&L&M&N&O&                ",
-"                    P&Q&R&S&T&U&V&W&X&Y&v&Z&                    ",
-"                          `& *.*+*@*#*                          "};
diff --git a/docs/FAQ.txt b/docs/FAQ.txt
index db3eb491..b52c0f17 100644
--- a/docs/FAQ.txt
+++ b/docs/FAQ.txt
@@ -7,10 +7,10 @@ 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: #themanaexperiment.
+   irc.freenode.net Channel: #aethyra.
    If you don't like IRC just come to our forums:
-   http://tme.onlinegamecore.com/forums. Ok, do you think forums are evil?
-   Don't worry, send me an e-mail at elvenprogrammer@gmail.com and you're done.
+   http://forums.aethyra.com/ . Ok, do you think forums are evil?
+   Don't worry, send me an e-mail at blame582@gmail.com and you're done.
    That's not enough? No, I won't give you my phone number! ;P
    
 GAME
@@ -21,7 +21,7 @@ A: First of all check that your username is at least 4 characters long. Is the
    first time you login? Have you registered an account? If not use the
    "Register" button in game. If you already succesfully connected before, but
    now you're getting this message, please send an e-mail to
-   elvenprogrammer@gmail.com.
+   blame582@gmail.com.
 
 
 Q: I always get "Wrong password" but I'm sure I typed it right, why?
@@ -52,13 +52,15 @@ A: It's a system where is stored the latest development version. It's not
    is updated quite frequently). If you want to check it out, read this guide
    http://themanaworld.org/svn-tutorial.txt 
 
+(We need our own svn tut -- kraant)
+
 
 DEVELOPMENT
 
 Q: When will the next version be released?
 
 A: We have scheduled releases. Usually a new release is available every month.
-   Check http://wiki.themanaworld.org/index.php/Roadmap for further infos.
+   Check http://www.aethyra.com/ for further info.
 
 
 Q: How can I contribute?
@@ -67,11 +69,11 @@ 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. Send an e-mail to
-     elvenprogrammer@gmail.com explaining what you want to do, or join our irc
-     channel: #themanaexperiment @ irc.freenode.net.
+     blame582@gmail.com explaining what you want to do, or join our irc
+     channel: #aethyra @ irc.freenode.net.
    
-   - You can be a beta tester. Just play with The Mana Experiment and report
+   - You can be a beta tester. Just play with Aethyra and report
      every error on the forum.
    
-   - Play with The Mana Experiment: more players, more fun! Simple as that! ;-)
+   - Play with Aethyra: more players, more fun! Simple as that! ;-)
 
diff --git a/docs/HACKING.txt b/docs/HACKING.txt
index fdec32a6..85ad0d8c 100644
--- a/docs/HACKING.txt
+++ b/docs/HACKING.txt
@@ -1,5 +1,5 @@
 ---------------------------------
-The Mana Experiment Hacking Guide
+Aethyra Hacking Guide
 ---------------------------------
 
 With multiple coders working on the same source files, there needs to be a
diff --git a/docs/INSTALL/debian.txt b/docs/INSTALL/debian.txt
index 59e2376e..e9cf3183 100644
--- a/docs/INSTALL/debian.txt
+++ b/docs/INSTALL/debian.txt
@@ -1,31 +1,43 @@
-How to install TME on my GNU/Debian Box
+How to install Aethyra on my GNU/Debian Box
 ==================================================
 
 Author:   FERREIRA Yohann (Bertram)
 Email:    Bertram@cegetel.net
 
-The Mana Experiment project
+With slight edits by Daniel Thomas (kraant@gmail.com)
+to for Aethyra...
+
+WARNING! These instructions are probably outdated!
+
+Check the forums (http://forums.aethyra.com/) where better help can be found.
+
+Aethyra project
 ======================
-Homepage: http://209.168.213.109/
-IRC:      irc.freenode.net / #themanaexperiment
+Homepage: http://www.aethyra.com/
+IRC:      irc.freenode.net / #aethyra
 
-1) Installing The Mana Experiment and dependencies
+1) Installing Aethyra and dependencies
 2) Creating a Debian Package using DebHelper Tools
 3) Notes
 
 
-1. Installing The Mana Experiment and Dependencies
+1. Installing Aethyra and Dependencies
 =============================================
 
-The Mana Experiment Debian Package can be installed under the Debian Testing and
+Aethyra Debian Package can be installed under the Debian Testing and
 Unstable (Sarge/Sid). In order to have Mana Experiment working, you'll need
 packages for SDL, SDL_mixer, SDL_image, libxml2, libphysfs and libguichan0.
 
 To install the dependencies, you can do type (as root):
 
-    apt-get install libsdl-mixer1.2 libsdl-image1.2 libxml2 libphysfs-1.0-0 libguichan0
+    apt-get install libsdl-mixer1.2 libsdl-image1.2 libxml2 libphysfs-1.0-0
 
-Type tmw as a normal user to play! (Enjoy!)
+(You'll need to compile libguichan from source since we've moved to 8.1
+and there is no package for this as of yet. This could create
+problems, any debian users trying this out and giving us fixes
+would be much appreciated -- kraant)
+
+Type aethyra as a normal user to play! (Enjoy!)
 
 2. Creating a Debian Package using DebHelper Tools
 ==================================================
@@ -41,9 +53,9 @@ And the debhelper tools:
 Download tmw from Subversion using the command (You'll need Subversion
 installed on your system):
 
-   svn svn://209.168.213.109 tme
+   svn co svn://209.168.213.109/client/trunk aethyra
 
-Rename the tme folder into tme-XXX and open a console in it.
+Rename the aethyra folder into aethyra-XXX and open a console in it.
 You can now type:
 
     fakeroot dpkg-buildpackage
@@ -53,16 +65,16 @@ file.
 
 Install it:
 
-    dpkg -i tme_XXXXXX_i386.deb
+    dpkg -i aethyra_XXXXXX_i386.deb
 
 (If you've got a previous one already installed with the same version number,
 don't forget to remove it with :)
 
-    apt-get remove tme
+    apt-get remove aethyra
 
 (Don't worry, you configuration files are not removed...)
 
-And now the final step: type 'tme' as a normal user in a shell and you're in!
+And now the final step: type 'aethyra' as a normal user in a shell and you're in!
 
 KDE/GNOME menu entries are created in Arcade Games upon installation.
 
@@ -71,6 +83,10 @@ KDE/GNOME menu entries are created in Arcade Games upon installation.
 
 A Debian Repository has been created.
 
+(This repository is for The Mana World not Aethyra, volunteers to make a
+package would be nice, basically if you follow these instructions 
+you won't get aethyra as of now -- kraant)
+
 Simply add in your /etc/apt/sources.list file:
 
     deb http://bertram.ifrance.com ./
@@ -79,9 +95,11 @@ Simply add in your /etc/apt/sources.list file:
 Then, as root, do:
 
     apt-get update
-    apt-get install tme
+    apt-get install aethyra
 
 and you're done!
 
-N.B.: The tme-music, libguichan0, and libguichan0-dev packages are also
+N.B.: The t_me-music, libguichan0, and libguichan0-dev packages are also
 provided in this repository.
+
+(Added '_' to avoid picking this file up in grep, fix this later -- kraant)
diff --git a/docs/INSTALL/win32.txt b/docs/INSTALL/win32.txt
index 88f47034..3ffd506e 100644
--- a/docs/INSTALL/win32.txt
+++ b/docs/INSTALL/win32.txt
@@ -1,10 +1,12 @@
-How setup Dev-C++ to compile TME on a Win32 Box
+How setup Dev-C++ to compile Aethyra on a Win32 Box
 ===============================================
 
-The Mana Experiment project
+(I think Dev-C++ support is broken as of now -- kraant)
+
+Aethyra project
 ===========================
-Homepage: http://209.168.213.109
-IRC:      irc.freenode.net / #themanaexperiment
+Homepage: http://www.aethyra.com
+IRC:      irc.freenode.net / #aethyra
 
 
 0. Index
@@ -12,7 +14,7 @@ IRC:      irc.freenode.net / #themanaexperiment
 1. Requirements
 2. Installing Dev-C++
 3. Installing the required libraries
-4. Compiling The Mana Experiment
+4. Compiling Aethyra
 
 
 1. Requirements
@@ -23,7 +25,7 @@ free IDE for Win32 built around GCC. Remember, Win32 was not meant for GCC and
 stuff so you will probably run into trouble unless you really know what you're
 doing, so best stick with Dev-C++.
 
-Besides a C++ compiler, TME depends on the following libraries:
+Besides a C++ compiler, Aethyra depends on the following libraries:
 
 1) SDL
 2) SDL_mixer
@@ -95,22 +97,22 @@ Install them all through the Dev-C++ package manager.
         iconv-1.9.1.win32.zip
 
      From each file, copy the headers to your include directory, the libs to
-     the lib direcotry and the dlls (in bin direcotry) to your tme directory.
+     the lib direcotry and the dlls (in bin direcotry) to your aethyra directory.
 
 **) For PhysFS copy the headers to your include directory, the libs to
-    the lib directory and the dlls (in bin direcotry) to your tme directory.
+    the lib directory and the dlls (in bin direcotry) to your aethyra directory.
 
 ***) Download developer files and put headers and libs in to include and lib
-     directories of Dev-Cpp. Download binaries and place the dll inside tme
+     directories of Dev-Cpp. Download binaries and place the dll inside aethyra
      folder.
 
 ****) Get latest win32 - mingw package and install as usual.
 
-You should now be fully equipped for compiling the latest TME development
+You should now be fully equipped for compiling the latest Aethyra development
 code!
 
 
-4. Compiling The Mana Experiment
+4. Compiling Aethyra
 ================================
 
 Check out The Mana Experiment from Subversion using either the command line svn
@@ -119,12 +121,12 @@ check out the following directory from our repository:
 
   svn://209.168.213.109/client/trunk
 
-Open "The Mana Experiment.dev" in Dev-C++. From there on you should be able to
-start compilition with Excute -> Compile. A file called tme.exe should appear
+Open "Aethyra.dev" in Dev-C++. From there on you should be able to
+start compilition with Excute -> Compile. A file called aethyra.exe should appear
 in the same directory as where you opened the .dev from.
 
 Before you can actually run the executable be sure to copy over the following
-DLLs from your Dev-Cpp/dll directory to the directory containing tme.exe (or 
+DLLs from your Dev-Cpp/dll directory to the directory containing aethyra.exe (or 
 alternatively into your c:\windows\system\ for a more universal solution):
 
  SDL.dll
@@ -143,7 +145,7 @@ And also make sure you have:
  zlib1.dll
 
 Additionally don't forget to copy any updated .dll (when libs are updated,
-the dll are usually updated too) to the folder containing tme.exe (or to the
+the dll are usually updated too) to the folder containing aethyra.exe (or to the
 c:\windows\system\).
 
-Have fun hacking The Mana Experiment!
+Have fun hacking Aethyra!
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 4ea96959..8b311f85 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,11 +1,11 @@
-man6_MANS = tme.6
+man6_MANS = aethyra.6
 
 EXTRA_DIST = $(man6_MANS) \
 	     packages.txt \
 	     FAQ.txt \
 	     HACKING.txt \
-	     SOURCE/tmedox.sh \
-	     SOURCE/tme.doxcfg \
+	     SOURCE/aethyradox.sh \
+	     SOURCE/aethyra.doxcfg \
 	     items.txt \
 	     progression.txt \
 	     INSTALL/debian.txt \
diff --git a/docs/SOURCE/aethyra.doxcfg b/docs/SOURCE/aethyra.doxcfg
new file mode 100644
index 00000000..cbc22910
--- /dev/null
+++ b/docs/SOURCE/aethyra.doxcfg
@@ -0,0 +1,1153 @@
+# Doxyfile 1.3.8
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = Aethyra
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER         =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = ../docs/SOURCE/
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of source
+# files, where putting all generated files in the same directory would otherwise
+# cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish,
+# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese,
+# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish,
+# Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# This tag can be used to specify the encoding used in the generated output.
+# The encoding is not always determined by the language that is chosen,
+# but also whether or not the output is meant for Windows or non-Windows users.
+# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
+# forces the Windows encoding (this is the default for the Windows binary),
+# whereas setting the tag to NO uses a Unix-style encoding (the default for
+# all platforms other than Windows).
+
+USE_WINDOWS_ENCODING   = NO
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is used
+# as the annotated text. Otherwise, the brief description is used as-is. If left
+# blank, the following values are used ("$name" is automatically replaced with the
+# name of the entity): "The $name class" "The $name widget" "The $name file"
+# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited
+# members of a class in the documentation of that class as if those members were
+# ordinary class members. Constructors, destructors and assignment operators of
+# the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like the Qt-style comments (thus requiring an
+# explicit @brief command for a brief description.
+
+JAVADOC_AUTOBRIEF      = YES
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member
+# documentation.
+
+DETAILS_AT_TOP         = YES
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources
+# only. Doxygen will then generate output that is more tailored for Java.
+# For instance, namespaces will be presented as packages, qualified scopes
+# will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = YES
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = YES
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT                  =
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
+# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
+
+FILE_PATTERNS          =
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
+# that are symbolic links (a Unix filesystem feature) are excluded from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+
+EXCLUDE_PATTERNS       =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.  Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.  The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# is applied to all files.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default)
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES (the default)
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        =
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE               = aethyra.chm
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20])
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
+# probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA             =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD                =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.  This is useful
+# if you want to understand what is going on.  On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse the
+# parser if not removed.
+
+SKIP_FUNCTION_MACROS   = NO
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+#   TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#   TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or
+# super classes. Setting the tag to NO turns the diagrams off. Note that this
+# option is superseded by the HAVE_DOT option below. This is only a fallback. It is
+# recommended to install and use dot, since it yields more powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK               = YES
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will
+# generate a call dependency graph for every global function or class method.
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found on the path.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS           =
+
+# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than
+# this value, doxygen will try to truncate the graph, so that it fits within
+# the specified constraint. Beware that most browsers cannot cope with very
+# large images.
+
+MAX_DOT_GRAPH_WIDTH    = 1024
+
+# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than
+# this value, doxygen will try to truncate the graph, so that it fits within
+# the specified constraint. Beware that most browsers cannot cope with very
+# large images.
+
+MAX_DOT_GRAPH_HEIGHT   = 1024
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes that
+# lay further from the root node will be omitted. Note that setting this option to
+# 1 or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that a graph may be further truncated if the graph's image dimensions are
+# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT).
+# If 0 is used for the depth value (the default), the graph is not depth-constrained.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = YES
diff --git a/docs/SOURCE/aethyradox.sh b/docs/SOURCE/aethyradox.sh
new file mode 100644
index 00000000..e0f299a8
--- /dev/null
+++ b/docs/SOURCE/aethyradox.sh
@@ -0,0 +1 @@
+cd ../../src/ && doxygen ../docs/SOURCE/aethyra.doxcfg
diff --git a/docs/SOURCE/tme.doxcfg b/docs/SOURCE/tme.doxcfg
deleted file mode 100644
index f3f90af9..00000000
--- a/docs/SOURCE/tme.doxcfg
+++ /dev/null
@@ -1,1153 +0,0 @@
-# Doxyfile 1.3.8
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = The Mana Experiment
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER         =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = ../docs/SOURCE/
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of source
-# files, where putting all generated files in the same directory would otherwise
-# cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish,
-# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese,
-# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish,
-# Swedish, and Ukrainian.
-
-OUTPUT_LANGUAGE        = English
-
-# This tag can be used to specify the encoding used in the generated output.
-# The encoding is not always determined by the language that is chosen,
-# but also whether or not the output is meant for Windows or non-Windows users.
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
-# forces the Windows encoding (this is the default for the Windows binary),
-# whereas setting the tag to NO uses a Unix-style encoding (the default for
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING   = NO
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is used
-# as the annotated text. Otherwise, the brief description is used as-is. If left
-# blank, the following values are used ("$name" is automatically replaced with the
-# name of the entity): "The $name class" "The $name widget" "The $name file"
-# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited
-# members of a class in the documentation of that class as if those members were
-# ordinary class members. Constructors, destructors and assignment operators of
-# the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like the Qt-style comments (thus requiring an
-# explicit @brief command for a brief description.
-
-JAVADOC_AUTOBRIEF      = YES
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member
-# documentation.
-
-DETAILS_AT_TOP         = YES
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources
-# only. Doxygen will then generate output that is more tailored for Java.
-# For instance, namespaces will be presented as packages, qualified scopes
-# will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = YES
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = YES
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = YES
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT                  =
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
-
-FILE_PATTERNS          =
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
-# that are symbolic links (a Unix filesystem feature) are excluded from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-
-EXCLUDE_PATTERNS       =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.  If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.  Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.  The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER         = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES (the default)
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = NO
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        =
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
-CHM_FILE               = tme.chm
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = NO
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
-
-DISABLE_INDEX          = NO
-
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
-# probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW      = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = NO
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD                =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.  This is useful
-# if you want to understand what is going on.  On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse the
-# parser if not removed.
-
-SKIP_FUNCTION_MACROS   = NO
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-#   TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#   TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or
-# super classes. Setting the tag to NO turns the diagrams off. Note that this
-# option is superseded by the HAVE_DOT option below. This is only a fallback. It is
-# recommended to install and use dot, since it yields more powerful graphs.
-
-CLASS_DIAGRAMS         = YES
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = NO
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-
-UML_LOOK               = YES
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will
-# generate a call dependency graph for every global function or class method.
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
-
-CALL_GRAPH             = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT       = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found on the path.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS           =
-
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
-# large images.
-
-MAX_DOT_GRAPH_WIDTH    = 1024
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
-# large images.
-
-MAX_DOT_GRAPH_HEIGHT   = 1024
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes that
-# lay further from the root node will be omitted. Note that setting this option to
-# 1 or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that a graph may be further truncated if the graph's image dimensions are
-# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT).
-# If 0 is used for the depth value (the default), the graph is not depth-constrained.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = YES
diff --git a/docs/SOURCE/tmedox.sh b/docs/SOURCE/tmedox.sh
deleted file mode 100644
index 7ab9ea74..00000000
--- a/docs/SOURCE/tmedox.sh
+++ /dev/null
@@ -1 +0,0 @@
-cd ../../src/ && doxygen ../docs/SOURCE/tme.doxcfg
diff --git a/docs/aethyra.6 b/docs/aethyra.6
new file mode 100644
index 00000000..a130a3a5
--- /dev/null
+++ b/docs/aethyra.6
@@ -0,0 +1,97 @@
+.TH "AETHYRA" "6"
+.SH "NAME"
+aethyra \- aethyra is Aethyra: A fantasy online game
+.SH "SYNOPSIS"
+\fBaethyra\fR
+.SH "DESCRIPTION"
+This manual page documents briefly the
+\fBaethyra\fR ingame
+commands.
+\fBaethyra\fR is a great online game based upon the Seiken Densetsu Serie.
+It has its own universe, and and its own character management system, which will
+give you the opportunity to play in a 2D heroic-fantasy world forever.
+.SH "BINARY PARAMETERS"
+This program follows the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-version
+Show version of the program.
+.TP
+.B \-u, \-\-skipupdate
+Skip the update process.
+.TP
+.B \-U, \-\-username
+Login with this username.
+.TP
+.B \-P, \-\-password
+Login with this password.
+.TP
+.B \-D, \-\-default
+Bypass the login process with default settings.
+.TP
+.B \-p, \-\-playername
+Login with this player.
+.TP
+.B \-C, \-\-configfile
+Configuration file to use
+.SH "COMMON KEYS"
+.TP
+.B Arrow Keys:
+Move your character around.
+.TP
+.B Left Ctrl:
+Make your character attack.
+.TP
+.B Key A:
+Target nearest monster.
+.TP
+.B Key Z:
+Get items on the ground or in a chest.
+.TP
+.B Key S:
+Make your character sit.
+.TP
+.B Alt + 1...9:
+Shows an emoticon above your character.
+.TP
+.B F1:
+Displays / Hides in game help.
+.TP
+.B F2:
+Displays / Hides status window.
+.TP
+.B F3:
+Displays / Hides inventory window.
+.TP
+.B F4:
+Displays / Hides equipment window.
+.TP
+.B F5:
+Displays / Hides skills window.
+.TP
+.B F6:
+Displays / Hides map.
+.TP
+.B F7
+Displays / Hides messages.
+.TP
+.B F8
+Displays / Hides hot-keys.
+.TP
+.B F9:
+Displays / Hides configuration window.
+.TP
+.B F10
+Displays / Hides debug window.
+.SH "AUTHOR"
+This manual page was written by Patrick Matth\[:a]i <patrick.matthaei@web.de>
+for The Mana World project.
+With slight alterations by Daniel Thomas\[:a]i <kraant@gmail.com>,
+for Aethyra.
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU General Public License, Version 2 any
+later version published by the Free Software Foundation.
diff --git a/docs/packages.txt b/docs/packages.txt
index 46c35f51..d5735e28 100644
--- a/docs/packages.txt
+++ b/docs/packages.txt
@@ -1,5 +1,5 @@
 ----------------------------------
-THE MANA EXPERIMENT PACKAGE SYSTEM
+AETHYRA PACKAGE SYSTEM
 ----------------------------------
 
 1. INTRODUCTION
@@ -10,41 +10,46 @@ THE MANA EXPERIMENT PACKAGE SYSTEM
 6. LOADING A REQUESTED RESOURCE
 7. RESOURCE MANAGEMENT DETAILS
 
+(Note this file is a _little_ outdated in some ways -- kraant)
+
 
 1. INTRODUCTION
 
-The Mana Experiment is expected to grow continuously with updates to the game
+Aethyra (Was The Mana Experiment, original;y The Mana World) is expected to grow continuously with updates to the game
 world occurring relatively frequently. More often so than for example new
 releases of the game client. To make sure players don't have to update their
 data manually all the time, by for example downloading the latest from the
-website, the TME client should be able to automatically obtain new data
+website, the Aethyra client should be able to automatically obtain new data
 packages from the server.
 
  Note: To reduce the load on the server (which isn't expected to have huge
  free uploading resources), the idea is that the server will only send a
  torrent file to the client and that the file is subsequently downloaded from
- several locations that have volunteered to spread TME data files. Ultimately
+ several locations that have volunteered to spread Aethyra data files. Ultimately
  a simple option on the client will even allow players to contribute their
  excess bandwidth to help other players get the updates faster.
 
+(This doesn't seem to have occurred we're still using http all the way
+up to now even into Aethyra)
+
 
 2. LOCATION OF DATA
 
-There are two locations where TME can look for game data. The install data
+There are two locations where Aethyra can look for game data. The install data
 directory and the data directory in the user's home directory. The latter one
 doesn't have to be used for Windows users, but is required for dynamic updates
 for UNIX users, who generally won't have write permissions to the install
 data directory. So for UNIX the two locations are:
 
- /usr/local/share/tme/data/*
+ /usr/local/share/aethyra/data/*
 
- ~/.tme/updates/*
+ ~/.aethyra/updates/*
 
- ~/.tme/customdata
+ ~/.aethyra/customdata
 
 While for Windows all the data will be located at:
 
- C:\Program Files\The Mana Experiment\data\*
+ C:\Program Files\Aethyra\data\*
 
 In the UNIX case it doesn't matter in which order the data directories are
 examined.
@@ -85,7 +90,7 @@ package is irrelevant. An example of the contents is given by:
 
 5. INITIALIZING PACKAGE MANAGEMENT
 
-When TME starts it will scan its data directories for both packages (archives)
+When Aethyra starts it will scan its data directories for both packages (archives)
 and directories. When a directory is found with the same name as a package, the
 directory is the preferred location to load data from as it is assumed to be
 more up to date.
@@ -129,7 +134,7 @@ The resource management technique is critical to the overall success of the
 package management system as a whole.  Resources are loaded at runtime as they
 are needed, and unloaded as they become unused.  In order to ensure the 
 autonomous functioning of this process reference counting is the agreed upon 
-technique for managing loaded resources in TME.  
+technique for managing loaded resources in Aethyra.  
 
 For those unfamiliar with the practice of reference counting, it involves 
 every resource object having a variable containing the number of references to
diff --git a/docs/sounddev.txt b/docs/sounddev.txt
index ed2ae71e..1c83157a 100644
--- a/docs/sounddev.txt
+++ b/docs/sounddev.txt
@@ -1,5 +1,5 @@
 -------------------------------------
-THE MANA EXPERIMENT SOUND DEVELOPMENT
+AETHYRA SOUND DEVELOPMENT
 -------------------------------------
 
 1. INTRODUCTION
@@ -9,7 +9,7 @@ THE MANA EXPERIMENT SOUND DEVELOPMENT
 
 1. INTRODUCTION
 
-In The Mana Experiment we plan to have both background music and sound effects
+In Aethyra we plan to have both background music and sound effects
 linked to beings actions.
 
 2. SPECS
diff --git a/docs/tme.6 b/docs/tme.6
deleted file mode 100644
index f4fe85cf..00000000
--- a/docs/tme.6
+++ /dev/null
@@ -1,97 +0,0 @@
-.TH "TME" "6"
-.SH "NAME"
-tme \- tme is The Mana Experiment: A fantasy online game
-.SH "SYNOPSIS"
-\fBtme\fR
-.SH "DESCRIPTION"
-This manual page documents briefly the
-\fBtme\fR ingame
-commands.
-\fBtme\fR is a great online game based upon the Seiken Densetsu Serie.
-It has its own universe, and and its own character management system, which will
-give you the opportunity to play in a 2D heroic-fantasy world forever.
-.SH "BINARY PARAMETERS"
-This program follows the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B \-h, \-\-help
-Show summary of options.
-.TP
-.B \-v, \-\-version
-Show version of the program.
-.TP
-.B \-u, \-\-skipupdate
-Skip the update process.
-.TP
-.B \-U, \-\-username
-Login with this username.
-.TP
-.B \-P, \-\-password
-Login with this password.
-.TP
-.B \-D, \-\-default
-Bypass the login process with default settings.
-.TP
-.B \-p, \-\-playername
-Login with this player.
-.TP
-.B \-C, \-\-configfile
-Configuration file to use
-.SH "COMMON KEYS"
-.TP
-.B Arrow Keys:
-Move your character around.
-.TP
-.B Left Ctrl:
-Make your character attack.
-.TP
-.B Key A:
-Target nearest monster.
-.TP
-.B Key Z:
-Get items on the ground or in a chest.
-.TP
-.B Key S:
-Make your character sit.
-.TP
-.B Alt + 1...9:
-Shows an emoticon above your character.
-.TP
-.B F1:
-Displays / Hides in game help.
-.TP
-.B F2:
-Displays / Hides status window.
-.TP
-.B F3:
-Displays / Hides inventory window.
-.TP
-.B F4:
-Displays / Hides equipment window.
-.TP
-.B F5:
-Displays / Hides skills window.
-.TP
-.B F6:
-Displays / Hides map.
-.TP
-.B F7
-Displays / Hides messages.
-.TP
-.B F8
-Displays / Hides hot-keys.
-.TP
-.B F9:
-Displays / Hides configuration window.
-.TP
-.B F10
-Displays / Hides debug window.
-.SH "AUTHOR"
-This manual page was written by Patrick Matth\[:a]i <patrick.matthaei@web.de>
-for The Mana World project.
-With slight alterations by Daniel Thomas\[:a]i <kraant@gmail.com>,
-for The Mana Experiment.
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU General Public License, Version 2 any
-later version published by the Free Software Foundation.
diff --git a/docs/win32-release.txt b/docs/win32-release.txt
index 1c0577df..64590139 100644
--- a/docs/win32-release.txt
+++ b/docs/win32-release.txt
@@ -1,5 +1,5 @@
 -------------------------------------------
-THE MANA EXPERIMENT WIN32 RELEASE CHECKLIST
+AETHYRA WIN32 RELEASE CHECKLIST
 -------------------------------------------
 
 Every Win32 releaser should follow this checklist when creating a new package.
@@ -11,7 +11,10 @@ Every Win32 releaser should follow this checklist when creating a new package.
     * Eventually Legal Copyright
 - Update README and ChangeLog if not already
 - Compile OpenGL version (Using -DUSE_OPENGL option) and rename the executable
-  from tme.exe to tme_opengl.exe
+  from aethyra.exe to aethyra_opengl.exe
+ (This isn't actually how it's happening because I'm cross compiling
+  and therefore flying blind. As it is aethyra.exe is the OpenGL version
+  and no sdl version is generated -- kraant)
 - Compile normal version (Do not use special flags as __DEBUG or USE_OPENGL)
 - Check if the dlls were compressed (SDL.dll, SDL_Image.dll, SDL_Mixer.dll)
 - Check config.xml for default values:
@@ -19,7 +22,7 @@ Every Win32 releaser should follow this checklist when creating a new package.
       <configuration>
         <option name="chatlog" value="chatlog.txt"/>
         <option name="guialpha" value="0.8"/>
-        <option name="host" value="server.themanaworld.org"/>
+        <option name="host" value="209.168.213.109"/>
         <option name="hwaccel" value="0"/>
         <option name="port" value="6901"/>
         <option name="remember" value="0"/>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d7dcbc7a..e6ee7405 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,7 +8,7 @@ FIND_PACKAGE(PhysFS REQUIRED)
 FIND_PACKAGE(PNG REQUIRED)
 
 SET(FLAGS "-DPACKAGE_VERSION=\\\"${VERSION}\\\"")
-SET(FLAGS "${FLAGS} -DTME_DATADIR=\\\"${PKG_DATADIR}/\\\"")
+SET(FLAGS "${FLAGS} -DAETHYRA_DATADIR=\\\"${PKG_DATADIR}/\\\"")
 
 SET(GUICHAN_COMPONENTS "SDL")
 IF (WITH_OPENGL)
@@ -339,9 +339,9 @@ SET(SRCS
     vector.h
     )
 
-ADD_EXECUTABLE(tme ${SRCS})
+ADD_EXECUTABLE(aethyra ${SRCS})
 
-TARGET_LINK_LIBRARIES(tme
+TARGET_LINK_LIBRARIES(aethyra
     ${SDL_LIBRARY}
     ${SDLIMAGE_LIBRARY}
     ${SDLMIXER_LIBRARY}
@@ -354,6 +354,6 @@ TARGET_LINK_LIBRARIES(tme
     ${OPENGL_LIBRARIES}
     )
 
-INSTALL(TARGETS tme RUNTIME DESTINATION ${PKG_BINDIR})
+INSTALL(TARGETS aethyra RUNTIME DESTINATION ${PKG_BINDIR})
 
-SET_TARGET_PROPERTIES(tme PROPERTIES COMPILE_FLAGS "${FLAGS}")
+SET_TARGET_PROPERTIES(aethyra PROPERTIES COMPILE_FLAGS "${FLAGS}")
diff --git a/src/Makefile.am b/src/Makefile.am
index e750e214..7cd233b7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
-bin_PROGRAMS = tme
-tme_SOURCES = gui/widgets/dropdown.cpp \
+bin_PROGRAMS = aethyra
+aethyra_SOURCES = gui/widgets/dropdown.cpp \
               gui/widgets/dropdown.h \
               gui/widgets/resizegrip.cpp \
 	      gui/widgets/resizegrip.h \
@@ -311,10 +311,10 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 # set the include path found by configure
 INCLUDES =					\
 	$(all_includes)				\
-	-DTME_DATADIR=\""$(pkgdatadir)/"\"
+	-DAETHYRA_DATADIR=\""$(pkgdatadir)/"\"
 
 # the library search path.
-tme_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) `pkg-config --libs libxml-2.0`
-tme_CXXFLAGS = -Wall $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` $(CURL_CFLAGS)
-tme_LDADD = $(LIBSDL_LIBS) -lguichan_sdl $(CURL_LIBS)
-tme_TARGET = tme
+aethyra_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) `pkg-config --libs libxml-2.0`
+aethyra_CXXFLAGS = -Wall $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` $(CURL_CFLAGS)
+aethyra_LDADD = $(LIBSDL_LIBS) -lguichan_sdl $(CURL_LIBS)
+aethyra_TARGET = aethyra
diff --git a/src/aethyra.rc b/src/aethyra.rc
new file mode 100644
index 00000000..f35c547d
--- /dev/null
+++ b/src/aethyra.rc
@@ -0,0 +1,23 @@
+#include <windows.h> // include for version info constants
+
+#include "winver.h"
+
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/aethyra.ico"
+
+1 VERSIONINFO
+FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
+PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
+FILETYPE VFT_APP {
+    BLOCK "StringFileInfo" {
+        BLOCK "040904E4" {
+            VALUE "CompanyName", "Aethyra Development Team"
+            VALUE "FileVersion", PACKAGE_VERSION
+            VALUE "FileDescription", "Aethyra Experiment"
+            VALUE "LegalCopyright", "2008 (C)"
+            VALUE "OriginalFilename", "aethyra.exe"
+            VALUE "ProductName", "Aethyra MMORPG"
+            VALUE "ProductVersion", PACKAGE_VERSION
+        }
+    }
+}
+
diff --git a/src/game.cpp b/src/game.cpp
index 2522c6e5..261fa157 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -357,11 +357,11 @@ bool saveScreenshot(SDL_Surface *screenshot)
     screenshotCount++;
     filename.str("");
 #if (defined __USE_UNIX98 || defined __FreeBSD__)
-    filename << PHYSFS_getUserDir() << ".tme/";
+    filename << PHYSFS_getUserDir() << ".aethyra/";
 #elif defined __APPLE__
     filename << PHYSFS_getUserDir() << "Desktop/";
 #endif
-    filename << "TMW_Screenshot_" << screenshotCount << ".png";
+    filename << "Aethyra_Screenshot_" << screenshotCount << ".png";
     testExists.open(filename.str().c_str(), std::ios::in);
     found = !testExists.is_open();
     testExists.close();
diff --git a/src/main.cpp b/src/main.cpp
index cc30ec0a..92e18906 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -198,18 +198,18 @@ void setUpdatesDir()
  */
 void init_engine(const Options &options)
 {
-    homeDir = std::string(PHYSFS_getUserDir()) + "/.tme";
+    homeDir = std::string(PHYSFS_getUserDir()) + "/.aethyra";
 #if defined WIN32
     if (!CreateDirectory(homeDir.c_str(), 0) &&
             GetLastError() != ERROR_ALREADY_EXISTS)
 #elif defined __APPLE__
-    // Use Application Directory instead of .tme
+    // Use Application Directory instead of .aethyra
     homeDir = std::string(PHYSFS_getUserDir()) +
-        "/Library/Application Support/The Mana Experiment";
+        "/Library/Application Support/Aethyra";
     if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) &&
             (errno != EEXIST))
 #else
-    // Checking if /home/user/.tme folder exists.
+    // Checking if /home/user/.Aethyra folder exists.
     if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) &&
             (errno != EEXIST))
 #endif
@@ -221,12 +221,12 @@ void init_engine(const Options &options)
     }
 
     // Set log file
-    logger->setLogFile(homeDir + std::string("/tme.log"));
+    logger->setLogFile(homeDir + std::string("/aethyra.log"));
 
     #ifdef PACKAGE_VERSION
-        logger->log("Starting The Mana Experiment Version %s", PACKAGE_VERSION);
+        logger->log("Starting Aethyra Version %s", PACKAGE_VERSION);
     #else
-        logger->log("Starting The Mana Experiment - Version not defined");
+        logger->log("Starting Aethyra - Version not defined");
     #endif
 
     // Initialize SDL
@@ -268,7 +268,7 @@ void init_engine(const Options &options)
     strncat(path, "/data", PATH_MAX - 1);
     resman->addToSearchPath(path, true);
 #else
-    resman->addToSearchPath(TME_DATADIR "data", true);
+    resman->addToSearchPath(AETHYRA_DATADIR "data", true);
 #endif
 
     // Fill configuration with defaults
@@ -294,28 +294,28 @@ void init_engine(const Options &options)
 
     // Checking if the configuration file exists... otherwise creates it with
     // default options !
-    FILE *tmeFile = 0;
+    FILE *aethyraFile = 0;
     std::string configPath = options.configPath;
 
     if (configPath.empty())
         configPath = homeDir + "/config.xml";
 
-    tmeFile = fopen(configPath.c_str(), "r");
+    aethyraFile = fopen(configPath.c_str(), "r");
 
     // If we can't read it, it doesn't exist !
-    if (tmeFile == NULL) {
+    if (aethyraFile == NULL) {
         // We reopen the file in write mode and we create it
-        tmeFile = fopen(configPath.c_str(), "wt");
+        aethyraFile = fopen(configPath.c_str(), "wt");
     }
-    if (tmeFile == NULL) {
+    if (aethyraFile == NULL) {
         std::cout << "Can't create " << configPath << ". "
             "Using Defaults." << std::endl;
     } else {
-        fclose(tmeFile);
+        fclose(aethyraFile);
         config.init(configPath);
     }
 
-    SDL_WM_SetCaption("The Mana Experiment", NULL);
+    SDL_WM_SetCaption("Aethyra", NULL);
 #ifdef WIN32
     static SDL_SysWMinfo pInfo;
     SDL_GetWMInfo(&pInfo);
@@ -325,7 +325,7 @@ void init_engine(const Options &options)
         SetClassLong(pInfo.window, GCL_HICON, (LONG) icon);
     }
 #else
-    SDL_Surface *icon = IMG_Load(TME_DATADIR "data/icons/tme.png");
+    SDL_Surface *icon = IMG_Load(AETHYRA_DATADIR "data/icons/aethyra.png");
     if (icon)
     {
         SDL_SetAlpha(icon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
@@ -422,7 +422,7 @@ void exit_engine()
 void printHelp()
 {
     std::cout
-        << "tme" << std::endl << std::endl
+        << "aethyra" << std::endl << std::endl
         << "Options: " << std::endl
         << "  -h --help       : Display this help" << std::endl
         << "  -v --version    : Display the version" << std::endl
@@ -439,10 +439,10 @@ void printHelp()
 void printVersion()
 {
 #ifdef PACKAGE_VERSION
-    std::cout << "The Mana Experiment version " << PACKAGE_VERSION <<
+    std::cout << "Aethyra version " << PACKAGE_VERSION <<
         std::endl;
 #else
-    std::cout << "The Mana Experiment version " <<
+    std::cout << "Aethyra version " <<
              "(local build?, PACKAGE_VERSION is not defined)" << std::endl;
 #endif
 }
diff --git a/src/main.h b/src/main.h
index 1f9aa9d0..8dfc51cf 100644
--- a/src/main.h
+++ b/src/main.h
@@ -32,8 +32,8 @@
 #include "winver.h"
 #endif
 
-#ifndef TME_DATADIR
-#define TME_DATADIR ""
+#ifndef AETHYRA_DATADIR
+#define AETHYRA_DATADIR ""
 #endif
 
 /*
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index ae255144..16a2c470 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -219,7 +219,7 @@ ResourceManager::getPath(const std::string &file)
     else
     {
         // if not found in search path return the default path
-        path = std::string(TME_DATADIR) + std::string("data") + "/" + file;
+        path = std::string(AETHYRA_DATADIR) + std::string("data") + "/" + file;
     }
 
     return path;
diff --git a/src/text.h b/src/text.h
index 04b213b3..19d75018 100644
--- a/src/text.h
+++ b/src/text.h
@@ -19,8 +19,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _TME_TEXT_H
-#define _TME_TEXT_H
+#ifndef _AETHYRA_TEXT_H
+#define _AETHYRA_TEXT_H
 
 #include "graphics.h"
 
diff --git a/src/textmanager.h b/src/textmanager.h
index 53419240..5b21ba81 100644
--- a/src/textmanager.h
+++ b/src/textmanager.h
@@ -19,8 +19,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _TME_TEXTMANAGER_H
-#define _TME_TEXTMANAGER_H
+#ifndef _AETHYRA_TEXTMANAGER_H
+#define _AETHYRA_TEXTMANAGER_H
 
 #include <list>
 
diff --git a/src/tme.rc b/src/tme.rc
deleted file mode 100644
index 495d0675..00000000
--- a/src/tme.rc
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <windows.h> // include for version info constants
-
-#include "winver.h"
-
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tme.ico"
-
-1 VERSIONINFO
-FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
-PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
-FILETYPE VFT_APP {
-    BLOCK "StringFileInfo" {
-        BLOCK "040904E4" {
-            VALUE "CompanyName", "The Mana Experiment Development Team"
-            VALUE "FileVersion", PACKAGE_VERSION
-            VALUE "FileDescription", "The Mana Experiment"
-            VALUE "LegalCopyright", "2008 (C)"
-            VALUE "OriginalFilename", "tme.exe"
-            VALUE "ProductName", "The Mana Experiment MMORPG"
-            VALUE "ProductVersion", PACKAGE_VERSION
-        }
-    }
-}
-
diff --git a/tme.cbp b/tme.cbp
deleted file mode 100644
index e51141a2..00000000
--- a/tme.cbp
+++ /dev/null
@@ -1,383 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="The Mana Experiment" />
-		<Option pch_mode="0" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="default">
-				<Option output="tme.exe" prefix_auto="0" extension_auto="0" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Option projectResourceIncludeDirsRelation="0" />
-				<Compiler>
-					<Add option="-Wall" />
-					<Add option="-DUSE_OPENGL" />
-					<Add option="-DNOGDI" />
-				</Compiler>
-				<Linker>
-					<Add library="guichan" />
-					<Add library="guichan_sdl" />
-					<Add library="guichan_opengl" />
-					<Add library="wsock32" />
-					<Add library="SDL_image" />
-					<Add library="SDL_mixer" />
-					<Add library="SDL_net" />
-					<Add library="mingw32" />
-					<Add library="SDLmain" />
-					<Add library="SDL.dll" />
-					<Add library="xml2.dll" />
-					<Add library="opengl32" />
-					<Add library="png12.dll" />
-					<Add library="z.dll" />
-					<Add library="physfs" />
-					<Add library="curl.dll" />
-				</Linker>
-			</Target>
-			<Target title="unix">
-				<Option platforms="Unix;" />
-				<Option output="tme" prefix_auto="1" extension_auto="1" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="`sdl-config --cflags`" />
-					<Add directory="/usr/local/include/libxml2" />
-				</Compiler>
-				<Linker>
-					<Add option="`sdl-config --libs`" />
-					<Add library="guichan" />
-					<Add library="guichan_sdl" />
-					<Add library="guichan_opengl" />
-					<Add library="GL" />
-					<Add library="physfs" />
-					<Add library="curl" />
-					<Add library="xml2" />
-					<Add library="SDL_mixer" />
-					<Add library="SDL_net" />
-					<Add library="SDL_image" />
-					<Add library="png" />
-				</Linker>
-			</Target>
-		</Build>
-		<VirtualTargets>
-			<Add alias="All" targets="default;" />
-		</VirtualTargets>
-		<Compiler>
-			<Add directory="../../../../../../mingw/include/SDL" />
-		</Compiler>
-		<Unit filename="src/animatedsprite.cpp" />
-		<Unit filename="src/animatedsprite.h" />
-		<Unit filename="src/animationparticle.cpp" />
-		<Unit filename="src/animationparticle.h" />
-		<Unit filename="src/being.cpp" />
-		<Unit filename="src/being.h" />
-		<Unit filename="src/beingmanager.cpp" />
-		<Unit filename="src/beingmanager.h" />
-		<Unit filename="src/configlistener.h" />
-		<Unit filename="src/configuration.cpp" />
-		<Unit filename="src/configuration.h" />
-		<Unit filename="src/engine.cpp" />
-		<Unit filename="src/engine.h" />
-		<Unit filename="src/equipment.cpp" />
-		<Unit filename="src/equipment.h" />
-		<Unit filename="src/floor_item.cpp" />
-		<Unit filename="src/floor_item.h" />
-		<Unit filename="src/flooritemmanager.cpp" />
-		<Unit filename="src/flooritemmanager.h" />
-		<Unit filename="src/game.cpp" />
-		<Unit filename="src/game.h" />
-		<Unit filename="src/graphics.cpp" />
-		<Unit filename="src/graphics.h" />
-		<Unit filename="src/gui/box.cpp" />
-		<Unit filename="src/gui/box.h" />
-		<Unit filename="src/gui/browserbox.cpp" />
-		<Unit filename="src/gui/browserbox.h" />
-		<Unit filename="src/gui/button.cpp" />
-		<Unit filename="src/gui/button.h" />
-		<Unit filename="src/gui/buy.cpp" />
-		<Unit filename="src/gui/buy.h" />
-		<Unit filename="src/gui/buysell.cpp" />
-		<Unit filename="src/gui/buysell.h" />
-		<Unit filename="src/gui/chargedialog.cpp" />
-		<Unit filename="src/gui/chargedialog.h" />
-		<Unit filename="src/gui/char_select.cpp" />
-		<Unit filename="src/gui/char_select.h" />
-		<Unit filename="src/gui/char_server.cpp" />
-		<Unit filename="src/gui/char_server.h" />
-		<Unit filename="src/gui/chat.cpp" />
-		<Unit filename="src/gui/chat.h" />
-		<Unit filename="src/gui/chatinput.cpp" />
-		<Unit filename="src/gui/chatinput.h" />
-		<Unit filename="src/gui/checkbox.cpp" />
-		<Unit filename="src/gui/checkbox.h" />
-		<Unit filename="src/gui/confirm_dialog.cpp" />
-		<Unit filename="src/gui/confirm_dialog.h" />
-		<Unit filename="src/gui/connection.cpp" />
-		<Unit filename="src/gui/connection.h" />
-		<Unit filename="src/gui/debugwindow.cpp" />
-		<Unit filename="src/gui/debugwindow.h" />
-		<Unit filename="src/gui/equipmentwindow.cpp" />
-		<Unit filename="src/gui/equipmentwindow.h" />
-		<Unit filename="src/gui/focushandler.cpp" />
-		<Unit filename="src/gui/focushandler.h" />
-		<Unit filename="src/gui/gccontainer.cpp" />
-		<Unit filename="src/gui/gccontainer.h" />
-		<Unit filename="src/gui/gui.cpp" />
-		<Unit filename="src/gui/gui.h" />
-		<Unit filename="src/gui/hbox.cpp" />
-		<Unit filename="src/gui/hbox.h" />
-		<Unit filename="src/gui/help.cpp" />
-		<Unit filename="src/gui/help.h" />
-		<Unit filename="src/gui/inttextbox.cpp" />
-		<Unit filename="src/gui/inttextbox.h" />
-		<Unit filename="src/gui/inventorywindow.cpp" />
-		<Unit filename="src/gui/inventorywindow.h" />
-		<Unit filename="src/gui/itemcontainer.cpp" />
-		<Unit filename="src/gui/itemcontainer.h" />
-		<Unit filename="src/gui/itemshortcutcontainer.cpp" />
-		<Unit filename="src/gui/itemshortcutcontainer.h" />
-		<Unit filename="src/gui/itemshortcutwindow.cpp" />
-		<Unit filename="src/gui/itemshortcutwindow.h" />
-		<Unit filename="src/gui/item_amount.cpp" />
-		<Unit filename="src/gui/item_amount.h" />
-		<Unit filename="src/gui/linkhandler.h" />
-		<Unit filename="src/gui/listbox.cpp" />
-		<Unit filename="src/gui/listbox.h" />
-		<Unit filename="src/gui/login.cpp" />
-		<Unit filename="src/gui/login.h" />
-		<Unit filename="src/gui/menuwindow.cpp" />
-		<Unit filename="src/gui/menuwindow.h" />
-		<Unit filename="src/gui/minimap.cpp" />
-		<Unit filename="src/gui/minimap.h" />
-		<Unit filename="src/gui/ministatus.cpp" />
-		<Unit filename="src/gui/ministatus.h" />
-		<Unit filename="src/gui/npc_text.cpp" />
-		<Unit filename="src/gui/npc_text.h" />
-		<Unit filename="src/gui/npclistdialog.cpp" />
-		<Unit filename="src/gui/npclistdialog.h" />
-		<Unit filename="src/gui/ok_dialog.cpp" />
-		<Unit filename="src/gui/ok_dialog.h" />
-		<Unit filename="src/gui/passwordfield.cpp" />
-		<Unit filename="src/gui/passwordfield.h" />
-		<Unit filename="src/gui/playerbox.cpp" />
-		<Unit filename="src/gui/playerbox.h" />
-		<Unit filename="src/gui/popupmenu.cpp" />
-		<Unit filename="src/gui/popupmenu.h" />
-		<Unit filename="src/gui/progressbar.cpp" />
-		<Unit filename="src/gui/progressbar.h" />
-		<Unit filename="src/gui/radiobutton.cpp" />
-		<Unit filename="src/gui/radiobutton.h" />
-		<Unit filename="src/gui/register.cpp" />
-		<Unit filename="src/gui/register.h" />
-		<Unit filename="src/gui/scrollarea.cpp" />
-		<Unit filename="src/gui/scrollarea.h" />
-		<Unit filename="src/gui/sell.cpp" />
-		<Unit filename="src/gui/sell.h" />
-		<Unit filename="src/gui/setup.cpp" />
-		<Unit filename="src/gui/setup.h" />
-		<Unit filename="src/gui/setup_audio.cpp" />
-		<Unit filename="src/gui/setup_audio.h" />
-		<Unit filename="src/gui/setup_joystick.cpp" />
-		<Unit filename="src/gui/setup_joystick.h" />
-		<Unit filename="src/gui/setup_keyboard.cpp" />
-		<Unit filename="src/gui/setup_keyboard.h" />
-		<Unit filename="src/gui/setup_players.cpp" />
-		<Unit filename="src/gui/setup_players.h" />
-		<Unit filename="src/gui/setup_video.cpp" />
-		<Unit filename="src/gui/setup_video.h" />
-		<Unit filename="src/gui/setuptab.h" />
-		<Unit filename="src/gui/shop.cpp" />
-		<Unit filename="src/gui/shop.h" />
-		<Unit filename="src/gui/shoplistbox.cpp" />
-		<Unit filename="src/gui/shoplistbox.h" />
-		<Unit filename="src/gui/skill.cpp" />
-		<Unit filename="src/gui/skill.h" />
-		<Unit filename="src/gui/slider.cpp" />
-		<Unit filename="src/gui/slider.h" />
-		<Unit filename="src/gui/status.cpp" />
-		<Unit filename="src/gui/status.h" />
-		<Unit filename="src/gui/tabbedcontainer.cpp" />
-		<Unit filename="src/gui/tabbedcontainer.h" />
-		<Unit filename="src/gui/table.cpp" />
-		<Unit filename="src/gui/table.h" />
-		<Unit filename="src/gui/table_model.cpp" />
-		<Unit filename="src/gui/table_model.h" />
-		<Unit filename="src/gui/textbox.cpp" />
-		<Unit filename="src/gui/textbox.h" />
-		<Unit filename="src/gui/textfield.cpp" />
-		<Unit filename="src/gui/textfield.h" />
-		<Unit filename="src/gui/trade.cpp" />
-		<Unit filename="src/gui/trade.h" />
-		<Unit filename="src/gui/updatewindow.cpp" />
-		<Unit filename="src/gui/updatewindow.h" />
-		<Unit filename="src/gui/vbox.cpp" />
-		<Unit filename="src/gui/vbox.h" />
-		<Unit filename="src/gui/viewport.cpp" />
-		<Unit filename="src/gui/viewport.h" />
-		<Unit filename="src/gui/widgets/dropdown.cpp"/>
-		<Unit filename="src/gui/widgets/dropdown.h" />
-		<Unit filename="src/gui/widgets/resizegrip.cpp" />
-		<Unit filename="src/gui/widgets/resizegrip.h" />
-		<Unit filename="src/gui/window.cpp" />
-		<Unit filename="src/gui/window.h" />
-		<Unit filename="src/gui/windowcontainer.cpp" />
-		<Unit filename="src/gui/windowcontainer.h" />
-		<Unit filename="src/guichanfwd.h" />
-		<Unit filename="src/imageparticle.cpp" />
-		<Unit filename="src/imageparticle.h" />
-		<Unit filename="src/inventory.cpp" />
-		<Unit filename="src/inventory.h" />
-		<Unit filename="src/item.cpp" />
-		<Unit filename="src/item.h" />
-		<Unit filename="src/itemshortcut.cpp" />
-		<Unit filename="src/itemshortcut.h" />
-		<Unit filename="src/joystick.cpp" />
-		<Unit filename="src/joystick.h" />
-		<Unit filename="src/keyboardconfig.cpp" />
-		<Unit filename="src/keyboardconfig.h" />
-		<Unit filename="src/localplayer.cpp" />
-		<Unit filename="src/localplayer.h" />
-		<Unit filename="src/lockedarray.h" />
-		<Unit filename="src/log.cpp" />
-		<Unit filename="src/log.h" />
-		<Unit filename="src/logindata.h" />
-		<Unit filename="src/main.cpp" />
-		<Unit filename="src/main.h" />
-		<Unit filename="src/map.cpp" />
-		<Unit filename="src/map.h" />
-		<Unit filename="src/monster.cpp" />
-		<Unit filename="src/monster.h" />
-		<Unit filename="src/net/beinghandler.cpp" />
-		<Unit filename="src/net/beinghandler.h" />
-		<Unit filename="src/net/buysellhandler.cpp" />
-		<Unit filename="src/net/buysellhandler.h" />
-		<Unit filename="src/net/charserverhandler.cpp" />
-		<Unit filename="src/net/charserverhandler.h" />
-		<Unit filename="src/net/chathandler.cpp" />
-		<Unit filename="src/net/chathandler.h" />
-		<Unit filename="src/net/equipmenthandler.cpp" />
-		<Unit filename="src/net/equipmenthandler.h" />
-		<Unit filename="src/net/inventoryhandler.cpp" />
-		<Unit filename="src/net/inventoryhandler.h" />
-		<Unit filename="src/net/itemhandler.cpp" />
-		<Unit filename="src/net/itemhandler.h" />
-		<Unit filename="src/net/loginhandler.cpp" />
-		<Unit filename="src/net/loginhandler.h" />
-		<Unit filename="src/net/maploginhandler.cpp" />
-		<Unit filename="src/net/maploginhandler.h" />
-		<Unit filename="src/net/messagehandler.cpp" />
-		<Unit filename="src/net/messagehandler.h" />
-		<Unit filename="src/net/messagein.cpp" />
-		<Unit filename="src/net/messagein.h" />
-		<Unit filename="src/net/messageout.cpp" />
-		<Unit filename="src/net/messageout.h" />
-		<Unit filename="src/net/network.cpp" />
-		<Unit filename="src/net/network.h" />
-		<Unit filename="src/net/npchandler.cpp" />
-		<Unit filename="src/net/npchandler.h" />
-		<Unit filename="src/net/partyhandler.cpp"/>
-		<Unit filename="src/net/partyhandler.h" />
-		<Unit filename="src/net/playerhandler.cpp" />
-		<Unit filename="src/net/playerhandler.h" />
-		<Unit filename="src/net/protocol.cpp" />
-		<Unit filename="src/net/protocol.h" />
-		<Unit filename="src/net/skillhandler.cpp" />
-		<Unit filename="src/net/skillhandler.h" />
-		<Unit filename="src/net/tradehandler.cpp" />
-		<Unit filename="src/net/tradehandler.h" />
-		<Unit filename="src/npc.cpp" />
-		<Unit filename="src/npc.h" />
-		<Unit filename="src/openglgraphics.cpp" />
-		<Unit filename="src/openglgraphics.h" />
-		<Unit filename="src/particle.cpp" />
-		<Unit filename="src/particle.h" />
-		<Unit filename="src/particleemitter.cpp" />
-		<Unit filename="src/particleemitter.h" />
-                <Unit filename="src/party.cpp" />
-		<Unit filename="src/party.h" />
-		<Unit filename="src/player.cpp" />
-		<Unit filename="src/player.h" />
-		<Unit filename="src/player_relations.cpp" />
-		<Unit filename="src/player_relations.h" />
-		<Unit filename="src/properties.h" />
-		<Unit filename="src/recorder.cpp" />
-		<Unit filename="src/recorder.h" />
-		<Unit filename="src/resources/action.cpp" />
-		<Unit filename="src/resources/action.h" />
-		<Unit filename="src/resources/ambientoverlay.cpp" />
-		<Unit filename="src/resources/ambientoverlay.h" />
-		<Unit filename="src/resources/animation.cpp" />
-		<Unit filename="src/resources/animation.h" />
-		<Unit filename="src/resources/buddylist.cpp"/>
-		<Unit filename="src/resources/buddylist.h" />
-		<Unit filename="src/resources/dye.cpp" />
-		<Unit filename="src/resources/dye.h" />
-		<Unit filename="src/resources/image.cpp" />
-		<Unit filename="src/resources/image.h" />
-		<Unit filename="src/resources/imageloader.cpp" />
-		<Unit filename="src/resources/imageloader.h" />
-		<Unit filename="src/resources/imageset.cpp" />
-		<Unit filename="src/resources/imageset.h" />
-		<Unit filename="src/resources/imagewriter.cpp" />
-		<Unit filename="src/resources/imagewriter.h" />
-		<Unit filename="src/resources/itemdb.cpp" />
-		<Unit filename="src/resources/itemdb.h" />
-		<Unit filename="src/resources/iteminfo.cpp" />
-		<Unit filename="src/resources/iteminfo.h" />
-		<Unit filename="src/resources/mapreader.cpp" />
-		<Unit filename="src/resources/mapreader.h" />
-		<Unit filename="src/resources/monsterdb.cpp" />
-		<Unit filename="src/resources/monsterdb.h" />
-		<Unit filename="src/resources/monsterinfo.cpp" />
-		<Unit filename="src/resources/monsterinfo.h" />
-		<Unit filename="src/resources/music.cpp" />
-		<Unit filename="src/resources/music.h" />
-		<Unit filename="src/resources/npcdb.cpp" />
-		<Unit filename="src/resources/npcdb.h" />
-		<Unit filename="src/resources/resource.cpp" />
-		<Unit filename="src/resources/resource.h" />
-		<Unit filename="src/resources/resourcemanager.cpp" />
-		<Unit filename="src/resources/resourcemanager.h" />
-		<Unit filename="src/resources/soundeffect.cpp" />
-		<Unit filename="src/resources/soundeffect.h" />
-		<Unit filename="src/resources/spritedef.cpp" />
-		<Unit filename="src/resources/spritedef.h" />
-		<Unit filename="src/serverinfo.h" />
-		<Unit filename="src/simpleanimation.cpp" />
-		<Unit filename="src/simpleanimation.h" />
-		<Unit filename="src/sound.cpp" />
-		<Unit filename="src/sound.h" />
-		<Unit filename="src/sprite.h" />
-		<Unit filename="src/text.cpp" />
-		<Unit filename="src/text.h" />
-		<Unit filename="src/textmanager.cpp" />
-		<Unit filename="src/textmanager.h" />
-		<Unit filename="src/textparticle.cpp" />
-		<Unit filename="src/textparticle.h" />
-		<Unit filename="src/tileset.h" />
-		<Unit filename="src/tme.rc">
-			<Option compilerVar="WINDRES" />
-			<Option target="&lt;{~None~}&gt;" />
-		</Unit>
-		<Unit filename="src/utils/base64.cpp" />
-		<Unit filename="src/utils/base64.h" />
-		<Unit filename="src/utils/dtor.h" />
-		<Unit filename="src/utils/fastsqrt.h" />
-		<Unit filename="src/utils/strprintf.cpp" />
-		<Unit filename="src/utils/strprintf.h" />
-		<Unit filename="src/utils/tostring.h" />
-		<Unit filename="src/utils/xml.cpp" />
-		<Unit filename="src/utils/xml.h" />
-		<Unit filename="src/winver.h">
-			<Option target="unix" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
diff --git a/tme.desktop b/tme.desktop
deleted file mode 100644
index cff8d732..00000000
--- a/tme.desktop
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=The Mana Experiment
-Name[fr]=L'expérimentation de Mana
-Comment=An on-line fantasy role playing game
-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
-Exec=tme
-StartupNotify=false
-Terminal=false
-Type=Application
-Icon=tmw.png
-Categories=Application;Game
-- 
cgit v1.2.3-70-g09d2


From 9aee6ce7fd3ab06f1f20dc6d7977281fc12f6009 Mon Sep 17 00:00:00 2001
From: Kraant <kraant@gmail.com>
Date: Thu, 7 Aug 2008 22:20:22 +0000
Subject: Updated default game and updates servers

---
 src/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 92e18906..f8e3d3c0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -273,7 +273,7 @@ void init_engine(const Options &options)
 
     // Fill configuration with defaults
     logger->log("Initializing configuration...");
-    config.setValue("host", "216.139.126.36");
+    config.setValue("host", "209.168.213.109");
     config.setValue("port", 6901);
     config.setValue("hwaccel", 0);
 #if (defined __APPLE__ || defined WIN32) && defined USE_OPENGL
@@ -288,7 +288,7 @@ void init_engine(const Options &options)
     config.setValue("sfxVolume", 100);
     config.setValue("musicVolume", 60);
     config.setValue("fpslimit", 60);
-    config.setValue("updatehost", "http://216.139.126.36/updates");
+    config.setValue("updatehost", "http://209.168.213.109/updates");
     config.setValue("customcursor", 1);
     config.setValue("ChatLogLength", 128);
 
-- 
cgit v1.2.3-70-g09d2


From 76d7ca358555224177a594f0b38cb247de74355f Mon Sep 17 00:00:00 2001
From: Kraant <kraant@gmail.com>
Date: Thu, 7 Aug 2008 22:24:04 +0000
Subject: Changes saving screenshots from Aethyra_ScreenShot_ to Ae_Screenshot
 in game.cpp

---
 src/game.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game.cpp b/src/game.cpp
index 261fa157..12d3947e 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -361,7 +361,7 @@ bool saveScreenshot(SDL_Surface *screenshot)
 #elif defined __APPLE__
     filename << PHYSFS_getUserDir() << "Desktop/";
 #endif
-    filename << "Aethyra_Screenshot_" << screenshotCount << ".png";
+    filename << "Ae_Screenshot_" << screenshotCount << ".png";
     testExists.open(filename.str().c_str(), std::ios::in);
     found = !testExists.is_open();
     testExists.close();
-- 
cgit v1.2.3-70-g09d2


From 0f033c073c7ae630c9359da358128f5f425f01a6 Mon Sep 17 00:00:00 2001
From: Douglas Boffey <DougABoffey@netscape.net>
Date: Fri, 8 Aug 2008 09:05:28 +0000
Subject: Changed the status window so that all the information appears by
 default

---
 src/gui/status.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index cba815b5..995b0149 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -41,7 +41,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     setResizable(true);
     setCloseButton(true);
     setDefaultSize((windowContainer->getWidth() - 365) / 2,
-                   (windowContainer->getHeight() - 255) / 2, 365, 255);
+                   (windowContainer->getHeight() - 255) / 2, 365, 275);
     loadWindowState();
 
     // ----------------------
-- 
cgit v1.2.3-70-g09d2


From 3b9bd9ea1a54f312848b20a889498eb1f6e3bf44 Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Sat, 9 Aug 2008 06:34:41 +0000
Subject: Changed --skipupdate functionality to just skip the actual downloads

---
 ChangeLog    |  5 +++++
 src/main.cpp | 25 +++++++++++++------------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6ca075b7..2bb8660f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-08  Lloyd Bryant ("Sanga")	<lloyd_bryant@netzero.net>
+
+	* Made "--skipupdate" skip the update download process, but
+	  still load whatever updates have been previously downloaded.
+
 2008-07-25  Lloyd Bryant ("Sanga")	<lloyd_bryant@netzero.net>
 
 	* Added feature to remember window locations from one 
diff --git a/src/main.cpp b/src/main.cpp
index f8e3d3c0..89bc8e6b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -426,7 +426,7 @@ void printHelp()
         << "Options: " << std::endl
         << "  -h --help       : Display this help" << std::endl
         << "  -v --version    : Display the version" << std::endl
-        << "  -u --skipupdate : Skip the update process" << std::endl
+        << "  -u --skipupdate : Skip the update downloads" << std::endl
         << "  -U --username   : Login with this username" << std::endl
         << "  -P --password   : Login with this password" << std::endl
         << "  -D --default    : Bypass the login process with default "
@@ -757,15 +757,11 @@ int main(int argc, char *argv[])
             switch (oldstate)
             {
                 case UPDATE_STATE:
-                    if (options.skipUpdate) {
-                        state = LOADDATA_STATE;
-                    } else {
-                        loadUpdates();
-                        // Reload the wallpaper in case that it was updated
-                        login_wallpaper->decRef();
-                        login_wallpaper = ResourceManager::getInstance()->
-                            getImage("graphics/images/login_wallpaper.png");
-                    }
+                    loadUpdates();
+                    // Reload the wallpaper in case that it was updated
+                    login_wallpaper->decRef();
+                    login_wallpaper = ResourceManager::getInstance()->
+                        getImage("graphics/images/login_wallpaper.png");
                     break;
 
                     // Those states don't cause a network disconnect
@@ -890,8 +886,13 @@ int main(int argc, char *argv[])
 
                     setUpdatesDir();
                     logger->log("State: UPDATE");
-                    currentDialog = new UpdaterWindow(updateHost,
-                            homeDir + "/" + updatesDir);
+
+                    if (options.skipUpdate) {
+                        state = LOADDATA_STATE;
+                    } else {
+                        currentDialog = new UpdaterWindow(updateHost,
+                                                homeDir + "/" + updatesDir);
+                    }
                     break;
 
                 case ERROR_STATE:
-- 
cgit v1.2.3-70-g09d2


From ccacde4192268fbf5250e9bd6894d158f957922c Mon Sep 17 00:00:00 2001
From: Kraant <kraant@gmail.com>
Date: Sun, 10 Aug 2008 10:56:58 +0000
Subject: Set headers for CURL so that proxies won't cache files to fix bug
 that causes resources2.txt to be old and out of sync with the files in the
 directory.

---
 src/gui/updatewindow.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index d8f23171..90cd66da 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -317,6 +317,13 @@ int UpdaterWindow::downloadThread(void *ptr)
             curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
             curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 15);
 
+            /*caching breaks things when resources2.txt is cached
+             *so caching is turned off on the proxy with this header
+             *change*/
+            struct curl_slist *pHeaders=NULL;
+            pHeaders = curl_slist_append(pHeaders, "pragma: no-cache");  
+            curl_easy_setopt(curl, CURLOPT_HTTPHEADER, pHeaders); 
+
             if ((res = curl_easy_perform(curl)) != 0)
             {
                 uw->mDownloadStatus = UPDATE_ERROR;
@@ -341,6 +348,8 @@ int UpdaterWindow::downloadThread(void *ptr)
 
             curl_easy_cleanup(curl);
 
+            curl_slist_free_all(pHeaders); 
+
             if (!uw->mStoreInMemory)
             {
                 // Don't check resources2.txt checksum
-- 
cgit v1.2.3-70-g09d2


From 3206b3254a1a9b90bbdbd1a7178e4df043a5ee26 Mon Sep 17 00:00:00 2001
From: Kraant <kraant@gmail.com>
Date: Sun, 10 Aug 2008 13:00:33 +0000
Subject: Changed proxy fix to only tell the proxy to no-cache for news.txt and
 resources2.txt and added linux to windows cross-compile codeblocks file.

---
 AethyraLin2WinXcompile.cbp | 380 +++++++++++++++++++++++++++++++++++++++++++++
 src/gui/updatewindow.cpp   |  17 +-
 2 files changed, 391 insertions(+), 6 deletions(-)
 create mode 100644 AethyraLin2WinXcompile.cbp

diff --git a/AethyraLin2WinXcompile.cbp b/AethyraLin2WinXcompile.cbp
new file mode 100644
index 00000000..6b5e9a16
--- /dev/null
+++ b/AethyraLin2WinXcompile.cbp
@@ -0,0 +1,380 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="Aethyra" />
+		<Option pch_mode="0" />
+		<Option compiler="mingw" />
+		<Build>
+			<Target title="default">
+				<Option output="aethyra.exe" prefix_auto="0" extension_auto="0" />
+				<Option type="0" />
+				<Option compiler="mingw" />
+				<Option projectResourceIncludeDirsRelation="0" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-DUSE_OPENGL" />
+					<Add option="-DNOGDI" />
+					<Add directory="../../../../../../mingw/include/SDL" />
+					<Add directory="/home/kraant/manaworld/Windows/tmw-svn-0.0.x/include" />
+					<Add directory="/home/kraant/manaworld/Windows/tmw-svn-0.0.x/include/SDL" />
+				</Compiler>
+				<Linker>
+					<Add library="guichan" />
+					<Add library="guichan_sdl" />
+					<Add library="guichan_opengl" />
+					<Add library="wsock32" />
+					<Add library="SDL_image" />
+					<Add library="SDL_mixer" />
+					<Add library="SDL_net" />
+					<Add library="mingw32" />
+					<Add library="SDLmain" />
+					<Add library="SDL.dll" />
+					<Add library="xml2.dll" />
+					<Add library="opengl32" />
+					<Add library="png12.dll" />
+					<Add library="z.dll" />
+					<Add library="physfs" />
+					<Add library="curl.dll" />
+					<Add directory="/home/kraant/manaworld/Windows/tmw-svn-0.0.x/lib" />
+				</Linker>
+			</Target>
+			<Target title="unix">
+				<Option platforms="Unix;" />
+				<Option output="tmw" prefix_auto="1" extension_auto="1" />
+				<Option type="0" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add option="`sdl-config --cflags`" />
+					<Add directory="/usr/local/include/libxml2" />
+				</Compiler>
+				<Linker>
+					<Add option="`sdl-config --libs`" />
+					<Add library="guichan" />
+					<Add library="guichan_sdl" />
+					<Add library="guichan_opengl" />
+					<Add library="GL" />
+					<Add library="physfs" />
+					<Add library="curl" />
+					<Add library="xml2" />
+					<Add library="SDL_mixer" />
+					<Add library="SDL_net" />
+					<Add library="SDL_image" />
+					<Add library="png" />
+				</Linker>
+			</Target>
+		</Build>
+		<VirtualTargets>
+			<Add alias="All" targets="default;" />
+		</VirtualTargets>
+		<Unit filename="src/animatedsprite.cpp" />
+		<Unit filename="src/animatedsprite.h" />
+		<Unit filename="src/animationparticle.cpp" />
+		<Unit filename="src/animationparticle.h" />
+		<Unit filename="src/being.cpp" />
+		<Unit filename="src/being.h" />
+		<Unit filename="src/beingmanager.cpp" />
+		<Unit filename="src/beingmanager.h" />
+		<Unit filename="src/configlistener.h" />
+		<Unit filename="src/configuration.cpp" />
+		<Unit filename="src/configuration.h" />
+		<Unit filename="src/engine.cpp" />
+		<Unit filename="src/engine.h" />
+		<Unit filename="src/equipment.cpp" />
+		<Unit filename="src/equipment.h" />
+		<Unit filename="src/floor_item.cpp" />
+		<Unit filename="src/floor_item.h" />
+		<Unit filename="src/flooritemmanager.cpp" />
+		<Unit filename="src/flooritemmanager.h" />
+		<Unit filename="src/game.cpp" />
+		<Unit filename="src/game.h" />
+		<Unit filename="src/graphics.cpp" />
+		<Unit filename="src/graphics.h" />
+		<Unit filename="src/gui/box.cpp" />
+		<Unit filename="src/gui/box.h" />
+		<Unit filename="src/gui/browserbox.cpp" />
+		<Unit filename="src/gui/browserbox.h" />
+		<Unit filename="src/gui/button.cpp" />
+		<Unit filename="src/gui/button.h" />
+		<Unit filename="src/gui/buttonbox.cpp" />
+		<Unit filename="src/gui/buttonbox.h" />
+		<Unit filename="src/gui/buy.cpp" />
+		<Unit filename="src/gui/buy.h" />
+		<Unit filename="src/gui/buysell.cpp" />
+		<Unit filename="src/gui/buysell.h" />
+		<Unit filename="src/gui/char_select.cpp" />
+		<Unit filename="src/gui/char_select.h" />
+		<Unit filename="src/gui/char_server.cpp" />
+		<Unit filename="src/gui/char_server.h" />
+		<Unit filename="src/gui/chat.cpp" />
+		<Unit filename="src/gui/chat.h" />
+		<Unit filename="src/gui/chatinput.cpp" />
+		<Unit filename="src/gui/chatinput.h" />
+		<Unit filename="src/gui/checkbox.cpp" />
+		<Unit filename="src/gui/checkbox.h" />
+		<Unit filename="src/gui/confirm_dialog.cpp" />
+		<Unit filename="src/gui/confirm_dialog.h" />
+		<Unit filename="src/gui/connection.cpp" />
+		<Unit filename="src/gui/connection.h" />
+		<Unit filename="src/gui/debugwindow.cpp" />
+		<Unit filename="src/gui/debugwindow.h" />
+		<Unit filename="src/gui/equipmentwindow.cpp" />
+		<Unit filename="src/gui/equipmentwindow.h" />
+		<Unit filename="src/gui/focushandler.cpp" />
+		<Unit filename="src/gui/focushandler.h" />
+		<Unit filename="src/gui/gccontainer.cpp" />
+		<Unit filename="src/gui/gccontainer.h" />
+		<Unit filename="src/gui/gui.cpp" />
+		<Unit filename="src/gui/gui.h" />
+		<Unit filename="src/gui/hbox.cpp" />
+		<Unit filename="src/gui/hbox.h" />
+		<Unit filename="src/gui/help.cpp" />
+		<Unit filename="src/gui/help.h" />
+		<Unit filename="src/gui/inttextbox.cpp" />
+		<Unit filename="src/gui/inttextbox.h" />
+		<Unit filename="src/gui/inventorywindow.cpp" />
+		<Unit filename="src/gui/inventorywindow.h" />
+		<Unit filename="src/gui/item_amount.cpp" />
+		<Unit filename="src/gui/item_amount.h" />
+		<Unit filename="src/gui/itemcontainer.cpp" />
+		<Unit filename="src/gui/itemcontainer.h" />
+		<Unit filename="src/gui/itemshortcutcontainer.cpp" />
+		<Unit filename="src/gui/itemshortcutcontainer.h" />
+		<Unit filename="src/gui/itemshortcutwindow.cpp" />
+		<Unit filename="src/gui/itemshortcutwindow.h" />
+		<Unit filename="src/gui/linkhandler.h" />
+		<Unit filename="src/gui/listbox.cpp" />
+		<Unit filename="src/gui/listbox.h" />
+		<Unit filename="src/gui/login.cpp" />
+		<Unit filename="src/gui/login.h" />
+		<Unit filename="src/gui/menuwindow.cpp" />
+		<Unit filename="src/gui/menuwindow.h" />
+		<Unit filename="src/gui/minimap.cpp" />
+		<Unit filename="src/gui/minimap.h" />
+		<Unit filename="src/gui/ministatus.cpp" />
+		<Unit filename="src/gui/ministatus.h" />
+		<Unit filename="src/gui/npc_text.cpp" />
+		<Unit filename="src/gui/npc_text.h" />
+		<Unit filename="src/gui/npclistdialog.cpp" />
+		<Unit filename="src/gui/npclistdialog.h" />
+		<Unit filename="src/gui/ok_dialog.cpp" />
+		<Unit filename="src/gui/ok_dialog.h" />
+		<Unit filename="src/gui/passwordfield.cpp" />
+		<Unit filename="src/gui/passwordfield.h" />
+		<Unit filename="src/gui/playerbox.cpp" />
+		<Unit filename="src/gui/playerbox.h" />
+		<Unit filename="src/gui/popup_box.h" />
+		<Unit filename="src/gui/popupmenu.cpp" />
+		<Unit filename="src/gui/popupmenu.h" />
+		<Unit filename="src/gui/progressbar.cpp" />
+		<Unit filename="src/gui/progressbar.h" />
+		<Unit filename="src/gui/radiobutton.cpp" />
+		<Unit filename="src/gui/radiobutton.h" />
+		<Unit filename="src/gui/register.cpp" />
+		<Unit filename="src/gui/register.h" />
+		<Unit filename="src/gui/scrollarea.cpp" />
+		<Unit filename="src/gui/scrollarea.h" />
+		<Unit filename="src/gui/sell.cpp" />
+		<Unit filename="src/gui/sell.h" />
+		<Unit filename="src/gui/setup.cpp" />
+		<Unit filename="src/gui/setup.h" />
+		<Unit filename="src/gui/setup_audio.cpp" />
+		<Unit filename="src/gui/setup_audio.h" />
+		<Unit filename="src/gui/setup_joystick.cpp" />
+		<Unit filename="src/gui/setup_joystick.h" />
+		<Unit filename="src/gui/setup_keyboard.cpp" />
+		<Unit filename="src/gui/setup_keyboard.h" />
+		<Unit filename="src/gui/setup_players.cpp" />
+		<Unit filename="src/gui/setup_players.h" />
+		<Unit filename="src/gui/setup_video.cpp" />
+		<Unit filename="src/gui/setup_video.h" />
+		<Unit filename="src/gui/setuptab.h" />
+		<Unit filename="src/gui/shop.cpp" />
+		<Unit filename="src/gui/shop.h" />
+		<Unit filename="src/gui/shoplistbox.cpp" />
+		<Unit filename="src/gui/shoplistbox.h" />
+		<Unit filename="src/gui/skill.cpp" />
+		<Unit filename="src/gui/skill.h" />
+		<Unit filename="src/gui/slider.cpp" />
+		<Unit filename="src/gui/slider.h" />
+		<Unit filename="src/gui/status.cpp" />
+		<Unit filename="src/gui/status.h" />
+		<Unit filename="src/gui/tabbedcontainer.cpp" />
+		<Unit filename="src/gui/tabbedcontainer.h" />
+		<Unit filename="src/gui/table.cpp" />
+		<Unit filename="src/gui/table.h" />
+		<Unit filename="src/gui/table_model.cpp" />
+		<Unit filename="src/gui/table_model.h" />
+		<Unit filename="src/gui/textbox.cpp" />
+		<Unit filename="src/gui/textbox.h" />
+		<Unit filename="src/gui/textfield.cpp" />
+		<Unit filename="src/gui/textfield.h" />
+		<Unit filename="src/gui/trade.cpp" />
+		<Unit filename="src/gui/trade.h" />
+		<Unit filename="src/gui/updatewindow.cpp" />
+		<Unit filename="src/gui/updatewindow.h" />
+		<Unit filename="src/gui/vbox.cpp" />
+		<Unit filename="src/gui/vbox.h" />
+		<Unit filename="src/gui/viewport.cpp" />
+		<Unit filename="src/gui/viewport.h" />
+		<Unit filename="src/gui/widgets/dropdown.cpp" />
+		<Unit filename="src/gui/widgets/dropdown.h" />
+		<Unit filename="src/gui/widgets/resizegrip.cpp" />
+		<Unit filename="src/gui/widgets/resizegrip.h" />
+		<Unit filename="src/gui/window.cpp" />
+		<Unit filename="src/gui/window.h" />
+		<Unit filename="src/gui/windowcontainer.cpp" />
+		<Unit filename="src/gui/windowcontainer.h" />
+		<Unit filename="src/guichanfwd.h" />
+		<Unit filename="src/imageparticle.cpp" />
+		<Unit filename="src/imageparticle.h" />
+		<Unit filename="src/inventory.cpp" />
+		<Unit filename="src/inventory.h" />
+		<Unit filename="src/item.cpp" />
+		<Unit filename="src/item.h" />
+		<Unit filename="src/itemshortcut.cpp" />
+		<Unit filename="src/itemshortcut.h" />
+		<Unit filename="src/joystick.cpp" />
+		<Unit filename="src/joystick.h" />
+		<Unit filename="src/keyboardconfig.cpp" />
+		<Unit filename="src/keyboardconfig.h" />
+		<Unit filename="src/localplayer.cpp" />
+		<Unit filename="src/localplayer.h" />
+		<Unit filename="src/lockedarray.h" />
+		<Unit filename="src/log.cpp" />
+		<Unit filename="src/log.h" />
+		<Unit filename="src/logindata.h" />
+		<Unit filename="src/main.cpp" />
+		<Unit filename="src/main.h" />
+		<Unit filename="src/map.cpp" />
+		<Unit filename="src/map.h" />
+		<Unit filename="src/monster.cpp" />
+		<Unit filename="src/monster.h" />
+		<Unit filename="src/net/beinghandler.cpp" />
+		<Unit filename="src/net/beinghandler.h" />
+		<Unit filename="src/net/buysellhandler.cpp" />
+		<Unit filename="src/net/buysellhandler.h" />
+		<Unit filename="src/net/charserverhandler.cpp" />
+		<Unit filename="src/net/charserverhandler.h" />
+		<Unit filename="src/net/chathandler.cpp" />
+		<Unit filename="src/net/chathandler.h" />
+		<Unit filename="src/net/equipmenthandler.cpp" />
+		<Unit filename="src/net/equipmenthandler.h" />
+		<Unit filename="src/net/inventoryhandler.cpp" />
+		<Unit filename="src/net/inventoryhandler.h" />
+		<Unit filename="src/net/itemhandler.cpp" />
+		<Unit filename="src/net/itemhandler.h" />
+		<Unit filename="src/net/loginhandler.cpp" />
+		<Unit filename="src/net/loginhandler.h" />
+		<Unit filename="src/net/maploginhandler.cpp" />
+		<Unit filename="src/net/maploginhandler.h" />
+		<Unit filename="src/net/messagehandler.cpp" />
+		<Unit filename="src/net/messagehandler.h" />
+		<Unit filename="src/net/messagein.cpp" />
+		<Unit filename="src/net/messagein.h" />
+		<Unit filename="src/net/messageout.cpp" />
+		<Unit filename="src/net/messageout.h" />
+		<Unit filename="src/net/network.cpp" />
+		<Unit filename="src/net/network.h" />
+		<Unit filename="src/net/npchandler.cpp" />
+		<Unit filename="src/net/npchandler.h" />
+		<Unit filename="src/net/playerhandler.cpp" />
+		<Unit filename="src/net/playerhandler.h" />
+		<Unit filename="src/net/protocol.cpp" />
+		<Unit filename="src/net/protocol.h" />
+		<Unit filename="src/net/skillhandler.cpp" />
+		<Unit filename="src/net/skillhandler.h" />
+		<Unit filename="src/net/tradehandler.cpp" />
+		<Unit filename="src/net/tradehandler.h" />
+		<Unit filename="src/npc.cpp" />
+		<Unit filename="src/npc.h" />
+		<Unit filename="src/openglgraphics.cpp" />
+		<Unit filename="src/openglgraphics.h" />
+		<Unit filename="src/particle.cpp" />
+		<Unit filename="src/particle.h" />
+		<Unit filename="src/particleemitter.cpp" />
+		<Unit filename="src/particleemitter.h" />
+		<Unit filename="src/party.cpp" />
+		<Unit filename="src/party.h" />
+		<Unit filename="src/player.cpp" />
+		<Unit filename="src/player.h" />
+		<Unit filename="src/player_relations.cpp" />
+		<Unit filename="src/player_relations.h" />
+		<Unit filename="src/properties.h" />
+		<Unit filename="src/recorder.cpp" />
+		<Unit filename="src/recorder.h" />
+		<Unit filename="src/resources/action.cpp" />
+		<Unit filename="src/resources/action.h" />
+		<Unit filename="src/resources/ambientoverlay.cpp" />
+		<Unit filename="src/resources/ambientoverlay.h" />
+		<Unit filename="src/resources/animation.cpp" />
+		<Unit filename="src/resources/animation.h" />
+		<Unit filename="src/resources/dye.cpp" />
+		<Unit filename="src/resources/dye.h" />
+		<Unit filename="src/resources/image.cpp" />
+		<Unit filename="src/resources/image.h" />
+		<Unit filename="src/resources/imageloader.cpp" />
+		<Unit filename="src/resources/imageloader.h" />
+		<Unit filename="src/resources/imageset.cpp" />
+		<Unit filename="src/resources/imageset.h" />
+		<Unit filename="src/resources/imagewriter.cpp" />
+		<Unit filename="src/resources/imagewriter.h" />
+		<Unit filename="src/resources/itemdb.cpp" />
+		<Unit filename="src/resources/itemdb.h" />
+		<Unit filename="src/resources/iteminfo.cpp" />
+		<Unit filename="src/resources/iteminfo.h" />
+		<Unit filename="src/resources/mapreader.cpp" />
+		<Unit filename="src/resources/mapreader.h" />
+		<Unit filename="src/resources/monsterdb.cpp" />
+		<Unit filename="src/resources/monsterdb.h" />
+		<Unit filename="src/resources/monsterinfo.cpp" />
+		<Unit filename="src/resources/monsterinfo.h" />
+		<Unit filename="src/resources/music.cpp" />
+		<Unit filename="src/resources/music.h" />
+		<Unit filename="src/resources/npcdb.cpp" />
+		<Unit filename="src/resources/npcdb.h" />
+		<Unit filename="src/resources/resource.cpp" />
+		<Unit filename="src/resources/resource.h" />
+		<Unit filename="src/resources/resourcemanager.cpp" />
+		<Unit filename="src/resources/resourcemanager.h" />
+		<Unit filename="src/resources/soundeffect.cpp" />
+		<Unit filename="src/resources/soundeffect.h" />
+		<Unit filename="src/resources/spritedef.cpp" />
+		<Unit filename="src/resources/spritedef.h" />
+		<Unit filename="src/serverinfo.h" />
+		<Unit filename="src/shopitem.cpp" />
+		<Unit filename="src/shopitem.h" />
+		<Unit filename="src/simpleanimation.cpp" />
+		<Unit filename="src/simpleanimation.h" />
+		<Unit filename="src/sound.cpp" />
+		<Unit filename="src/sound.h" />
+		<Unit filename="src/sprite.h" />
+		<Unit filename="src/text.cpp" />
+		<Unit filename="src/text.h" />
+		<Unit filename="src/textmanager.cpp" />
+		<Unit filename="src/textmanager.h" />
+		<Unit filename="src/textparticle.cpp" />
+		<Unit filename="src/textparticle.h" />
+		<Unit filename="src/tileset.h" />
+		<Unit filename="src/aethyra.rc">
+			<Option compilerVar="WINDRES" />
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
+		<Unit filename="src/utils/base64.cpp" />
+		<Unit filename="src/utils/base64.h" />
+		<Unit filename="src/utils/dtor.h" />
+		<Unit filename="src/utils/tostring.h" />
+		<Unit filename="src/utils/xml.cpp" />
+		<Unit filename="src/utils/xml.h" />
+		<Unit filename="src/winver.h">
+			<Option target="unix" />
+		</Unit>
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 90cd66da..22e361c5 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -317,12 +317,15 @@ int UpdaterWindow::downloadThread(void *ptr)
             curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
             curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 15);
 
-            /*caching breaks things when resources2.txt is cached
-             *so caching is turned off on the proxy with this header
-             *change*/
             struct curl_slist *pHeaders=NULL;
-            pHeaders = curl_slist_append(pHeaders, "pragma: no-cache");  
-            curl_easy_setopt(curl, CURLOPT_HTTPHEADER, pHeaders); 
+            if(uw->mDownloadStatus != UPDATE_RESOURCES){
+                /*caching breaks things when resources2.txt is cached
+                 *so caching is turned off on the proxy with this header
+                 *change*/
+                pHeaders = curl_slist_append(pHeaders, "pragma: no-cache");  
+                pHeaders = curl_slist_append(pHeaders, "Cache-Control: no-cache");
+                curl_easy_setopt(curl, CURLOPT_HTTPHEADER, pHeaders); 
+            }
 
             if ((res = curl_easy_perform(curl)) != 0)
             {
@@ -348,7 +351,9 @@ int UpdaterWindow::downloadThread(void *ptr)
 
             curl_easy_cleanup(curl);
 
-            curl_slist_free_all(pHeaders); 
+            if(uw->mDownloadStatus != UPDATE_RESOURCES){
+                curl_slist_free_all(pHeaders); 
+            }
 
             if (!uw->mStoreInMemory)
             {
-- 
cgit v1.2.3-70-g09d2


From cebb066c8edc77b4ae2368ea4f686845fc5be6c9 Mon Sep 17 00:00:00 2001
From: Kraant <kraant@gmail.com>
Date: Mon, 11 Aug 2008 08:08:10 +0000
Subject: Added a WinReadMe.txt file for windows users

---
 WinReadMe.txt | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 WinReadMe.txt

diff --git a/WinReadMe.txt b/WinReadMe.txt
new file mode 100644
index 00000000..8e72f036
--- /dev/null
+++ b/WinReadMe.txt
@@ -0,0 +1,13 @@
+To run aethyra double click on aethyra.exe in this folder.
+
+To install the client, just copy this folder to your Program Files
+folder and add a shortcut to aethyra.exe to your Start Menu.
+
+For any further questions pop onto the forums at http://forums.aethyra.com/
+especially the Windows Way forum, or pop onto the IRC channel #aethyra on the
+FreeNode network
+
+If you don't have an IRC client you can still get to the
+channel through this page: http://www.aethyra.com/ircchat.html
+
+Thanks for playing from the Aethyra team.
-- 
cgit v1.2.3-70-g09d2


From c9175a4d140f4c852aa5195b72ad9bd1ae8d5cee Mon Sep 17 00:00:00 2001
From: Kevin Day <blame582@gmail.com>
Date: Tue, 12 Aug 2008 19:49:40 +0000
Subject: added new login_wallpaper.png (submit by sraul with authors
 permission Kayla Shirley)

---
 data/graphics/images/login_wallpaper.png | Bin 643307 -> 663636 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/graphics/images/login_wallpaper.png b/data/graphics/images/login_wallpaper.png
index 7af4f913..14073185 100644
Binary files a/data/graphics/images/login_wallpaper.png and b/data/graphics/images/login_wallpaper.png differ
-- 
cgit v1.2.3-70-g09d2


From 94024e2b57b31ee92bb81fc48ce236283330b60c Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Wed, 13 Aug 2008 15:02:59 +0000
Subject: Added support for different colored fonts for different being types

---
 ChangeLog                                  |   7 +++++
 data/graphics/gui/Makefile.am              |   3 ++
 data/graphics/gui/rpgfont_wider-blue.png   | Bin 0 -> 4475 bytes
 data/graphics/gui/rpgfont_wider-green.png  | Bin 0 -> 4423 bytes
 data/graphics/gui/rpgfont_wider-orange.png | Bin 0 -> 4415 bytes
 src/being.cpp                              |   1 +
 src/being.h                                |   4 +++
 src/gui/gui.cpp                            |  47 +++++++++++++++++++++++++++++
 src/gui/gui.h                              |   8 +++++
 src/monster.cpp                            |   2 +-
 src/net/beinghandler.cpp                   |   6 ++--
 src/npc.cpp                                |   2 +-
 src/player.cpp                             |  13 ++++++--
 13 files changed, 86 insertions(+), 7 deletions(-)
 create mode 100644 data/graphics/gui/rpgfont_wider-blue.png
 create mode 100644 data/graphics/gui/rpgfont_wider-green.png
 create mode 100644 data/graphics/gui/rpgfont_wider-orange.png

diff --git a/ChangeLog b/ChangeLog
index 2bb8660f..171295d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-13	Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
+
+	* Added code to display NPC and monster names using an
+	  alternate colored font.  Added support for a server
+	  provided "GM flag", which prepends "(GM)" to the player's
+	  name and changes the font color.
+
 2008-08-08  Lloyd Bryant ("Sanga")	<lloyd_bryant@netzero.net>
 
 	* Made "--skipupdate" skip the update download process, but
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index cfa14192..ec99fdf6 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -32,6 +32,9 @@ gui_DATA =				\
 	radioout.png			\
 	resize.png			\
 	rpgfont_wider.png		\
+    rpgfont_wider-blue.png	\
+    rpgfont_wider-green.png	\
+    rpgfont_wider-orange.png	\
 	selection.png			\
 	sansserif8.png			\
 	slider.png			\
diff --git a/data/graphics/gui/rpgfont_wider-blue.png b/data/graphics/gui/rpgfont_wider-blue.png
new file mode 100644
index 00000000..4cd45c5c
Binary files /dev/null and b/data/graphics/gui/rpgfont_wider-blue.png differ
diff --git a/data/graphics/gui/rpgfont_wider-green.png b/data/graphics/gui/rpgfont_wider-green.png
new file mode 100644
index 00000000..00098746
Binary files /dev/null and b/data/graphics/gui/rpgfont_wider-green.png differ
diff --git a/data/graphics/gui/rpgfont_wider-orange.png b/data/graphics/gui/rpgfont_wider-orange.png
new file mode 100644
index 00000000..18dd67e9
Binary files /dev/null and b/data/graphics/gui/rpgfont_wider-orange.png differ
diff --git a/src/being.cpp b/src/being.cpp
index 14f7ce20..822bc647 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -82,6 +82,7 @@ Being::Being(int id, int job, Map *map):
 
     instances++;
     mSpeech = 0;
+    mIsGM = false;
 }
 
 Being::~Being()
diff --git a/src/being.h b/src/being.h
index 90bab9ac..7f68c8c3 100644
--- a/src/being.h
+++ b/src/being.h
@@ -233,6 +233,9 @@ class Being : public Sprite
         virtual void
         nextStep();
 
+        virtual void
+        setGM() { mIsGM = true; }
+
         /**
          * Performs being logic.
          */
@@ -382,6 +385,7 @@ class Being : public Sprite
         Map *mMap;                      /**< Map on which this being resides */
         std::string mName;              /**< Name of character */
         SpriteIterator mSpriteIterator;
+        bool mIsGM;
 
         /** Engine-related infos about weapon. */
         const ItemInfo* mEquippedWeapon;
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index e56afc76..edc25152 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -56,6 +56,13 @@ gcn::Font *hitYellowFont;
 // Font used to display speech and player names
 gcn::Font *speechFont;
 
+// Font for displaying NPC names
+gcn::Font *npcNameFont;
+// Font for displaying mob names
+gcn::Font *mobNameFont;
+// Font for displaying GM names
+gcn::Font *gmNameFont;
+
 class GuiConfigListener : public ConfigListener
 {
     public:
@@ -128,6 +135,46 @@ Gui::Gui(Graphics *graphics):
         logger->error("Unable to load rpgfont_wider.png!");
     }
 
+    // Set npc name font
+    try {
+        npcNameFont = new gcn::ImageFont("graphics/gui/rpgfont_wider-blue.png",
+                " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@$\\"
+                "�����������륣���������������������"
+                );
+    }
+    catch (gcn::Exception e)
+    {
+        logger->error("Unable to load rpgfont_wider-blue.png!");
+    }
+
+    // Set monster name font
+    try {
+        mobNameFont = new gcn::ImageFont("graphics/gui/rpgfont_wider-orange.png",
+                " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@$\\"
+                "�����������륣���������������������"
+                );
+    }
+    catch (gcn::Exception e)
+    {
+        logger->error("Unable to load rpgfont_wider-orange.png!");
+    }
+
+    // Set GM name font
+    try {
+        gmNameFont = new gcn::ImageFont("graphics/gui/rpgfont_wider-green.png",
+                " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@$\\"
+                "�����������륣���������������������"
+                );
+    }
+    catch (gcn::Exception e)
+    {
+        logger->error("Unable to load rpgfont_wider-green.png!");
+    }
+
+
     gcn::Widget::setGlobalFont(mGuiFont);
 
     // Load hits' colourful fonts
diff --git a/src/gui/gui.h b/src/gui/gui.h
index d2a832c7..f250a8e3 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -119,4 +119,12 @@ extern gcn::Font *hitYellowFont;
  */
 extern gcn::Font *speechFont;
 
+/**
+ * being name fonts
+ */
+extern gcn::Font *npcNameFont;
+extern gcn::Font *mobNameFont;
+extern gcn::Font *gmNameFont;
+
+
 #endif
diff --git a/src/monster.cpp b/src/monster.cpp
index 1a7f6c4e..5d62a9cc 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -168,7 +168,7 @@ void Monster::showName(bool show)
         mText = new Text(getInfo().getName(), mPx + NAME_X_OFFSET,
                          mPy + NAME_Y_OFFSET - getHeight(),
                          gcn::Graphics::CENTER,
-                         speechFont, gcn::Color(255, 32, 32));
+                         mobNameFont, gcn::Color(255, 32, 32));
     }
     else
     {
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index a8591fce..34c65d1c 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -71,6 +71,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
     Uint16 headTop, headMid, headBottom;
     Uint16 shoes, gloves, cape, misc1, misc2;
     Uint16 weapon, shield;
+    Uint16 gmstatus;
     Sint16 param1;
     Sint8 type;
     Being *srcBeing, *dstBeing;
@@ -443,8 +444,9 @@ void BeingHandler::handleMessage(MessageIn *msg)
                 dstBeing->setDirection(dir);
             }
 
-            msg->readInt8();   // unknown
-            msg->readInt8();   // unknown
+            gmstatus = msg->readInt16();
+            if (gmstatus & 0x01)
+                dstBeing->setGM();
 
             if (msg->getId() == SMSG_PLAYER_UPDATE_1)
             {
diff --git a/src/npc.cpp b/src/npc.cpp
index ec7088ab..1615ecd6 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -84,7 +84,7 @@ void NPC::setName(const std::string &name)
         delete mName;
     }
     mName = new Text(name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET,
-                     gcn::Graphics::CENTER, speechFont,
+                     gcn::Graphics::CENTER, npcNameFont,
                      gcn::Color(200, 200, 255));
                  }
 
diff --git a/src/player.cpp b/src/player.cpp
index 5db009ba..0740c7db 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -43,6 +43,7 @@ Player::Player(int id, int job, Map *map):
     Being(id, job, map)
 {
     mName = 0;
+    mIsGM = false;
 }
 
 Player::~Player()
@@ -57,9 +58,15 @@ void Player::setName(const std::string &name)
 {
     if (mName == 0)
     {
-        mName = new FlashText(name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET,
-                              gcn::Graphics::CENTER,
-                              speechFont, gcn::Color(255, 255, 255));
+        if (mIsGM) {
+            mName = new FlashText("(GM) " + name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET,
+                                  gcn::Graphics::CENTER,
+                                  gmNameFont, gcn::Color(255, 255, 255));
+        } else {
+            mName = new FlashText(name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET,
+                                  gcn::Graphics::CENTER,
+                                  speechFont, gcn::Color(255, 255, 255));
+        }
         Being::setName(name);
     }
 }
-- 
cgit v1.2.3-70-g09d2


From 25601ef7b416d7f17302b517e158f5fdf6556569 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 13 Aug 2008 16:03:25 +0000
Subject: Added Aethyra logo to the login wallpaper. Do not redistribute or
 modify this image without the original author's consent (Kayla Shirley,
 kai_kaiyla@live.com).

---
 data/graphics/images/login_wallpaper.png | Bin 663636 -> 187106 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/graphics/images/login_wallpaper.png b/data/graphics/images/login_wallpaper.png
index 14073185..06a9e94f 100644
Binary files a/data/graphics/images/login_wallpaper.png and b/data/graphics/images/login_wallpaper.png differ
-- 
cgit v1.2.3-70-g09d2


From 2c7db5f8f052930784be5bd661f0919db5111b66 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 13 Aug 2008 17:14:33 +0000
Subject: Added upper resolutions for Mitsukai Hana by Kayla Shirley
 (kai_kaiyla@live.com). Do not reuse or modify these files without her
 permission.

---
 data/graphics/images/copyright.txt                 |   1 +
 data/graphics/images/login_wallpaper_1024x768.png  | Bin 0 -> 1016644 bytes
 data/graphics/images/login_wallpaper_1280x960.png  | Bin 0 -> 1413986 bytes
 data/graphics/images/login_wallpaper_1440x1080.png | Bin 0 -> 1648969 bytes
 data/graphics/images/login_wallpaper_1600x1200.png | Bin 0 -> 1835415 bytes
 5 files changed, 1 insertion(+)
 create mode 100644 data/graphics/images/copyright.txt
 create mode 100644 data/graphics/images/login_wallpaper_1024x768.png
 create mode 100644 data/graphics/images/login_wallpaper_1280x960.png
 create mode 100644 data/graphics/images/login_wallpaper_1440x1080.png
 create mode 100644 data/graphics/images/login_wallpaper_1600x1200.png

diff --git a/data/graphics/images/copyright.txt b/data/graphics/images/copyright.txt
new file mode 100644
index 00000000..47e3632a
--- /dev/null
+++ b/data/graphics/images/copyright.txt
@@ -0,0 +1 @@
+The login wallpaper (Mitsukai Hana) is used by permission of Kayla Shirley (kai_kaiyla@live.com). All rights are reserved by her.
\ No newline at end of file
diff --git a/data/graphics/images/login_wallpaper_1024x768.png b/data/graphics/images/login_wallpaper_1024x768.png
new file mode 100644
index 00000000..1239c6b0
Binary files /dev/null and b/data/graphics/images/login_wallpaper_1024x768.png differ
diff --git a/data/graphics/images/login_wallpaper_1280x960.png b/data/graphics/images/login_wallpaper_1280x960.png
new file mode 100644
index 00000000..a7cf1242
Binary files /dev/null and b/data/graphics/images/login_wallpaper_1280x960.png differ
diff --git a/data/graphics/images/login_wallpaper_1440x1080.png b/data/graphics/images/login_wallpaper_1440x1080.png
new file mode 100644
index 00000000..f0659073
Binary files /dev/null and b/data/graphics/images/login_wallpaper_1440x1080.png differ
diff --git a/data/graphics/images/login_wallpaper_1600x1200.png b/data/graphics/images/login_wallpaper_1600x1200.png
new file mode 100644
index 00000000..9e8d6663
Binary files /dev/null and b/data/graphics/images/login_wallpaper_1600x1200.png differ
-- 
cgit v1.2.3-70-g09d2


From 7618ab3d354a1691d656f1be160e7ffeb8f46b21 Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Wed, 13 Aug 2008 23:48:07 +0000
Subject: Changed the bit to signal GM status to evade bad data from TMW's
 server

---
 src/net/beinghandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 34c65d1c..affdcd56 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -445,7 +445,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
             }
 
             gmstatus = msg->readInt16();
-            if (gmstatus & 0x01)
+            if (gmstatus & 0x80)
                 dstBeing->setGM();
 
             if (msg->getId() == SMSG_PLAYER_UPDATE_1)
-- 
cgit v1.2.3-70-g09d2


From 36b946d9ae9ae70ac63882d69cd3c805f0f0a5d9 Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Thu, 14 Aug 2008 02:02:02 +0000
Subject: Lightened the color of the NPC font

---
 data/graphics/gui/rpgfont_wider-blue.png | Bin 4475 -> 4431 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/graphics/gui/rpgfont_wider-blue.png b/data/graphics/gui/rpgfont_wider-blue.png
index 4cd45c5c..b4a27434 100644
Binary files a/data/graphics/gui/rpgfont_wider-blue.png and b/data/graphics/gui/rpgfont_wider-blue.png differ
-- 
cgit v1.2.3-70-g09d2


From ab1ac07910ae0a4a874a4469a28b192eba28c5d6 Mon Sep 17 00:00:00 2001
From: Kraant <kraant@gmail.com>
Date: Thu, 14 Aug 2008 07:35:10 +0000
Subject: Doesn't require restart to change to full screen anymore

---
 src/gui/setup_video.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 1b619b9a..0e85138c 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -280,9 +280,15 @@ void Setup_Video::apply()
     bool fullscreen = mFsCheckBox->isSelected();
     if (fullscreen != (config.getValue("screen", 0) == 1))
     {
+
+        /*Commented  out the openGL test because
+ *        the fullscreen mode change works fine, but
+ *        will need to test it on windows so not
+ *        deleting entirely until then  --kraant*/
+
         // checks for opengl usage
-        if (!(config.getValue("opengl", 0) == 1))
-        {
+        /*if (!(config.getValue("opengl", 0) == 1))
+        {*/
             if (!graphics->setFullscreen(fullscreen))
             {
                 fullscreen = !fullscreen;
@@ -296,10 +302,10 @@ void Setup_Video::apply()
                     logger->error(error.str());
                 }
             }
-        } else {
+        /*} else {
             new OkDialog("Switching to full screen",
                     "Restart needed for changes to take effect.");
-        }
+        }*/
         config.setValue("screen", fullscreen ? 1 : 0);
     }
 
-- 
cgit v1.2.3-70-g09d2


From 4843a33a35cf46fe7978c59c0bf9b5b5e7c885c8 Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Fri, 15 Aug 2008 04:05:00 +0000
Subject: Activated MP status progress bar

---
 ChangeLog              | 5 +++++
 src/gui/ministatus.cpp | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 171295d9..0204d81e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-14	Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
+
+	* Uncommented line so that MP status bar correctly
+	  updates based on remaining mana
+
 2008-08-13	Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
 
 	* Added code to display NPC and monster names using an
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 3a7e7bf0..1bdabbfe 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -98,7 +98,7 @@ void MiniStatusWindow::update()
     }
 
     mHpBar->setProgress((float) player_node->mHp / player_node->mMaxHp);
-    // mMpBar->setProgress((float) player_node->mMp / player_node->mMaxMp);
+    mMpBar->setProgress((float) player_node->mMp / player_node->mMaxMp);
     mXpBar->setProgress(
             (float) player_node->getXp() / player_node->mXpForNextLevel);
 
-- 
cgit v1.2.3-70-g09d2


From f16b0615a4b1942f5fb7c55782e3c80c15b70757 Mon Sep 17 00:00:00 2001
From: Kraant <kraant@gmail.com>
Date: Fri, 15 Aug 2008 11:27:33 +0000
Subject: Updated copyright statement to Creative Commons Non-Commercial

---
 data/graphics/images/copyright.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/data/graphics/images/copyright.txt b/data/graphics/images/copyright.txt
index 47e3632a..2eb4c9df 100644
--- a/data/graphics/images/copyright.txt
+++ b/data/graphics/images/copyright.txt
@@ -1 +1,6 @@
-The login wallpaper (Mitsukai Hana) is used by permission of Kayla Shirley (kai_kaiyla@live.com). All rights are reserved by her.
\ No newline at end of file
+The login wallpaper (Mitsukai Hana) is used by permission of Kayla Shirley (kai_kaiyla@live.com). All rights are reserved by her.
+
+The login wallpaper with permission of the author is now licenced under
+a CC-NC (Creative Commons Non-Commercial) licence.
+
+http://creativecommons.org/licenses/by-nc/3.0/
-- 
cgit v1.2.3-70-g09d2


From 95bc446f7b2977fb596585998dc4b3de50c65673 Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Sat, 16 Aug 2008 07:54:32 +0000
Subject: Bugfix for segfault when hitting a warp while targeting another
 player

---
 src/localplayer.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 5f392a52..4e72169f 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -184,6 +184,11 @@ void LocalPlayer::pickUp(FloorItem *item)
 
 void LocalPlayer::walk(unsigned char dir)
 {
+
+    // If they have someone or something targeted, cancel it
+    if (mTarget)
+        setTarget(NULL);
+
     if (!mMap || !dir)
         return;
 
-- 
cgit v1.2.3-70-g09d2


From 68888853bc946a52ca368c5fc859b6709ae0e661 Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Sat, 16 Aug 2008 15:52:55 +0000
Subject: reverted last change - playability issues

---
 src/localplayer.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 4e72169f..571cc21b 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -185,10 +185,6 @@ void LocalPlayer::pickUp(FloorItem *item)
 void LocalPlayer::walk(unsigned char dir)
 {
 
-    // If they have someone or something targeted, cancel it
-    if (mTarget)
-        setTarget(NULL);
-
     if (!mMap || !dir)
         return;
 
-- 
cgit v1.2.3-70-g09d2


From d5b86aa54dfa4ddf5b5f2361918c719ba8d0dd18 Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Sun, 17 Aug 2008 06:28:13 +0000
Subject: Fixed crash resulting from having a player targeted when hitting a
 warp point

---
 ChangeLog                 | 31 ++++++++++++++++++-------------
 src/being.cpp             |  1 +
 src/monster.cpp           | 10 ++++------
 src/net/beinghandler.cpp  |  5 ++---
 src/net/playerhandler.cpp |  7 ++++++-
 5 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0204d81e..81fc32d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-16	Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
+
+	* Fixed bug where client would crash if another player
+	  was targeted when you hit a warp point.
+
 2008-08-14	Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
 
 	* Uncommented line so that MP status bar correctly
@@ -10,33 +15,33 @@
 	  provided "GM flag", which prepends "(GM)" to the player's
 	  name and changes the font color.
 
-2008-08-08  Lloyd Bryant ("Sanga")	<lloyd_bryant@netzero.net>
+2008-08-08  Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
 
 	* Made "--skipupdate" skip the update download process, but
 	  still load whatever updates have been previously downloaded.
 
-2008-07-25  Lloyd Bryant ("Sanga")	<lloyd_bryant@netzero.net>
+2008-07-25  Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
 
 	* Added feature to remember window locations from one 
 	  session to the next (patch from TMW by ElvenProgrammer)
 
-2008-07-24  Lloyd Bryant ("Sanga")  <lloyd_bryant@netzero.net>
+2008-07-24  Lloyd Bryant ("Sanga")  <sanga@aethyra.com>
 
 	* Tweak in net/beinghandler.cpp to compensate for a visual
 	  bug when using the TMW server.
 
-2008-07-23  Lloyd Bryant ("Sanga")	<lloyd_bryant@netzero.net>
+2008-07-23  Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
 
 	* Added support for capes/misc1/misc2 into the character
 	  selection display
 
-2008-07-23  Lloyd Bryant ("Sanga")  <lloyd_bryant@netzero.net>
+2008-07-23  Lloyd Bryant ("Sanga")  <sanga@aethyra.com>
 
 	* Added "chat" button to open/close chat window
 	* Added support for viewable cape/misc1/misc2 (new eAthena
 	  version ONLY
 
-2008-07-22  Lloyd Bryant ("Sanga")  <lloyd_bryant@netzero.net>
+2008-07-22  Lloyd Bryant ("Sanga")  <sanga@aethyra.com>
 
 	* Added handler for 0x0086 movement packet (new eAthena).
 	* Changed startup sequence for game.cpp to send a ping packet
@@ -44,11 +49,11 @@
 	  This is required by the new eAthena version.
 	* Added #deines for some "ping" packets.
 
-2008-07-19  Lloyd Bryant ("Sanga")  <lloyd_bryant@netzero.net>
+2008-07-19  Lloyd Bryant ("Sanga")  <sanga@aethyra.com>
 
 	* Removed unnecessary check ("weight") from itemdb loader
 
-2008-07-18  Lloyd Bryant ("Sanga")  <lloyd_bryant@netzero.net>
+2008-07-18  Lloyd Bryant ("Sanga")  <sanga@aethyra.com>
 
 	* Added code to provide viewable glove and shoe sprites
 
@@ -56,18 +61,18 @@
 
 	* Added code to avoid collision between different displayed text.
 
-2008-07-08  Lloyd Bryant ("Sanga")	<lloyd_bryant@netzero.net>
+2008-07-08  Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
 
 	* Added handling for a "Stop Walking" packet.  This will
 	  force the client back into sync during those "can't run
 	  away from a battle" sync error conditions.
 
-2008-07-07  Lloyd Bryant ("Sanga")	<lloyd_bryant@netzero.net>
+2008-07-07  Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
 
 	* Added support for update host provided by login server
 	* Changed startup sequence to login first, then update
 
-2008-07-05  Lloyd Bryant ("Sanga")  <lloyd_bryant@netzero.net>
+2008-07-05  Lloyd Bryant ("Sanga")  <sanga@aethyra.com>
 
 	* Applied patch from kraant to convert into a TME branded client
 	* Removed redundant autoconf files
@@ -153,12 +158,12 @@
 	now stored in an update host specific directory. Based on a patch by
 	Sanga.
 
-2008-06-04  Lloyd Bryant  <lloyd_bryant@netzero.net>
+2008-06-04  Lloyd Bryant  <sanga@aethyra.com>
 
 	* src/net/charserverhandler.cpp: Display shield sprite also in
 	character select window.
 
-2008-05-30  Lloyd Bryant  <lloyd_bryant@netzero.net>
+2008-05-30  Lloyd Bryant  <sanga@aethyra.com>
 
 	* src/net/equipmenthandler.cpp, src/net/beinghandler.cpp,
 	src/net/protocol.h, src/being.h: Merged handling for eAthena packets
diff --git a/src/being.cpp b/src/being.cpp
index 822bc647..fd1b67fe 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -33,6 +33,7 @@
 #include "map.h"
 #include "particle.h"
 #include "text.h"
+#include "localplayer.h"
 
 #include "resources/resourcemanager.h"
 #include "resources/imageset.h"
diff --git a/src/monster.cpp b/src/monster.cpp
index 5d62a9cc..e5f9f4b2 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -28,7 +28,6 @@
 #include "sound.h"
 #include "particle.h"
 #include "text.h"
-#include "localplayer.h"
 
 #include "gui/gui.h"
 
@@ -66,12 +65,11 @@ Monster::Monster(Uint32 id, Uint16 job, Map *map):
     }
 }
 
-Monster::~Monster()
-{
+Monster::~Monster() {
+
     if (mText)
-    {
-        player_node->setTarget(0);
-    }
+        delete mText;
+
 }
 
 void
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index affdcd56..5b2ac5f4 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -201,10 +201,9 @@ void BeingHandler::handleMessage(MessageIn *msg)
             if (!dstBeing)
                 break;
 
-            if (dstBeing == player_node->getTarget())
-            {
+            // If this is player's current target, clear it.
+            if (player_node->getTarget() == dstBeing)
                 player_node->stopAttack();
-            }
 
             if (msg->readInt8() == 1)
             {
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 7f9e455a..e871b670 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -129,6 +129,12 @@ void PlayerHandler::handleMessage(MessageIn *msg)
 
                 logger->log("Warping to %s (%d, %d)", mapPath.c_str(), x, y);
 
+                /*
+                 * We must clear the local player's target *before* the call
+                 * to changeMap, as it deletes all beings.
+                 */
+                player_node->stopAttack();
+
                 // Switch the actual map, deleting the previous one
                 engine->changeMap(mapPath);
 
@@ -138,7 +144,6 @@ void PlayerHandler::handleMessage(MessageIn *msg)
                 float scrollOffsetY = (y - player_node->mY) * 32;
 
                 player_node->setAction(Being::STAND);
-                player_node->stopAttack();
                 player_node->mFrame = 0;
                 player_node->mX = x;
                 player_node->mY = y;
-- 
cgit v1.2.3-70-g09d2


From 46074f67394f313331d13a5def4eb81ca92df576 Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Mon, 18 Aug 2008 00:04:30 +0000
Subject: Fixed bugs with new arrow types

---
 ChangeLog                    |  5 ++++
 src/equipment.cpp            | 18 ++++++++++++++
 src/equipment.h              |  4 +--
 src/inventory.cpp            |  8 ------
 src/localplayer.cpp          |  3 ---
 src/net/equipmenthandler.cpp | 59 ++++++++++++++++----------------------------
 src/net/inventoryhandler.cpp | 10 +++-----
 7 files changed, 50 insertions(+), 57 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 81fc32d9..f3835387 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-17	Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
+
+	* Fixed issues with unequipping some arrows failing.
+	* Removed hard-coded item ID's from several files
+
 2008-08-16	Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
 
 	* Fixed bug where client would crash if another player
diff --git a/src/equipment.cpp b/src/equipment.cpp
index 0a285447..08e6fad1 100644
--- a/src/equipment.cpp
+++ b/src/equipment.cpp
@@ -41,6 +41,13 @@ Equipment::removeEquipment(Item *item)
     if (i != mEquipment + EQUIPMENT_SIZE) {
         *i = 0;
     }
+    item->setEquipped(false);
+}
+
+void Equipment::removeEquipment(int index)
+{
+    mEquipment[index]->setEquipped(false);
+    mEquipment[index] = 0;
 }
 
 void Equipment::setEquipment(int index, Item *item)
@@ -48,3 +55,14 @@ void Equipment::setEquipment(int index, Item *item)
     mEquipment[index] = item;
     item->setEquipped(true);
 }
+
+void Equipment::setArrows(Item *arrows)
+{
+    if (mArrows)
+        mArrows->setEquipped(false);
+
+    mArrows = arrows;
+
+    if (arrows)
+        arrows->setEquipped(true);
+}
diff --git a/src/equipment.h b/src/equipment.h
index 04017549..fd7a9c1e 100644
--- a/src/equipment.h
+++ b/src/equipment.h
@@ -52,7 +52,7 @@ class Equipment
          * Remove equipment from the given slot.
          */
         void
-        removeEquipment(int index) { mEquipment[index] = 0; }
+        removeEquipment(int index);
 
         /**
          * Remove the given item from equipment.
@@ -69,7 +69,7 @@ class Equipment
          * Set the item used in the arrow slot.
          */
         void
-        setArrows(Item *arrows) { mArrows = arrows; }
+        setArrows(Item *arrows);
 
     private:
         Item *mEquipment[EQUIPMENT_SIZE];
diff --git a/src/inventory.cpp b/src/inventory.cpp
index e6f006de..20958c44 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -80,14 +80,6 @@ void Inventory::setItem(int index, int id, int quantity, bool equipment)
         return;
     }
 
-    /* TODO: Check where to reenable this code.
-    // Dont stack equipment other than arrows.
-    if (equipment && !(id == 1199 || id == 529))
-        mItems[index].setQuantity(quantity);
-    else
-        mItems[index].increaseQuantity(quantity);
-    */
-
     if (!mItems[index] && id > 0) {
         Item *item = new Item(id, quantity, equipment);
         item->setInvIndex(index);
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 571cc21b..7b0c2b8b 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -142,9 +142,6 @@ void LocalPlayer::unequipItem(Item *item)
     MessageOut outMsg(mNetwork);
     outMsg.writeInt16(CMSG_PLAYER_UNEQUIP);
     outMsg.writeInt16(item->getInvIndex());
-
-    // Tidy equipment directly to avoid weapon still shown bug, for instance
-    mEquipment->removeEquipment(item);
 }
 
 void LocalPlayer::useItem(Item *item)
diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index 7b15ee8b..cc5d016c 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.cpp
@@ -109,7 +109,10 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
                 break;
             }
 
-            // Unequip any existing equipped item in this position
+            /*
+             * An item may occupy more than 1 slot.  If so, it's
+             * only shown as equipped on the *first* slot.
+             */
             mask = 1;
             position = 0;
             while (!(equipPoint & mask)) {
@@ -118,6 +121,8 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
             }
             logger->log("Position %i", position);
             item = player_node->mEquipment->getEquipment(position);
+
+            // Unequip any existing equipped item in this position
             if (item) {
                 item->setEquipped(false);
             }
@@ -141,37 +146,17 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
                 break;
             }
 
-            mask = 1;
-            position = 0;
-            while (!(equipPoint & mask)) {
-                mask <<= 1;
-                position++;
-            }
-
-            item = inventory->getItem(index);
-            if (!item)
-                break;
-
-            item->setEquipped(false);
-
-            switch (item->getId()) {
-                case 529:
-                case 1199:
-                    player_node->mEquipment->setArrows(NULL);
-                    break;
-                case 521:
-                case 522:
-                case 530:
-                case 536:
-                case 1200:
-                case 1201:
-                    player_node->setSprite(Being::WEAPON_SPRITE, 0);
-                    // TODO: Why this break? Shouldn't a weapon be
-                    //       unequipped in inventory too?
-                    break;
-                default:
-                    player_node->mEquipment->removeEquipment(position);
-                    break;
+            if (equipPoint & 0x8000) {    // Arrows
+                player_node->mEquipment->setArrows(NULL);
+                position = 11;
+            } else {
+                mask = 1;
+                position = 0;
+                while (!(equipPoint & mask)) {
+                    mask <<= 1;
+                    position++;
+                }
+                player_node->mEquipment->removeEquipment(position);
             }
             logger->log("Unequipping: %i %i(%i) %i",
                     index, equipPoint, type, position);
@@ -188,12 +173,10 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
                 break;
 
             item = inventory->getItem(index);
-            if (!item)
-                break;
-
-            item->setEquipped(true);
-            player_node->mEquipment->setArrows(item);
-            logger->log("Arrows equipped: %i", index);
+            if (item) {
+                player_node->mEquipment->setArrows(item);
+                logger->log("Arrows equipped: %i", index);
+            }
             break;
     }
 }
diff --git a/src/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp
index c0661710..37ae5fb9 100644
--- a/src/net/inventoryhandler.cpp
+++ b/src/net/inventoryhandler.cpp
@@ -55,7 +55,7 @@ InventoryHandler::InventoryHandler()
 void InventoryHandler::handleMessage(MessageIn *msg)
 {
     Sint32 number;
-    Sint16 index, amount, itemId, equipType;
+    Sint16 index, amount, itemId, equipType, arrow;
     Inventory *inventory = player_node->getInventory();
 
     switch (msg->getId())
@@ -67,21 +67,19 @@ void InventoryHandler::handleMessage(MessageIn *msg)
             msg->readInt16();  // length
             number = (msg->getLength() - 4) / 18;
 
-            for (int loop = 0; loop < number; loop++)
-            {
+            for (int loop = 0; loop < number; loop++) {
                 index = msg->readInt16();
                 itemId = msg->readInt16();
                 msg->readInt8(); // type
                 msg->readInt8(); // identify flag
                 amount = msg->readInt16();
-                msg->skip(2);    // unknown
+                arrow = msg->readInt16();
                 msg->skip(8);    // card (4 shorts)
 
                 inventory->setItem(index, itemId, amount, false);
 
                 // Trick because arrows are not considered equipment
-                if (itemId == 1199 || itemId == 529)
-                {
+                if (arrow & 0x8000) {
                     if (Item *item = inventory->getItem(index))
                         item->setEquipment(true);
                 }
-- 
cgit v1.2.3-70-g09d2


From 7ac798f289e58348fdd1c08bd422fb435399f5d4 Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Mon, 18 Aug 2008 15:51:10 +0000
Subject: Fixed bug with GP shown being incorrect after purchasing from NPC
 vendor (code from TMW svn, r4449)

---
 ChangeLog       |  5 +++++
 src/gui/buy.cpp | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f3835387..80a8381a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-17	Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
+
+	* Correctly show GP remaining after buying from NPC
+	  vendor (from TMW svn, r4449)
+
 2008-08-17	Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
 
 	* Fixed issues with unequipping some arrows failing.
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 0e48ea29..8e2a7a7a 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -171,15 +171,15 @@ void BuyDialog::action(const gcn::ActionEvent &event)
         outMsg.writeInt16(mAmountItems);
         outMsg.writeInt16(mShopItems->at(selectedItem)->getId());
 
-        // Reset selection
-        mAmountItems = 1;
-        mSlider->setValue(1);
-        mSlider->gcn::Slider::setScale(1, mMaxItems);
-
         // Update money and adjust the max number of items that can be bought
         mMaxItems -= mAmountItems;
         setMoney(mMoney -
                 mAmountItems * mShopItems->at(selectedItem)->getPrice());
+
+        // Reset selection
+        mAmountItems = 1;
+        mSlider->setValue(1);
+        mSlider->gcn::Slider::setScale(1, mMaxItems);
     }
 }
 
-- 
cgit v1.2.3-70-g09d2


From 6be958da64e96f0b0d7ae043182b3f124eadfd4e Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Tue, 19 Aug 2008 02:17:09 +0000
Subject: Added handling for different resolution wallpapers, reduced CPU usage
 during login sequence

---
 ChangeLog                        |  6 ++++++
 data/graphics/images/Makefile.am |  6 +++++-
 src/main.cpp                     | 37 +++++++++++++++++++++++++++----------
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 80a8381a..22ae8172 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-17  Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
+
+	* Set the wallpaper based on the screen width.
+	* Added a usleep to the login sequence loop to 
+	  prevent it from unnecessarily maxing out the CPU
+
 2008-08-17	Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
 
 	* Correctly show GP remaining after buying from NPC
diff --git a/data/graphics/images/Makefile.am b/data/graphics/images/Makefile.am
index 4df6b7ed..e003bc7a 100644
--- a/data/graphics/images/Makefile.am
+++ b/data/graphics/images/Makefile.am
@@ -2,7 +2,11 @@ imagesdir = $(pkgdatadir)/data/graphics/images
 
 images_DATA =				\
 	error.png				\
-	login_wallpaper.png
+	login_wallpaper.png		\
+    login_wallpaper_1024x768.png	\
+    login_wallpaper_1280x960.png	\
+    login_wallpaper_1440x1080.png	\
+    login_wallpaper_1600x1200.png	
 
 EXTRA_DIST =				\
 	$(images_DATA)
diff --git a/src/main.cpp b/src/main.cpp
index 89bc8e6b..7efbca4f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -697,6 +697,27 @@ int main(int argc, char *argv[])
 
     SDLNet_Init();
     Network *network = new Network();
+
+    // Set the most appropriate wallpaper, based on screen width
+    int screenWidth = (int) config.getValue("screenwidth", defaultScreenWidth);
+    std::string wallpaperName;
+
+    if (screenWidth <= 800)
+        wallpaperName = "graphics/images/login_wallpaper.png";
+    else if (screenWidth <= 1024)
+        wallpaperName = "graphics/images/login_wallpaper_1024x768.png";
+    else if (screenWidth <= 1280)
+        wallpaperName = "graphics/images/login_wallpaper_1280x960.png";
+    else if (screenWidth <= 1440)
+        wallpaperName = "graphics/images/login_wallpaper_1440x1080.png";
+    else
+        wallpaperName = "graphics/images/login_wallpaper_1600x1200.png";
+
+    login_wallpaper = ResourceManager::getInstance()-> getImage(wallpaperName);
+
+    if (!login_wallpaper)
+        logger->log("Couldn't load %s as wallpaper", wallpaperName.c_str());
+
     while (state != EXIT_STATE)
     {
         // Handle SDL events
@@ -732,16 +753,6 @@ int main(int argc, char *argv[])
             }
         }
 
-        if (!login_wallpaper)
-        {
-            login_wallpaper = ResourceManager::getInstance()->
-                    getImage("graphics/images/login_wallpaper.png");
-            if (!login_wallpaper)
-            {
-                logger->error("Couldn't load login_wallpaper.png");
-            }
-        }
-
         if (progressBar->isVisible())
         {
             progressBar->setProgress(progressBar->getProgress() + 0.005f);
@@ -933,6 +944,12 @@ int main(int argc, char *argv[])
                     break;
             }
         }
+        /*
+         * This loop can really stress the CPU, for no reason since it's
+         * just constantly redrawing the wallpaper.  Added the following
+         * usleep to limit it to 20 FPS during the login sequence
+         */
+        usleep(50000);
     }
 
 #ifdef PACKAGE_VERSION
-- 
cgit v1.2.3-70-g09d2


From 4434679b6f0d0e1345321d075f627d528f405883 Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Fri, 22 Aug 2008 05:39:01 +0000
Subject: Added config option to honor stop-walking packet, added X and Y to
 /where, reformatted src/chat.cpp

---
 ChangeLog                |   8 +
 src/game.cpp             |   2 +-
 src/gui/chat.cpp         | 995 ++++++++++++++++++++++-------------------------
 src/net/beinghandler.cpp |  36 +-
 src/net/beinghandler.h   |   6 +-
 5 files changed, 491 insertions(+), 556 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 22ae8172..b4042915 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-21  Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
+
+	* Added configuration option "EnableSync" that causes
+	  client to honor 0x88 "Stop Walking" packet.
+	* Added X and Y coordinates to output of "/where"
+	* Reformatted src/chat.cpp - it was missing indentation
+	  in large areas
+
 2008-08-17  Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
 
 	* Set the wallpaper based on the screen width.
diff --git a/src/game.cpp b/src/game.cpp
index 12d3947e..0562b75e 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -261,7 +261,7 @@ void destroyGuiWindows()
 
 Game::Game(Network *network):
     mNetwork(network),
-    mBeingHandler(new BeingHandler()),
+    mBeingHandler(new BeingHandler(config.getValue("EnableSync", 0) == 1)),
     mBuySellHandler(new BuySellHandler()),
     mChatHandler(new ChatHandler()),
     mEquipmentHandler(new EquipmentHandler()),
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 7b69ec1c..c2377f65 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -45,10 +45,8 @@
 
 #include "../utils/trim.h"
 
-ChatWindow::ChatWindow(Network *network):
-    Window(""),
-    mNetwork(network),
-    mTmpVisible(false)
+ChatWindow::ChatWindow(Network * network):
+Window(""), mNetwork(network), mTmpVisible(false)
 {
     setWindowName("Chat");
 
@@ -65,10 +63,10 @@ ChatWindow::ChatWindow(Network *network):
     mTextOutput->disableLinksAndUserColors();
     mTextOutput->setMaxRow((int) config.getValue("ChatLogLength", 0));
     mScrollArea = new ScrollArea(mTextOutput);
-    mScrollArea->setPosition(
-	    mScrollArea->getFrameSize(), mScrollArea->getFrameSize());
-    mScrollArea->setScrollPolicy(
-	    gcn::ScrollArea::SHOW_NEVER, gcn::ScrollArea::SHOW_ALWAYS);
+    mScrollArea->setPosition(mScrollArea->getFrameSize(),
+                             mScrollArea->getFrameSize());
+    mScrollArea->setScrollPolicy(gcn::ScrollArea::SHOW_NEVER,
+                                 gcn::ScrollArea::SHOW_ALWAYS);
     mScrollArea->setOpaque(false);
 
     add(mScrollArea);
@@ -96,81 +94,79 @@ ChatWindow::~ChatWindow()
 }
 
 void
-ChatWindow::logic()
+ ChatWindow::logic()
 {
     // todo: only do this when the size changes (updateWidgets?)
 
     const gcn::Rectangle area = getChildrenArea();
 
     mChatInput->setPosition(mChatInput->getFrameSize(),
-			    area.height - mChatInput->getHeight() -
-				mChatInput->getFrameSize());
+                            area.height - mChatInput->getHeight() -
+                            mChatInput->getFrameSize());
     mChatInput->setWidth(area.width - 2 * mChatInput->getFrameSize());
     mScrollArea->setWidth(area.width - 2 * mScrollArea->getFrameSize());
     mScrollArea->setHeight(area.height - 2 * mScrollArea->getFrameSize() -
-	    mChatInput->getHeight() - 5);
+                           mChatInput->getHeight() - 5);
     mScrollArea->logic();
 }
 
-void
-ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
+void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
 {
     // Trim whitespace
     trim(line);
 
     CHATLOG tmp;
-    tmp.own  = own;
+    tmp.own = own;
     tmp.nick = "";
     tmp.text = line;
 
     // Fix the owner of welcome message.
-    if (line.substr(0, 7) == "Welcome")
-    {
-	own = BY_SERVER;
+    if (line.substr(0, 7) == "Welcome") {
+        own = BY_SERVER;
     }
 
     std::string::size_type pos = line.find(" : ");
     if (pos != std::string::npos) {
-	tmp.nick = line.substr(0, pos);
-	tmp.text = line.substr(pos + 3);
+        tmp.nick = line.substr(0, pos);
+        tmp.text = line.substr(pos + 3);
     }
 
-    std::string lineColor = "##0"; // Equiv. to BrowserBox::BLACK
+    std::string lineColor = "##0";      // Equiv. to BrowserBox::BLACK
     switch (own) {
-	case BY_GM:
-	    tmp.nick += std::string("Global announcement: ");
-	    lineColor = "##1"; // Equiv. to BrowserBox::RED
-	    break;
-	case BY_PLAYER:
-	    tmp.nick += CAT_NORMAL;
-	    lineColor = "##2"; // Equiv. to BrowserBox::GREEN
-	    break;
-	case BY_OTHER:
-	    tmp.nick += CAT_NORMAL;
-	    lineColor = "##0"; // Equiv. to BrowserBox::BLACK
-	    break;
-	case BY_SERVER:
-	    tmp.nick = "Server: ";
-	    tmp.text = line;
-	    lineColor = "##7"; // Equiv. to BrowserBox::PURPLE
-	    break;
-	case BY_PARTY:
-	    tmp.nick += CAT_NORMAL;
-	    lineColor = "##6"; // Equiv. to BrowserBox::PINK
-	    break;
-	case ACT_WHISPER:
-	    tmp.nick += CAT_WHISPER;
-	    lineColor = "##3"; // Equiv. to BrowserBox::BLUE
-	    break;
-	case ACT_IS:
-	    tmp.nick += CAT_IS;
-	    lineColor = "##5"; // Equiv. to BrowserBox::YELLOW
-	    break;
-	case BY_LOGGER:
-	    tmp.nick = "";
-	    tmp.text = line;
-	    lineColor = "##8"; // Equiv. to BrowserBox::GRAY
-	    break;
+        case BY_GM:
+            tmp.nick += std::string("Global announcement: ");
+            lineColor = "##1";  // Equiv. to BrowserBox::RED
+            break;
+        case BY_PLAYER:
+            tmp.nick += CAT_NORMAL;
+            lineColor = "##2";  // Equiv. to BrowserBox::GREEN
+            break;
+        case BY_OTHER:
+            tmp.nick += CAT_NORMAL;
+            lineColor = "##0";  // Equiv. to BrowserBox::BLACK
+            break;
+        case BY_SERVER:
+            tmp.nick = "Server: ";
+            tmp.text = line;
+            lineColor = "##7";  // Equiv. to BrowserBox::PURPLE
+            break;
+        case BY_PARTY:
+            tmp.nick += CAT_NORMAL;
+            lineColor = "##6";  // Equiv. to BrowserBox::PINK
+            break;
+        case ACT_WHISPER:
+            tmp.nick += CAT_WHISPER;
+            lineColor = "##3";  // Equiv. to BrowserBox::BLUE
+            break;
+        case ACT_IS:
+            tmp.nick += CAT_IS;
+            lineColor = "##5";  // Equiv. to BrowserBox::YELLOW
+            break;
+        case BY_LOGGER:
+            tmp.nick = "";
+            tmp.text = line;
+            lineColor = "##8";  // Equiv. to BrowserBox::GRAY
+            break;
     }
 
     // Get the current system time
@@ -179,411 +175,360 @@ ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
 
     // Format the time string properly
     std::stringstream timeStr;
-    timeStr << "["
-	    << ((((t / 60) / 60) % 24 < 10) ? "0" : "")
-	    << (int)(((t / 60) / 60) % 24)
-	    << ":"
-	    << (((t / 60) % 60 < 10) ? "0" : "")
-	    << (int)((t / 60) % 60)
-	    << "] ";
+    timeStr << "[" << ((((t / 60) / 60) % 24 < 10) ? "0" : "")
+        << (int) (((t / 60) / 60) % 24)
+        << ":" << (((t / 60) % 60 < 10) ? "0" : "")
+        << (int) ((t / 60) % 60)
+        << "] ";
 
     line = lineColor + timeStr.str() + tmp.nick + tmp.text;
 
     // We look if the Vertical Scroll Bar is set at the max before
     // adding a row, otherwise the max will always be a row higher
     // at comparison.
-    if (mScrollArea->getVerticalScrollAmount() == mScrollArea->getVerticalMaxScroll())
-    {
-	mTextOutput->addRow(line);
-	mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll());
-    }
-    else
-    {
-	mTextOutput->addRow(line);
+    if (mScrollArea->getVerticalScrollAmount() ==
+        mScrollArea->getVerticalMaxScroll()) {
+        mTextOutput->addRow(line);
+        mScrollArea->setVerticalScrollAmount(mScrollArea->
+                                             getVerticalMaxScroll());
+    } else {
+        mTextOutput->addRow(line);
     }
 
     mRecorder->record(line.substr(3));
 }
 
-void
-ChatWindow::chatLog(CHATSKILL act)
+void ChatWindow::chatLog(CHATSKILL act)
 {
     chatLog(const_msg(act), BY_SERVER);
 }
 
-void
-ChatWindow::action(const gcn::ActionEvent &event)
+void ChatWindow::action(const gcn::ActionEvent & event)
 {
-    if (event.getId() == "chatinput")
-    {
-	std::string message = mChatInput->getText();
-
-	if (!message.empty()) {
-	    // If message different from previous, put it in the history
-	    if (mHistory.empty() || message != mHistory.back()) {
-		mHistory.push_back(message);
-	    }
-
-	    // Reset history iterator
-	    mCurHist = mHistory.end();
-
-	    // Send the message to the server
-	    chatSend(player_node->getName(), message);
-
-	    // Clear the text from the chat input
-	    mChatInput->setText("");
-	}
-	if (message.empty() || !mReturnToggles)
-	{
-	    // Remove focus and hide input
-	    mFocusHandler->focusNone();
-
-	    // If the chatWindow is shown up because you want to send a message
-	    // It should hide now
-	    if (mTmpVisible)
-	    {
-		setVisible(false);
-	    }
-	}
+    if (event.getId() == "chatinput") {
+        std::string message = mChatInput->getText();
+
+        if (!message.empty()) {
+            // If message different from previous, put it in the history
+            if (mHistory.empty() || message != mHistory.back()) {
+                mHistory.push_back(message);
+            }
+            // Reset history iterator
+            mCurHist = mHistory.end();
+
+            // Send the message to the server
+            chatSend(player_node->getName(), message);
+
+            // Clear the text from the chat input
+            mChatInput->setText("");
+        }
+        if (message.empty() || !mReturnToggles) {
+            // Remove focus and hide input
+            mFocusHandler->focusNone();
+
+            // If the chatWindow is shown up because you want to send a message
+            // It should hide now
+            if (mTmpVisible) {
+                setVisible(false);
+            }
+        }
     }
 }
 
-void
-ChatWindow::requestChatFocus()
+void ChatWindow::requestChatFocus()
 {
     // Make sure chatWindow is visible
-    if (!isVisible())
-    {
-	setVisible(true);
+    if (!isVisible()) {
+        setVisible(true);
 
-	/*
-	 * This is used to hide chatWindow after sending the message. There is
-	 * a trick here, because setVisible will set mTmpVisible to false, you
-	 * have to put this sentence *after* setVisible, not before it
-	 */
-	mTmpVisible = true;
+        /*
+         * This is used to hide chatWindow after sending the message. There is
+         * a trick here, because setVisible will set mTmpVisible to false, you
+         * have to put this sentence *after* setVisible, not before it
+         */
+        mTmpVisible = true;
     }
-
     // Give focus to the chat input
     mChatInput->setVisible(true);
     mChatInput->requestFocus();
 }
 
-bool
-ChatWindow::isInputFocused()
+bool ChatWindow::isInputFocused()
 {
     return mChatInput->isFocused();
 }
 
-void
-ChatWindow::chatSend(const std::string &nick, std::string msg)
+void ChatWindow::chatSend(const std::string & nick, std::string msg)
 {
     /* Some messages are managed client side, while others
      * require server handling by proper packet. Probably
      * those if elses should be replaced by protocol calls */
 
     // Send party message
-    if (msg.at(0) == mPartyPrefix)
-    {
-	msg.erase(0, 1);
-	std::size_t length = msg.length() + 1;
-
-	if (length == 0)
-	{
-	    chatLog("Trying to send a blank party message.", BY_SERVER);
-	    return;
-	}
-	MessageOut outMsg(mNetwork);
-
-	outMsg.writeInt16(CMSG_PARTY_MESSAGE);
-	outMsg.writeInt16(length + 4);
-	outMsg.writeString(msg, length);
-	return;
+    if (msg.at(0) == mPartyPrefix) {
+        msg.erase(0, 1);
+        std::size_t length = msg.length() + 1;
+
+        if (length == 0) {
+            chatLog("Trying to send a blank party message.", BY_SERVER);
+            return;
+        }
+        MessageOut outMsg(mNetwork);
+
+        outMsg.writeInt16(CMSG_PARTY_MESSAGE);
+        outMsg.writeInt16(length + 4);
+        outMsg.writeString(msg, length);
+        return;
     }
     // Prepare ordinary message
     if (msg.substr(0, 1) != "/") {
-	msg = nick + " : " + msg;
+        msg = nick + " : " + msg;
 
-	MessageOut outMsg(mNetwork);
-	outMsg.writeInt16(CMSG_CHAT_MESSAGE);
-	// Added + 1 in order to let eAthena parse admin commands correctly
-	outMsg.writeInt16(msg.length() + 4 + 1);
-	outMsg.writeString(msg, msg.length() + 1);
-	return;
+        MessageOut outMsg(mNetwork);
+        outMsg.writeInt16(CMSG_CHAT_MESSAGE);
+        // Added + 1 in order to let eAthena parse admin commands correctly
+        outMsg.writeInt16(msg.length() + 4 + 1);
+        outMsg.writeString(msg, msg.length() + 1);
+        return;
     }
     msg.erase(0, 1);
     trim(msg);
 
     std::size_t space = msg.find(" ");
     std::string command = msg.substr(0, space);
-    if (space == std::string::npos)
-    {
-	msg = "";
-    }
-    else
-    {
-	msg = msg.substr(space);
-	trim(msg);
-    }
-
-    if (command == "announce")
-    {
-	MessageOut outMsg(mNetwork);
-	outMsg.writeInt16(0x0099);
-	outMsg.writeInt16(msg.length() + 4);
-	outMsg.writeString(msg, msg.length());
-	return;
-    }
-    if (command == "help")
-    {
-	std::size_t space = msg.find(" ");
-	std::string msg1;
-	if (space == std::string::npos)
-	{
-	    msg1 = "";
-	}
-	else
-	{
-	    msg1 = msg.substr(space + 1, msg.length());
-	    msg = msg.substr(0, space);
-	}
-	if (msg != "" && msg.at(0) == '/')
-	{
-	    msg.erase(0, 1);
-	}
-	while (msg1 != "" && msg1.at(0) == ' ')
-	{
-	    msg1.erase(0, 1);
-	}
-	help(msg, msg1);
-	return;
-    }
-    if (command == "where")
-    {
-	chatLog(map_path, BY_SERVER);
-	return;
-    }
-    if (command == "who")
-    {
-	MessageOut outMsg(mNetwork);
-	outMsg.writeInt16(0x00c1);
-	return;
-    }
-    if (command == "clear")
-    {
-	mTextOutput->clearRows();
-	return;
-    }
-    if (command == "whisper")
-    {
-	std::string recvnick = "";
-
-	if (msg.substr(0,1) == "\"")
-	{
-	    const std::string::size_type pos = msg.find('"', 1);
-	    if (pos != std::string::npos) {
-		recvnick = msg.substr(1, pos - 1);
-		msg.erase(0, pos + 2);
-	    }
-	}
-	else
-	{
-	    const std::string::size_type pos = msg.find(" ");
-	    if (pos != std::string::npos) {
-		recvnick = msg.substr(0, pos);
-		msg.erase(0, pos + 1);
-	    }
-	}
-
-	MessageOut outMsg(mNetwork);
-	outMsg.writeInt16(CMSG_CHAT_WHISPER);
-	outMsg.writeInt16(msg.length() + 28);
-	outMsg.writeString(recvnick, 24);
-	outMsg.writeString(msg, msg.length());
-
-	chatLog("Whispering to " + recvnick + " : " + msg, BY_PLAYER);
-	return;
-    }
-    if (command == "record")
-    {
+    if (space == std::string::npos) {
+        msg = "";
+    } else {
+        msg = msg.substr(space);
+        trim(msg);
+    }
+
+    if (command == "announce") {
+        MessageOut outMsg(mNetwork);
+        outMsg.writeInt16(0x0099);
+        outMsg.writeInt16(msg.length() + 4);
+        outMsg.writeString(msg, msg.length());
+        return;
+    }
+    if (command == "help") {
+        std::size_t space = msg.find(" ");
+        std::string msg1;
+        if (space == std::string::npos) {
+            msg1 = "";
+        } else {
+            msg1 = msg.substr(space + 1, msg.length());
+            msg = msg.substr(0, space);
+        }
+        if (msg != "" && msg.at(0) == '/') {
+            msg.erase(0, 1);
+        }
+        while (msg1 != "" && msg1.at(0) == ' ') {
+            msg1.erase(0, 1);
+        }
+        help(msg, msg1);
+        return;
+    }
+    if (command == "where") {
+        // Display the current map, X, and Y
+        std::ostringstream where;
+        where << map_path << " " << player_node->mX << " " << player_node->mY;
+        chatLog(where.str(), BY_SERVER);
+        return;
+    }
+    if (command == "who") {
+        MessageOut outMsg(mNetwork);
+        outMsg.writeInt16(0x00c1);
+        return;
+    }
+    if (command == "clear") {
+        mTextOutput->clearRows();
+        return;
+    }
+    if (command == "whisper") {
+        std::string recvnick = "";
+
+        if (msg.substr(0, 1) == "\"") {
+            const std::string::size_type pos = msg.find('"', 1);
+            if (pos != std::string::npos) {
+                recvnick = msg.substr(1, pos - 1);
+                msg.erase(0, pos + 2);
+            }
+        } else {
+            const std::string::size_type pos = msg.find(" ");
+            if (pos != std::string::npos) {
+                recvnick = msg.substr(0, pos);
+                msg.erase(0, pos + 1);
+            }
+        }
+
+        MessageOut outMsg(mNetwork);
+        outMsg.writeInt16(CMSG_CHAT_WHISPER);
+        outMsg.writeInt16(msg.length() + 28);
+        outMsg.writeString(recvnick, 24);
+        outMsg.writeString(msg, msg.length());
+
+        chatLog("Whispering to " + recvnick + " : " + msg, BY_PLAYER);
+        return;
+    }
+    if (command == "record") {
         mRecorder->respond(msg);
-	return;
-    }
-    if (command == "toggle")
-    {
-	if (msg == "")
-	{
-	    chatLog(mReturnToggles ? "Return toggles chat."
-		                   : "Message closes chat.", BY_SERVER);
-	    return;
-	}
-	msg = msg.substr(0, 1);
-	if (msg == "1" || msg == "y" || msg == "t" || msg == "Y" || msg == "T")
-	{
-	    chatLog("Return now toggles chat.", BY_SERVER);
-	    mReturnToggles = true;
-	    return;
-	}
-	if (msg == "0" || msg == "n" || msg == "f" || msg == "N" || msg == "F")
-	{
-	    chatLog("Message now closes chat.", BY_SERVER);
-	    mReturnToggles = false;
-	    return;
-	}
-	chatLog("Options to /toggle are \"yes\", \"no\", \"true\", \"false\", "
-		"\"1\", \"0\".", BY_SERVER);
-	return;
-    }
-    if (command == "party")
-    {
-	if (msg == "")
-	{
-	    chatLog("Unknown party command... Type \"/help\" party for more "
-		    "information.", BY_SERVER);
-	    return;
-	}
-	const std::string::size_type space = msg.find(" ");
-	std::string rest = (space == std::string::npos ? ""
-				     : msg.substr(space + 1, msg.length()));
-	if (rest != "")
-	{
-	    msg = msg.substr(0, space);
-	    while (msg != "" && msg[0] == ' ')
-	    {
-		msg = msg.substr(1, msg.length());
-	    }
-	}
-	party(msg, rest);
-	return;
-    }
-    if (command == "present")
-    {
-	Beings &beings = beingManager->getAll();
-	std::string response = "";
-	for (BeingIterator bi = beings.begin(), be = beings.end();
-	     bi != be;
-	     ++bi)
-	{
-	    if ((*bi)->getType() == Being::PLAYER)
-	    {
-		if (response != "")
-		{
-		    response += ", ";
-		}
-		response += (*bi)->getName();
-	    }
-	}
-	if (mRecorder->isRecording())
-	{
-	    // Get the current system time
- 	    time_t t;
-	    time(&t);
-	    
-	    // Format the time string properly
-	    std::stringstream timeStr;
-	    timeStr << "["
-		    << ((((t / 60) / 60) % 24 < 10) ? "0" : "")
-		    << (int)(((t / 60) / 60) % 24)
-		    << ":"
-		    << (((t / 60) % 60 < 10) ? "0" : "")
-		    << (int)((t / 60) % 60)
-		    << "] ";
-
-  
-	    mRecorder->record(timeStr.str() + "Present: " + response + ".");
-	    chatLog("Attendance written to record log.", BY_SERVER, true);
-	}
-	else
-	{
-	    chatLog("Present: " + response, BY_SERVER);
-	}
-	return;
+        return;
+    }
+    if (command == "toggle") {
+        if (msg == "") {
+            chatLog(mReturnToggles ? "Return toggles chat."
+                    : "Message closes chat.", BY_SERVER);
+            return;
+        }
+        msg = msg.substr(0, 1);
+        if (msg == "1" || msg == "y" || msg == "t" || msg == "Y" || msg == "T") {
+            chatLog("Return now toggles chat.", BY_SERVER);
+            mReturnToggles = true;
+            return;
+        }
+        if (msg == "0" || msg == "n" || msg == "f" || msg == "N" || msg == "F") {
+            chatLog("Message now closes chat.", BY_SERVER);
+            mReturnToggles = false;
+            return;
+        }
+        chatLog("Options to /toggle are \"yes\", \"no\", \"true\", \"false\", "
+                "\"1\", \"0\".", BY_SERVER);
+        return;
+    }
+    if (command == "party") {
+        if (msg == "") {
+            chatLog("Unknown party command... Type \"/help\" party for more "
+                    "information.", BY_SERVER);
+            return;
+        }
+        const std::string::size_type space = msg.find(" ");
+        std::string rest = (space == std::string::npos ? ""
+                            : msg.substr(space + 1, msg.length()));
+        if (rest != "") {
+            msg = msg.substr(0, space);
+            while (msg != "" && msg[0] == ' ') {
+                msg = msg.substr(1, msg.length());
+            }
+        }
+        party(msg, rest);
+        return;
+    }
+    if (command == "present") {
+        Beings & beings = beingManager->getAll();
+        std::string response = "";
+        for (BeingIterator bi = beings.begin(), be = beings.end();
+             bi != be; ++bi) {
+            if ((*bi)->getType() == Being::PLAYER) {
+                if (response != "") {
+                    response += ", ";
+                }
+                response += (*bi)->getName();
+            }
+        }
+        if (mRecorder->isRecording()) {
+            // Get the current system time
+            time_t t;
+            time(&t);
+
+            // Format the time string properly
+            std::stringstream timeStr;
+            timeStr << "[" << ((((t / 60) / 60) % 24 < 10) ? "0" : "")
+                << (int) (((t / 60) / 60) % 24)
+                << ":" << (((t / 60) % 60 < 10) ? "0" : "")
+                << (int) ((t / 60) % 60)
+                << "] ";
+
+
+            mRecorder->record(timeStr.str() + "Present: " + response + ".");
+            chatLog("Attendance written to record log.", BY_SERVER, true);
+        } else {
+            chatLog("Present: " + response, BY_SERVER);
+        }
+        return;
     }
     chatLog("Unknown command", BY_SERVER);
 }
 
-std::string
-ChatWindow::const_msg(CHATSKILL act)
+std::string ChatWindow::const_msg(CHATSKILL act)
 {
     std::string msg;
     if (act.success == SKILL_FAILED && act.skill == SKILL_BASIC) {
-	switch (act.bskill) {
-	    case BSKILL_TRADE :
-		msg = "Trade failed!";
-		break;
-	    case BSKILL_EMOTE :
-		msg = "Emote failed!";
-		break;
-	    case BSKILL_SIT :
-		msg = "Sit failed!";
-		break;
-	    case BSKILL_CREATECHAT :
-		msg = "Chat creating failed!";
-		break;
-	    case BSKILL_JOINPARTY :
-		msg = "Could not join party!";
-		break;
-	    case BSKILL_SHOUT :
-		msg = "Cannot shout!";
-		break;
-	}
-
-	switch (act.reason) {
-	    case RFAIL_SKILLDEP :
-		msg += " You have not yet reached a high enough level!";
-		break;
-	    case RFAIL_INSUFHP :
-		msg += " Insufficient HP!";
-		break;
-	    case RFAIL_INSUFSP :
-		msg += " Insufficient SP!";
-		break;
-	    case RFAIL_NOMEMO :
-		msg += " You have no memos!";
-		break;
-	    case RFAIL_SKILLDELAY :
-		msg += " You cannot do that right now!";
-		break;
-	    case RFAIL_ZENY :
-		msg += " Seems you need more Zeny... ;-)";
-		break;
-	    case RFAIL_WEAPON :
-		msg += " You cannot use this skill with that kind of weapon!";
-		break;
-	    case RFAIL_REDGEM :
-		msg += " You need another red gem!";
-		break;
-	    case RFAIL_BLUEGEM :
-		msg += " You need another blue gem!";
-		break;
-	    case RFAIL_OVERWEIGHT :
-		msg += " You're carrying to much to do this!";
-		break;
-	    default :
-		msg += " Huh? What's that?";
-		break;
-	}
+        switch (act.bskill) {
+            case BSKILL_TRADE:
+                msg = "Trade failed!";
+                break;
+            case BSKILL_EMOTE:
+                msg = "Emote failed!";
+                break;
+            case BSKILL_SIT:
+                msg = "Sit failed!";
+                break;
+            case BSKILL_CREATECHAT:
+                msg = "Chat creating failed!";
+                break;
+            case BSKILL_JOINPARTY:
+                msg = "Could not join party!";
+                break;
+            case BSKILL_SHOUT:
+                msg = "Cannot shout!";
+                break;
+        }
+
+        switch (act.reason) {
+            case RFAIL_SKILLDEP:
+                msg += " You have not yet reached a high enough level!";
+                break;
+            case RFAIL_INSUFHP:
+                msg += " Insufficient HP!";
+                break;
+            case RFAIL_INSUFSP:
+                msg += " Insufficient SP!";
+                break;
+            case RFAIL_NOMEMO:
+                msg += " You have no memos!";
+                break;
+            case RFAIL_SKILLDELAY:
+                msg += " You cannot do that right now!";
+                break;
+            case RFAIL_ZENY:
+                msg += " Seems you need more Zeny... ;-)";
+                break;
+            case RFAIL_WEAPON:
+                msg += " You cannot use this skill with that kind of weapon!";
+                break;
+            case RFAIL_REDGEM:
+                msg += " You need another red gem!";
+                break;
+            case RFAIL_BLUEGEM:
+                msg += " You need another blue gem!";
+                break;
+            case RFAIL_OVERWEIGHT:
+                msg += " You're carrying to much to do this!";
+                break;
+            default:
+                msg += " Huh? What's that?";
+                break;
+        }
     } else {
-	switch(act.skill) {
-	    case SKILL_WARP :
-		msg = "Warp failed...";
-		break;
-	    case SKILL_STEAL :
-		msg = "Could not steal anything...";
-		break;
-	    case SKILL_ENVENOM :
-		msg = "Poison had no effect...";
-		break;
-	}
+        switch (act.skill) {
+            case SKILL_WARP:
+                msg = "Warp failed...";
+                break;
+            case SKILL_STEAL:
+                msg = "Could not steal anything...";
+                break;
+            case SKILL_ENVENOM:
+                msg = "Poison had no effect...";
+                break;
+        }
     }
     return msg;
 }
 
-void
-ChatWindow::scroll(int amount)
+void ChatWindow::scroll(int amount)
 {
     if (!isVisible())
-	return;
+        return;
 
     int range = mScrollArea->getHeight() / 8 * amount;
     gcn::Rectangle scr;
@@ -592,41 +537,34 @@ ChatWindow::scroll(int amount)
     mTextOutput->showPart(scr);
 }
 
-void
-ChatWindow::keyPressed(gcn::KeyEvent &event)
+void ChatWindow::keyPressed(gcn::KeyEvent & event)
 {
     if (event.getKey().getValue() == gcn::Key::DOWN &&
-	    mCurHist != mHistory.end())
-    {
-	// Move forward through the history
-	HistoryIterator prevHist = mCurHist++;
-	if (mCurHist != mHistory.end()) {
-	    mChatInput->setText(*mCurHist);
-	    mChatInput->setCaretPosition(mChatInput->getText().length());
-	}
-	else {
-	    mCurHist = prevHist;
-	}
-    }
-    else if (event.getKey().getValue() == gcn::Key::UP &&
-	    mCurHist != mHistory.begin() && mHistory.size() > 0)
-    {
-	// Move backward through the history
-	mCurHist--;
-	mChatInput->setText(*mCurHist);
-	mChatInput->setCaretPosition(mChatInput->getText().length());
+        mCurHist != mHistory.end()) {
+        // Move forward through the history
+        HistoryIterator prevHist = mCurHist++;
+        if (mCurHist != mHistory.end()) {
+            mChatInput->setText(*mCurHist);
+            mChatInput->setCaretPosition(mChatInput->getText().length());
+        } else {
+            mCurHist = prevHist;
+        }
+    } else if (event.getKey().getValue() == gcn::Key::UP &&
+               mCurHist != mHistory.begin() && mHistory.size() > 0) {
+        // Move backward through the history
+        mCurHist--;
+        mChatInput->setText(*mCurHist);
+        mChatInput->setCaretPosition(mChatInput->getText().length());
     }
 }
 
-void
-ChatWindow::setInputText(std::string input_str)
+void ChatWindow::setInputText(std::string input_str)
 {
-     mChatInput->setText(input_str + " ");
-     requestChatFocus();
+    mChatInput->setText(input_str + " ");
+    requestChatFocus();
 }
 
-void
-ChatWindow::setVisible(bool isVisible)
+void ChatWindow::setVisible(bool isVisible)
 {
     Window::setVisible(isVisible);
 
@@ -638,78 +576,64 @@ ChatWindow::setVisible(bool isVisible)
     mTmpVisible = false;
 }
 
-void
-ChatWindow::party(const std::string &command, const std::string &rest)
+void ChatWindow::party(const std::string & command, const std::string & rest)
 {
-    if (command == "prefix")
-    {
-	if (rest == "")
-	{
-	    char temp[2] = ".";
-	    *temp = mPartyPrefix;
-	    chatLog("The current party prefix is " + std::string(temp),
-		    BY_SERVER);
-	    return;
-	}
-	if (rest.length() != 1)
-	{
-	    chatLog("Party prefix must be one character long.", BY_SERVER);
-	}
-	else
-	{
-	    if (rest == "/")
-	    {
-		chatLog("Cannot use a '/' as the prefix.", BY_SERVER);
-	    }
-	    else
-	    {
-		mPartyPrefix = rest.at(0);
-		chatLog("Changing prefix to " + rest, BY_SERVER);
-	    }
-	}
-	return;
+    if (command == "prefix") {
+        if (rest == "") {
+            char temp[2] = ".";
+            *temp = mPartyPrefix;
+            chatLog("The current party prefix is " + std::string(temp),
+                    BY_SERVER);
+            return;
+        }
+        if (rest.length() != 1) {
+            chatLog("Party prefix must be one character long.", BY_SERVER);
+        } else {
+            if (rest == "/") {
+                chatLog("Cannot use a '/' as the prefix.", BY_SERVER);
+            } else {
+                mPartyPrefix = rest.at(0);
+                chatLog("Changing prefix to " + rest, BY_SERVER);
+            }
+        }
+        return;
     }
     mParty->respond(command, rest);
 }
 
-void
-ChatWindow::help(const std::string &msg1, const std::string &msg2)
+void ChatWindow::help(const std::string & msg1, const std::string & msg2)
 {
     chatLog("-- Help --", BY_SERVER);
-    if (msg1 == "")
-    {
-	chatLog("/announce: Global announcement (GM only)", BY_SERVER);
-	chatLog("/clear: Clears this window", BY_SERVER);
-	chatLog("/help: Display this help.", BY_SERVER);
-	mParty->help();
-	chatLog("/present: Get list of players present", BY_SERVER);
-	mRecorder->help();
-	chatLog("/toggle: Determine whether <return> toggles the chat log.",
-		BY_SERVER);
-	chatLog("/where: Display map name", BY_SERVER);
-	chatLog("/whisper <nick> <message>: Sends a private <message>"
-		" to <nick>", BY_SERVER);
-	chatLog("/who: Display number of online users", BY_SERVER);
-	chatLog("For more information, type /help <command>", BY_SERVER);
-	return;
-    }
-    if (msg1 == "announce")
-    {
-	chatLog("Command: /announce <msg>", BY_SERVER);
-	chatLog("*** only available to a GM ***", BY_SERVER);
-	chatLog("This command sends the message <msg> to "
-		"all players currently online.", BY_SERVER);
-	return;
-    }
-    if (msg1 == "clear")
-    {
-	chatLog("Command: /clear", BY_SERVER);
-	chatLog("This command clears the chat log of previous chat.",
-		BY_SERVER);
-	return;
-    }
-    if (msg1 == "help")
-    {
+    if (msg1 == "") {
+        chatLog("/announce: Global announcement (GM only)", BY_SERVER);
+        chatLog("/clear: Clears this window", BY_SERVER);
+        chatLog("/help: Display this help.", BY_SERVER);
+        mParty->help();
+        chatLog("/present: Get list of players present", BY_SERVER);
+        mRecorder->help();
+        chatLog("/toggle: Determine whether <return> toggles the chat log.",
+                BY_SERVER);
+        chatLog("/where: Display map name", BY_SERVER);
+        chatLog("/whisper <nick> <message>: Sends a private <message>"
+                " to <nick>", BY_SERVER);
+        chatLog("/who: Display number of online users", BY_SERVER);
+        chatLog("For more information, type /help <command>", BY_SERVER);
+        return;
+    }
+    if (msg1 == "announce") {
+        chatLog("Command: /announce <msg>", BY_SERVER);
+        chatLog("*** only available to a GM ***", BY_SERVER);
+        chatLog("This command sends the message <msg> to "
+                "all players currently online.", BY_SERVER);
+        return;
+    }
+    if (msg1 == "clear") {
+        chatLog("Command: /clear", BY_SERVER);
+        chatLog("This command clears the chat log of previous chat.",
+                BY_SERVER);
+        return;
+    }
+    if (msg1 == "help") {
         chatLog("Command: /help", BY_SERVER);
         chatLog("This command displays a list of all commands available.",
                 BY_SERVER);
@@ -717,58 +641,51 @@ ChatWindow::help(const std::string &msg1, const std::string &msg2)
         chatLog("This command displays help on <command>.", BY_SERVER);
         return;
     }
-    if (msg1 == "party")
-    {
+    if (msg1 == "party") {
         mParty->help(msg2);
-	return;
-    }
-    if (msg1 == "present")
-    {
-	chatLog("Command: /present", BY_SERVER);
-	chatLog("This command gets a list of players within hearing "
-		"and sends it to either the record log if recording, or the "
-		"chat log otherwise.", BY_SERVER);
-	return;
-    }
-    if (msg1 == "record")
-    {
+        return;
+    }
+    if (msg1 == "present") {
+        chatLog("Command: /present", BY_SERVER);
+        chatLog("This command gets a list of players within hearing "
+                "and sends it to either the record log if recording, or the "
+                "chat log otherwise.", BY_SERVER);
+        return;
+    }
+    if (msg1 == "record") {
         mRecorder->help(msg2);
-	return;
-    }
-    if (msg1 == "toggle")
-    {
-	chatLog("Command: /toggle <state>", BY_SERVER);
-	chatLog("This command sets whether the return key should toggle the "
-		"chat log, or whether the chat log turns off automatically.",
-		BY_SERVER);
-	chatLog("<state> can be one of \"1\", \"yes\", \"true\" to turn "
-		"the toggle on, or \"0\", \"no\", \"false\" to turn the "
-		"toggle off.", BY_SERVER);
-	chatLog("Command: /toggle", BY_SERVER);
-	chatLog("This command displays the return toggle status.", BY_SERVER);
-	return;
-    }
-    if (msg1 == "where")
-    {
-	chatLog("Command: /where", BY_SERVER);
-	chatLog("This command displays the name of the current map.",
-		BY_SERVER);
-	return;
-    }
-    if (msg1 == "whisper")
-    {
-	chatLog("Command: /whisper <nick> <msg>", BY_SERVER);
-	chatLog("This command sends the message <msg> to <nick.", BY_SERVER);
-	chatLog("If the <nick> has spaces in it, enclose it in "
-		"double quotes (\").", BY_SERVER);
-	return;
-    }
-    if (msg1 == "who")
-    {
-	chatLog("Command: /who", BY_SERVER);
-	chatLog("This command displays the number of players currently "
-		"online.", BY_SERVER);
-	return;
+        return;
+    }
+    if (msg1 == "toggle") {
+        chatLog("Command: /toggle <state>", BY_SERVER);
+        chatLog("This command sets whether the return key should toggle the "
+                "chat log, or whether the chat log turns off automatically.",
+                BY_SERVER);
+        chatLog("<state> can be one of \"1\", \"yes\", \"true\" to turn "
+                "the toggle on, or \"0\", \"no\", \"false\" to turn the "
+                "toggle off.", BY_SERVER);
+        chatLog("Command: /toggle", BY_SERVER);
+        chatLog("This command displays the return toggle status.", BY_SERVER);
+        return;
+    }
+    if (msg1 == "where") {
+        chatLog("Command: /where", BY_SERVER);
+        chatLog("This command displays the name of the current map.",
+                BY_SERVER);
+        return;
+    }
+    if (msg1 == "whisper") {
+        chatLog("Command: /whisper <nick> <msg>", BY_SERVER);
+        chatLog("This command sends the message <msg> to <nick.", BY_SERVER);
+        chatLog("If the <nick> has spaces in it, enclose it in "
+                "double quotes (\").", BY_SERVER);
+        return;
+    }
+    if (msg1 == "who") {
+        chatLog("Command: /who", BY_SERVER);
+        chatLog("This command displays the number of players currently "
+                "online.", BY_SERVER);
+        return;
     }
     chatLog("Unknown command.", BY_SERVER);
     chatLog("Type /help for a list of commands.", BY_SERVER);
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 5b2ac5f4..fbef02bd 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -40,7 +40,8 @@
 
 const int EMOTION_TIME = 150;    /**< Duration of emotion icon */
 
-BeingHandler::BeingHandler()
+BeingHandler::BeingHandler(bool enableSync):
+   mSync(enableSync)
 {
     static const Uint16 _messages[] = {
         SMSG_BEING_VISIBLE,
@@ -467,25 +468,30 @@ void BeingHandler::handleMessage(MessageIn *msg)
             break;
 
         case SMSG_PLAYER_STOP:
-            // Instruction from server to stop walking at x, y.
             /*
-             * Deactivated - it drives people on the TMW server nuts
+             *  Instruction from server to stop walking at x, y.
              *
-            id = msg->readInt32();
-            dstBeing = beingManager->findBeing(id);
+             *  Some people like having this enabled.  Others absolutely
+             *  despise it.  So I'm setting to so that it only affects the
+             *  local player if the person has set a key "EnableSync" to "1"
+             *  in their config.xml file.
+             *
+             *  This packet will be honored for all other beings, regardless
+             *  of the config setting.
+             */
 
-            if (dstBeing) {
-                dstBeing->mX = msg->readInt16();
-                dstBeing->mY = msg->readInt16();
-                if (dstBeing->mAction == Being::WALK) {
-                     dstBeing->mFrame = 0;
-                     dstBeing->setAction(Being::STAND);
+            id = msg->readInt32();
+            if (mSync || id != player_node->getId()) {
+                dstBeing = beingManager->findBeing(id);
+                if (dstBeing) {
+                    dstBeing->mX = msg->readInt16();
+                    dstBeing->mY = msg->readInt16();
+                    if (dstBeing->mAction == Being::WALK) {
+                        dstBeing->mFrame = 0;
+                        dstBeing->setAction(Being::STAND);
+                    }
                 }
-
-            } else {
-                logger->log("0x0088: Non-existent being %d", id);
             }
-            */
             break;
 
         case SMSG_PLAYER_MOVE_TO_ATTACK:
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index 5429d962..8f58a397 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -29,9 +29,13 @@
 class BeingHandler : public MessageHandler
 {
     public:
-        BeingHandler();
+        BeingHandler(bool enableSync);
 
         void handleMessage(MessageIn *msg);
+
+    private:
+        // Should we honor server "Stop Walking" packets
+        bool mSync;
 };
 
 #endif
-- 
cgit v1.2.3-70-g09d2


From 07108777759efe97e0435f4586212ffc2d878279 Mon Sep 17 00:00:00 2001
From: Douglas Boffey <DougABoffey@netscape.net>
Date: Tue, 26 Aug 2008 14:02:59 +0000
Subject: Corrected splash screen problem as per mantis #52

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 7efbca4f..b5fd0e98 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -772,7 +772,7 @@ int main(int argc, char *argv[])
                     // Reload the wallpaper in case that it was updated
                     login_wallpaper->decRef();
                     login_wallpaper = ResourceManager::getInstance()->
-                        getImage("graphics/images/login_wallpaper.png");
+                        getImage(wallpaperName);
                     break;
 
                     // Those states don't cause a network disconnect
-- 
cgit v1.2.3-70-g09d2


From b16c29acb5d625df121f5c6aa8ea60a2943845c9 Mon Sep 17 00:00:00 2001
From: Douglas Boffey <DougABoffey@netscape.net>
Date: Tue, 26 Aug 2008 14:51:38 +0000
Subject: Corrected position of registration dialogs

---
 src/main.cpp | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index b5fd0e98..22d82f94 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -576,6 +576,18 @@ void accountLogin(Network *network, LoginData *loginData)
     config.setValue("remember", loginData->remember);
 }
 
+inline int MIN(int x, int y)
+{
+    return x < y ? x : y;
+}
+
+void positionDialog(Window *dialog, int screenWidth, int screenHeight)
+{
+    dialog->setPosition(
+        MIN(screenWidth * 5 / 8, screenWidth - dialog->getWidth()),
+        MIN(screenHeight * 5 / 8, screenHeight - dialog->getHeight()));
+}
+
 void charLogin(Network *network, LoginData *loginData)
 {
     logger->log("Trying to connect to char server...");
@@ -700,6 +712,8 @@ int main(int argc, char *argv[])
 
     // Set the most appropriate wallpaper, based on screen width
     int screenWidth = (int) config.getValue("screenwidth", defaultScreenWidth);
+    int screenHeight = static_cast<int>(config.getValue("screenheight",
+                                                        defaultScreenHeight));
     std::string wallpaperName;
 
     if (screenWidth <= 800)
@@ -825,12 +839,15 @@ int main(int argc, char *argv[])
                         state = ACCOUNT_STATE;
                     } else {
                         currentDialog = new LoginDialog(&loginData);
+                        positionDialog(currentDialog, screenWidth,
+                                                      screenHeight);
                     }
                     break;
 
                 case REGISTER_STATE:
                     logger->log("State: REGISTER");
                     currentDialog = new RegisterDialog(&loginData);
+                    positionDialog(currentDialog, screenWidth, screenHeight);
                     break;
 
                 case CHAR_SERVER_STATE:
@@ -843,6 +860,8 @@ int main(int argc, char *argv[])
                         state = UPDATE_STATE;
                     } else {
                         currentDialog = new ServerSelectDialog(&loginData);
+                        positionDialog(currentDialog, screenWidth,
+                                                      screenHeight);
                         if (options.chooseDefault || options.playername != "") {
                             ((ServerSelectDialog*) currentDialog)->action(
                                 gcn::ActionEvent(NULL, "ok"));
@@ -853,7 +872,7 @@ int main(int argc, char *argv[])
                     logger->log("State: CHAR_SELECT");
                     currentDialog = new CharSelectDialog(network, &charInfo,
                                                          1 - loginData.sex);
-
+                    positionDialog(currentDialog, screenWidth, screenHeight);
                     if (((CharSelectDialog*) currentDialog)->
                             selectByName(options.playername))
                         options.chooseDefault = true;
@@ -903,12 +922,15 @@ int main(int argc, char *argv[])
                     } else {
                         currentDialog = new UpdaterWindow(updateHost,
                                                 homeDir + "/" + updatesDir);
+                        positionDialog(currentDialog, screenWidth,
+                                                      screenHeight);
                     }
                     break;
 
                 case ERROR_STATE:
                     logger->log("State: ERROR");
                     currentDialog = new OkDialog("Error", errorMessage);
+                    positionDialog(currentDialog, screenWidth, screenHeight);
                     currentDialog->addActionListener(&errorListener);
                     currentDialog = NULL; // OkDialog deletes itself
                     network->disconnect();
-- 
cgit v1.2.3-70-g09d2


From af742ceb85512edd1d6883a5ea4f4188e64725be Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Fri, 29 Aug 2008 01:36:21 +0000
Subject: Added fix from TMW to prevent crash if a map layer has too many tiles

---
 ChangeLog                   | 5 +++++
 src/resources/mapreader.cpp | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b4042915..9a391194 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-28  Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
+
+	* Patch to prevent crash if a map layer has too many
+	  tiles (From TMW svn, r4544)
+
 2008-08-21  Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
 
 	* Added configuration option "EnableSync" that causes
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 3dbaefde..e2b47e66 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -378,7 +378,13 @@ MapReader::readLayer(xmlNodePtr node, Map *map, int layer)
                     map->setTileWithGid(x, y, layer, gid);
 
                     x++;
-                    if (x == w) {x = 0; y++;}
+                    if (x == w) {
+                        x = 0; y++;
+
+                        // When we're done, don't crash on too much data
+                        if (y == h)
+                            break;
+                    }
                 }
                 free(binData);
             }
-- 
cgit v1.2.3-70-g09d2


From c43c4cfc69133c1d1da4e89c3879b96d8edfa981 Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Fri, 29 Aug 2008 21:13:19 +0000
Subject: Committed complex (multi-sprite) monster patch - from TMW Mantis, by
 Jaxad0127

---
 src/monster.cpp               | 29 ++++++++++++++++++++++-------
 src/resources/monsterdb.cpp   |  4 ++--
 src/resources/monsterinfo.cpp |  3 +--
 src/resources/monsterinfo.h   |  8 ++++----
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/monster.cpp b/src/monster.cpp
index e5f9f4b2..d3e52520 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -44,15 +44,24 @@ Monster::Monster(Uint32 id, Uint16 job, Map *map):
 {
     const MonsterInfo&  info = MonsterDB::get(job - 1002);
 
-    std::string filename = info.getSprite();
-    if (filename != "")
+    // Setup Monster sprites
+    int c = BASE_SPRITE;
+    const std::list<std::string> &sprites = info.getSprites();
+    for (std::list<std::string>::const_iterator i = sprites.begin();
+         i != sprites.end();
+         i++)
     {
-        mSprites[BASE_SPRITE] = AnimatedSprite::load(
-            "graphics/sprites/" + filename);
+        if (c == VECTOREND_SPRITE) break;
+
+        std::string file = "graphics/sprites/" + *i;
+        mSprites[c] = AnimatedSprite::load(file);
+        c++;
     }
-    else
+
+    // Ensure that something is shown
+    if (c == BASE_SPRITE)
     {
-        mSprites[BASE_SPRITE] = AnimatedSprite::load("graphics/sprites/error.xml");
+        mSprites[c] = AnimatedSprite::load("graphics/sprites/error.xml");
     }
 
     const std::list<std::string> &particleEffects = info.getParticleEffects();
@@ -122,7 +131,13 @@ Monster::setAction(Uint8 action)
 
     if (currentAction != ACTION_INVALID)
     {
-        mSprites[BASE_SPRITE]->play(currentAction);
+        for (int i = 0; i < VECTOREND_SPRITE; i++)
+        {
+            if (mSprites[i])
+            {
+                mSprites[i]->play(currentAction);
+            }
+        }
         mAction = action;
     }
 }
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 04de0e7c..847b99fe 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -45,7 +45,7 @@ MonsterDB::load()
     if (mLoaded)
         return;
 
-    mUnknown.setSprite("error.xml");
+    mUnknown.addSprite("error.xml");
     mUnknown.setName("unnamed");
 
     logger->log("Initializing monster database...");
@@ -96,7 +96,7 @@ MonsterDB::load()
         {
             if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite"))
             {
-                currentInfo->setSprite((const char*) spriteNode->xmlChildrenNode->content);
+                currentInfo->addSprite((const char*) spriteNode->xmlChildrenNode->content);
             }
 
             if (xmlStrEqual(spriteNode->name, BAD_CAST "sound"))
diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp
index 8238dc3e..e492ccd3 100644
--- a/src/resources/monsterinfo.cpp
+++ b/src/resources/monsterinfo.cpp
@@ -27,8 +27,7 @@
 
 #include "../utils/dtor.h"
 
-MonsterInfo::MonsterInfo():
-    mSprite("error.xml")
+MonsterInfo::MonsterInfo()
 {
 
 }
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index d9d17510..2f690756 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -63,7 +63,7 @@ class MonsterInfo
         setName(std::string name) { mName = name; }
 
         void
-        setSprite(std::string filename) { mSprite = filename; }
+        addSprite(std::string filename) { mSprites.push_back(filename); }
 
         void
         setTargetCursorSize(Being::TargetCursorSize targetCursorSize)
@@ -78,8 +78,8 @@ class MonsterInfo
         const std::string&
         getName() const { return mName; }
 
-        const std::string&
-        getSprite() const { return mSprite; }
+        const std::list<std::string>&
+        getSprites() const { return mSprites; }
 
         Being::TargetCursorSize
         getTargetCursorSize() const { return mTargetCursorSize; }
@@ -92,7 +92,7 @@ class MonsterInfo
 
     private:
         std::string mName;
-        std::string mSprite;
+        std::list<std::string> mSprites;
         Being::TargetCursorSize mTargetCursorSize;
         std::map<MonsterSoundEvent, std::vector<std::string>* > mSounds;
         std::list<std::string> mParticleEffects;
-- 
cgit v1.2.3-70-g09d2


From 27344eda61e59196f57299415b997ddd96933468 Mon Sep 17 00:00:00 2001
From: Kevin Day <blame582@gmail.com>
Date: Sat, 30 Aug 2008 12:41:45 +0000
Subject: updated the in game help files

---
 AUTHORS                |  18 +++---
 ChangeLog              |   8 +++
 data/help/about.txt    |  49 +++++++++++-----
 data/help/changes.txt  |  67 +---------------------
 data/help/commands.txt |   4 ++
 data/help/header.txt   |   6 +-
 data/help/index.txt    |   2 +-
 data/help/skills.txt   |   2 +
 data/help/support.txt  |   4 +-
 data/help/team.txt     | 148 ++++++++++---------------------------------------
 10 files changed, 96 insertions(+), 212 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a876c194..71cab2dd 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,23 +2,25 @@
 Aethyra Dev Team
 ---------------------------
 
- Blameu aka Kevin Day (blame582@gmail.com)
+ Blameu aka Kevin Day (blame@aethyra.com.com)
 
 == Programmers ==
 
- Sanga            
- Scraggy          
- Kraant
+ Sanga            <sanga@aethyra.com>
+ Scraggy          <DougABoffey@netscape.net>
+ Kraant           <kraant@gmail.com>
+ Tametomo
 
 == Artists ==
  
  Frictor
  Angeliex
- Tametomo
+ 
 
 == Map Designers ==
 
- Ichigo Black
+ Ichigo Black (aka Gonzo Dark)
+ Arkyan 
 
 == Inactive ==
 
@@ -34,8 +36,8 @@ The Mana World Dev Team
 == Programmers ==
 
  Bertram          (SDL input, progress bar drawing, Debian package)
- Bj�rn Lindeijer  (various parts, GUI, graphics, A* and map rewrites)
- Bj�rn Steinbrink (various parts)
+ Bj�rn Lindeijer  (various parts, GUI, graphics, A* and map rewrites)
+ Bj�rn Steinbrink (various parts)
  Javila           (various parts, GUI)
  nym              (several GUI parts)
  Shura            (configuration, sound, misc. ports)
diff --git a/ChangeLog b/ChangeLog
index 9a391194..deebf57c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,16 @@
+2008-08-30  kevin Day ("blame")     <blame@aethyra.com>
+
+	* Updated the in game help files "/trunk/data/help"
+
 2008-08-28  Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
 
 	* Patch to prevent crash if a map layer has too many
 	  tiles (From TMW svn, r4544)
 
+2008-08-26 Douglas Boffey ("Scraggy")	<DougABoffey@netscape.net>
+
+	* Corrected position of registration dialogs
+
 2008-08-21  Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
 
 	* Added configuration option "EnableSync" that causes
diff --git a/data/help/about.txt b/data/help/about.txt
index 812aad84..79840ad6 100644
--- a/data/help/about.txt
+++ b/data/help/about.txt
@@ -1,17 +1,40 @@
  <- @@index|Back to Index@@
  
  
-##3                      === ABOUT THE MANA WORLD ===
+##3                      === ABOUT Aethyra ===
  
- ##2The Mana World (TMW)##P is a serious effort to create an innovative free
- and open source MMORPG. TMW uses 2D graphics and aims to create a
- large and diverse interactive world. It is licensed under the GPL,
- making sure this game can't ever run away from you.
- 
- The project includes the development of both a client and a server,
- as well as the development of an online world. At the moment we're
- making alpha releases of the client, while our server is in early
- development. The eAthena free software Ragnarok Online server is used
- until our own server has matured enough to replace it. Once ready,
- we'll be making releases of our server too so anybody will be free to
- set up their own server and start building their own online world.
+ ##2Aethyra (Ae)##P Aethyra is a 2D MMORPG, using the eAthena server 
+ (an open-source clone of the commercial Ragnarok Online server). It
+ features expanding lands and community-made graphics, making for a 
+ fun, free, open source community project.
+
+ ##PAethyra started out as "The Mana Experiment," an experimental 
+ test-server for community-developed content designed for The Mana 
+ World which was put into action by Blame, Sanga, and Sertaline.
+ ##PSoon thereafter, it became evident that it was taking far too 
+ long for the elitist development team at The Mana World to 
+ implement good tested-content. They made excuses and treated the
+ long-awaited custom server TMWServ as the answer to all the problems,
+ and left the eAthena server (which The Mana World still runs on) 
+ to rot. Many development team members lost interest in helping, and 
+ the programmers forsook the eAthena server saying that it would 
+ simply delay TMWServ progress for months to fix the simplest of 
+ errors. In response to this, The Mana Experiment became a fork 
+ project, and an official game server. 
+ ##PTime passed, and more and more content was tested and implemented.
+ Soon, discussion began for a name. Aethyra was chosen, and the Game 
+ you see now was setup. Content development has never been better, and
+ the staff never more motivated! Stay on the lookout for more exciting
+ Aethyra developments!
+
+##3                     === Aethyra's Goal ===
+
+ ##PAethyra is a community driven experiment that utilizes eAthena at 
+ its core with the end goal of getting its players as involved in the
+ process as much as possible.  It's originally forked from The Mana
+ World when its developers came up with the idea of "Why should we
+ have to wait for an MMORPG game in development when we've already got
+ a great server setup here that does everything we've been promised
+ and more?" ##P As such, we are trying to implement as many functions
+ of eAthena as possible while creating our own in the process based
+ on what our players want to see.
diff --git a/data/help/changes.txt b/data/help/changes.txt
index 8b47cc9c..eb25c86d 100644
--- a/data/help/changes.txt
+++ b/data/help/changes.txt
@@ -3,70 +3,5 @@
  
 ##3                         === RECENT CHANGES ===
  
- 0.0.24.1 (7 April 2008)
- - Added /clear command to clear chat window
- - Added ability to close quit dialog by pressing ESC
- - Added key for targetting nearest player
- - Added the possibility to assign particle effects to monsters
- - Added possibility to pass through players with key controls
- - Fixed crash on exit after connection to server was lost
- - Fixed initialization of some variables
- - Fixed an error with chat messages without a sender that include a colon
- - Fixed minimap to not keep reappearing when hidden
- - Fixed a GCC 4.3 compile error
- - Fixed music loading from non-default location
- - Fixed crash on trying to show out of range emoticon
- - Updated Dev-C++ and Code::Blocks project files
- 
- 0.0.24 (24 December 2007)
- - Added female specific hair styles
- - Added user-definable key settings
- - Added XP gaining notification
- - Added close button to most windows
- - Added support for dynamic sprite recoloring
- - Added notification when the connection to the server is lost
- - Updated to work with Guichan 0.7.x
- - Mouse cursor now indicates when resize is possible
- - Changed amount slider in buy and sell dialogs to start at 1
- - Made weapon sprites and sounds customizable
- - Made buy and sell dialogs resizable
- - Merged equipment database with items database
- - Chat window log no longer goes back forever
- - Chat messages are trimmed (spaces are removed on both sides)
- - Fixed segmentation fault with some OpenGL drivers
- - Fixed updating of defense when increasing vitality
- - Fixed a bug that prevented being-controlled particles from being deleted
- - Fixed a crash in the particle engine related to child emitters
- - Fixed encoding issues with user home directory
- - Fixed a crash in equipment window on failure to load an item icon
- - Fixed a crash on filling up your inventory
- - Fixed item list in shops not to scroll back when selling
- 
- 0.0.23 (3 June 2007)
- - Added a particle engine along with some particle effects
- - Added a cursor to indicate targeted enemy
- - Added new program icon
- - Added a man page for UNIX like systems
- - Added the --version command line parameter
- - Improved MacOS X release
- - Screenshots are now saved in the .tmw directory on UNIX like systems
- - Magic pink is no longer used for transparency (fixes issues with that on Mac)
- - Fixed difficulties with resizing windows
- - Fixed misleading error message when connecting fails
- - Fixed wrong error message when account name already exists
- - Fixed crash when deleting a character
- - Fixed error message when creating a new character fails
- - Fixed updating problem when using scrollwheel to change shop selection
- 
- 0.0.22.2 (17 February 2007)
- - Updated to work with Guichan 0.6.1
- - Changed to new default server (server.themanaworld.org)
- - Changed custom mouse cursor
- - Fixed the issue where _M or _F is appended to the username
- - Fixed problem with Cancel button in update dialog
- 
- 0.0.22.1 (15 January 2007)
- - Updated to work with Guichan 0.6.0 (older versions no longer supported)
- - Fixed mouse coordinates in debug window
- - Fixed clicking on GUI to cause the player to start walking sometimes
+check out  www.aethyra.com for our changes in progress
  
diff --git a/data/help/commands.txt b/data/help/commands.txt
index 5cd9aee4..8303e995 100644
--- a/data/help/commands.txt
+++ b/data/help/commands.txt
@@ -50,6 +50,10 @@
  /whisper <name> <message>
 
  This will send <message> to player <name>, if that player is logged in.
+ to whisper to users with spaces in there name you must incase the user name in qoutes
+	(e.g. /whisper "user name" <message>)
+
+ For further help type /help in the chat console.
 
 
 ##2IGNORING COMMUNICATION
diff --git a/data/help/header.txt b/data/help/header.txt
index 57e9f141..ea622623 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -1,9 +1,9 @@
  
-##1               T  H  E      M  A  N  A      W  O  R  L  D
+##1                                 AETHYRA
 ##1               ==========================================
  
-           ##2Version:##6 0.0.24.1              ##2Date:##37 April 2008
+           ##2Version:##6 Aethyra SVN 0.0.25              ##2Date:##3 August 2008
  
-##2                    Website: http://themanaworld.org
+##2                    Website: http://www.aethyra.com
  
  
diff --git a/data/help/index.txt b/data/help/index.txt
index 56c5e352..b0568c35 100644
--- a/data/help/index.txt
+++ b/data/help/index.txt
@@ -1,6 +1,6 @@
 ##3                             === INDEX ===
 
- -> @@about|About The Mana World@@
+ -> @@about|About Aethyra@@
  -> @@team|Development Team@@
  -> @@changes|Recent Changes@@
 
diff --git a/data/help/skills.txt b/data/help/skills.txt
index 84d5bc5a..3a075ee0 100644
--- a/data/help/skills.txt
+++ b/data/help/skills.txt
@@ -11,5 +11,7 @@
      ##2Level 1:##P enables the ability to trade with others
      ##2Level 2:##P enables the ability to express emotions
      ##2Level 3:##P enables character to sit
+     ##2Level 5:##P enables a char to join a party.
+     ##2Level 7:##P enables a char to create a party
      Other levels are still not implemented.
  
\ No newline at end of file
diff --git a/data/help/support.txt b/data/help/support.txt
index 014e37b7..44fd08f3 100644
--- a/data/help/support.txt
+++ b/data/help/support.txt
@@ -7,11 +7,11 @@
  can't find a solution to your problem, feel free to check our
  Bugs/Support section of the forum:
  
-##2     http://themanaworld.org/phpBB2/viewforum.php?f=3
+##2     http://forums.aethyra.com
  
  or come visit us on our IRC channel:
  
-##2     #themanaworld ##P@##2 irc.freenode.net
+##2     #aethyra ##P@##2 irc.freenode.net
  
  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 e17771d5..bdd0c8c9 100644
--- a/data/help/team.txt
+++ b/data/help/team.txt
@@ -2,131 +2,41 @@
  
  
 ##3                        === DEVELOPMENT TEAM ===
- 
-##2 Project Leader:
- 
-     ##9Eugenio Favalli (aka ElvenProgrammer)
-         elvenprogrammer@gmail.com
- 
- 
+
 ##2 Programmers:
  
-     ##9Bjorn Lindeijer (aka Hammerbear)
-         b_lindeijer@users.sourceforge.net
-             (various parts, GUI, graphics, A* and map rewrites)
- 
-     ##9Bj�rn Steinbrink  (aka Doener)
-         der_doener@users.sourceforge.net
-             (various parts)
- 
-     ##9Eric Scrivner (aka zenogais)
-         bitshift2002@users.sourceforge.net
-             (resource manager)
- 
-     ##9J. Avila (aka Javila)
-         javila@users.sourceforge.net
-             (various parts, GUI)
- 
-     ##9Jan-Fabian Humann (aka Mra)
-         malastare@users.sourceforge.net
-             (some GUI parts)
- 
-     ##9Kiyoshi Kyokai (aka Kiokay)
-         kyokai@users.sourceforge.net
-             (game systems designer)
- 
-     ##9Mateusz Kaduk (aka Usiu)
-         usiu@users.sourceforge.net
-             (several GUI parts)
- 
-     ##9Aaron Marks (aka nym)
-         nymacro@users.sourceforge.net
-             (several GUI parts)
- 
-     ##9Shura
-         kth5@users.sourceforge.net
-             (configuration, sound, misc. ports)
- 
-     ##9Yohann Ferreira (aka Bertram)
-         bertram25@users.sourceforge.net
-             (SDL input, progress bar drawing, Debian package)
+  ##9Sanga Head Developer/GM ("Sanga")
+            <sanga@aethyra.com>
+
+  ##9Scraggy Client Developer 
+            <DougABoffey@netscape.net>
+
+  ##9Kraant Developer
+            <kraant@gmail.com>
+
+  ##9Tametomo Developer/Artist
  
  
 ##2 Artists:
  
-     ##9Clef
-             (tiles, concepts)
- 
-     ##9Frode Lindeijer (aka Modanung)
-         f.lindeijer@xs4all.nl
-             (arts)
- 
-     ##9Gnulia 
-             (conceptual art)
- 
-     ##9Magick
-             (music and sound effects)
- 
-     ##9Neko-mon
-             (player sprites, various things)
-    
-     ##9Neorice
-             (monster sprites, tiles)
- 
-     ##9Pajarico
-         pajarico@users.sourceforge.net
-             (conceptual arts)
- 
-     ##9Romulo Fernandes
-         razor85@users.sourceforge.net
-             (arts)
- 
-     ##9Rotonen
-         rotonen@users.sourceforge.net
-             (backstory, art director, music, sound)
- 
-     ##9Talaroc
-         talaroc@users.sourceforge.net
-             (sprites)
- 
-     ##9Ti Sing Hao
-             (music)
+  ##9Frictor Head Artist 
+
+  ##9Angeliex Artist
+
+  ##9GonzoDark Mapper
+
+  ##9Arkyan Mapper
  
  
 ##2 Misc. thanks:
- 
-     ##9David Smith (aka catfish_man)
-         catfish_man@users.sourceforge.net
-             (Mac package)
- 
-     ##9Igor Morgado (aka imorgado)
-         imorgado@users.sourceforge.net
-             (tester)
- 
-     ##9maci
-         maci321@users.sourceforge.net
-             (technical support)
- 
-     ##9Rodney Dawes (aka dobey)
-         dobey@users.sourceforge.net
-             (Mac package)
- 
-     ##9Ultramichy
-             (hosting test server)
- 
- 
-##2 Inactive/retired:
- 
-     ##9Chetic
-         chetic@users.sourceforge.net
-             (maps)
- 
-     ##9Simon Edwardsson (aka SimEdw)
-         simonedw@users.sourceforge.net
-             (network code, Mac package)
- 
-     ##9Sull 
-             (hosting CVS and related services)
- 
-     ##9Vlady
-             (several items)
+
+  ##9MrDan Forum Admin/GM 
+
+  ##9Slinker Game Server Host
+
+##2 Leave of Absence
+
+  ##9Sert Head Artist/GM
+
+  ##9Blame Developer/GM
+            <blame@aethyra.com>
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 9acb6d27b2038906c1e04bc0a413cb9005185d38 Mon Sep 17 00:00:00 2001
From: Kraant <kraant@gmail.com>
Date: Mon, 1 Sep 2008 21:45:06 +0000
Subject: Added a few known issues to WinReadMe.txt.

Also changed main.cpp to define usleep for the windows
compile.
---
 WinReadMe.txt | 9 +++++++++
 src/main.cpp  | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/WinReadMe.txt b/WinReadMe.txt
index 8e72f036..17870e03 100644
--- a/WinReadMe.txt
+++ b/WinReadMe.txt
@@ -1,5 +1,14 @@
 To run aethyra double click on aethyra.exe in this folder.
 
+There are a couple of known bugs you might run into first run...
+
+aethyra.exe might complain about not being able to create it's
+configuration folder. If it crashes out just run it again.
+
+You may also have issues with the aethyra crashing with lots of
+updates. Again just run it again and it should continue the update
+from where it left off.
+
 To install the client, just copy this folder to your Program Files
 folder and add a shortcut to aethyra.exe to your Start Menu.
 
diff --git a/src/main.cpp b/src/main.cpp
index 22d82f94..57eb67bb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -40,6 +40,10 @@
 #include <cerrno>
 #include <sys/stat.h>
 #endif
+#ifdef __MINGW32__
+#include <windows.h>
+#define usleep(usec) (Sleep ((usec) / 1000), 0)
+#endif
 #if defined __APPLE__
 #include <CoreFoundation/CFBundle.h>
 #endif
-- 
cgit v1.2.3-70-g09d2


From 2e2e9916998865f5959f2e6da236e001862c39a6 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 2 Sep 2008 04:51:52 +0000
Subject: Added Aethyra icon by Grimmjow, as well as adding Cave_1-1 to the
 server. Also, a new NPC was added, which is a girl wearing blue clothes with
 pink hair and pink bunny ears .

---
 aethyra.png            |  Bin 18176 -> 10182 bytes
 data/icons/aethyra.ico |  Bin 22382 -> 38630 bytes
 data/icons/aethyra.png |  Bin 18176 -> 7645 bytes
 data/icons/aethyra.xpm | 1090 ++++++++++++++----------------------------------
 4 files changed, 308 insertions(+), 782 deletions(-)

diff --git a/aethyra.png b/aethyra.png
index 93e6c9ae..b3c128f7 100644
Binary files a/aethyra.png and b/aethyra.png differ
diff --git a/data/icons/aethyra.ico b/data/icons/aethyra.ico
index 61d559a3..62f0d937 100644
Binary files a/data/icons/aethyra.ico and b/data/icons/aethyra.ico differ
diff --git a/data/icons/aethyra.png b/data/icons/aethyra.png
index 93e6c9ae..702a88c6 100644
Binary files a/data/icons/aethyra.png and b/data/icons/aethyra.png differ
diff --git a/data/icons/aethyra.xpm b/data/icons/aethyra.xpm
index 06ec2865..cf720302 100644
--- a/data/icons/aethyra.xpm
+++ b/data/icons/aethyra.xpm
@@ -1,784 +1,310 @@
 /* XPM */
-static char * tmw_xpm[] = {
-"32 32 749 2",
+static char * aethyra_xpm[] = {
+"32 32 275 2",
 "  	c None",
-". 	c #E4EB6D",
-"+ 	c #EFF271",
-"@ 	c #E7EF65",
-"# 	c #DDED61",
-"$ 	c #D6E955",
-"% 	c #DAED4D",
-"& 	c #F6F5A0",
-"* 	c #EFEF89",
-"= 	c #ECF084",
-"- 	c #EDF077",
-"; 	c #EAF075",
-"> 	c #E0E960",
-", 	c #D9E757",
-"' 	c #D4EA52",
-") 	c #CFE74D",
-"! 	c #BEE140",
-"~ 	c #C2E43E",
-"{ 	c #B6DF33",
-"] 	c #F8F7C2",
-"^ 	c #F9F7AB",
-"/ 	c #F2F099",
-"( 	c #EEEF80",
-"_ 	c #F3F077",
-": 	c #F8F8B1",
-"< 	c #E8EE6F",
-"[ 	c #E1EB69",
-"} 	c #DBEB5E",
-"| 	c #D5E852",
-"1 	c #CDE445",
-"2 	c #CEE843",
-"3 	c #B6DC34",
-"4 	c #A9DA2F",
-"5 	c #B3E02F",
-"6 	c #B6E630",
-"7 	c #F1F2E2",
-"8 	c #F9F9D4",
-"9 	c #F9F8C5",
-"0 	c #F8F8CE",
-"a 	c #F9F8D6",
-"b 	c #F9F7CB",
-"c 	c #F9F7B1",
-"d 	c #F9F7A7",
-"e 	c #E7EE73",
-"f 	c #E4EC69",
-"g 	c #DEEB60",
-"h 	c #D8E755",
-"i 	c #D5EB55",
-"j 	c #C2E33F",
-"k 	c #BEE33C",
-"l 	c #B5E339",
-"m 	c #A7DF2E",
-"n 	c #9BDA28",
-"o 	c #95DA24",
-"p 	c #8DD724",
-"q 	c #F9F9F5",
-"r 	c #F9F9EA",
-"s 	c #F9F9E1",
-"t 	c #F9F9F4",
-"u 	c #F9F7DF",
-"v 	c #F9F7D1",
-"w 	c #F9F7C9",
-"x 	c #F9F7B6",
-"y 	c #F9F7AE",
-"z 	c #D7E363",
-"A 	c #E1EC6B",
-"B 	c #DDEC60",
-"C 	c #D8EC61",
-"D 	c #CDE552",
-"E 	c #C6E543",
-"F 	c #BCE440",
-"G 	c #BEE73E",
-"H 	c #ABDF30",
-"I 	c #ACE230",
-"J 	c #8FD720",
-"K 	c #80D01C",
-"L 	c #80D51A",
-"M 	c #F9F9F7",
-"N 	c #F9F9EB",
-"O 	c #F9F9F9",
-"P 	c #F9F7E6",
-"Q 	c #F9F7D3",
-"R 	c #F9F7CE",
-"S 	c #F9F7BF",
-"T 	c #F9F8B9",
-"U 	c #E6EF8F",
-"V 	c #E1EB65",
-"W 	c #E0ED63",
-"X 	c #D1E452",
-"Y 	c #D3E84D",
-"Z 	c #C3E340",
-"` 	c #BBE13E",
-" .	c #B0DD35",
-"..	c #ABDD2E",
-"+.	c #A0DB2A",
-"@.	c #95D923",
-"#.	c #7ED31C",
-"$.	c #7ED31A",
-"%.	c #80DA18",
-"&.	c #F4F3EF",
-"*.	c #F9F9F6",
-"=.	c #F9F8F5",
-"-.	c #F9F7EE",
-";.	c #F9F7E2",
-">.	c #F9F7D5",
-",.	c #F9F6C2",
-"'.	c #F8F69C",
-").	c #D4E56D",
-"!.	c #E4ED73",
-"~.	c #DBEA60",
-"{.	c #DDE961",
-"].	c #C9E54E",
-"^.	c #BFE242",
-"/.	c #BEE33E",
-"(.	c #B1DE34",
-"_.	c #ABDE33",
-":.	c #95D826",
-"<.	c #8DD620",
-"[.	c #8DDB20",
-"}.	c #91DD1E",
-"|.	c #71D116",
-"1.	c #50B910",
-"2.	c #F9F8F7",
-"3.	c #F9F8F4",
-"4.	c #F9F7EB",
-"5.	c #F9F7E1",
-"6.	c #F9F5CF",
-"7.	c #F9F6C9",
-"8.	c #F9F6BF",
-"9.	c #D6E471",
-"0.	c #E9F075",
-"a.	c #E3EC6B",
-"b.	c #D9E96D",
-"c.	c #CEE558",
-"d.	c #CBE44E",
-"e.	c #BEDE3E",
-"f.	c #ACDA37",
-"g.	c #BCE639",
-"h.	c #AEE135",
-"i.	c #9EDB2A",
-"j.	c #8FD822",
-"k.	c #7CD31B",
-"l.	c #82DA1C",
-"m.	c #63CE13",
-"n.	c #61CE12",
-"o.	c #F9F9F8",
-"p.	c #F9F7F5",
-"q.	c #F9F4DD",
-"r.	c #F9F5D7",
-"s.	c #F9F5C9",
-"t.	c #F9F5B6",
-"u.	c #E3ED8D",
-"v.	c #DEE865",
-"w.	c #E3ED6D",
-"x.	c #DDEB5E",
-"y.	c #D3E755",
-"z.	c #CAE349",
-"A.	c #CFEB4D",
-"B.	c #C1E33B",
-"C.	c #BCE743",
-"D.	c #B0E02D",
-"E.	c #95DB28",
-"F.	c #95DB26",
-"G.	c #C6E627",
-"H.	c #E8F433",
-"I.	c #CAED26",
-"J.	c #60CD0F",
-"K.	c #58CD0E",
-"L.	c #F9F7EC",
-"M.	c #F9F7F1",
-"N.	c #F9F4E4",
-"O.	c #F9F3D7",
-"P.	c #F9F3CA",
-"Q.	c #F9F5CA",
-"R.	c #F9F5BB",
-"S.	c #F9F8B6",
-"T.	c #F6F89E",
-"U.	c #DFEB5C",
-"V.	c #CEE453",
-"W.	c #D0E753",
-"X.	c #CDE543",
-"Y.	c #C7E842",
-"Z.	c #C1E53C",
-"`.	c #A7DC30",
-" +	c #E6F453",
-".+	c #E2F448",
-"++	c #D8F03C",
-"@+	c #D1ED2E",
-"#+	c #D0F033",
-"$+	c #CAED2C",
-"%+	c #ACE51F",
-"&+	c #55CF0F",
-"*+	c #F5F6EF",
-"=+	c #F9F9F2",
-"-+	c #F9F9F1",
-";+	c #F9F8F0",
-">+	c #F9F7E7",
-",+	c #F9F5F0",
-"'+	c #F9F3E1",
-")+	c #F9F5DB",
-"!+	c #F9F6DB",
-"~+	c #F9F6BE",
-"{+	c #F8F59B",
-"]+	c #F9F5A2",
-"^+	c #F8F68D",
-"/+	c #F7F689",
-"(+	c #D7EC65",
-"_+	c #CEE84E",
-":+	c #BBE23F",
-"<+	c #B6E238",
-"[+	c #A2DC30",
-"}+	c #EBF553",
-"|+	c #E4F443",
-"1+	c #DCF340",
-"2+	c #D4F033",
-"3+	c #CEEF2D",
-"4+	c #C2E926",
-"5+	c #BEEB20",
-"6+	c #5CD50E",
-"7+	c #53CE0D",
-"8+	c #F9F7D9",
-"9+	c #F9F6F2",
-"0+	c #F9F5EB",
-"a+	c #F9F3DA",
-"b+	c #F9F6DF",
-"c+	c #F9F7D0",
-"d+	c #F9F7C2",
-"e+	c #F9F7BB",
-"f+	c #F8F68F",
-"g+	c #F7F58D",
-"h+	c #F6F58B",
-"i+	c #EEF68B",
-"j+	c #BFDF43",
-"k+	c #B5DE37",
-"l+	c #B5E234",
-"m+	c #A7DD30",
-"n+	c #E7F248",
-"o+	c #D6EF40",
-"p+	c #DBF239",
-"q+	c #D0ED2F",
-"r+	c #C3EB2A",
-"s+	c #BCEB26",
-"t+	c #B5E81E",
-"u+	c #52CE0F",
-"v+	c #4ECB0B",
-"w+	c #F9F9D9",
-"x+	c #F9F9D7",
-"y+	c #F9F8F8",
-"z+	c #F9F7E9",
-"A+	c #F9F6E9",
-"B+	c #F9F5E0",
-"C+	c #F8F2D6",
-"D+	c #F9F3CE",
-"E+	c #F9F7CA",
-"F+	c #F9F8B5",
-"G+	c #F6F691",
-"H+	c #F9F699",
-"I+	c #F5F68F",
-"J+	c #F3F579",
-"K+	c #E8F575",
-"L+	c #C7E646",
-"M+	c #B5DF37",
-"N+	c #B9E438",
-"O+	c #9CD928",
-"P+	c #D7F348",
-"Q+	c #DBEF3B",
-"R+	c #D1EF35",
-"S+	c #D7F230",
-"T+	c #C1EA25",
-"U+	c #B5E91F",
-"V+	c #63DC1E",
-"W+	c #48CA0C",
-"X+	c #F4F4DC",
-"Y+	c #F9F9C3",
-"Z+	c #F9F9C5",
-"`+	c #F9F9C7",
-" @	c #F9F9E8",
-".@	c #F9F6DD",
-"+@	c #F9F6D6",
-"@@	c #F9F3C1",
-"#@	c #F9F3BF",
-"$@	c #F9F5B8",
-"%@	c #F8F8A6",
-"&@	c #F6F68F",
-"*@	c #F4F791",
-"=@	c #ABD746",
-"-@	c #C5E449",
-";@	c #C1E448",
-">@	c #BBE23E",
-",@	c #BBE237",
-"'@	c #A9DC30",
-")@	c #99D927",
-"!@	c #D3E32C",
-"~@	c #E2F340",
-"{@	c #D3ED2D",
-"]@	c #CAED2B",
-"^@	c #CDF028",
-"/@	c #C5EB27",
-"(@	c #B0E51C",
-"_@	c #91DC13",
-":@	c #49CA08",
-"<@	c #25B305",
-"[@	c #F5F6BE",
-"}@	c #F5F5A9",
-"|@	c #F3F4B0",
-"1@	c #F6F6B0",
-"2@	c #F7F8B5",
-"3@	c #EDF097",
-"4@	c #F5F18F",
-"5@	c #F9F7B8",
-"6@	c #F9F4B0",
-"7@	c #F9F3AE",
-"8@	c #F9F3A4",
-"9@	c #F9F7A4",
-"0@	c #F7F7A0",
-"a@	c #F5F682",
-"b@	c #D3E75E",
-"c@	c #CAE646",
-"d@	c #CBE846",
-"e@	c #EDF05A",
-"f@	c #C6E432",
-"g@	c #A9E02E",
-"h@	c #99DA27",
-"i@	c #B9DB20",
-"j@	c #E1F33F",
-"k@	c #CEEB2E",
-"l@	c #C7EB27",
-"m@	c #BBEA26",
-"n@	c #B9E722",
-"o@	c #A6DF19",
-"p@	c #ABE815",
-"q@	c #48CB09",
-"r@	c #3ECA08",
-"s@	c #F8F7A7",
-"t@	c #F3F4A0",
-"u@	c #F4F59C",
-"v@	c #F0F49C",
-"w@	c #F2F5A4",
-"x@	c #F5F6A0",
-"y@	c #EFF28F",
-"z@	c #F9F8CD",
-"A@	c #F9F6A7",
-"B@	c #F9F3A0",
-"C@	c #F8F399",
-"D@	c #F8F493",
-"E@	c #F8F693",
-"F@	c #F7F58B",
-"G@	c #E8EF65",
-"H@	c #C7E445",
-"I@	c #C7DB30",
-"J@	c #E1ED48",
-"K@	c #E8F353",
-"L@	c #C3E227",
-"M@	c #D9EB2E",
-"N@	c #E7F549",
-"O@	c #D3EE3B",
-"P@	c #CBED2D",
-"Q@	c #CDEF27",
-"R@	c #BFEC23",
-"S@	c #B6E81E",
-"T@	c #A9E518",
-"U@	c #B1EB1B",
-"V@	c #35BE06",
-"W@	c #38C306",
-"X@	c #F9F9A7",
-"Y@	c #F2F38F",
-"Z@	c #F2F495",
-"`@	c #F3F38D",
-" #	c #F9F9E9",
-".#	c #F7F8C5",
-"+#	c #F8F7D1",
-"@#	c #F8F6A2",
-"##	c #F9F7A9",
-"$#	c #F8F59C",
-"%#	c #F8F291",
-"&#	c #F8F58F",
-"*#	c #F6F789",
-"=#	c #F2F477",
-"-#	c #F0F571",
-";#	c #EAEE52",
-">#	c #DCEA45",
-",#	c #EBEF43",
-"'#	c #E4F04D",
-")#	c #DEEF45",
-"!#	c #E1F246",
-"~#	c #E4F448",
-"{#	c #DBF039",
-"]#	c #D9F235",
-"^#	c #C9ED2B",
-"/#	c #CAEF2C",
-"(#	c #CEF22B",
-"_#	c #B6E91E",
-":#	c #B1EB21",
-"<#	c #A9E815",
-"[#	c #48CF09",
-"}#	c #40CD06",
-"|#	c #EDEF6B",
-"1#	c #EBF07C",
-"2#	c #E7EB71",
-"3#	c #E8E865",
-"4#	c #F8F79E",
-"5#	c #F8F7A4",
-"6#	c #F9F69E",
-"7#	c #F8F48F",
-"8#	c #F6F280",
-"9#	c #F6F482",
-"0#	c #F3F473",
-"a#	c #EFF169",
-"b#	c #EDF467",
-"c#	c #EAF35C",
-"d#	c #EAF258",
-"e#	c #E4F052",
-"f#	c #E4F046",
-"g#	c #E0F03F",
-"h#	c #D5EE3B",
-"i#	c #DFF23E",
-"j#	c #D7F137",
-"k#	c #CEED2E",
-"l#	c #C9EF28",
-"m#	c #CAF025",
-"n#	c #B9EA1E",
-"o#	c #B3E91D",
-"p#	c #B1EB1A",
-"q#	c #A6E817",
-"r#	c #39C506",
-"s#	c #35C505",
-"t#	c #B3BC3E",
-"u#	c #E9F07C",
-"v#	c #DEE867",
-"w#	c #F9F79E",
-"x#	c #F8F793",
-"y#	c #F8F78F",
-"z#	c #F7F684",
-"A#	c #F5F27E",
-"B#	c #F4F26D",
-"C#	c #F4F36F",
-"D#	c #EDF061",
-"E#	c #EEF363",
-"F#	c #EDF35C",
-"G#	c #EEF45C",
-"H#	c #EAF357",
-"I#	c #E8F34B",
-"J#	c #DCEE43",
-"K#	c #E1F03F",
-"L#	c #D6ED37",
-"M#	c #D5EE33",
-"N#	c #D5F134",
-"O#	c #D9F232",
-"P#	c #CEF22D",
-"Q#	c #C7F22A",
-"R#	c #9BDB18",
-"S#	c #A7E518",
-"T#	c #AEEB1B",
-"U#	c #95E514",
-"V#	c #37C306",
-"W#	c #3CC705",
-"X#	c #E0EC60",
-"Y#	c #D1E455",
-"Z#	c #F7F78F",
-"`#	c #F7F891",
-" $	c #F8F78B",
-".$	c #F5F782",
-"+$	c #F8F791",
-"@$	c #EFF06B",
-"#$	c #F3F36D",
-"$$	c #EFF36D",
-"%$	c #F1F56F",
-"&$	c #EDF260",
-"*$	c #EDF461",
-"=$	c #E7F150",
-"-$	c #E9F355",
-";$	c #E8F349",
-">$	c #E8F442",
-",$	c #DDF13E",
-"'$	c #DAF038",
-")$	c #CEEB26",
-"!$	c #D0EE2C",
-"~$	c #B9E82A",
-"{$	c #C1ED26",
-"]$	c #A0E41C",
-"^$	c #ABE71B",
-"/$	c #99E315",
-"($	c #99E415",
-"_$	c #33B306",
-":$	c #2BBB05",
-"<$	c #D9EB5E",
-"[$	c #CDE44E",
-"}$	c #F6F579",
-"|$	c #F4F577",
-"1$	c #F3F571",
-"2$	c #F4F57C",
-"3$	c #F3F363",
-"4$	c #F2F475",
-"5$	c #F0F567",
-"6$	c #A2D93F",
-"7$	c #C3E43F",
-"8$	c #B6D92E",
-"9$	c #A7CD1F",
-"0$	c #E4F042",
-"a$	c #E4F248",
-"b$	c #E5F348",
-"c$	c #D7EC39",
-"d$	c #DBF33C",
-"e$	c #DDF23E",
-"f$	c #D1EF2D",
-"g$	c #C1E825",
-"h$	c #BFEB26",
-"i$	c #AEE61B",
-"j$	c #A7E318",
-"k$	c #B0E818",
-"l$	c #9EE615",
-"m$	c #6DD30D",
-"n$	c #27A603",
-"o$	c #2CBE05",
-"p$	c #E2ED50",
-"q$	c #CBE348",
-"r$	c #F6F780",
-"s$	c #F5F577",
-"t$	c #F3F56F",
-"u$	c #EFF469",
-"v$	c #F3F471",
-"w$	c #F3F46F",
-"x$	c #EFF461",
-"y$	c #E7F053",
-"z$	c #C6E83F",
-"A$	c #A4D733",
-"B$	c #ABDD2F",
-"C$	c #B0DF2E",
-"D$	c #A7DD2B",
-"E$	c #E4F240",
-"F$	c #E8F555",
-"G$	c #DDF33C",
-"H$	c #E1F53E",
-"I$	c #D4F032",
-"J$	c #CEF02E",
-"K$	c #CAEF2D",
-"L$	c #C2EF28",
-"M$	c #B5E91B",
-"N$	c #93DD13",
-"O$	c #93E215",
-"P$	c #93E213",
-"Q$	c #80DB0D",
-"R$	c #45CA05",
-"S$	c #2FC204",
-"T$	c #CEE743",
-"U$	c #C1E23E",
-"V$	c #F0F365",
-"W$	c #F5F473",
-"X$	c #F2F269",
-"Y$	c #E9EF57",
-"Z$	c #EFF363",
-"`$	c #E8F052",
-" %	c #EBF358",
-".%	c #B8E439",
-"+%	c #BCE839",
-"@%	c #A4DC2A",
-"#%	c #ABE22D",
-"$%	c #95D822",
-"%%	c #E1F240",
-"&%	c #D6ED32",
-"*%	c #CFEC2C",
-"=%	c #D4F02F",
-"-%	c #CAEE2B",
-";%	c #C3EB27",
-">%	c #C6EE25",
-",%	c #C3EE21",
-"'%	c #B8ED21",
-")%	c #AEEA16",
-"!%	c #79D90F",
-"~%	c #2EB106",
-"{%	c #26B808",
-"]%	c #2CBF05",
-"^%	c #C9E73B",
-"/%	c #C5E63C",
-"(%	c #F0F56B",
-"_%	c #EEF258",
-":%	c #F0F265",
-"<%	c #EFF155",
-"[%	c #EDF358",
-"}%	c #EBF550",
-"|%	c #EBF54D",
-"1%	c #C9E83B",
-"2%	c #A4DB28",
-"3%	c #9EDC2B",
-"4%	c #8FD622",
-"5%	c #82D01E",
-"6%	c #7EC512",
-"7%	c #C9E827",
-"8%	c #D0EE2E",
-"9%	c #C7ED2C",
-"0%	c #C7EE27",
-"a%	c #C1EE2A",
-"b%	c #C2EF24",
-"c%	c #BEED22",
-"d%	c #A9E718",
-"e%	c #3EC307",
-"f%	c #39C306",
-"g%	c #38C606",
-"h%	c #23B603",
-"i%	c #ACDB2F",
-"j%	c #B0DF34",
-"k%	c #EDF35A",
-"l%	c #EDF553",
-"m%	c #E2F045",
-"n%	c #E6F350",
-"o%	c #E6F448",
-"p%	c #9CD01E",
-"q%	c #8BC916",
-"r%	c #B8DC1B",
-"s%	c #7CBC0F",
-"t%	c #95D618",
-"u%	c #7ED319",
-"v%	c #BFE118",
-"w%	c #C6ED2A",
-"x%	c #C1EA21",
-"y%	c #C1ED22",
-"z%	c #B8EA1D",
-"A%	c #B6EB1D",
-"B%	c #BCEF1F",
-"C%	c #53CA07",
-"D%	c #3FC708",
-"E%	c #2EBC05",
-"F%	c #2FBE04",
-"G%	c #2DBF04",
-"H%	c #A2CF1F",
-"I%	c #B1E12F",
-"J%	c #B5E32E",
-"K%	c #E8F243",
-"L%	c #D7EB45",
-"M%	c #E8F245",
-"N%	c #DDEF40",
-"O%	c #E2F342",
-"P%	c #DFF33E",
-"Q%	c #E4F542",
-"R%	c #DAF138",
-"S%	c #D8F230",
-"T%	c #CBEB28",
-"U%	c #D1F02E",
-"V%	c #C6EC24",
-"W%	c #CAEF25",
-"X%	c #BCEB21",
-"Y%	c #B6EB1E",
-"Z%	c #ABE91B",
-"`%	c #A2E616",
-" &	c #3CC508",
-".&	c #3EC906",
-"+&	c #37C305",
-"@&	c #27B903",
-"#&	c #209B02",
-"$&	c #A9DF27",
-"%&	c #A4DD27",
-"&&	c #91D623",
-"*&	c #E3F13C",
-"=&	c #E4F340",
-"-&	c #E4F33F",
-";&	c #E4F43E",
-">&	c #E2F439",
-",&	c #D6F033",
-"'&	c #D5F034",
-")&	c #CEEF2E",
-"!&	c #CBED26",
-"~&	c #CFEF27",
-"{&	c #D5F22E",
-"]&	c #B5E620",
-"^&	c #B9EA1F",
-"/&	c #84E620",
-"(&	c #3EB508",
-"_&	c #58CE0D",
-":&	c #39CA11",
-"<&	c #3EC607",
-"[&	c #3BCA08",
-"}&	c #28BB04",
-"|&	c #28BC03",
-"1&	c #8FD620",
-"2&	c #97D823",
-"3&	c #A6E22B",
-"4&	c #69CB1D",
-"5&	c #86D61F",
-"6&	c #E5F740",
-"7&	c #DCF338",
-"8&	c #CAEC2D",
-"9&	c #CDED2B",
-"0&	c #D1F02C",
-"a&	c #CDEE27",
-"b&	c #C1EB22",
-"c&	c #CFF228",
-"d&	c #BCE922",
-"e&	c #3CBB09",
-"f&	c #50CD0C",
-"g&	c #4BCD0B",
-"h&	c #3CC207",
-"i&	c #42CD09",
-"j&	c #2EBB04",
-"k&	c #28B905",
-"l&	c #28B903",
-"m&	c #61B113",
-"n&	c #7ED41A",
-"o&	c #89D71B",
-"p&	c #8DDB1A",
-"q&	c #7CD518",
-"r&	c #8FDA1B",
-"s&	c #71D314",
-"t&	c #7CDA18",
-"u&	c #BEF232",
-"v&	c #8BD715",
-"w&	c #63C207",
-"x&	c #55C108",
-"y&	c #5AD111",
-"z&	c #4BC90B",
-"A&	c #3EC108",
-"B&	c #46C908",
-"C&	c #40CB08",
-"D&	c #34C205",
-"E&	c #32C505",
-"F&	c #22A003",
-"G&	c #79D818",
-"H&	c #75D314",
-"I&	c #67D012",
-"J&	c #69D313",
-"K&	c #71D613",
-"L&	c #67D413",
-"M&	c #4BC20C",
-"N&	c #4DCB0E",
-"O&	c #5AD510",
-"P&	c #50CA0B",
-"Q&	c #4BC909",
-"R&	c #3CC708",
-"S&	c #42C906",
-"T&	c #35C206",
-"U&	c #33C306",
-"V&	c #30C504",
-"W&	c #49C30E",
-"X&	c #71D913",
-"Y&	c #84E318",
-"Z&	c #5ECF0E",
-"`&	c #58D00D",
-" *	c #5ED40D",
-".*	c #48C70A",
-"+*	c #57D40B",
-"@*	c #37BE06",
-"#*	c #39C707",
-"$*	c #37C505",
-"%*	c #34C705",
-"&*	c #49BE0B",
-"**	c #4BD00C",
-"=*	c #46C609",
-"-*	c #46D00A",
-";*	c #33BE06",
-">*	c #20A904",
-"                          . + @ # $ %                           ",
-"                    & * = - ; > , ' ) ! ~ {                     ",
-"                ] ^ / ( _ : < [ } | 1 2 3 4 5 6                 ",
-"            7 8 9 0 a b c d e f g h i j k l m n o p             ",
-"          q r s t u v w x y z A B C D E F G H I J K L           ",
-"        M M N O P u Q R S T U V W X Y Z `  ...+.@.#.$.%.        ",
-"      &.O *.O =.-.;.>.R ,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.      ",
-"      O O O 2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.      ",
-"    o.O *.p.p.3.-.q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.    ",
-"    O o.q L.p.M.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+    ",
-"  *+=+-+;+>+p.,+'+)+!+~+8.{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+  ",
-"  r N N 8+p.9+0+a+b+c+d+e+d f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+  ",
-"  w+x+w+y+z+A+B+C+D+E+S F+G+H+I+J+K+L+M+N+O+P+Q+R+S+$+T+U+V+W+  ",
-"X+Y+Z+`+ @.@+@6.@@#@$@^ %@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@",
-"[@}@|@1@2@3@4@5@6@7@8@9@0@a@b@) c@d@e@f@g@h@i@j@k@l@m@n@o@p@q@r@",
-"s@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@>@I@J@K@L@M@N@O@P@Q@R@S@T@U@V@W@",
-"X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_#:#<#[#}#",
-"|#1#2#3#4###5#'.6#7#8#9#0#a#b#c#d#e#f#g#h#i#j#k#l#m#n#o#p#q#r#s#",
-"t#u#v#w#s@x#y#z#a@A#B#C#D#E#F#G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#",
-"  X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$I#;$>$,$'$)$!$~${$]$^$/$($_$:$  ",
-"  <$[$}$|$*#1$2$3$4$5$6$7$8$9$0$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$  ",
-"  p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O$P$Q$R$S$  ",
-"    T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%>%,%'%)%!%~%{%]%    ",
-"    ^%/%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8%9%0%a%b%c%d%($e%f%g%h%    ",
-"      i%j%k%l%a$m%n%o%p%q%r%s%t%u%v%w%x%y%z%A%B%C%D%E%F%G%      ",
-"      H%I%J%K%L%M%N%O%P%Q%G$R%S%T%U%V%W%X%Y%Z%`% &.&+&@&#&      ",
-"        $&%&&&*&=&-&;&>&,&'&)&!&~&{&]&^&/&(&_&:&<&[&}&|&        ",
-"          1&2&3&4&5&6&7&8&9&0&a&b&c&d&e&f&g&h&i&j&k&l&          ",
-"            m&n&o&p&q&r&s&t&u&v&w&x&y&z&A&B&C&D&E&F&            ",
-"                G&H&I&J&K&L&M&N&O&P&Q&R&S&T&U&V&                ",
-"                    W&X&Y&Z&`& *.*+*@*#*$*%*                    ",
-"                          &***=*-*;*>*                          "};
+". 	c #840000",
+"+ 	c #7F0000",
+"@ 	c #4F0000",
+"# 	c #810000",
+"$ 	c #830000",
+"% 	c #790000",
+"& 	c #460000",
+"* 	c #4B0000",
+"= 	c #750000",
+"- 	c #800000",
+"; 	c #880000",
+"> 	c #860000",
+", 	c #820000",
+"' 	c #5C0000",
+") 	c #4A0000",
+"! 	c #6B0000",
+"~ 	c #8C0000",
+"{ 	c #990000",
+"] 	c #950000",
+"^ 	c #700000",
+"/ 	c #6D0000",
+"( 	c #740000",
+"_ 	c #6E0202",
+": 	c #540505",
+"< 	c #420404",
+"[ 	c #450101",
+"} 	c #430000",
+"| 	c #490000",
+"1 	c #4D0000",
+"2 	c #4E0000",
+"3 	c #470000",
+"4 	c #9D0000",
+"5 	c #9B0000",
+"6 	c #710000",
+"7 	c #770000",
+"8 	c #690404",
+"9 	c #480D0D",
+"0 	c #3A0A0A",
+"a 	c #480101",
+"b 	c #440101",
+"c 	c #470101",
+"d 	c #510000",
+"e 	c #520000",
+"f 	c #780000",
+"g 	c #8A0000",
+"h 	c #9A0000",
+"i 	c #930000",
+"j 	c #730404",
+"k 	c #763119",
+"l 	c #8D4518",
+"m 	c #710902",
+"n 	c #640704",
+"o 	c #43100F",
+"p 	c #3C130C",
+"q 	c #551608",
+"r 	c #4F0C03",
+"s 	c #350A0A",
+"t 	c #360909",
+"u 	c #490202",
+"v 	c #500000",
+"w 	c #940000",
+"x 	c #830202",
+"y 	c #692418",
+"z 	c #B29354",
+"A 	c #8C6E25",
+"B 	c #8C661F",
+"C 	c #A67925",
+"D 	c #8D6822",
+"E 	c #D2AF5B",
+"F 	c #886826",
+"G 	c #3E1C0A",
+"H 	c #221A1A",
+"I 	c #231919",
+"J 	c #8D0000",
+"K 	c #720404",
+"L 	c #71481D",
+"M 	c #413719",
+"N 	c #47391B",
+"O 	c #8B6B29",
+"P 	c #4E2207",
+"Q 	c #3B1104",
+"R 	c #C99F35",
+"S 	c #563C0A",
+"T 	c #1F0F0E",
+"U 	c #192525",
+"V 	c #192323",
+"W 	c #271111",
+"X 	c #430202",
+"Y 	c #480000",
+"Z 	c #6B0505",
+"` 	c #412222",
+" .	c #454637",
+"..	c #AA8F48",
+"+.	c #886B33",
+"@.	c #A9864B",
+"#.	c #B7944C",
+"$.	c #D8B762",
+"%.	c #533C0C",
+"&.	c #211614",
+"*.	c #1C2828",
+"=.	c #1A2424",
+"-.	c #241111",
+";.	c #410202",
+">.	c #6B0404",
+",.	c #48211E",
+"'.	c #B39D63",
+").	c #9B7F38",
+"!.	c #6F5923",
+"~.	c #44330F",
+"{.	c #45340F",
+"].	c #B38E2D",
+"^.	c #49360B",
+"/.	c #241E1D",
+"(.	c #222928",
+"_.	c #1B2222",
+":.	c #251010",
+"<.	c #6A0202",
+"[.	c #794C2D",
+"}.	c #997F3E",
+"|.	c #3B3115",
+"1.	c #393834",
+"2.	c #454545",
+"3.	c #555049",
+"4.	c #D2AD4E",
+"5.	c #554210",
+"6.	c #272625",
+"7.	c #252929",
+"8.	c #1C2222",
+"9.	c #4C0000",
+"0.	c #690302",
+"a.	c #B48B4A",
+"b.	c #5F4B17",
+"c.	c #3E4241",
+"d.	c #6C6E6E",
+"e.	c #747676",
+"f.	c #7A7466",
+"g.	c #DAB556",
+"h.	c #574310",
+"i.	c #282725",
+"j.	c #252A2A",
+"k.	c #1A2323",
+"l.	c #231212",
+"m.	c #3D0202",
+"n.	c #750802",
+"o.	c #C59D4A",
+"p.	c #45350E",
+"q.	c #484949",
+"r.	c #6F7171",
+"s.	c #7B7B7B",
+"t.	c #867C60",
+"u.	c #B49543",
+"v.	c #5F480F",
+"w.	c #2E2B25",
+"x.	c #232727",
+"y.	c #1D1E1E",
+"z.	c #2B0F0F",
+"A.	c #400202",
+"B.	c #860B02",
+"C.	c #C59838",
+"D.	c #49330C",
+"E.	c #423C3C",
+"F.	c #626666",
+"G.	c #747471",
+"H.	c #7F6D3E",
+"I.	c #423718",
+"J.	c #40320F",
+"K.	c #322F1D",
+"L.	c #1D2121",
+"M.	c #261313",
+"N.	c #3D0606",
+"O.	c #8C0100",
+"P.	c #BF7E1F",
+"Q.	c #6F4E11",
+"R.	c #3E3333",
+"S.	c #565D5D",
+"T.	c #686A6A",
+"U.	c #585857",
+"V.	c #3C3934",
+"W.	c #413927",
+"X.	c #313224",
+"Y.	c #1B1D1C",
+"Z.	c #2D0A0A",
+"`.	c #900101",
+" +	c #9E3D0A",
+".+	c #AF851C",
+"++	c #473023",
+"@+	c #484B4B",
+"#+	c #5A5C5C",
+"$+	c #81765B",
+"%+	c #957D3D",
+"&+	c #5C4B1C",
+"*+	c #67531B",
+"=+	c #947426",
+"-+	c #471608",
+";+	c #890606",
+">+	c #890701",
+",+	c #A96E13",
+"'+	c #906718",
+")+	c #403633",
+"!+	c #4B514F",
+"~+	c #AE9042",
+"{+	c #695214",
+"]+	c #836B27",
+"^+	c #3C2D13",
+"/+	c #977125",
+"(+	c #855712",
+"_+	c #420000",
+":+	c #7E0909",
+"<+	c #8C0101",
+"[+	c #7D0F01",
+"}+	c #956612",
+"|+	c #8B6B24",
+"1+	c #464942",
+"2+	c #4E4835",
+"3+	c #5D4814",
+"4+	c #5B4813",
+"5+	c #25180C",
+"6+	c #9C793B",
+"7+	c #553709",
+"8+	c #3E0000",
+"9+	c #8E0101",
+"0+	c #640803",
+"a+	c #5F3C11",
+"b+	c #836820",
+"c+	c #74612A",
+"d+	c #645222",
+"e+	c #665321",
+"f+	c #846729",
+"g+	c #644314",
+"h+	c #350900",
+"i+	c #8D0303",
+"j+	c #7A0101",
+"k+	c #4E0909",
+"l+	c #281815",
+"m+	c #26291C",
+"n+	c #2C2B18",
+"o+	c #321F0D",
+"p+	c #350A02",
+"q+	c #3E0100",
+"r+	c #450000",
+"s+	c #840202",
+"t+	c #5F0202",
+"u+	c #351212",
+"v+	c #1D2323",
+"w+	c #191F1F",
+"x+	c #290C0C",
+"y+	c #7C0303",
+"z+	c #710101",
+"A+	c #4C0D0D",
+"B+	c #2A1919",
+"C+	c #241616",
+"D+	c #390707",
+"E+	c #440000",
+"F+	c #7E0202",
+"G+	c #7B0000",
+"H+	c #600505",
+"I+	c #390E0E",
+"J+	c #2F0B0B",
+"K+	c #460202",
+"L+	c #7C0404",
+"M+	c #7C0000",
+"N+	c #670303",
+"O+	c #400D0D",
+"P+	c #340B0B",
+"Q+	c #760000",
+"R+	c #640404",
+"S+	c #420E0E",
+"T+	c #380C0C",
+"U+	c #480202",
+"V+	c #580202",
+"W+	c #460707",
+"X+	c #400606",
+"Y+	c #4C0101",
+"Z+	c #490101",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"          . +                                     @             ",
+"          # $ %                               & * @             ",
+"          = - ; > ,           ' )           & * @ *             ",
+"          ! % ~ { ] . ^ / ( _ : < [ & } | 1 1 2 @ 3             ",
+"            % ~ 4 5 > / 6 7 8 9 0 a 1 b c d e @ @ |             ",
+"            f g h i j k l m n o p q r s t u v 2 2               ",
+"            ^ > w x y z A B C D E F G H I t ) @ )               ",
+"              # J K L M N O P Q R S T U V W X d Y               ",
+"              - ; Z `  ...+.@.#.$.%.&.*.=.-.;.d                 ",
+"              , > >.,.'.).!.~.{.].^./.(._.:.X v                 ",
+"                $ <.[.}.|.1.2.3.4.5.6.7.8.:.;.9.                ",
+"                - 0.a.b.c.d.e.f.g.h.i.j.k.l.m.                  ",
+"                , n.o.p.q.r.s.t.u.v.w.x.y.z.A.                  ",
+"                  B.C.D.E.F.G.H.I.J.K.L.M.N.Y                   ",
+"                  O.P.Q.R.S.T.U.V.W.X.Y.Z.| 2                   ",
+"                  `. +.+++@+#+$+%+&+*+=+-+9.*                   ",
+"                  ;+>+,+'+)+!+~+{+]+^+/+(+3 _+                  ",
+"                  :+<+[+}+|+1+2+3+4+5+6+7+8+                    ",
+"                    9+g 0+a+b+c+d+e+f+g+h+_+                    ",
+"                    i+J j+k+l+m+n+o+p+q+r+r+                    ",
+"                      s+# t+u+v+w+x+& e 3                       ",
+"                      y+$ z+A+B+C+D+2 @ E+                      ",
+"                        F+G+H+I+J+K+d Y                         ",
+"                        L+M+N+O+P+a v }                         ",
+"                          Q+R+S+T+U+1                           ",
+"                            V+W+X+c                             ",
+"                              Y+Z+                              ",
+"                                                                ",
+"                                                                "};
-- 
cgit v1.2.3-70-g09d2


From 27e8d20ad8b5590995d1d4af3563f8956f180373 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 3 Sep 2008 02:34:15 +0000
Subject: From Frictor: Revised the Windows icon so that it can be used.

---
 data/icons/aethyra.ico | Bin 38630 -> 17542 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/icons/aethyra.ico b/data/icons/aethyra.ico
index 62f0d937..e0c12642 100644
Binary files a/data/icons/aethyra.ico and b/data/icons/aethyra.ico differ
-- 
cgit v1.2.3-70-g09d2


From 7946cd875877870e7cab002cba099d21cf9fc063 Mon Sep 17 00:00:00 2001
From: Douglas Boffey <DougABoffey@netscape.net>
Date: Thu, 4 Sep 2008 16:56:10 +0000
Subject: Added code to change text colouring

---
 src/Makefile.am             |   8 +-
 src/gui/browserbox.cpp      |  72 +---
 src/gui/browserbox.h        |  27 +-
 src/gui/chat.cpp            | 995 ++++++++++++++++++++++++--------------------
 src/gui/setup.cpp           |  12 +-
 src/gui/tabbedcontainer.cpp |  25 +-
 src/gui/tabbedcontainer.h   |  11 +-
 src/gui/textfield.cpp       |  68 ++-
 src/gui/textfield.h         |  47 +++
 src/main.cpp                |   6 +
 10 files changed, 726 insertions(+), 545 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 7cd233b7..d2fd5efb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,6 +27,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/chatinput.h \
 	      gui/checkbox.cpp \
 	      gui/checkbox.h \
+	      gui/colour.cpp \
+	      gui/colour.h \
 	      gui/confirm_dialog.cpp \
 	      gui/confirm_dialog.h \
 	      gui/connection.cpp \
@@ -92,10 +94,12 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/scrollarea.h \
 	      gui/sell.cpp \
 	      gui/sell.h \
-	      gui/setup_audio.cpp \
-	      gui/setup_audio.h \
 	      gui/setup.cpp \
 	      gui/setup.h \
+	      gui/setup_audio.cpp \
+	      gui/setup_audio.h \
+	      gui/setup_colours.cpp \
+	      gui/setup_colours.h \
 	      gui/setup_joystick.cpp \
 	      gui/setup_joystick.h \
 	      gui/setup_keyboard.cpp \
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 4f771a7e..b7d08cab 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -29,6 +29,7 @@
 
 #include "browserbox.h"
 #include "linkhandler.h"
+#include "colour.h"
 
 #ifdef USE_OPENGL
 #include "../configuration.h"
@@ -135,12 +136,12 @@ void BrowserBox::addRow(const std::string &row)
 
             mLinks.push_back(bLink);
 
-            newRow += "##L" + bLink.caption;
+            newRow += "##<" + bLink.caption;
 
             tmp.erase(0, idx3 + 2);
             if(tmp != "")
             {
-                newRow += "##P";
+                newRow += "##>";
             }
             idx1 = tmp.find("@@");
         }
@@ -290,7 +291,8 @@ BrowserBox::draw(gcn::Graphics *graphics)
 
         if ((mHighMode & UNDERLINE))
         {
-            graphics->setColor(gcn::Color(LINK));
+            bool valid;
+            graphics->setColor(gcn::Color(textColour->getColour('<', valid)));
             graphics->drawLine(
                     mLinks[mSelectedLink].x1,
                     mLinks[mSelectedLink].y2,
@@ -317,58 +319,26 @@ BrowserBox::draw(gcn::Graphics *graphics)
             if ( (mUseLinksAndUserColors && (j + 3) <= row.size()) ||
                     (!mUseLinksAndUserColors && (j == 0)) )
             {
-                // Check for color change in format "##x", x = [L,P,0..9]
+                // Check for color change in format "##x"
                 if ((row.at(j) == '#') && (row.at(j + 1) == '#'))
                 {
-                    switch (row.at(j + 2))
+                    char c = row.at(j + 2);
+                    if (c == '>')
                     {
-                        case 'L': // Link color
-                            prevColor = selColor;
-                            selColor = LINK;
-                            break;
-                        case 'P': // Previous color
-                            selColor = prevColor;
-                            break;
-                        case '1':
-                            prevColor = selColor;
-                            selColor = RED;
-                            break;
-                        case '2':
-                            prevColor = selColor;
-                            selColor = GREEN;
-                            break;
-                        case '3':
-                            prevColor = selColor;
-                            selColor = BLUE;
-                            break;
-                        case '4':
-                            prevColor = selColor;
-                            selColor = ORANGE;
-                            break;
-                        case '5':
-                            prevColor = selColor;
-                            selColor = YELLOW;
-                            break;
-                        case '6':
-                            prevColor = selColor;
-                            selColor = PINK;
-                            break;
-                        case '7':
-                            prevColor = selColor;
-                            selColor = PURPLE;
-                            break;
-                        case '8':
-                            prevColor = selColor;
-                            selColor = GRAY;
-                            break;
-                        case '9':
-                            prevColor = selColor;
-                            selColor = BROWN;
-                            break;
-                        case '0':
-                        default:
+                        selColor = prevColor;
+                    }
+                    else
+                    {
+                        bool valid;
+                        int rgb = textColour->getColour(c, valid);
+                        if (c == '<')
+                        {
                             prevColor = selColor;
-                            selColor = BLACK;
+                        }
+                        if (valid)
+                        {
+                            selColor = rgb;
+                        }
                     }
                     j += 3;
 
diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h
index 636fe5a0..c671d835 100644
--- a/src/gui/browserbox.h
+++ b/src/gui/browserbox.h
@@ -113,30 +113,13 @@ class BrowserBox : public gcn::Widget, public gcn::MouseListener
         };
 
         /**
-         * BrowserBox colors.
-         *
-         * NOTES (by Javila):
-         *  - color values is "0x" prefix followed by HTML color style.
-         *  - we can add up to 10 different colors: [0..9].
-         *  - we need a link and a highlighted link colors.
-         *  - not all colors will be fine with all backgrounds due transparent
-         *    windows and widgets. So, I think it's better keep BrowserBox
-         *    opaque (white background) by default.
+         * Some colours used in the browser box
          */
+
         enum {
-            BLACK = 0x000000,       /**< Color 0 */
-            RED = 0xff0000,         /**< Color 1 */
-            GREEN = 0x1fa052,       /**< Color 2 */
-            BLUE = 0x0000ff,        /**< Color 3 */
-            ORANGE = 0xe0980e,      /**< Color 4 */
-            YELLOW = 0xf1dc27,      /**< Color 5 */
-            PINK = 0xff00d8,        /**< Color 6 */
-            PURPLE = 0x8415e2,      /**< Color 7 */
-            GRAY = 0x919191,        /**< Color 8 */
-            BROWN = 0x8e4c17,       /**< Color 9 */
-            BGCOLOR = 0xffffff,     /**< Bg color for opacity */
-            LINK = 0xe50d0d,        /**< Color L */
-            HIGHLIGHT = 0xcacaca    /**< Bg color for highlighted link */
+            BLACK = 0x000000,
+            BGCOLOR = 0xffffff,
+            HIGHLIGHT = 0xcacaca
         };
 
         /**
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index c2377f65..8d9dac9d 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -45,8 +45,10 @@
 
 #include "../utils/trim.h"
 
-ChatWindow::ChatWindow(Network * network):
-Window(""), mNetwork(network), mTmpVisible(false)
+ChatWindow::ChatWindow(Network *network):
+    Window(""),
+    mNetwork(network),
+    mTmpVisible(false)
 {
     setWindowName("Chat");
 
@@ -63,10 +65,10 @@ Window(""), mNetwork(network), mTmpVisible(false)
     mTextOutput->disableLinksAndUserColors();
     mTextOutput->setMaxRow((int) config.getValue("ChatLogLength", 0));
     mScrollArea = new ScrollArea(mTextOutput);
-    mScrollArea->setPosition(mScrollArea->getFrameSize(),
-                             mScrollArea->getFrameSize());
-    mScrollArea->setScrollPolicy(gcn::ScrollArea::SHOW_NEVER,
-                                 gcn::ScrollArea::SHOW_ALWAYS);
+    mScrollArea->setPosition(
+	    mScrollArea->getFrameSize(), mScrollArea->getFrameSize());
+    mScrollArea->setScrollPolicy(
+	    gcn::ScrollArea::SHOW_NEVER, gcn::ScrollArea::SHOW_ALWAYS);
     mScrollArea->setOpaque(false);
 
     add(mScrollArea);
@@ -94,79 +96,81 @@ ChatWindow::~ChatWindow()
 }
 
 void
- ChatWindow::logic()
+ChatWindow::logic()
 {
     // todo: only do this when the size changes (updateWidgets?)
 
     const gcn::Rectangle area = getChildrenArea();
 
     mChatInput->setPosition(mChatInput->getFrameSize(),
-                            area.height - mChatInput->getHeight() -
-                            mChatInput->getFrameSize());
+			    area.height - mChatInput->getHeight() -
+				mChatInput->getFrameSize());
     mChatInput->setWidth(area.width - 2 * mChatInput->getFrameSize());
     mScrollArea->setWidth(area.width - 2 * mScrollArea->getFrameSize());
     mScrollArea->setHeight(area.height - 2 * mScrollArea->getFrameSize() -
-                           mChatInput->getHeight() - 5);
+	    mChatInput->getHeight() - 5);
     mScrollArea->logic();
 }
 
-void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
+void
+ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
 {
     // Trim whitespace
     trim(line);
 
     CHATLOG tmp;
-    tmp.own = own;
+    tmp.own  = own;
     tmp.nick = "";
     tmp.text = line;
 
     // Fix the owner of welcome message.
-    if (line.substr(0, 7) == "Welcome") {
-        own = BY_SERVER;
+    if (line.substr(0, 7) == "Welcome")
+    {
+	own = BY_SERVER;
     }
 
     std::string::size_type pos = line.find(" : ");
     if (pos != std::string::npos) {
-        tmp.nick = line.substr(0, pos);
-        tmp.text = line.substr(pos + 3);
+	tmp.nick = line.substr(0, pos);
+	tmp.text = line.substr(pos + 3);
     }
 
-    std::string lineColor = "##0";      // Equiv. to BrowserBox::BLACK
+    std::string lineColor = "##C";
     switch (own) {
-        case BY_GM:
-            tmp.nick += std::string("Global announcement: ");
-            lineColor = "##1";  // Equiv. to BrowserBox::RED
-            break;
-        case BY_PLAYER:
-            tmp.nick += CAT_NORMAL;
-            lineColor = "##2";  // Equiv. to BrowserBox::GREEN
-            break;
-        case BY_OTHER:
-            tmp.nick += CAT_NORMAL;
-            lineColor = "##0";  // Equiv. to BrowserBox::BLACK
-            break;
-        case BY_SERVER:
-            tmp.nick = "Server: ";
-            tmp.text = line;
-            lineColor = "##7";  // Equiv. to BrowserBox::PURPLE
-            break;
-        case BY_PARTY:
-            tmp.nick += CAT_NORMAL;
-            lineColor = "##6";  // Equiv. to BrowserBox::PINK
-            break;
-        case ACT_WHISPER:
-            tmp.nick += CAT_WHISPER;
-            lineColor = "##3";  // Equiv. to BrowserBox::BLUE
-            break;
-        case ACT_IS:
-            tmp.nick += CAT_IS;
-            lineColor = "##5";  // Equiv. to BrowserBox::YELLOW
-            break;
-        case BY_LOGGER:
-            tmp.nick = "";
-            tmp.text = line;
-            lineColor = "##8";  // Equiv. to BrowserBox::GRAY
-            break;
+	case BY_GM:
+	    tmp.nick += std::string("Global announcement: ");
+	    lineColor = "##G";
+	    break;
+	case BY_PLAYER:
+	    tmp.nick += CAT_NORMAL;
+	    lineColor = "##Y";
+	    break;
+	case BY_OTHER:
+	    tmp.nick += CAT_NORMAL;
+	    lineColor = "##C";
+	    break;
+	case BY_SERVER:
+	    tmp.nick = "Server: ";
+	    tmp.text = line;
+	    lineColor = "##S";
+	    break;
+	case BY_PARTY:
+	    tmp.nick += CAT_NORMAL;
+	    lineColor = "##P";
+	    break;
+	case ACT_WHISPER:
+	    tmp.nick += CAT_WHISPER;
+	    lineColor = "##W";
+	    break;
+	case ACT_IS:
+	    tmp.nick += CAT_IS;
+	    lineColor = "##I";
+	    break;
+	case BY_LOGGER:
+	    tmp.nick = "";
+	    tmp.text = line;
+	    lineColor = "##L";
+	    break;
     }
 
     // Get the current system time
@@ -175,360 +179,411 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
 
     // Format the time string properly
     std::stringstream timeStr;
-    timeStr << "[" << ((((t / 60) / 60) % 24 < 10) ? "0" : "")
-        << (int) (((t / 60) / 60) % 24)
-        << ":" << (((t / 60) % 60 < 10) ? "0" : "")
-        << (int) ((t / 60) % 60)
-        << "] ";
+    timeStr << "["
+	    << ((((t / 60) / 60) % 24 < 10) ? "0" : "")
+	    << (int)(((t / 60) / 60) % 24)
+	    << ":"
+	    << (((t / 60) % 60 < 10) ? "0" : "")
+	    << (int)((t / 60) % 60)
+	    << "] ";
 
     line = lineColor + timeStr.str() + tmp.nick + tmp.text;
 
     // We look if the Vertical Scroll Bar is set at the max before
     // adding a row, otherwise the max will always be a row higher
     // at comparison.
-    if (mScrollArea->getVerticalScrollAmount() ==
-        mScrollArea->getVerticalMaxScroll()) {
-        mTextOutput->addRow(line);
-        mScrollArea->setVerticalScrollAmount(mScrollArea->
-                                             getVerticalMaxScroll());
-    } else {
-        mTextOutput->addRow(line);
+    if (mScrollArea->getVerticalScrollAmount() == mScrollArea->getVerticalMaxScroll())
+    {
+	mTextOutput->addRow(line);
+	mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll());
+    }
+    else
+    {
+	mTextOutput->addRow(line);
     }
 
     mRecorder->record(line.substr(3));
 }
 
-void ChatWindow::chatLog(CHATSKILL act)
+void
+ChatWindow::chatLog(CHATSKILL act)
 {
     chatLog(const_msg(act), BY_SERVER);
 }
 
-void ChatWindow::action(const gcn::ActionEvent & event)
+void
+ChatWindow::action(const gcn::ActionEvent &event)
 {
-    if (event.getId() == "chatinput") {
-        std::string message = mChatInput->getText();
-
-        if (!message.empty()) {
-            // If message different from previous, put it in the history
-            if (mHistory.empty() || message != mHistory.back()) {
-                mHistory.push_back(message);
-            }
-            // Reset history iterator
-            mCurHist = mHistory.end();
-
-            // Send the message to the server
-            chatSend(player_node->getName(), message);
-
-            // Clear the text from the chat input
-            mChatInput->setText("");
-        }
-        if (message.empty() || !mReturnToggles) {
-            // Remove focus and hide input
-            mFocusHandler->focusNone();
-
-            // If the chatWindow is shown up because you want to send a message
-            // It should hide now
-            if (mTmpVisible) {
-                setVisible(false);
-            }
-        }
+    if (event.getId() == "chatinput")
+    {
+	std::string message = mChatInput->getText();
+
+	if (!message.empty()) {
+	    // If message different from previous, put it in the history
+	    if (mHistory.empty() || message != mHistory.back()) {
+		mHistory.push_back(message);
+	    }
+
+	    // Reset history iterator
+	    mCurHist = mHistory.end();
+
+	    // Send the message to the server
+	    chatSend(player_node->getName(), message);
+
+	    // Clear the text from the chat input
+	    mChatInput->setText("");
+	}
+	if (message.empty() || !mReturnToggles)
+	{
+	    // Remove focus and hide input
+	    mFocusHandler->focusNone();
+
+	    // If the chatWindow is shown up because you want to send a message
+	    // It should hide now
+	    if (mTmpVisible)
+	    {
+		setVisible(false);
+	    }
+	}
     }
 }
 
-void ChatWindow::requestChatFocus()
+void
+ChatWindow::requestChatFocus()
 {
     // Make sure chatWindow is visible
-    if (!isVisible()) {
-        setVisible(true);
+    if (!isVisible())
+    {
+	setVisible(true);
 
-        /*
-         * This is used to hide chatWindow after sending the message. There is
-         * a trick here, because setVisible will set mTmpVisible to false, you
-         * have to put this sentence *after* setVisible, not before it
-         */
-        mTmpVisible = true;
+	/*
+	 * This is used to hide chatWindow after sending the message. There is
+	 * a trick here, because setVisible will set mTmpVisible to false, you
+	 * have to put this sentence *after* setVisible, not before it
+	 */
+	mTmpVisible = true;
     }
+
     // Give focus to the chat input
     mChatInput->setVisible(true);
     mChatInput->requestFocus();
 }
 
-bool ChatWindow::isInputFocused()
+bool
+ChatWindow::isInputFocused()
 {
     return mChatInput->isFocused();
 }
 
-void ChatWindow::chatSend(const std::string & nick, std::string msg)
+void
+ChatWindow::chatSend(const std::string &nick, std::string msg)
 {
     /* Some messages are managed client side, while others
      * require server handling by proper packet. Probably
      * those if elses should be replaced by protocol calls */
 
     // Send party message
-    if (msg.at(0) == mPartyPrefix) {
-        msg.erase(0, 1);
-        std::size_t length = msg.length() + 1;
-
-        if (length == 0) {
-            chatLog("Trying to send a blank party message.", BY_SERVER);
-            return;
-        }
-        MessageOut outMsg(mNetwork);
-
-        outMsg.writeInt16(CMSG_PARTY_MESSAGE);
-        outMsg.writeInt16(length + 4);
-        outMsg.writeString(msg, length);
-        return;
+    if (msg.at(0) == mPartyPrefix)
+    {
+	msg.erase(0, 1);
+	std::size_t length = msg.length() + 1;
+
+	if (length == 0)
+	{
+	    chatLog("Trying to send a blank party message.", BY_SERVER);
+	    return;
+	}
+	MessageOut outMsg(mNetwork);
+
+	outMsg.writeInt16(CMSG_PARTY_MESSAGE);
+	outMsg.writeInt16(length + 4);
+	outMsg.writeString(msg, length);
+	return;
     }
     // Prepare ordinary message
     if (msg.substr(0, 1) != "/") {
-        msg = nick + " : " + msg;
+	msg = nick + " : " + msg;
 
-        MessageOut outMsg(mNetwork);
-        outMsg.writeInt16(CMSG_CHAT_MESSAGE);
-        // Added + 1 in order to let eAthena parse admin commands correctly
-        outMsg.writeInt16(msg.length() + 4 + 1);
-        outMsg.writeString(msg, msg.length() + 1);
-        return;
+	MessageOut outMsg(mNetwork);
+	outMsg.writeInt16(CMSG_CHAT_MESSAGE);
+	// Added + 1 in order to let eAthena parse admin commands correctly
+	outMsg.writeInt16(msg.length() + 4 + 1);
+	outMsg.writeString(msg, msg.length() + 1);
+	return;
     }
     msg.erase(0, 1);
     trim(msg);
 
     std::size_t space = msg.find(" ");
     std::string command = msg.substr(0, space);
-    if (space == std::string::npos) {
-        msg = "";
-    } else {
-        msg = msg.substr(space);
-        trim(msg);
-    }
-
-    if (command == "announce") {
-        MessageOut outMsg(mNetwork);
-        outMsg.writeInt16(0x0099);
-        outMsg.writeInt16(msg.length() + 4);
-        outMsg.writeString(msg, msg.length());
-        return;
-    }
-    if (command == "help") {
-        std::size_t space = msg.find(" ");
-        std::string msg1;
-        if (space == std::string::npos) {
-            msg1 = "";
-        } else {
-            msg1 = msg.substr(space + 1, msg.length());
-            msg = msg.substr(0, space);
-        }
-        if (msg != "" && msg.at(0) == '/') {
-            msg.erase(0, 1);
-        }
-        while (msg1 != "" && msg1.at(0) == ' ') {
-            msg1.erase(0, 1);
-        }
-        help(msg, msg1);
-        return;
-    }
-    if (command == "where") {
-        // Display the current map, X, and Y
-        std::ostringstream where;
-        where << map_path << " " << player_node->mX << " " << player_node->mY;
-        chatLog(where.str(), BY_SERVER);
-        return;
-    }
-    if (command == "who") {
-        MessageOut outMsg(mNetwork);
-        outMsg.writeInt16(0x00c1);
-        return;
-    }
-    if (command == "clear") {
-        mTextOutput->clearRows();
-        return;
-    }
-    if (command == "whisper") {
-        std::string recvnick = "";
-
-        if (msg.substr(0, 1) == "\"") {
-            const std::string::size_type pos = msg.find('"', 1);
-            if (pos != std::string::npos) {
-                recvnick = msg.substr(1, pos - 1);
-                msg.erase(0, pos + 2);
-            }
-        } else {
-            const std::string::size_type pos = msg.find(" ");
-            if (pos != std::string::npos) {
-                recvnick = msg.substr(0, pos);
-                msg.erase(0, pos + 1);
-            }
-        }
-
-        MessageOut outMsg(mNetwork);
-        outMsg.writeInt16(CMSG_CHAT_WHISPER);
-        outMsg.writeInt16(msg.length() + 28);
-        outMsg.writeString(recvnick, 24);
-        outMsg.writeString(msg, msg.length());
-
-        chatLog("Whispering to " + recvnick + " : " + msg, BY_PLAYER);
-        return;
-    }
-    if (command == "record") {
+    if (space == std::string::npos)
+    {
+	msg = "";
+    }
+    else
+    {
+	msg = msg.substr(space);
+	trim(msg);
+    }
+
+    if (command == "announce")
+    {
+	MessageOut outMsg(mNetwork);
+	outMsg.writeInt16(0x0099);
+	outMsg.writeInt16(msg.length() + 4);
+	outMsg.writeString(msg, msg.length());
+	return;
+    }
+    if (command == "help")
+    {
+	std::size_t space = msg.find(" ");
+	std::string msg1;
+	if (space == std::string::npos)
+	{
+	    msg1 = "";
+	}
+	else
+	{
+	    msg1 = msg.substr(space + 1, msg.length());
+	    msg = msg.substr(0, space);
+	}
+	if (msg != "" && msg.at(0) == '/')
+	{
+	    msg.erase(0, 1);
+	}
+	while (msg1 != "" && msg1.at(0) == ' ')
+	{
+	    msg1.erase(0, 1);
+	}
+	help(msg, msg1);
+	return;
+    }
+    if (command == "where")
+    {
+	chatLog(map_path, BY_SERVER);
+	return;
+    }
+    if (command == "who")
+    {
+	MessageOut outMsg(mNetwork);
+	outMsg.writeInt16(0x00c1);
+	return;
+    }
+    if (command == "clear")
+    {
+	mTextOutput->clearRows();
+	return;
+    }
+    if (command == "whisper")
+    {
+	std::string recvnick = "";
+
+	if (msg.substr(0,1) == "\"")
+	{
+	    const std::string::size_type pos = msg.find('"', 1);
+	    if (pos != std::string::npos) {
+		recvnick = msg.substr(1, pos - 1);
+		msg.erase(0, pos + 2);
+	    }
+	}
+	else
+	{
+	    const std::string::size_type pos = msg.find(" ");
+	    if (pos != std::string::npos) {
+		recvnick = msg.substr(0, pos);
+		msg.erase(0, pos + 1);
+	    }
+	}
+
+	MessageOut outMsg(mNetwork);
+	outMsg.writeInt16(CMSG_CHAT_WHISPER);
+	outMsg.writeInt16(msg.length() + 28);
+	outMsg.writeString(recvnick, 24);
+	outMsg.writeString(msg, msg.length());
+
+	chatLog("Whispering to " + recvnick + " : " + msg, BY_PLAYER);
+	return;
+    }
+    if (command == "record")
+    {
         mRecorder->respond(msg);
-        return;
-    }
-    if (command == "toggle") {
-        if (msg == "") {
-            chatLog(mReturnToggles ? "Return toggles chat."
-                    : "Message closes chat.", BY_SERVER);
-            return;
-        }
-        msg = msg.substr(0, 1);
-        if (msg == "1" || msg == "y" || msg == "t" || msg == "Y" || msg == "T") {
-            chatLog("Return now toggles chat.", BY_SERVER);
-            mReturnToggles = true;
-            return;
-        }
-        if (msg == "0" || msg == "n" || msg == "f" || msg == "N" || msg == "F") {
-            chatLog("Message now closes chat.", BY_SERVER);
-            mReturnToggles = false;
-            return;
-        }
-        chatLog("Options to /toggle are \"yes\", \"no\", \"true\", \"false\", "
-                "\"1\", \"0\".", BY_SERVER);
-        return;
-    }
-    if (command == "party") {
-        if (msg == "") {
-            chatLog("Unknown party command... Type \"/help\" party for more "
-                    "information.", BY_SERVER);
-            return;
-        }
-        const std::string::size_type space = msg.find(" ");
-        std::string rest = (space == std::string::npos ? ""
-                            : msg.substr(space + 1, msg.length()));
-        if (rest != "") {
-            msg = msg.substr(0, space);
-            while (msg != "" && msg[0] == ' ') {
-                msg = msg.substr(1, msg.length());
-            }
-        }
-        party(msg, rest);
-        return;
-    }
-    if (command == "present") {
-        Beings & beings = beingManager->getAll();
-        std::string response = "";
-        for (BeingIterator bi = beings.begin(), be = beings.end();
-             bi != be; ++bi) {
-            if ((*bi)->getType() == Being::PLAYER) {
-                if (response != "") {
-                    response += ", ";
-                }
-                response += (*bi)->getName();
-            }
-        }
-        if (mRecorder->isRecording()) {
-            // Get the current system time
-            time_t t;
-            time(&t);
-
-            // Format the time string properly
-            std::stringstream timeStr;
-            timeStr << "[" << ((((t / 60) / 60) % 24 < 10) ? "0" : "")
-                << (int) (((t / 60) / 60) % 24)
-                << ":" << (((t / 60) % 60 < 10) ? "0" : "")
-                << (int) ((t / 60) % 60)
-                << "] ";
-
-
-            mRecorder->record(timeStr.str() + "Present: " + response + ".");
-            chatLog("Attendance written to record log.", BY_SERVER, true);
-        } else {
-            chatLog("Present: " + response, BY_SERVER);
-        }
-        return;
+	return;
+    }
+    if (command == "toggle")
+    {
+	if (msg == "")
+	{
+	    chatLog(mReturnToggles ? "Return toggles chat."
+		                   : "Message closes chat.", BY_SERVER);
+	    return;
+	}
+	msg = msg.substr(0, 1);
+	if (msg == "1" || msg == "y" || msg == "t" || msg == "Y" || msg == "T")
+	{
+	    chatLog("Return now toggles chat.", BY_SERVER);
+	    mReturnToggles = true;
+	    return;
+	}
+	if (msg == "0" || msg == "n" || msg == "f" || msg == "N" || msg == "F")
+	{
+	    chatLog("Message now closes chat.", BY_SERVER);
+	    mReturnToggles = false;
+	    return;
+	}
+	chatLog("Options to /toggle are \"yes\", \"no\", \"true\", \"false\", "
+		"\"1\", \"0\".", BY_SERVER);
+	return;
+    }
+    if (command == "party")
+    {
+	if (msg == "")
+	{
+	    chatLog("Unknown party command... Type \"/help\" party for more "
+		    "information.", BY_SERVER);
+	    return;
+	}
+	const std::string::size_type space = msg.find(" ");
+	std::string rest = (space == std::string::npos ? ""
+				     : msg.substr(space + 1, msg.length()));
+	if (rest != "")
+	{
+	    msg = msg.substr(0, space);
+	    while (msg != "" && msg[0] == ' ')
+	    {
+		msg = msg.substr(1, msg.length());
+	    }
+	}
+	party(msg, rest);
+	return;
+    }
+    if (command == "present")
+    {
+	Beings &beings = beingManager->getAll();
+	std::string response = "";
+	for (BeingIterator bi = beings.begin(), be = beings.end();
+	     bi != be;
+	     ++bi)
+	{
+	    if ((*bi)->getType() == Being::PLAYER)
+	    {
+		if (response != "")
+		{
+		    response += ", ";
+		}
+		response += (*bi)->getName();
+	    }
+	}
+	if (mRecorder->isRecording())
+	{
+	    // Get the current system time
+	    time_t t;
+	    time(&t);
+
+	    // Format the time string properly
+	    std::stringstream timeStr;
+	    timeStr << "["
+		    << ((((t / 60) / 60) % 24 < 10) ? "0" : "")
+		    << (int)(((t / 60) / 60) % 24)
+		    << ":"
+		    << (((t / 60) % 60 < 10) ? "0" : "")
+		    << (int)((t / 60) % 60)
+		    << "] ";
+
+
+	    mRecorder->record(timeStr.str() + "Present: " + response + ".");
+	    chatLog("Attendance written to record log.", BY_SERVER, true);
+	}
+	else
+	{
+	    chatLog("Present: " + response, BY_SERVER);
+	}
+	return;
     }
     chatLog("Unknown command", BY_SERVER);
 }
 
-std::string ChatWindow::const_msg(CHATSKILL act)
+std::string
+ChatWindow::const_msg(CHATSKILL act)
 {
     std::string msg;
     if (act.success == SKILL_FAILED && act.skill == SKILL_BASIC) {
-        switch (act.bskill) {
-            case BSKILL_TRADE:
-                msg = "Trade failed!";
-                break;
-            case BSKILL_EMOTE:
-                msg = "Emote failed!";
-                break;
-            case BSKILL_SIT:
-                msg = "Sit failed!";
-                break;
-            case BSKILL_CREATECHAT:
-                msg = "Chat creating failed!";
-                break;
-            case BSKILL_JOINPARTY:
-                msg = "Could not join party!";
-                break;
-            case BSKILL_SHOUT:
-                msg = "Cannot shout!";
-                break;
-        }
-
-        switch (act.reason) {
-            case RFAIL_SKILLDEP:
-                msg += " You have not yet reached a high enough level!";
-                break;
-            case RFAIL_INSUFHP:
-                msg += " Insufficient HP!";
-                break;
-            case RFAIL_INSUFSP:
-                msg += " Insufficient SP!";
-                break;
-            case RFAIL_NOMEMO:
-                msg += " You have no memos!";
-                break;
-            case RFAIL_SKILLDELAY:
-                msg += " You cannot do that right now!";
-                break;
-            case RFAIL_ZENY:
-                msg += " Seems you need more Zeny... ;-)";
-                break;
-            case RFAIL_WEAPON:
-                msg += " You cannot use this skill with that kind of weapon!";
-                break;
-            case RFAIL_REDGEM:
-                msg += " You need another red gem!";
-                break;
-            case RFAIL_BLUEGEM:
-                msg += " You need another blue gem!";
-                break;
-            case RFAIL_OVERWEIGHT:
-                msg += " You're carrying to much to do this!";
-                break;
-            default:
-                msg += " Huh? What's that?";
-                break;
-        }
+	switch (act.bskill) {
+	    case BSKILL_TRADE :
+		msg = "Trade failed!";
+		break;
+	    case BSKILL_EMOTE :
+		msg = "Emote failed!";
+		break;
+	    case BSKILL_SIT :
+		msg = "Sit failed!";
+		break;
+	    case BSKILL_CREATECHAT :
+		msg = "Chat creating failed!";
+		break;
+	    case BSKILL_JOINPARTY :
+		msg = "Could not join party!";
+		break;
+	    case BSKILL_SHOUT :
+		msg = "Cannot shout!";
+		break;
+	}
+
+	switch (act.reason) {
+	    case RFAIL_SKILLDEP :
+		msg += " You have not yet reached a high enough level!";
+		break;
+	    case RFAIL_INSUFHP :
+		msg += " Insufficient HP!";
+		break;
+	    case RFAIL_INSUFSP :
+		msg += " Insufficient SP!";
+		break;
+	    case RFAIL_NOMEMO :
+		msg += " You have no memos!";
+		break;
+	    case RFAIL_SKILLDELAY :
+		msg += " You cannot do that right now!";
+		break;
+	    case RFAIL_ZENY :
+		msg += " Seems you need more Zeny... ;-)";
+		break;
+	    case RFAIL_WEAPON :
+		msg += " You cannot use this skill with that kind of weapon!";
+		break;
+	    case RFAIL_REDGEM :
+		msg += " You need another red gem!";
+		break;
+	    case RFAIL_BLUEGEM :
+		msg += " You need another blue gem!";
+		break;
+	    case RFAIL_OVERWEIGHT :
+		msg += " You're carrying to much to do this!";
+		break;
+	    default :
+		msg += " Huh? What's that?";
+		break;
+	}
     } else {
-        switch (act.skill) {
-            case SKILL_WARP:
-                msg = "Warp failed...";
-                break;
-            case SKILL_STEAL:
-                msg = "Could not steal anything...";
-                break;
-            case SKILL_ENVENOM:
-                msg = "Poison had no effect...";
-                break;
-        }
+	switch(act.skill) {
+	    case SKILL_WARP :
+		msg = "Warp failed...";
+		break;
+	    case SKILL_STEAL :
+		msg = "Could not steal anything...";
+		break;
+	    case SKILL_ENVENOM :
+		msg = "Poison had no effect...";
+		break;
+	}
     }
     return msg;
 }
 
-void ChatWindow::scroll(int amount)
+void
+ChatWindow::scroll(int amount)
 {
     if (!isVisible())
-        return;
+	return;
 
     int range = mScrollArea->getHeight() / 8 * amount;
     gcn::Rectangle scr;
@@ -537,34 +592,41 @@ void ChatWindow::scroll(int amount)
     mTextOutput->showPart(scr);
 }
 
-void ChatWindow::keyPressed(gcn::KeyEvent & event)
+void
+ChatWindow::keyPressed(gcn::KeyEvent &event)
 {
     if (event.getKey().getValue() == gcn::Key::DOWN &&
-        mCurHist != mHistory.end()) {
-        // Move forward through the history
-        HistoryIterator prevHist = mCurHist++;
-        if (mCurHist != mHistory.end()) {
-            mChatInput->setText(*mCurHist);
-            mChatInput->setCaretPosition(mChatInput->getText().length());
-        } else {
-            mCurHist = prevHist;
-        }
-    } else if (event.getKey().getValue() == gcn::Key::UP &&
-               mCurHist != mHistory.begin() && mHistory.size() > 0) {
-        // Move backward through the history
-        mCurHist--;
-        mChatInput->setText(*mCurHist);
-        mChatInput->setCaretPosition(mChatInput->getText().length());
+	    mCurHist != mHistory.end())
+    {
+	// Move forward through the history
+	HistoryIterator prevHist = mCurHist++;
+	if (mCurHist != mHistory.end()) {
+	    mChatInput->setText(*mCurHist);
+	    mChatInput->setCaretPosition(mChatInput->getText().length());
+	}
+	else {
+	    mCurHist = prevHist;
+	}
+    }
+    else if (event.getKey().getValue() == gcn::Key::UP &&
+	    mCurHist != mHistory.begin() && mHistory.size() > 0)
+    {
+	// Move backward through the history
+	mCurHist--;
+	mChatInput->setText(*mCurHist);
+	mChatInput->setCaretPosition(mChatInput->getText().length());
     }
 }
 
-void ChatWindow::setInputText(std::string input_str)
+void
+ChatWindow::setInputText(std::string input_str)
 {
-    mChatInput->setText(input_str + " ");
-    requestChatFocus();
+     mChatInput->setText(input_str + " ");
+     requestChatFocus();
 }
 
-void ChatWindow::setVisible(bool isVisible)
+void
+ChatWindow::setVisible(bool isVisible)
 {
     Window::setVisible(isVisible);
 
@@ -576,64 +638,78 @@ void ChatWindow::setVisible(bool isVisible)
     mTmpVisible = false;
 }
 
-void ChatWindow::party(const std::string & command, const std::string & rest)
+void
+ChatWindow::party(const std::string &command, const std::string &rest)
 {
-    if (command == "prefix") {
-        if (rest == "") {
-            char temp[2] = ".";
-            *temp = mPartyPrefix;
-            chatLog("The current party prefix is " + std::string(temp),
-                    BY_SERVER);
-            return;
-        }
-        if (rest.length() != 1) {
-            chatLog("Party prefix must be one character long.", BY_SERVER);
-        } else {
-            if (rest == "/") {
-                chatLog("Cannot use a '/' as the prefix.", BY_SERVER);
-            } else {
-                mPartyPrefix = rest.at(0);
-                chatLog("Changing prefix to " + rest, BY_SERVER);
-            }
-        }
-        return;
+    if (command == "prefix")
+    {
+	if (rest == "")
+	{
+	    char temp[2] = ".";
+	    *temp = mPartyPrefix;
+	    chatLog("The current party prefix is " + std::string(temp),
+		    BY_SERVER);
+	    return;
+	}
+	if (rest.length() != 1)
+	{
+	    chatLog("Party prefix must be one character long.", BY_SERVER);
+	}
+	else
+	{
+	    if (rest == "/")
+	    {
+		chatLog("Cannot use a '/' as the prefix.", BY_SERVER);
+	    }
+	    else
+	    {
+		mPartyPrefix = rest.at(0);
+		chatLog("Changing prefix to " + rest, BY_SERVER);
+	    }
+	}
+	return;
     }
     mParty->respond(command, rest);
 }
 
-void ChatWindow::help(const std::string & msg1, const std::string & msg2)
+void
+ChatWindow::help(const std::string &msg1, const std::string &msg2)
 {
     chatLog("-- Help --", BY_SERVER);
-    if (msg1 == "") {
-        chatLog("/announce: Global announcement (GM only)", BY_SERVER);
-        chatLog("/clear: Clears this window", BY_SERVER);
-        chatLog("/help: Display this help.", BY_SERVER);
-        mParty->help();
-        chatLog("/present: Get list of players present", BY_SERVER);
-        mRecorder->help();
-        chatLog("/toggle: Determine whether <return> toggles the chat log.",
-                BY_SERVER);
-        chatLog("/where: Display map name", BY_SERVER);
-        chatLog("/whisper <nick> <message>: Sends a private <message>"
-                " to <nick>", BY_SERVER);
-        chatLog("/who: Display number of online users", BY_SERVER);
-        chatLog("For more information, type /help <command>", BY_SERVER);
-        return;
-    }
-    if (msg1 == "announce") {
-        chatLog("Command: /announce <msg>", BY_SERVER);
-        chatLog("*** only available to a GM ***", BY_SERVER);
-        chatLog("This command sends the message <msg> to "
-                "all players currently online.", BY_SERVER);
-        return;
-    }
-    if (msg1 == "clear") {
-        chatLog("Command: /clear", BY_SERVER);
-        chatLog("This command clears the chat log of previous chat.",
-                BY_SERVER);
-        return;
-    }
-    if (msg1 == "help") {
+    if (msg1 == "")
+    {
+	chatLog("/announce: Global announcement (GM only)", BY_SERVER);
+	chatLog("/clear: Clears this window", BY_SERVER);
+	chatLog("/help: Display this help.", BY_SERVER);
+	mParty->help();
+	chatLog("/present: Get list of players present", BY_SERVER);
+	mRecorder->help();
+	chatLog("/toggle: Determine whether <return> toggles the chat log.",
+		BY_SERVER);
+	chatLog("/where: Display map name", BY_SERVER);
+	chatLog("/whisper <nick> <message>: Sends a private <message>"
+		" to <nick>", BY_SERVER);
+	chatLog("/who: Display number of online users", BY_SERVER);
+	chatLog("For more information, type /help <command>", BY_SERVER);
+	return;
+    }
+    if (msg1 == "announce")
+    {
+	chatLog("Command: /announce <msg>", BY_SERVER);
+	chatLog("*** only available to a GM ***", BY_SERVER);
+	chatLog("This command sends the message <msg> to "
+		"all players currently online.", BY_SERVER);
+	return;
+    }
+    if (msg1 == "clear")
+    {
+	chatLog("Command: /clear", BY_SERVER);
+	chatLog("This command clears the chat log of previous chat.",
+		BY_SERVER);
+	return;
+    }
+    if (msg1 == "help")
+    {
         chatLog("Command: /help", BY_SERVER);
         chatLog("This command displays a list of all commands available.",
                 BY_SERVER);
@@ -641,51 +717,58 @@ void ChatWindow::help(const std::string & msg1, const std::string & msg2)
         chatLog("This command displays help on <command>.", BY_SERVER);
         return;
     }
-    if (msg1 == "party") {
+    if (msg1 == "party")
+    {
         mParty->help(msg2);
-        return;
-    }
-    if (msg1 == "present") {
-        chatLog("Command: /present", BY_SERVER);
-        chatLog("This command gets a list of players within hearing "
-                "and sends it to either the record log if recording, or the "
-                "chat log otherwise.", BY_SERVER);
-        return;
-    }
-    if (msg1 == "record") {
+	return;
+    }
+    if (msg1 == "present")
+    {
+	chatLog("Command: /present", BY_SERVER);
+	chatLog("This command gets a list of players within hearing "
+		"and sends it to either the record log if recording, or the "
+		"chat log otherwise.", BY_SERVER);
+	return;
+    }
+    if (msg1 == "record")
+    {
         mRecorder->help(msg2);
-        return;
-    }
-    if (msg1 == "toggle") {
-        chatLog("Command: /toggle <state>", BY_SERVER);
-        chatLog("This command sets whether the return key should toggle the "
-                "chat log, or whether the chat log turns off automatically.",
-                BY_SERVER);
-        chatLog("<state> can be one of \"1\", \"yes\", \"true\" to turn "
-                "the toggle on, or \"0\", \"no\", \"false\" to turn the "
-                "toggle off.", BY_SERVER);
-        chatLog("Command: /toggle", BY_SERVER);
-        chatLog("This command displays the return toggle status.", BY_SERVER);
-        return;
-    }
-    if (msg1 == "where") {
-        chatLog("Command: /where", BY_SERVER);
-        chatLog("This command displays the name of the current map.",
-                BY_SERVER);
-        return;
-    }
-    if (msg1 == "whisper") {
-        chatLog("Command: /whisper <nick> <msg>", BY_SERVER);
-        chatLog("This command sends the message <msg> to <nick.", BY_SERVER);
-        chatLog("If the <nick> has spaces in it, enclose it in "
-                "double quotes (\").", BY_SERVER);
-        return;
-    }
-    if (msg1 == "who") {
-        chatLog("Command: /who", BY_SERVER);
-        chatLog("This command displays the number of players currently "
-                "online.", BY_SERVER);
-        return;
+	return;
+    }
+    if (msg1 == "toggle")
+    {
+	chatLog("Command: /toggle <state>", BY_SERVER);
+	chatLog("This command sets whether the return key should toggle the "
+		"chat log, or whether the chat log turns off automatically.",
+		BY_SERVER);
+	chatLog("<state> can be one of \"1\", \"yes\", \"true\" to turn "
+		"the toggle on, or \"0\", \"no\", \"false\" to turn the "
+		"toggle off.", BY_SERVER);
+	chatLog("Command: /toggle", BY_SERVER);
+	chatLog("This command displays the return toggle status.", BY_SERVER);
+	return;
+    }
+    if (msg1 == "where")
+    {
+	chatLog("Command: /where", BY_SERVER);
+	chatLog("This command displays the name of the current map.",
+		BY_SERVER);
+	return;
+    }
+    if (msg1 == "whisper")
+    {
+	chatLog("Command: /whisper <nick> <msg>", BY_SERVER);
+	chatLog("This command sends the message <msg> to <nick.", BY_SERVER);
+	chatLog("If the <nick> has spaces in it, enclose it in "
+		"double quotes (\").", BY_SERVER);
+	return;
+    }
+    if (msg1 == "who")
+    {
+	chatLog("Command: /who", BY_SERVER);
+	chatLog("This command displays the number of players currently "
+		"online.", BY_SERVER);
+	return;
     }
     chatLog("Unknown command.", BY_SERVER);
     chatLog("Type /help for a list of commands.", BY_SERVER);
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index ce843452..9c562b68 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -31,6 +31,7 @@
 #include "setup_video.h"
 #include "setup_keyboard.h"
 #include "setup_players.h"
+#include "setup_colours.h"
 #include "tabbedcontainer.h"
 
 #include "../utils/dtor.h"
@@ -49,21 +50,22 @@ Setup::Setup():
 {
     setCloseButton(true);
     int width = 310;
-    int height = 265;
+    int height = 290;
     setContentSize(width, height);
 
     const char *buttonNames[] = {
         "Apply", "Cancel", "Reset Windows", 0
     };
     int x = width;
-    for (const char **curBtn = buttonNames; *curBtn; ++curBtn) {
+    for (const char **curBtn = buttonNames; *curBtn; ++curBtn)
+    {
         Button *btn = new Button(*curBtn, *curBtn, this);
         x -= btn->getWidth() + 5;
         btn->setPosition(x, height - btn->getHeight() - 5);
         add(btn);
     }
 
-    TabbedContainer *panel = new TabbedContainer();
+    TabbedContainer *panel = new TabbedContainer(width, 5, 20, 45, 5, 3);
     panel->setDimension(gcn::Rectangle(5, 5, width, height - 40));
     panel->setOpaque(false);
 
@@ -85,6 +87,10 @@ Setup::Setup():
     panel->addTab(tab, "Keyboard");
     mTabs.push_back(tab);
 
+    tab = new Setup_Colours();
+    panel->addTab(tab, "Colours");
+    mTabs.push_back(tab);
+
     tab = new Setup_Players();
     panel->addTab(tab, "Players");
     mTabs.push_back(tab);
diff --git a/src/gui/tabbedcontainer.cpp b/src/gui/tabbedcontainer.cpp
index 71e0f3c4..fc3efbd5 100644
--- a/src/gui/tabbedcontainer.cpp
+++ b/src/gui/tabbedcontainer.cpp
@@ -30,11 +30,17 @@
 #include "../utils/tostring.h"
 #include "../utils/dtor.h"
 
-#define TABWIDTH 60
-#define TABHEIGHT 20
-
-TabbedContainer::TabbedContainer():
-    mActiveContent(0)
+TabbedContainer::TabbedContainer(int width, int padX, int buttonHeight,
+                                 int height, int padY, int buttonsPerRow):
+    mActiveContent(0),
+    mWidth(width),
+    mPadX(padX),
+    mButtonHeight(buttonHeight),
+    mHeight(height),
+    mPadY(padY),
+    mButtonsPerRow(buttonsPerRow),
+
+    mButtonWidth((width - (buttonsPerRow - 1) * padX) / buttonsPerRow - padX)
 {
 }
 
@@ -52,13 +58,14 @@ void TabbedContainer::addTab(gcn::Widget *widget, const std::string &caption)
 
     Button *tab = new Button(caption, toString(tabNumber), this);
 
-    tab->setSize(TABWIDTH, TABHEIGHT);
-    add(tab, TABWIDTH * tabNumber, 0);
+    tab->setSize(mButtonWidth, mButtonHeight);
+    add(tab, (mButtonWidth + mPadX) * (tabNumber % mButtonsPerRow),
+             (mButtonHeight + mPadY) * (tabNumber / mButtonsPerRow));
 
     mTabs[caption] = tab;
 
     mContents.push_back(widget);
-    widget->setPosition(0, TABHEIGHT);
+    widget->setPosition(0, mHeight);
 
     // If this is the first tab in this container, make it visible
     if (!mActiveContent) {
@@ -83,7 +90,7 @@ void TabbedContainer::logic()
     if (mActiveContent) {
         mActiveContent->setSize(
                 getWidth() - 2 * mActiveContent->getFrameSize(),
-                getHeight() - TABHEIGHT - 2 * mActiveContent->getFrameSize());
+                getHeight() - mHeight - 2 * mActiveContent->getFrameSize());
     }
 
     Container::logic();
diff --git a/src/gui/tabbedcontainer.h b/src/gui/tabbedcontainer.h
index 14f27aba..b004edc2 100644
--- a/src/gui/tabbedcontainer.h
+++ b/src/gui/tabbedcontainer.h
@@ -37,7 +37,8 @@
 class TabbedContainer : public gcn::Container, public gcn::ActionListener
 {
     public:
-        TabbedContainer();
+        TabbedContainer(int width, int padX, int buttonHeight,
+                        int height, int padY, int buttonsPerRow);
         ~TabbedContainer();
 
         void addTab(gcn::Widget *widget, const std::string &caption);
@@ -62,6 +63,14 @@ class TabbedContainer : public gcn::Container, public gcn::ActionListener
 
         std::map<gcn::Widget*, std::string> mWidgets;
         gcn::Widget *mActiveContent;
+
+        int mWidth;         /**< The total width of all buttons */
+        int mPadX;          /**< The horizontal gap between buttons */
+        int mButtonHeight;  /**< The height of each button */
+        int mHeight;        /**< Height of the panel */
+        int mPadY;          /**< The vertical gap between buttons */
+        int mButtonsPerRow; /**< The number of buttons on each row */
+        int mButtonWidth;   /**< The width of each button */
 };
 
 #endif
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index 95291267..21c3adbc 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -38,7 +38,9 @@ int TextField::instances = 0;
 ImageRect TextField::skin;
 
 TextField::TextField(const std::string& text):
-    gcn::TextField(text)
+    gcn::TextField(text),
+    mNumeric(false),
+    mListener(0)
 {
     setFrameSize(2);
 
@@ -102,3 +104,67 @@ void TextField::drawFrame(gcn::Graphics *graphics)
 
     static_cast<Graphics*>(graphics)->drawImageRect(0, 0, w, h, skin);
 }
+
+void TextField::setNumeric(bool numeric)
+{
+    mNumeric = numeric;
+    if (!numeric)
+    {
+        return;
+    }
+    const char *text = mText.c_str();
+    for (const char *textPtr = text; *textPtr; ++textPtr)
+    {
+        if (*textPtr < '0' || *textPtr > '9')
+        {
+            setText(mText.substr(0, textPtr - text));
+            return;
+        }
+    }
+}
+
+void TextField::keyPressed(gcn::KeyEvent &keyEvent)
+{
+    if (mNumeric)
+    {
+        while (true)
+        {
+            const gcn::Key &key = keyEvent.getKey();
+            if (key.isNumber())
+            {
+                break;
+            }
+            int value = key.getValue();
+            if (value == gcn::Key::LEFT || value == gcn::Key::RIGHT ||
+                value == gcn::Key::HOME || value == gcn::Key::END ||
+                value == gcn::Key::BACKSPACE || value == gcn::Key::DELETE)
+            {
+                break;
+            }
+            return;
+        }
+    }
+    gcn::TextField::keyPressed(keyEvent);
+    if (mListener)
+    {
+        mListener->listen(this);
+    }
+}
+
+int TextField::getValue() const
+{
+    if (!mNumeric)
+    {
+        return 0;
+    }
+    int value = atoi(mText.c_str());
+    if (value < mMinimum)
+    {
+        return mMinimum;
+    }
+    if (value > mMaximum)
+    {
+        return mMaximum;
+    }
+    return value;
+}
diff --git a/src/gui/textfield.h b/src/gui/textfield.h
index 39bcbf85..0fc53f39 100644
--- a/src/gui/textfield.h
+++ b/src/gui/textfield.h
@@ -28,6 +28,14 @@
 
 class ImageRect;
 
+class TextField;
+
+class TextFieldListener
+{
+    public:
+        virtual void listen(const TextField *value) = 0;
+};
+
 /**
  * A text field.
  *
@@ -55,9 +63,48 @@ class TextField : public gcn::TextField {
          */
         void drawFrame(gcn::Graphics *graphics);
 
+        /**
+         * Determine whether the field should be numeric or not
+         */
+        void setNumeric(bool numeric);
+
+        /**
+         * Set the range on the field if it is numeric
+         */
+        void setRange(int min, int max) {mMinimum = min; mMaximum = max; }
+
+        /**
+         * Restrict keyboard input if numeric
+         */
+        void keyPressed(gcn::KeyEvent &keyEvent);
+
+        /**
+         * Set the minimum value for a range
+         */
+        void setMinimum(int min) {mMinimum = min; }
+
+        /**
+         * Set the maximum value for a range
+         */
+        void setMaximum(int max) {mMaximum = max; }
+
+        /**
+         * Return the value for a numeric field
+         */
+        int getValue() const;
+
+        /**
+         * Add a listener
+         */
+        void addListener(TextFieldListener *listener) {mListener = listener; }
+
     private:
         static int instances;
         static ImageRect skin;
+        bool mNumeric;
+        int mMinimum;
+        int mMaximum;
+        TextFieldListener *mListener;
 };
 
 #endif
diff --git a/src/main.cpp b/src/main.cpp
index 57eb67bb..f1bd89f4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -66,6 +66,7 @@
 
 #include "gui/char_server.h"
 #include "gui/char_select.h"
+#include "gui/colour.h"
 #include "gui/gui.h"
 #include "gui/login.h"
 #include "gui/ok_dialog.h"
@@ -117,6 +118,7 @@ CharServerHandler charServerHandler;
 LoginData loginData;
 LockedArray<LocalPlayer*> charInfo(MAX_SLOT + 1);
 
+Colour *textColour;
 
 // This anonymous namespace hides whatever is inside from other modules.
 namespace {
@@ -736,6 +738,9 @@ int main(int argc, char *argv[])
     if (!login_wallpaper)
         logger->log("Couldn't load %s as wallpaper", wallpaperName.c_str());
 
+    // Needs to be created in main, as the updater uses it
+    textColour = new Colour();
+
     while (state != EXIT_STATE)
     {
         // Handle SDL events
@@ -978,6 +983,7 @@ int main(int argc, char *argv[])
         usleep(50000);
     }
 
+    delete textColour;
 #ifdef PACKAGE_VERSION
     delete versionLabel;
 #endif
-- 
cgit v1.2.3-70-g09d2


From c57fdaf3c18f34678cf4753a1fae0e6d622839a7 Mon Sep 17 00:00:00 2001
From: Douglas Boffey <DougABoffey@netscape.net>
Date: Thu, 4 Sep 2008 17:05:27 +0000
Subject: Added omitted files from rev 405

---
 ChangeLog                 |  10 ++-
 src/gui/colour.cpp        | 137 ++++++++++++++++++++++++++++++
 src/gui/colour.h          | 130 +++++++++++++++++++++++++++++
 src/gui/setup_colours.cpp | 208 ++++++++++++++++++++++++++++++++++++++++++++++
 src/gui/setup_colours.h   |  76 +++++++++++++++++
 5 files changed, 558 insertions(+), 3 deletions(-)
 create mode 100644 src/gui/colour.cpp
 create mode 100644 src/gui/colour.h
 create mode 100644 src/gui/setup_colours.cpp
 create mode 100644 src/gui/setup_colours.h

diff --git a/ChangeLog b/ChangeLog
index deebf57c..99952782 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-04  Douglas Boffey ("Scraggy")  <scraggy@aethyra.com>
+
+	* Added code to change colours in the chatlog
+
 2008-08-30  kevin Day ("blame")     <blame@aethyra.com>
 
 	* Updated the in game help files "/trunk/data/help"
@@ -7,7 +11,7 @@
 	* Patch to prevent crash if a map layer has too many
 	  tiles (From TMW svn, r4544)
 
-2008-08-26 Douglas Boffey ("Scraggy")	<DougABoffey@netscape.net>
+2008-08-26  Douglas Boffey ("Scraggy")	<DougABoffey@netscape.net>
 
 	* Corrected position of registration dialogs
 
@@ -22,7 +26,7 @@
 2008-08-17  Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
 
 	* Set the wallpaper based on the screen width.
-	* Added a usleep to the login sequence loop to 
+	* Added a usleep to the login sequence loop to
 	  prevent it from unnecessarily maxing out the CPU
 
 2008-08-17	Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
@@ -59,7 +63,7 @@
 
 2008-07-25  Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
 
-	* Added feature to remember window locations from one 
+	* Added feature to remember window locations from one
 	  session to the next (patch from TMW by ElvenProgrammer)
 
 2008-07-24  Lloyd Bryant ("Sanga")  <sanga@aethyra.com>
diff --git a/src/gui/colour.cpp b/src/gui/colour.cpp
new file mode 100644
index 00000000..d1782e1c
--- /dev/null
+++ b/src/gui/colour.cpp
@@ -0,0 +1,137 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Douglas Boffey                                  *
+ *                                                                         *
+ *       DougABoffey@netscape.net                                          *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed with The Mana Experiment                  *
+ *   in the hope that it will be useful,                                   *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include "colour.h"
+
+#include <cstdio>
+
+#include "../configuration.h"
+
+Colour::Colour()
+{
+    addColour('C', 0x000000, "Chat");
+    addColour('G', 0xff0000, "GM");
+    addColour('Y', 0x1fa052, "Player");
+    addColour('W', 0x0000ff, "Whisper");
+    addColour('I', 0xf1dc27, "Is");
+    addColour('P', 0xff00d8, "Party");
+    addColour('S', 0x8415e2, "Server");
+    addColour('L', 0x919191, "Logger");
+    addColour('<', 0xe50d0d, "Hyperlink");
+    commit();
+}
+
+Colour::~Colour()
+{
+    for (ColVector::iterator col = mColVector.begin(),
+             colEnd = mColVector.end();
+         col != colEnd;
+         ++col)
+    {
+        char buffer[20];
+        std::sprintf(buffer, "0x%06x", col->rgb);
+        config.setValue("Colour" + col->text, buffer);
+    }
+}
+
+void Colour::setColour(const char c, const int rgb)
+{
+    for (ColVector::iterator col = mColVector.begin(),
+             colEnd = mColVector.end();
+         col != colEnd;
+         ++col)
+    {
+        if (col->ch == c)
+        {
+            col->rgb = rgb;
+            return;
+        }
+    }
+}
+
+int Colour::getColour(const char c, bool &valid) const
+{
+    for (ColVector::const_iterator col = mColVector.begin(),
+             colEnd = mColVector.end();
+         col != colEnd;
+         ++col)
+    {
+        if (col->ch == c)
+        {
+            valid = true;
+            return col->rgb;
+        }
+    }
+    valid = false;
+    return 0x000000;
+}
+
+std::string Colour::getElementAt(int i)
+{
+    if (i < 0 || i >= getNumberOfElements())
+    {
+        return "";
+    }
+    return mColVector[i].text;
+}
+
+void Colour::addColour(const char c, const int rgb, const std::string &text)
+{
+    int trueRgb = config.getValue("Colour" + text, rgb);
+    mColVector.push_back(ColourElem(c, trueRgb, text));
+}
+
+int Colour::getColourAt(int i)
+{
+    if (i < 0 || i >= getNumberOfElements())
+    {
+        return 0;
+    }
+    return mColVector[i].rgb;
+}
+
+void Colour::setColourAt(int i, int rgb)
+{
+    if (i >= 0 && i < getNumberOfElements())
+    {
+        mColVector[i].rgb = rgb;
+    }
+}
+
+void Colour::commit()
+{
+    for (ColVector::iterator i = mColVector.begin(), iEnd = mColVector.end();
+         i != iEnd;
+         ++i)
+    {
+        i->committedRgb = i->rgb;
+    }
+}
+
+void Colour::rollback()
+{
+    for (ColVector::iterator i = mColVector.begin(), iEnd = mColVector.end();
+         i != iEnd;
+         ++i)
+    {
+        i->rgb = i->committedRgb;
+    }
+}
diff --git a/src/gui/colour.h b/src/gui/colour.h
new file mode 100644
index 00000000..69253f95
--- /dev/null
+++ b/src/gui/colour.h
@@ -0,0 +1,130 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Douglas Boffey                                  *
+ *                                                                         *
+ *       DougABoffey@netscape.net                                          *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed with The Mana Experiment                  *
+ *   in the hope that it will be useful,                                   *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef _COLOUR_H
+#define _COLOUR_H
+#include <cstdio>
+#include <vector>
+#include <string>
+
+#include <guichan/listmodel.hpp>
+
+class Colour : public gcn::ListModel
+{
+    public:
+        /**
+         * Constructor
+         */
+        Colour();
+
+        /**
+         * Destructor
+         */
+        ~Colour();
+
+        /**
+         * Define the colour replacement for a character
+         *
+         * @param c charater to be replaced
+         * @param rgb colour to replace character
+         */
+        void setColour(const char c, const int rgb);
+
+        /**
+         * Define the colour replacement for a character
+         *
+         * @param c character to be replaced
+         * @param r red component
+         * @param g green component
+         * @param b blue component
+         */
+        void setColour(const char c, const int r, const int g, const int b)
+        {
+            setColour(c, (r << 16) | (g << 8) | b);
+        }
+
+        /**
+         * Return the colour associated with a character, if exists
+         *
+         * @param c character requested
+         * @param valid indicate whether character is known
+         */
+        int getColour(const char c, bool &valid) const;
+
+        /**
+         * Return the number of colours known
+         */
+        int getNumberOfElements() {return mColVector.size(); }
+
+        /**
+         * Return the name of the ith colour
+         *
+         * @param i index of colour interested in
+         */
+        std::string getElementAt(int i);
+
+        /**
+         * Get the colour for the element at index i in the current colour
+         * model
+         */
+        int getColourAt(int i);
+
+        /**
+         * Set the colour for the element at index i
+         */
+        void setColourAt(int i, int rgb);
+
+        /**
+         * Commit the colours
+         */
+        void commit();
+
+        /**
+         * Rollback the colours
+         */
+        void rollback();
+
+    private:
+        struct ColourElem
+        {
+            ColourElem(const char c, const int rgb, const std::string &text) :
+                ch(c), rgb(rgb), text(text) {}
+            char ch;
+            int rgb;
+            int committedRgb;
+            std::string text;
+        };
+        typedef std::vector<ColourElem> ColVector;
+        ColVector mColVector;
+
+        /**
+         * Initialise colour
+         *
+         * @param c character that needs initialising
+         * @param rgb default colour if not found in config
+         * @param text identifier of colour
+         */
+        void addColour(const char c, const int rgb, const std::string &text);
+};
+
+extern Colour *textColour;
+
+#endif
diff --git a/src/gui/setup_colours.cpp b/src/gui/setup_colours.cpp
new file mode 100644
index 00000000..2c6d7aa9
--- /dev/null
+++ b/src/gui/setup_colours.cpp
@@ -0,0 +1,208 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Douglas Boffey                                  *
+ *                                                                         *
+ *       DougABoffey@netscape.net                                          *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed with The Mana Experiment                  *
+ *   in the hope that it will be useful,                                   *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include "setup_colours.h"
+
+#include <vector>
+
+#include <guichan/listmodel.hpp>
+#include <guichan/widgets/label.hpp>
+#include <guichan/widgets/slider.hpp>
+
+#include "colour.h"
+#include "scrollarea.h"
+#include "slider.h"
+
+#include "../configuration.h"
+
+Setup_Colours::Setup_Colours() :
+    mColourLabel("Colour:"),
+    mSelected(-1)
+{
+    mColourBox = new gcn::ListBox(textColour);
+    mScroll = new ScrollArea(mColourBox);
+
+    mColourLabel.setX(5);
+    mColourLabel.setY(5);
+
+    mColourBox->setDimension(gcn::Rectangle(0, 10 + mColourLabel.getHeight(),
+                                            80,
+                                            115 - mColourLabel.getHeight()));
+    mScroll->setDimension(gcn::Rectangle(5, 10 + mColourLabel.getHeight(),
+                                         100, 115 - mColourLabel.getHeight()));
+    mColourBox->setSelected(-1);
+    mColourBox->setActionEventId("colour_box");
+    mColourBox->addActionListener(this);
+
+    setOpaque(false);
+
+    add(&mColourLabel);
+    add(mScroll);
+
+    setupPlacer(140, mLabel1, mSlider1, mText1, "R", "1");
+    setupPlacer(165, mLabel2, mSlider2, mText2, "G", "2");
+    setupPlacer(190, mLabel3, mSlider3, mText3, "B", "3");
+
+}
+
+Setup_Colours::~Setup_Colours()
+{
+    delete mLabel1;
+    delete mSlider1;
+    delete mText1;
+
+    delete mLabel2;
+    delete mSlider2;
+    delete mText2;
+
+    delete mLabel3;
+    delete mSlider3;
+    delete mText3;
+
+    delete mScroll;
+}
+
+void Setup_Colours::action(const gcn::ActionEvent &event)
+{
+    if (event.getId() == "colour_box")
+    {
+        mSelected = mColourBox->getSelected();
+        int col = textColour->getColourAt(mSelected);
+        setEntry(mSlider1, mText1, col >> 16);
+        setEntry(mSlider2, mText2, (col >> 8) & 0xff);
+        setEntry(mSlider3, mText3, col & 0xff);
+        return;
+    }
+
+    if (event.getId() == "slider1")
+    {
+        char buffer[30];
+        std::sprintf(buffer, "%d", static_cast<int>(mSlider1->getValue()));
+        mText1->setText(buffer);
+        updateColour();
+        return;
+    }
+
+    if (event.getId() == "slider2")
+    {
+        char buffer[30];
+        std::sprintf(buffer, "%d", static_cast<int>(mSlider2->getValue()));
+        mText2->setText(buffer);
+        updateColour();
+        return;
+    }
+
+    if (event.getId() == "slider3")
+    {
+        char buffer[30];
+        std::sprintf(buffer, "%d", static_cast<int>(mSlider3->getValue()));
+        mText3->setText(buffer);
+        updateColour();
+        return;
+    }
+}
+
+void Setup_Colours::setEntry(Slider *s, TextField *t, int value)
+{
+    s->setValue(value);
+    char buffer[100];
+    sprintf(buffer, "%d", value);
+    t->setText(buffer);
+}
+
+void Setup_Colours::apply()
+{
+    textColour->commit();
+}
+
+void Setup_Colours::cancel()
+{
+    textColour->rollback();
+    int col = textColour->getColourAt(mSelected);
+    setEntry(mSlider1, mText1, col >> 16);
+    setEntry(mSlider2, mText2, (col >> 8) & 0xff);
+    setEntry(mSlider3, mText3, col & 0xff);
+}
+
+void Setup_Colours::setupPlacer(int v, gcn::Label *&l, Slider *&s,
+                                TextField *&t, std::string lbl,
+                                std::string sfx)
+{
+    l = new gcn::Label(lbl + ":");
+    l->setX(5);
+    l->setY(v - l->getHeight() / 2);
+
+    s = new Slider(0, 255);
+    s->setHeight(10);
+    s->setX(25);
+    s->setY(v - s->getHeight() / 2);
+    s->setWidth(128);
+    s->setScale(0, 255);
+
+    t = new TextField();
+    t->setX(165);
+    t->setY(v - t->getHeight() / 2);
+    t->setWidth(40);
+    t->setNumeric(true);
+    t->setRange(0, 255);
+    t->addListener(this);
+
+    s->setActionEventId("slider" + sfx);
+    s->addActionListener(this);
+
+    add(l);
+    add(s);
+    add(t);
+}
+
+void Setup_Colours::listen(const TextField *tf)
+{
+    if (tf == mText1)
+    {
+        mSlider1->setValue(tf->getValue());
+        updateColour();
+        return;
+    }
+    if (tf == mText2)
+    {
+        mSlider2->setValue(tf->getValue());
+        updateColour();
+        return;
+    }
+    if (tf == mText3)
+    {
+        mSlider3->setValue(tf->getValue());
+        updateColour();
+        return;
+    }
+}
+
+void Setup_Colours::updateColour()
+{
+    if (mSelected == -1)
+    {
+        return;
+    }
+    int rgb = static_cast<int>(mSlider1->getValue()) << 16 |
+              static_cast<int>(mSlider2->getValue()) << 8 |
+              static_cast<int>(mSlider3->getValue());
+    textColour->setColourAt(mSelected, rgb);
+}
diff --git a/src/gui/setup_colours.h b/src/gui/setup_colours.h
new file mode 100644
index 00000000..566bed37
--- /dev/null
+++ b/src/gui/setup_colours.h
@@ -0,0 +1,76 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Douglas Boffey                                  *
+ *                                                                         *
+ *       DougABoffey@netscape.net                                          *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed with The Mana Experiment                  *
+ *   in the hope that it will be useful,                                   *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef _SETUP_COLOURS_H
+#define _SETUP_COLOURS_H
+
+#include <vector>
+#include <string>
+
+#include <guichan/actionlistener.hpp>
+#include <guichan/widgets/listbox.hpp>
+#include <guichan/widgets/label.hpp>
+
+#include "setuptab.h"
+#include "slider.h"
+#include "textfield.h"
+#include "scrollarea.h"
+
+#include "../guichanfwd.h"
+
+class Setup_Colours : public SetupTab, public gcn::ActionListener,
+                      public TextFieldListener
+{
+    public:
+        Setup_Colours();
+        ~Setup_Colours();
+        void apply();
+        void cancel();
+        void action(const gcn::ActionEvent &event);
+
+        void listen(const TextField *tf);
+    private:
+        gcn::ListBox *mColourBox;
+        gcn::Label mColourLabel;
+        ScrollArea *mScroll;
+        int mSelected;
+
+        gcn::Label *mLabel1;
+        Slider *mSlider1;
+        TextField *mText1;
+        int mValue1;
+
+        gcn::Label *mLabel2;
+        Slider *mSlider2;
+        TextField *mText2;
+        int mValue2;
+
+        gcn::Label *mLabel3;
+        Slider *mSlider3;
+        TextField *mText3;
+        int mValue3;
+
+        void setupPlacer(int v, gcn::Label *&l, Slider *&s, TextField *&t,
+                         std::string lbl, std::string sfx);
+        void setEntry(Slider *s, TextField *t, int value);
+        void updateColour();
+};
+#endif
-- 
cgit v1.2.3-70-g09d2


From 56b48b23124ca351269978720ab72bc366eef425 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 7 Sep 2008 05:34:19 +0000
Subject: Added 6 colors for each of the hair styles. Since 10 is an odd number
 for the number of colors for a packet, I added 6 more fun colors. I'd add in
 two more hair styles as well, but since I don't know if it's safe, I'm going
 to play it safe for now and not include them.

---
 src/being.h    |  2 +-
 src/player.cpp | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/being.h b/src/being.h
index 7f68c8c3..e6cfd479 100644
--- a/src/being.h
+++ b/src/being.h
@@ -35,7 +35,7 @@
 #include "animatedsprite.h"
 
 #define NR_HAIR_STYLES 8
-#define NR_HAIR_COLORS 10
+#define NR_HAIR_COLORS 16
 
 #define FIRST_IGNORE_EMOTE 14
 
diff --git a/src/player.cpp b/src/player.cpp
index 0740c7db..125407de 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -157,14 +157,20 @@ void Player::setHairStyle(int style, int color)
     {
         "#8c4b41,da9041,ffffff", // light brown
         "#06372b,489e25,fdedcc", // green
-        "#5f0b33,91191c,f9ad81", // red
+        "#5f0b33,91191c,f9ad81", // dark red
         "#602486,934cc3,fdc689", // purple
-        "#805e74,c6b09b,ffffff", // gray
+        "#805e74,c6b09b,ffffff", // white
         "#8c6625,dab425,ffffff", // yellow
         "#1d2d6d,1594a3,fdedcc", // blue
         "#831f2d,be4f2d,f8cc8b", // brown
         "#432482,584bbc,dae8e5", // light blue
         "#460850,611967,e7b4ae", // dark purple
+        "#8f3e21,bc522b,ff946c", // orange
+        "#9c6b84,d272a3,ffcae5", // pink
+        "#1d1d1d,414141,6f6f6f", // charcoal
+        "#525252,99999b,cacaca", // silver
+        "#841413,aa2829,ffaeb1", // light red
+        "#a82513,ffa525,ffffff", // strawberry blond
     };
 
     setSprite(HAIR_SPRITE, style * -1, colors[color]);
-- 
cgit v1.2.3-70-g09d2


From 2ac3733699150e6a6271e3b6447515ae31aa3bc6 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 7 Sep 2008 13:36:18 +0000
Subject: Added 2 new hair styles in game.

---
 src/being.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/being.h b/src/being.h
index e6cfd479..f196f66c 100644
--- a/src/being.h
+++ b/src/being.h
@@ -34,7 +34,7 @@
 #include "map.h"
 #include "animatedsprite.h"
 
-#define NR_HAIR_STYLES 8
+#define NR_HAIR_STYLES 10
 #define NR_HAIR_COLORS 16
 
 #define FIRST_IGNORE_EMOTE 14
-- 
cgit v1.2.3-70-g09d2


From a9595f435664df56948ae70e954cf72143ddcfa1 Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Fri, 12 Sep 2008 15:49:30 +0000
Subject: Changed default port for Aethyra server to 21001

---
 src/gui/login.cpp | 2 +-
 src/main.cpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 1420575d..6a4cfeb7 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -52,7 +52,7 @@ LoginDialog::LoginDialog(LoginData *loginData):
     gcn::Label *portLabel = new gcn::Label("Port:");
     mServerList = new DropDownList("MostRecent00",
                                    "209.168.213.109",
-                                   "6901",
+                                   "21001",
                                    MAX_SERVER_LIST_SIZE);
     mServerListBox = new gcn::ListBox(mServerList);
     mServerScrollArea = new ScrollArea();
diff --git a/src/main.cpp b/src/main.cpp
index f1bd89f4..8df54635 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -280,7 +280,7 @@ void init_engine(const Options &options)
     // Fill configuration with defaults
     logger->log("Initializing configuration...");
     config.setValue("host", "209.168.213.109");
-    config.setValue("port", 6901);
+    config.setValue("port", 21001);
     config.setValue("hwaccel", 0);
 #if (defined __APPLE__ || defined WIN32) && defined USE_OPENGL
     config.setValue("opengl", 1);
-- 
cgit v1.2.3-70-g09d2


From 8551f4a5c5e1feddc4f2868488bdefeae85aa26d Mon Sep 17 00:00:00 2001
From: Lloyd Bryant <lloyd_bryant@netzero.net>
Date: Fri, 12 Sep 2008 17:12:24 +0000
Subject: Fixed /where, added /cast for heal and gather, some changes to
 inventory to support storage

---
 ChangeLog                     |   13 +
 src/extensions.h              |   34 ++
 src/gui/chat.cpp              | 1023 +++++++++++++++++++----------------------
 src/gui/inventorywindow.cpp   |    6 +-
 src/gui/itemcontainer.cpp     |   15 +-
 src/gui/itemcontainer.h       |    3 +-
 src/gui/trade.cpp             |    9 +-
 src/inventory.cpp             |   29 +-
 src/inventory.h               |   10 +-
 src/localplayer.cpp           |    8 +-
 src/localplayer.h             |   16 +
 src/net/charserverhandler.cpp |   16 +-
 src/net/inventoryhandler.cpp  |  106 ++++-
 src/net/protocol.h            |   19 +-
 14 files changed, 716 insertions(+), 591 deletions(-)
 create mode 100644 src/extensions.h

diff --git a/ChangeLog b/ChangeLog
index 99952782..bc9580fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-09-12 	Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
+
+	* Changed default port for Aethyra to 21001
+	* Modified "/where" command to display X and Y coordinates
+	  (Again - this was done on 2008-08-21, but the changes
+	  were overwritten somehow)
+	* Added client support for Heal spell ("/cast heal")
+	* Added client support for Gather spell ("/cast gather")
+	* some changes to inventory system, to support the use of
+	  "Kafra" storage (this is not yet operational - these
+	  changes are only part of what's required to enable storage
+	  in the client)
+
 2008-09-04  Douglas Boffey ("Scraggy")  <scraggy@aethyra.com>
 
 	* Added code to change colours in the chatlog
diff --git a/src/extensions.h b/src/extensions.h
new file mode 100644
index 00000000..5b95afc8
--- /dev/null
+++ b/src/extensions.h
@@ -0,0 +1,34 @@
+/*
+ *  Aethyra
+ *  Copyright 2008  Lloyd Bryant <sanga@aethyra.com>
+ *
+ *  This file is part of the Aethyra project.
+ *
+ *  Aethyra is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  Aethyra is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#ifndef _EXTENSIONS_
+#define _EXTENSIONS_
+
+struct EXTENSIONS
+{
+    bool aethyra_inventory;
+    bool aethyra_spells;
+    bool aethyra_misc;
+};
+
+extern struct EXTENSIONS extensions;
+#endif
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 8d9dac9d..918b4dbe 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -39,16 +39,15 @@
 #include "../beingmanager.h"
 #include "../recorder.h"
 #include "../party.h"
+#include "../extensions.h"
 
 #include "../net/messageout.h"
 #include "../net/protocol.h"
 
 #include "../utils/trim.h"
 
-ChatWindow::ChatWindow(Network *network):
-    Window(""),
-    mNetwork(network),
-    mTmpVisible(false)
+ChatWindow::ChatWindow(Network * network):
+Window(""), mNetwork(network), mTmpVisible(false)
 {
     setWindowName("Chat");
 
@@ -65,10 +64,10 @@ ChatWindow::ChatWindow(Network *network):
     mTextOutput->disableLinksAndUserColors();
     mTextOutput->setMaxRow((int) config.getValue("ChatLogLength", 0));
     mScrollArea = new ScrollArea(mTextOutput);
-    mScrollArea->setPosition(
-	    mScrollArea->getFrameSize(), mScrollArea->getFrameSize());
-    mScrollArea->setScrollPolicy(
-	    gcn::ScrollArea::SHOW_NEVER, gcn::ScrollArea::SHOW_ALWAYS);
+    mScrollArea->setPosition(mScrollArea->getFrameSize(),
+                             mScrollArea->getFrameSize());
+    mScrollArea->setScrollPolicy(gcn::ScrollArea::SHOW_NEVER,
+                                 gcn::ScrollArea::SHOW_ALWAYS);
     mScrollArea->setOpaque(false);
 
     add(mScrollArea);
@@ -96,81 +95,79 @@ ChatWindow::~ChatWindow()
 }
 
 void
-ChatWindow::logic()
+ ChatWindow::logic()
 {
     // todo: only do this when the size changes (updateWidgets?)
 
     const gcn::Rectangle area = getChildrenArea();
 
     mChatInput->setPosition(mChatInput->getFrameSize(),
-			    area.height - mChatInput->getHeight() -
-				mChatInput->getFrameSize());
+                            area.height - mChatInput->getHeight() -
+                            mChatInput->getFrameSize());
     mChatInput->setWidth(area.width - 2 * mChatInput->getFrameSize());
     mScrollArea->setWidth(area.width - 2 * mScrollArea->getFrameSize());
     mScrollArea->setHeight(area.height - 2 * mScrollArea->getFrameSize() -
-	    mChatInput->getHeight() - 5);
+                           mChatInput->getHeight() - 5);
     mScrollArea->logic();
 }
 
-void
-ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
+void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
 {
     // Trim whitespace
     trim(line);
 
     CHATLOG tmp;
-    tmp.own  = own;
+    tmp.own = own;
     tmp.nick = "";
     tmp.text = line;
 
     // Fix the owner of welcome message.
-    if (line.substr(0, 7) == "Welcome")
-    {
-	own = BY_SERVER;
+    if (line.substr(0, 7) == "Welcome") {
+        own = BY_SERVER;
     }
 
     std::string::size_type pos = line.find(" : ");
     if (pos != std::string::npos) {
-	tmp.nick = line.substr(0, pos);
-	tmp.text = line.substr(pos + 3);
+        tmp.nick = line.substr(0, pos);
+        tmp.text = line.substr(pos + 3);
     }
 
     std::string lineColor = "##C";
     switch (own) {
-	case BY_GM:
-	    tmp.nick += std::string("Global announcement: ");
-	    lineColor = "##G";
-	    break;
-	case BY_PLAYER:
-	    tmp.nick += CAT_NORMAL;
-	    lineColor = "##Y";
-	    break;
-	case BY_OTHER:
-	    tmp.nick += CAT_NORMAL;
-	    lineColor = "##C";
-	    break;
-	case BY_SERVER:
-	    tmp.nick = "Server: ";
-	    tmp.text = line;
-	    lineColor = "##S";
-	    break;
-	case BY_PARTY:
-	    tmp.nick += CAT_NORMAL;
-	    lineColor = "##P";
-	    break;
-	case ACT_WHISPER:
-	    tmp.nick += CAT_WHISPER;
-	    lineColor = "##W";
-	    break;
-	case ACT_IS:
-	    tmp.nick += CAT_IS;
-	    lineColor = "##I";
-	    break;
-	case BY_LOGGER:
-	    tmp.nick = "";
-	    tmp.text = line;
-	    lineColor = "##L";
-	    break;
+        case BY_GM:
+            tmp.nick += std::string("Global announcement: ");
+            lineColor = "##G";
+            break;
+        case BY_PLAYER:
+            tmp.nick += CAT_NORMAL;
+            lineColor = "##Y";
+            break;
+        case BY_OTHER:
+            tmp.nick += CAT_NORMAL;
+            lineColor = "##C";
+            break;
+        case BY_SERVER:
+            tmp.nick = "Server: ";
+            tmp.text = line;
+            lineColor = "##S";
+            break;
+        case BY_PARTY:
+            tmp.nick += CAT_NORMAL;
+            lineColor = "##P";
+            break;
+        case ACT_WHISPER:
+            tmp.nick += CAT_WHISPER;
+            lineColor = "##W";
+            break;
+        case ACT_IS:
+            tmp.nick += CAT_IS;
+            lineColor = "##I";
+            break;
+        case BY_LOGGER:
+            tmp.nick = "";
+            tmp.text = line;
+            lineColor = "##L";
+            break;
     }
 
     // Get the current system time
@@ -179,411 +176,389 @@ ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
 
     // Format the time string properly
     std::stringstream timeStr;
-    timeStr << "["
-	    << ((((t / 60) / 60) % 24 < 10) ? "0" : "")
-	    << (int)(((t / 60) / 60) % 24)
-	    << ":"
-	    << (((t / 60) % 60 < 10) ? "0" : "")
-	    << (int)((t / 60) % 60)
-	    << "] ";
+    timeStr << "[" << ((((t / 60) / 60) % 24 < 10) ? "0" : "")
+        << (int) (((t / 60) / 60) % 24)
+        << ":" << (((t / 60) % 60 < 10) ? "0" : "")
+        << (int) ((t / 60) % 60)
+        << "] ";
 
     line = lineColor + timeStr.str() + tmp.nick + tmp.text;
 
     // We look if the Vertical Scroll Bar is set at the max before
     // adding a row, otherwise the max will always be a row higher
     // at comparison.
-    if (mScrollArea->getVerticalScrollAmount() == mScrollArea->getVerticalMaxScroll())
-    {
-	mTextOutput->addRow(line);
-	mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll());
-    }
-    else
-    {
-	mTextOutput->addRow(line);
+    if (mScrollArea->getVerticalScrollAmount() ==
+        mScrollArea->getVerticalMaxScroll()) {
+        mTextOutput->addRow(line);
+        mScrollArea->setVerticalScrollAmount(mScrollArea->
+                                             getVerticalMaxScroll());
+    } else {
+        mTextOutput->addRow(line);
     }
 
     mRecorder->record(line.substr(3));
 }
 
-void
-ChatWindow::chatLog(CHATSKILL act)
+void ChatWindow::chatLog(CHATSKILL act)
 {
     chatLog(const_msg(act), BY_SERVER);
 }
 
-void
-ChatWindow::action(const gcn::ActionEvent &event)
+void ChatWindow::action(const gcn::ActionEvent & event)
 {
-    if (event.getId() == "chatinput")
-    {
-	std::string message = mChatInput->getText();
-
-	if (!message.empty()) {
-	    // If message different from previous, put it in the history
-	    if (mHistory.empty() || message != mHistory.back()) {
-		mHistory.push_back(message);
-	    }
-
-	    // Reset history iterator
-	    mCurHist = mHistory.end();
-
-	    // Send the message to the server
-	    chatSend(player_node->getName(), message);
-
-	    // Clear the text from the chat input
-	    mChatInput->setText("");
-	}
-	if (message.empty() || !mReturnToggles)
-	{
-	    // Remove focus and hide input
-	    mFocusHandler->focusNone();
-
-	    // If the chatWindow is shown up because you want to send a message
-	    // It should hide now
-	    if (mTmpVisible)
-	    {
-		setVisible(false);
-	    }
-	}
+    if (event.getId() == "chatinput") {
+        std::string message = mChatInput->getText();
+
+        if (!message.empty()) {
+            // If message different from previous, put it in the history
+            if (mHistory.empty() || message != mHistory.back()) {
+                mHistory.push_back(message);
+            }
+            // Reset history iterator
+            mCurHist = mHistory.end();
+
+            // Send the message to the server
+            chatSend(player_node->getName(), message);
+
+            // Clear the text from the chat input
+            mChatInput->setText("");
+        }
+        if (message.empty() || !mReturnToggles) {
+            // Remove focus and hide input
+            mFocusHandler->focusNone();
+
+            // If the chatWindow is shown up because you want to send a message
+            // It should hide now
+            if (mTmpVisible) {
+                setVisible(false);
+            }
+        }
     }
 }
 
-void
-ChatWindow::requestChatFocus()
+void ChatWindow::requestChatFocus()
 {
     // Make sure chatWindow is visible
-    if (!isVisible())
-    {
-	setVisible(true);
+    if (!isVisible()) {
+        setVisible(true);
 
-	/*
-	 * This is used to hide chatWindow after sending the message. There is
-	 * a trick here, because setVisible will set mTmpVisible to false, you
-	 * have to put this sentence *after* setVisible, not before it
-	 */
-	mTmpVisible = true;
+        /*
+         * This is used to hide chatWindow after sending the message. There is
+         * a trick here, because setVisible will set mTmpVisible to false, you
+         * have to put this sentence *after* setVisible, not before it
+         */
+        mTmpVisible = true;
     }
-
     // Give focus to the chat input
     mChatInput->setVisible(true);
     mChatInput->requestFocus();
 }
 
-bool
-ChatWindow::isInputFocused()
+bool ChatWindow::isInputFocused()
 {
     return mChatInput->isFocused();
 }
 
-void
-ChatWindow::chatSend(const std::string &nick, std::string msg)
+void ChatWindow::chatSend(const std::string & nick, std::string msg)
 {
     /* Some messages are managed client side, while others
      * require server handling by proper packet. Probably
      * those if elses should be replaced by protocol calls */
 
     // Send party message
-    if (msg.at(0) == mPartyPrefix)
-    {
-	msg.erase(0, 1);
-	std::size_t length = msg.length() + 1;
-
-	if (length == 0)
-	{
-	    chatLog("Trying to send a blank party message.", BY_SERVER);
-	    return;
-	}
-	MessageOut outMsg(mNetwork);
-
-	outMsg.writeInt16(CMSG_PARTY_MESSAGE);
-	outMsg.writeInt16(length + 4);
-	outMsg.writeString(msg, length);
-	return;
+    if (msg.at(0) == mPartyPrefix) {
+        msg.erase(0, 1);
+        std::size_t length = msg.length() + 1;
+
+        if (length == 0) {
+            chatLog("Trying to send a blank party message.", BY_SERVER);
+            return;
+        }
+        MessageOut outMsg(mNetwork);
+
+        outMsg.writeInt16(CMSG_PARTY_MESSAGE);
+        outMsg.writeInt16(length + 4);
+        outMsg.writeString(msg, length);
+        return;
     }
     // Prepare ordinary message
     if (msg.substr(0, 1) != "/") {
-	msg = nick + " : " + msg;
+        msg = nick + " : " + msg;
 
-	MessageOut outMsg(mNetwork);
-	outMsg.writeInt16(CMSG_CHAT_MESSAGE);
-	// Added + 1 in order to let eAthena parse admin commands correctly
-	outMsg.writeInt16(msg.length() + 4 + 1);
-	outMsg.writeString(msg, msg.length() + 1);
-	return;
+        MessageOut outMsg(mNetwork);
+        outMsg.writeInt16(CMSG_CHAT_MESSAGE);
+        // Added + 1 in order to let eAthena parse admin commands correctly
+        outMsg.writeInt16(msg.length() + 4 + 1);
+        outMsg.writeString(msg, msg.length() + 1);
+        return;
     }
     msg.erase(0, 1);
     trim(msg);
 
     std::size_t space = msg.find(" ");
     std::string command = msg.substr(0, space);
-    if (space == std::string::npos)
-    {
-	msg = "";
-    }
-    else
-    {
-	msg = msg.substr(space);
-	trim(msg);
-    }
-
-    if (command == "announce")
-    {
-	MessageOut outMsg(mNetwork);
-	outMsg.writeInt16(0x0099);
-	outMsg.writeInt16(msg.length() + 4);
-	outMsg.writeString(msg, msg.length());
-	return;
-    }
-    if (command == "help")
-    {
-	std::size_t space = msg.find(" ");
-	std::string msg1;
-	if (space == std::string::npos)
-	{
-	    msg1 = "";
-	}
-	else
-	{
-	    msg1 = msg.substr(space + 1, msg.length());
-	    msg = msg.substr(0, space);
-	}
-	if (msg != "" && msg.at(0) == '/')
-	{
-	    msg.erase(0, 1);
-	}
-	while (msg1 != "" && msg1.at(0) == ' ')
-	{
-	    msg1.erase(0, 1);
-	}
-	help(msg, msg1);
-	return;
-    }
-    if (command == "where")
-    {
-	chatLog(map_path, BY_SERVER);
-	return;
-    }
-    if (command == "who")
-    {
-	MessageOut outMsg(mNetwork);
-	outMsg.writeInt16(0x00c1);
-	return;
-    }
-    if (command == "clear")
-    {
-	mTextOutput->clearRows();
-	return;
-    }
-    if (command == "whisper")
-    {
-	std::string recvnick = "";
-
-	if (msg.substr(0,1) == "\"")
-	{
-	    const std::string::size_type pos = msg.find('"', 1);
-	    if (pos != std::string::npos) {
-		recvnick = msg.substr(1, pos - 1);
-		msg.erase(0, pos + 2);
-	    }
-	}
-	else
-	{
-	    const std::string::size_type pos = msg.find(" ");
-	    if (pos != std::string::npos) {
-		recvnick = msg.substr(0, pos);
-		msg.erase(0, pos + 1);
-	    }
-	}
-
-	MessageOut outMsg(mNetwork);
-	outMsg.writeInt16(CMSG_CHAT_WHISPER);
-	outMsg.writeInt16(msg.length() + 28);
-	outMsg.writeString(recvnick, 24);
-	outMsg.writeString(msg, msg.length());
-
-	chatLog("Whispering to " + recvnick + " : " + msg, BY_PLAYER);
-	return;
-    }
-    if (command == "record")
-    {
+    if (space == std::string::npos) {
+        msg = "";
+    } else {
+        msg = msg.substr(space);
+        trim(msg);
+    }
+
+    if (command == "announce") {
+        MessageOut outMsg(mNetwork);
+        outMsg.writeInt16(0x0099);
+        outMsg.writeInt16(msg.length() + 4);
+        outMsg.writeString(msg, msg.length());
+        return;
+    }
+    if (command == "help") {
+        std::size_t space = msg.find(" ");
+        std::string msg1;
+        if (space == std::string::npos) {
+            msg1 = "";
+        } else {
+            msg1 = msg.substr(space + 1, msg.length());
+            msg = msg.substr(0, space);
+        }
+        if (msg != "" && msg.at(0) == '/') {
+            msg.erase(0, 1);
+        }
+        while (msg1 != "" && msg1.at(0) == ' ') {
+            msg1.erase(0, 1);
+        }
+        help(msg, msg1);
+        return;
+    }
+    if (command == "where") {
+        // Display the current map, X, and Y
+        std::ostringstream where;
+        where << map_path << " " << player_node->mX << " " << player_node->mY;
+        chatLog(where.str(), BY_SERVER);
+        return;
+    }
+    if (command == "who") {
+        MessageOut outMsg(mNetwork);
+        outMsg.writeInt16(0x00c1);
+        return;
+    }
+    if (command == "clear") {
+        mTextOutput->clearRows();
+        return;
+    }
+    if (command == "whisper") {
+        std::string recvnick = "";
+
+        if (msg.substr(0, 1) == "\"") {
+            const std::string::size_type pos = msg.find('"', 1);
+            if (pos != std::string::npos) {
+                recvnick = msg.substr(1, pos - 1);
+                msg.erase(0, pos + 2);
+            }
+        } else {
+            const std::string::size_type pos = msg.find(" ");
+            if (pos != std::string::npos) {
+                recvnick = msg.substr(0, pos);
+                msg.erase(0, pos + 1);
+            }
+        }
+
+        MessageOut outMsg(mNetwork);
+        outMsg.writeInt16(CMSG_CHAT_WHISPER);
+        outMsg.writeInt16(msg.length() + 28);
+        outMsg.writeString(recvnick, 24);
+        outMsg.writeString(msg, msg.length());
+
+        chatLog("Whispering to " + recvnick + " : " + msg, BY_PLAYER);
+        return;
+    }
+    if (command == "record") {
         mRecorder->respond(msg);
-	return;
-    }
-    if (command == "toggle")
-    {
-	if (msg == "")
-	{
-	    chatLog(mReturnToggles ? "Return toggles chat."
-		                   : "Message closes chat.", BY_SERVER);
-	    return;
-	}
-	msg = msg.substr(0, 1);
-	if (msg == "1" || msg == "y" || msg == "t" || msg == "Y" || msg == "T")
-	{
-	    chatLog("Return now toggles chat.", BY_SERVER);
-	    mReturnToggles = true;
-	    return;
-	}
-	if (msg == "0" || msg == "n" || msg == "f" || msg == "N" || msg == "F")
-	{
-	    chatLog("Message now closes chat.", BY_SERVER);
-	    mReturnToggles = false;
-	    return;
-	}
-	chatLog("Options to /toggle are \"yes\", \"no\", \"true\", \"false\", "
-		"\"1\", \"0\".", BY_SERVER);
-	return;
-    }
-    if (command == "party")
-    {
-	if (msg == "")
-	{
-	    chatLog("Unknown party command... Type \"/help\" party for more "
-		    "information.", BY_SERVER);
-	    return;
-	}
-	const std::string::size_type space = msg.find(" ");
-	std::string rest = (space == std::string::npos ? ""
-				     : msg.substr(space + 1, msg.length()));
-	if (rest != "")
-	{
-	    msg = msg.substr(0, space);
-	    while (msg != "" && msg[0] == ' ')
-	    {
-		msg = msg.substr(1, msg.length());
-	    }
-	}
-	party(msg, rest);
-	return;
-    }
-    if (command == "present")
-    {
-	Beings &beings = beingManager->getAll();
-	std::string response = "";
-	for (BeingIterator bi = beings.begin(), be = beings.end();
-	     bi != be;
-	     ++bi)
-	{
-	    if ((*bi)->getType() == Being::PLAYER)
-	    {
-		if (response != "")
-		{
-		    response += ", ";
-		}
-		response += (*bi)->getName();
-	    }
-	}
-	if (mRecorder->isRecording())
-	{
-	    // Get the current system time
-	    time_t t;
-	    time(&t);
-
-	    // Format the time string properly
-	    std::stringstream timeStr;
-	    timeStr << "["
-		    << ((((t / 60) / 60) % 24 < 10) ? "0" : "")
-		    << (int)(((t / 60) / 60) % 24)
-		    << ":"
-		    << (((t / 60) % 60 < 10) ? "0" : "")
-		    << (int)((t / 60) % 60)
-		    << "] ";
-
-
-	    mRecorder->record(timeStr.str() + "Present: " + response + ".");
-	    chatLog("Attendance written to record log.", BY_SERVER, true);
-	}
-	else
-	{
-	    chatLog("Present: " + response, BY_SERVER);
-	}
-	return;
+        return;
+    }
+    if (command == "toggle") {
+        if (msg == "") {
+            chatLog(mReturnToggles ? "Return toggles chat."
+                    : "Message closes chat.", BY_SERVER);
+            return;
+        }
+        msg = msg.substr(0, 1);
+        if (msg == "1" || msg == "y" || msg == "t" || msg == "Y" || msg == "T") {
+            chatLog("Return now toggles chat.", BY_SERVER);
+            mReturnToggles = true;
+            return;
+        }
+        if (msg == "0" || msg == "n" || msg == "f" || msg == "N" || msg == "F") {
+            chatLog("Message now closes chat.", BY_SERVER);
+            mReturnToggles = false;
+            return;
+        }
+        chatLog("Options to /toggle are \"yes\", \"no\", \"true\", \"false\", "
+                "\"1\", \"0\".", BY_SERVER);
+        return;
+    }
+    if (command == "party") {
+        if (msg == "") {
+            chatLog("Unknown party command... Type \"/help\" party for more "
+                    "information.", BY_SERVER);
+            return;
+        }
+        const std::string::size_type space = msg.find(" ");
+        std::string rest = (space == std::string::npos ? ""
+                            : msg.substr(space + 1, msg.length()));
+        if (rest != "") {
+            msg = msg.substr(0, space);
+            while (msg != "" && msg[0] == ' ') {
+                msg = msg.substr(1, msg.length());
+            }
+        }
+        party(msg, rest);
+        return;
+    }
+    if (command == "cast") {
+        /*
+         * This will eventually be replaced by a GUI, so
+         * we don't need to get too sophisticated
+         */
+        if (extensions.aethyra_spells) {
+            MessageOut outMsg(mNetwork);
+            if (msg == "heal") {
+                outMsg.writeInt16(0x03f3);
+                outMsg.writeInt16(0x01);
+                outMsg.writeInt32(0);
+                outMsg.writeInt8(0);
+                outMsg.writeInt8(0);
+                outMsg.writeString("", 24);
+            } else if (msg == "gather") {
+                outMsg.writeInt16(0x03f3);
+                outMsg.writeInt16(0x02);
+                outMsg.writeInt32(0);
+                outMsg.writeInt8(0);
+                outMsg.writeInt8(0);
+                outMsg.writeString("", 24);
+            } else {
+                chatLog("No such spell!", BY_SERVER);
+            }
+        } else {
+            chatLog("The current server doesn't support spells", BY_SERVER);
+        }
+        return;
+    }
+    if (command == "present") {
+        Beings & beings = beingManager->getAll();
+        std::string response = "";
+        for (BeingIterator bi = beings.begin(), be = beings.end();
+             bi != be; ++bi) {
+            if ((*bi)->getType() == Being::PLAYER) {
+                if (response != "") {
+                    response += ", ";
+                }
+                response += (*bi)->getName();
+            }
+        }
+        if (mRecorder->isRecording()) {
+            // Get the current system time
+            time_t t;
+            time(&t);
+
+            // Format the time string properly
+            std::stringstream timeStr;
+            timeStr << "[" << ((((t / 60) / 60) % 24 < 10) ? "0" : "")
+                << (int) (((t / 60) / 60) % 24)
+                << ":" << (((t / 60) % 60 < 10) ? "0" : "")
+                << (int) ((t / 60) % 60)
+                << "] ";
+
+
+            mRecorder->record(timeStr.str() + "Present: " + response + ".");
+            chatLog("Attendance written to record log.", BY_SERVER, true);
+        } else {
+            chatLog("Present: " + response, BY_SERVER);
+        }
+        return;
     }
     chatLog("Unknown command", BY_SERVER);
 }
 
-std::string
-ChatWindow::const_msg(CHATSKILL act)
+std::string ChatWindow::const_msg(CHATSKILL act)
 {
     std::string msg;
     if (act.success == SKILL_FAILED && act.skill == SKILL_BASIC) {
-	switch (act.bskill) {
-	    case BSKILL_TRADE :
-		msg = "Trade failed!";
-		break;
-	    case BSKILL_EMOTE :
-		msg = "Emote failed!";
-		break;
-	    case BSKILL_SIT :
-		msg = "Sit failed!";
-		break;
-	    case BSKILL_CREATECHAT :
-		msg = "Chat creating failed!";
-		break;
-	    case BSKILL_JOINPARTY :
-		msg = "Could not join party!";
-		break;
-	    case BSKILL_SHOUT :
-		msg = "Cannot shout!";
-		break;
-	}
-
-	switch (act.reason) {
-	    case RFAIL_SKILLDEP :
-		msg += " You have not yet reached a high enough level!";
-		break;
-	    case RFAIL_INSUFHP :
-		msg += " Insufficient HP!";
-		break;
-	    case RFAIL_INSUFSP :
-		msg += " Insufficient SP!";
-		break;
-	    case RFAIL_NOMEMO :
-		msg += " You have no memos!";
-		break;
-	    case RFAIL_SKILLDELAY :
-		msg += " You cannot do that right now!";
-		break;
-	    case RFAIL_ZENY :
-		msg += " Seems you need more Zeny... ;-)";
-		break;
-	    case RFAIL_WEAPON :
-		msg += " You cannot use this skill with that kind of weapon!";
-		break;
-	    case RFAIL_REDGEM :
-		msg += " You need another red gem!";
-		break;
-	    case RFAIL_BLUEGEM :
-		msg += " You need another blue gem!";
-		break;
-	    case RFAIL_OVERWEIGHT :
-		msg += " You're carrying to much to do this!";
-		break;
-	    default :
-		msg += " Huh? What's that?";
-		break;
-	}
+        switch (act.bskill) {
+            case BSKILL_TRADE:
+                msg = "Trade failed!";
+                break;
+            case BSKILL_EMOTE:
+                msg = "Emote failed!";
+                break;
+            case BSKILL_SIT:
+                msg = "Sit failed!";
+                break;
+            case BSKILL_CREATECHAT:
+                msg = "Chat creating failed!";
+                break;
+            case BSKILL_JOINPARTY:
+                msg = "Could not join party!";
+                break;
+            case BSKILL_SHOUT:
+                msg = "Cannot shout!";
+                break;
+        }
+
+        switch (act.reason) {
+            case RFAIL_SKILLDEP:
+                msg += " You have not yet reached a high enough level!";
+                break;
+            case RFAIL_INSUFHP:
+                msg += " Insufficient HP!";
+                break;
+            case RFAIL_INSUFSP:
+                msg += " Insufficient SP!";
+                break;
+            case RFAIL_NOMEMO:
+                msg += " You have no memos!";
+                break;
+            case RFAIL_SKILLDELAY:
+                msg += " You cannot do that right now!";
+                break;
+            case RFAIL_ZENY:
+                msg += " Seems you need more Zeny... ;-)";
+                break;
+            case RFAIL_WEAPON:
+                msg += " You cannot use this skill with that kind of weapon!";
+                break;
+            case RFAIL_REDGEM:
+                msg += " You need another red gem!";
+                break;
+            case RFAIL_BLUEGEM:
+                msg += " You need another blue gem!";
+                break;
+            case RFAIL_OVERWEIGHT:
+                msg += " You're carrying to much to do this!";
+                break;
+            default:
+                msg += " Huh? What's that?";
+                break;
+        }
     } else {
-	switch(act.skill) {
-	    case SKILL_WARP :
-		msg = "Warp failed...";
-		break;
-	    case SKILL_STEAL :
-		msg = "Could not steal anything...";
-		break;
-	    case SKILL_ENVENOM :
-		msg = "Poison had no effect...";
-		break;
-	}
+        switch (act.skill) {
+            case SKILL_WARP:
+                msg = "Warp failed...";
+                break;
+            case SKILL_STEAL:
+                msg = "Could not steal anything...";
+                break;
+            case SKILL_ENVENOM:
+                msg = "Poison had no effect...";
+                break;
+        }
     }
     return msg;
 }
 
-void
-ChatWindow::scroll(int amount)
+void ChatWindow::scroll(int amount)
 {
     if (!isVisible())
-	return;
+        return;
 
     int range = mScrollArea->getHeight() / 8 * amount;
     gcn::Rectangle scr;
@@ -592,41 +567,34 @@ ChatWindow::scroll(int amount)
     mTextOutput->showPart(scr);
 }
 
-void
-ChatWindow::keyPressed(gcn::KeyEvent &event)
+void ChatWindow::keyPressed(gcn::KeyEvent & event)
 {
     if (event.getKey().getValue() == gcn::Key::DOWN &&
-	    mCurHist != mHistory.end())
-    {
-	// Move forward through the history
-	HistoryIterator prevHist = mCurHist++;
-	if (mCurHist != mHistory.end()) {
-	    mChatInput->setText(*mCurHist);
-	    mChatInput->setCaretPosition(mChatInput->getText().length());
-	}
-	else {
-	    mCurHist = prevHist;
-	}
-    }
-    else if (event.getKey().getValue() == gcn::Key::UP &&
-	    mCurHist != mHistory.begin() && mHistory.size() > 0)
-    {
-	// Move backward through the history
-	mCurHist--;
-	mChatInput->setText(*mCurHist);
-	mChatInput->setCaretPosition(mChatInput->getText().length());
+        mCurHist != mHistory.end()) {
+        // Move forward through the history
+        HistoryIterator prevHist = mCurHist++;
+        if (mCurHist != mHistory.end()) {
+            mChatInput->setText(*mCurHist);
+            mChatInput->setCaretPosition(mChatInput->getText().length());
+        } else {
+            mCurHist = prevHist;
+        }
+    } else if (event.getKey().getValue() == gcn::Key::UP &&
+               mCurHist != mHistory.begin() && mHistory.size() > 0) {
+        // Move backward through the history
+        mCurHist--;
+        mChatInput->setText(*mCurHist);
+        mChatInput->setCaretPosition(mChatInput->getText().length());
     }
 }
 
-void
-ChatWindow::setInputText(std::string input_str)
+void ChatWindow::setInputText(std::string input_str)
 {
-     mChatInput->setText(input_str + " ");
-     requestChatFocus();
+    mChatInput->setText(input_str + " ");
+    requestChatFocus();
 }
 
-void
-ChatWindow::setVisible(bool isVisible)
+void ChatWindow::setVisible(bool isVisible)
 {
     Window::setVisible(isVisible);
 
@@ -638,78 +606,64 @@ ChatWindow::setVisible(bool isVisible)
     mTmpVisible = false;
 }
 
-void
-ChatWindow::party(const std::string &command, const std::string &rest)
+void ChatWindow::party(const std::string & command, const std::string & rest)
 {
-    if (command == "prefix")
-    {
-	if (rest == "")
-	{
-	    char temp[2] = ".";
-	    *temp = mPartyPrefix;
-	    chatLog("The current party prefix is " + std::string(temp),
-		    BY_SERVER);
-	    return;
-	}
-	if (rest.length() != 1)
-	{
-	    chatLog("Party prefix must be one character long.", BY_SERVER);
-	}
-	else
-	{
-	    if (rest == "/")
-	    {
-		chatLog("Cannot use a '/' as the prefix.", BY_SERVER);
-	    }
-	    else
-	    {
-		mPartyPrefix = rest.at(0);
-		chatLog("Changing prefix to " + rest, BY_SERVER);
-	    }
-	}
-	return;
+    if (command == "prefix") {
+        if (rest == "") {
+            char temp[2] = ".";
+            *temp = mPartyPrefix;
+            chatLog("The current party prefix is " + std::string(temp),
+                    BY_SERVER);
+            return;
+        }
+        if (rest.length() != 1) {
+            chatLog("Party prefix must be one character long.", BY_SERVER);
+        } else {
+            if (rest == "/") {
+                chatLog("Cannot use a '/' as the prefix.", BY_SERVER);
+            } else {
+                mPartyPrefix = rest.at(0);
+                chatLog("Changing prefix to " + rest, BY_SERVER);
+            }
+        }
+        return;
     }
     mParty->respond(command, rest);
 }
 
-void
-ChatWindow::help(const std::string &msg1, const std::string &msg2)
+void ChatWindow::help(const std::string & msg1, const std::string & msg2)
 {
     chatLog("-- Help --", BY_SERVER);
-    if (msg1 == "")
-    {
-	chatLog("/announce: Global announcement (GM only)", BY_SERVER);
-	chatLog("/clear: Clears this window", BY_SERVER);
-	chatLog("/help: Display this help.", BY_SERVER);
-	mParty->help();
-	chatLog("/present: Get list of players present", BY_SERVER);
-	mRecorder->help();
-	chatLog("/toggle: Determine whether <return> toggles the chat log.",
-		BY_SERVER);
-	chatLog("/where: Display map name", BY_SERVER);
-	chatLog("/whisper <nick> <message>: Sends a private <message>"
-		" to <nick>", BY_SERVER);
-	chatLog("/who: Display number of online users", BY_SERVER);
-	chatLog("For more information, type /help <command>", BY_SERVER);
-	return;
-    }
-    if (msg1 == "announce")
-    {
-	chatLog("Command: /announce <msg>", BY_SERVER);
-	chatLog("*** only available to a GM ***", BY_SERVER);
-	chatLog("This command sends the message <msg> to "
-		"all players currently online.", BY_SERVER);
-	return;
-    }
-    if (msg1 == "clear")
-    {
-	chatLog("Command: /clear", BY_SERVER);
-	chatLog("This command clears the chat log of previous chat.",
-		BY_SERVER);
-	return;
-    }
-    if (msg1 == "help")
-    {
+    if (msg1 == "") {
+        chatLog("/announce: Global announcement (GM only)", BY_SERVER);
+        chatLog("/clear: Clears this window", BY_SERVER);
+        chatLog("/help: Display this help.", BY_SERVER);
+        mParty->help();
+        chatLog("/present: Get list of players present", BY_SERVER);
+        mRecorder->help();
+        chatLog("/toggle: Determine whether <return> toggles the chat log.",
+                BY_SERVER);
+        chatLog("/where: Display map name", BY_SERVER);
+        chatLog("/whisper <nick> <message>: Sends a private <message>"
+                " to <nick>", BY_SERVER);
+        chatLog("/who: Display number of online users", BY_SERVER);
+        chatLog("For more information, type /help <command>", BY_SERVER);
+        return;
+    }
+    if (msg1 == "announce") {
+        chatLog("Command: /announce <msg>", BY_SERVER);
+        chatLog("*** only available to a GM ***", BY_SERVER);
+        chatLog("This command sends the message <msg> to "
+                "all players currently online.", BY_SERVER);
+        return;
+    }
+    if (msg1 == "clear") {
+        chatLog("Command: /clear", BY_SERVER);
+        chatLog("This command clears the chat log of previous chat.",
+                BY_SERVER);
+        return;
+    }
+    if (msg1 == "help") {
         chatLog("Command: /help", BY_SERVER);
         chatLog("This command displays a list of all commands available.",
                 BY_SERVER);
@@ -717,58 +671,51 @@ ChatWindow::help(const std::string &msg1, const std::string &msg2)
         chatLog("This command displays help on <command>.", BY_SERVER);
         return;
     }
-    if (msg1 == "party")
-    {
+    if (msg1 == "party") {
         mParty->help(msg2);
-	return;
-    }
-    if (msg1 == "present")
-    {
-	chatLog("Command: /present", BY_SERVER);
-	chatLog("This command gets a list of players within hearing "
-		"and sends it to either the record log if recording, or the "
-		"chat log otherwise.", BY_SERVER);
-	return;
-    }
-    if (msg1 == "record")
-    {
+        return;
+    }
+    if (msg1 == "present") {
+        chatLog("Command: /present", BY_SERVER);
+        chatLog("This command gets a list of players within hearing "
+                "and sends it to either the record log if recording, or the "
+                "chat log otherwise.", BY_SERVER);
+        return;
+    }
+    if (msg1 == "record") {
         mRecorder->help(msg2);
-	return;
-    }
-    if (msg1 == "toggle")
-    {
-	chatLog("Command: /toggle <state>", BY_SERVER);
-	chatLog("This command sets whether the return key should toggle the "
-		"chat log, or whether the chat log turns off automatically.",
-		BY_SERVER);
-	chatLog("<state> can be one of \"1\", \"yes\", \"true\" to turn "
-		"the toggle on, or \"0\", \"no\", \"false\" to turn the "
-		"toggle off.", BY_SERVER);
-	chatLog("Command: /toggle", BY_SERVER);
-	chatLog("This command displays the return toggle status.", BY_SERVER);
-	return;
-    }
-    if (msg1 == "where")
-    {
-	chatLog("Command: /where", BY_SERVER);
-	chatLog("This command displays the name of the current map.",
-		BY_SERVER);
-	return;
-    }
-    if (msg1 == "whisper")
-    {
-	chatLog("Command: /whisper <nick> <msg>", BY_SERVER);
-	chatLog("This command sends the message <msg> to <nick.", BY_SERVER);
-	chatLog("If the <nick> has spaces in it, enclose it in "
-		"double quotes (\").", BY_SERVER);
-	return;
-    }
-    if (msg1 == "who")
-    {
-	chatLog("Command: /who", BY_SERVER);
-	chatLog("This command displays the number of players currently "
-		"online.", BY_SERVER);
-	return;
+        return;
+    }
+    if (msg1 == "toggle") {
+        chatLog("Command: /toggle <state>", BY_SERVER);
+        chatLog("This command sets whether the return key should toggle the "
+                "chat log, or whether the chat log turns off automatically.",
+                BY_SERVER);
+        chatLog("<state> can be one of \"1\", \"yes\", \"true\" to turn "
+                "the toggle on, or \"0\", \"no\", \"false\" to turn the "
+                "toggle off.", BY_SERVER);
+        chatLog("Command: /toggle", BY_SERVER);
+        chatLog("This command displays the return toggle status.", BY_SERVER);
+        return;
+    }
+    if (msg1 == "where") {
+        chatLog("Command: /where", BY_SERVER);
+        chatLog("This command displays the name of the current map.",
+                BY_SERVER);
+        return;
+    }
+    if (msg1 == "whisper") {
+        chatLog("Command: /whisper <nick> <msg>", BY_SERVER);
+        chatLog("This command sends the message <msg> to <nick.", BY_SERVER);
+        chatLog("If the <nick> has spaces in it, enclose it in "
+                "double quotes (\").", BY_SERVER);
+        return;
+    }
+    if (msg1 == "who") {
+        chatLog("Command: /who", BY_SERVER);
+        chatLog("This command displays the number of players currently "
+                "online.", BY_SERVER);
+        return;
     }
     chatLog("Unknown command.", BY_SERVER);
     chatLog("Type /help for a list of commands.", BY_SERVER);
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index b53fa43b..8866515f 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -57,7 +57,7 @@ InventoryWindow::InventoryWindow():
     mUseButton = new Button("Use", "use", this);
     mDropButton = new Button("Drop", "drop", this);
 
-    mItems = new ItemContainer(player_node->getInventory());
+    mItems = new ItemContainer(player_node->getInventory(), 2);
     mItems->addSelectionListener(this);
 
     mInvenScroll = new ScrollArea(mItems);
@@ -94,8 +94,8 @@ void InventoryWindow::logic()
 
     // Update weight information
     mWeightLabel->setCaption(
-            "Total Weight: " + toString(player_node->mTotalWeight) + " - "
-            "Maximum Weight: " + toString(player_node->mMaxWeight));
+        "Total Weight: " + toString(player_node->mTotalWeight) + " - " +
+        "Maximum Weight: " + toString(player_node->mMaxWeight));
 }
 
 void InventoryWindow::action(const gcn::ActionEvent &event)
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index ce7337d2..186a2da6 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -31,6 +31,7 @@
 #include "../item.h"
 #include "../itemshortcut.h"
 #include "../log.h"
+#include "../localplayer.h"
 
 #include "../resources/image.h"
 #include "../resources/iteminfo.h"
@@ -41,9 +42,10 @@
 const int ItemContainer::gridWidth = 36;  // item icon width + 4
 const int ItemContainer::gridHeight = 42; // item icon height + 10
 
-ItemContainer::ItemContainer(Inventory *inventory):
+ItemContainer::ItemContainer(Inventory *inventory, int offset):
     mInventory(inventory),
-    mSelectedItem(NULL)
+    mSelectedItem(NULL),
+    mOffset(offset)
 {
     ResourceManager *resman = ResourceManager::getInstance();
 
@@ -94,10 +96,11 @@ ItemContainer::draw(gcn::Graphics *graphics)
     }
 
     /*
-     * eAthena seems to start inventory from the 3rd slot. Still a mystery to
-     * us why, make sure not to copy this oddity to our own server.
+     * mOffset is used to compensate for some weirdness that eAthena inherited from
+     * Ragnarok Online.  Inventory slots and cart slots are +2 from their actual index,
+     * while storage slots are +1.
      */
-    for (int i = 2; i < INVENTORY_SIZE; i++)
+    for (int i = mOffset; i < mInventory->getSize(); i++)
     {
         Item *item = mInventory->getItem(i);
 
@@ -194,7 +197,7 @@ ItemContainer::mousePressed(gcn::MouseEvent &event)
         int columns = getWidth() / gridWidth;
         int mx = event.getX();
         int my = event.getY();
-        int index = mx / gridWidth + ((my / gridHeight) * columns) + 2;
+        int index = mx / gridWidth + ((my / gridHeight) * columns) + mOffset;
 
         itemShortcut->setItemSelected(-1);
         // Fix for old server, it should be: if (index >= mMaxItems)
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index 353ac51d..78301669 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -50,7 +50,7 @@ class ItemContainer : public gcn::Widget, public gcn::MouseListener,
         /**
          * Constructor. Initializes the graphic.
          */
-        ItemContainer(Inventory *inventory);
+        ItemContainer(Inventory *inventory, int offset);
 
         /**
          * Destructor.
@@ -126,6 +126,7 @@ class ItemContainer : public gcn::Widget, public gcn::MouseListener,
         Item *mSelectedItem;
 
         int mMaxItems;
+        int mOffset;
 
         std::list<gcn::SelectionListener*> mListeners;
 
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 54544250..2831fc46 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -37,6 +37,7 @@
 
 #include "../inventory.h"
 #include "../item.h"
+#include "../localplayer.h"
 
 #include "../net/messageout.h"
 #include "../net/protocol.h"
@@ -48,8 +49,8 @@
 TradeWindow::TradeWindow(Network *network):
     Window("Trade: You"),
     mNetwork(network),
-    mMyInventory(new Inventory()),
-    mPartnerInventory(new Inventory())
+    mMyInventory(new Inventory(INVENTORY_SIZE)),
+    mPartnerInventory(new Inventory(INVENTORY_SIZE))
 {
     setWindowName("Trade");
     setDefaultSize(115, 197, 332, 209);
@@ -59,14 +60,14 @@ TradeWindow::TradeWindow(Network *network):
     mCancelButton = new Button("Cancel", "cancel", this);
     mTradeButton = new Button("Trade", "trade", this);
 
-    mMyItemContainer = new ItemContainer(mMyInventory.get());
+    mMyItemContainer = new ItemContainer(mMyInventory.get(), 2);
     mMyItemContainer->addSelectionListener(this);
     mMyItemContainer->setPosition(2, 2);
 
     mMyScroll = new ScrollArea(mMyItemContainer);
     mMyScroll->setPosition(8, 8);
 
-    mPartnerItemContainer = new ItemContainer(mPartnerInventory.get());
+    mPartnerItemContainer = new ItemContainer(mPartnerInventory.get(), 2);
     mPartnerItemContainer->addSelectionListener(this);
     mPartnerItemContainer->setPosition(2, 58);
 
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 20958c44..0b1b9613 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -36,15 +36,16 @@ struct SlotUsed : public std::unary_function<Item*, bool>
     }
 };
 
-Inventory::Inventory()
+Inventory::Inventory(int size):
+    mSize(size)
 {
-    mItems = new Item*[INVENTORY_SIZE];
-    std::fill_n(mItems, INVENTORY_SIZE, (Item*) 0);
+    mItems = new Item*[mSize];
+    std::fill_n(mItems, mSize, (Item*) 0);
 }
 
 Inventory::~Inventory()
 {
-    for (int i = 0; i < INVENTORY_SIZE; i++)
+    for (int i = 0; i < mSize; i++)
         delete mItems[i];
 
     delete [] mItems;
@@ -52,7 +53,7 @@ Inventory::~Inventory()
 
 Item* Inventory::getItem(int index) const
 {
-    if (index < 0 || index >= INVENTORY_SIZE)
+    if (index < 0 || index >= mSize)
         return 0;
 
     return mItems[index];
@@ -60,7 +61,7 @@ Item* Inventory::getItem(int index) const
 
 Item* Inventory::findItem(int itemId) const
 {
-    for (int i = 0; i < INVENTORY_SIZE; i++)
+    for (int i = 0; i < mSize; i++)
     {
         if (mItems[i] && mItems[i]->getId() == itemId)
             return mItems[i];
@@ -75,7 +76,7 @@ void Inventory::addItem(int id, int quantity, bool equipment)
 
 void Inventory::setItem(int index, int id, int quantity, bool equipment)
 {
-    if (index < 0 || index >= INVENTORY_SIZE) {
+    if (index < 0 || index >= mSize) {
         logger->log("Warning: invalid inventory index: %d", index);
         return;
     }
@@ -95,14 +96,14 @@ void Inventory::setItem(int index, int id, int quantity, bool equipment)
 
 void Inventory::clear()
 {
-    for (int i = 0; i < INVENTORY_SIZE; i++) {
+    for (int i = 0; i < mSize; i++) {
         removeItemAt(i);
     }
 }
 
 void Inventory::removeItem(int id)
 {
-    for (int i = 0; i < INVENTORY_SIZE; i++) {
+    for (int i = 0; i < mSize; i++) {
         if (mItems[i] && mItems[i]->getId() == id) {
             removeItemAt(i);
         }
@@ -117,7 +118,7 @@ void Inventory::removeItemAt(int index)
 
 bool Inventory::contains(Item *item) const
 {
-    for (int i = 0; i < INVENTORY_SIZE; i++) {
+    for (int i = 0; i < mSize; i++) {
         if (mItems[i] && mItems[i]->getId() == item->getId()) {
             return true;
         }
@@ -128,19 +129,19 @@ bool Inventory::contains(Item *item) const
 
 int Inventory::getFreeSlot()
 {
-    Item **i = std::find_if(mItems + 2, mItems + INVENTORY_SIZE,
+    Item **i = std::find_if(mItems + 2, mItems + mSize,
             std::not1(SlotUsed()));
-    return (i == mItems + INVENTORY_SIZE) ? -1 : (i - mItems);
+    return (i == mItems + mSize) ? -1 : (i - mItems);
 }
 
 int Inventory::getNumberOfSlotsUsed()
 {
-    return count_if(mItems, mItems + INVENTORY_SIZE, SlotUsed());
+    return count_if(mItems, mItems + mSize, SlotUsed());
 }
 
 int Inventory::getLastUsedSlot()
 {
-    for (int i = INVENTORY_SIZE - 1; i >= 0; i--) {
+    for (int i = mSize - 1; i >= 0; i--) {
         if (SlotUsed()(mItems[i])) {
             return i;
         }
diff --git a/src/inventory.h b/src/inventory.h
index 2e0dd792..42b0d86a 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -26,21 +26,24 @@
 
 class Item;
 
-#define INVENTORY_SIZE 102
-
 class Inventory
 {
     public:
         /**
          * Constructor.
          */
-        Inventory();
+        Inventory(int size);
 
         /**
          * Destructor.
          */
         ~Inventory();
 
+        /**
+         * Returns the size that this instance is configured for
+         */
+        int getSize() { return mSize; }
+
         /**
          * Returns the item at the specified index.
          */
@@ -101,6 +104,7 @@ class Inventory
 
     protected:
         Item **mItems;  /**< The holder of items */
+        int mSize;      /**< The max number of inventory items */
 };
 
 #endif
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 7b0c2b8b..554c52a6 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -48,16 +48,18 @@ LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map):
     mAttackRange(0),
     mXp(0), mNetwork(0),
     mTarget(NULL), mPickUpTarget(NULL),
-    mTrading(false), mGoingToTarget(false),
-    mLastAction(-1),
+    mTrading(false), mInStorage(false),
+    mGoingToTarget(false), mLastAction(-1),
     mWalkingDir(0), mDestX(0), mDestY(0),
-    mInventory(new Inventory)
+    mInventory(new Inventory(INVENTORY_SIZE)),
+    mStorage(new Inventory(STORAGE_SIZE))
 {
 }
 
 LocalPlayer::~LocalPlayer()
 {
     delete mInventory;
+    delete mStorage;
 }
 
 void LocalPlayer::logic()
diff --git a/src/localplayer.h b/src/localplayer.h
index 64e6c5ad..1d865824 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -29,6 +29,9 @@
 // TODO move into some sane place...
 #define MAX_SLOT 2
 
+#define INVENTORY_SIZE 102
+#define STORAGE_SIZE 301
+
 class FloorItem;
 class Inventory;
 class Item;
@@ -70,6 +73,11 @@ class LocalPlayer : public Player
          */
         Inventory* getInventory() const { return mInventory; }
 
+        /**
+         * Returns the player's storage
+         */
+        Inventory* getStorage() const { return mStorage; }
+
         /**
          * Equips an item.
          */
@@ -165,6 +173,12 @@ class LocalPlayer : public Player
 
         void revive();
 
+        /**
+         * Accessors for mInStorage
+         */
+        bool getInStorage() { return mInStorage; }
+        void setInStorage(bool inStorage) { mInStorage = inStorage; }
+
         /**
          * Sets the amount of XP. Shows XP gaining effect if the player is on
          * a map.
@@ -210,6 +224,7 @@ class LocalPlayer : public Player
         FloorItem *mPickUpTarget;
 
         bool mTrading;
+        bool mInStorage;    /**< Whether storage is currently accessible */
         bool mGoingToTarget;
         int mLastAction;    /**< Time stamp of the last action, -1 if none. */
         int mWalkingDir;    /**< The direction the player is walking in. */
@@ -217,6 +232,7 @@ class LocalPlayer : public Player
         int mDestY;         /**< Y coordinate of destination. */
 
         Inventory *mInventory;
+        Inventory *mStorage;
 };
 
 extern LocalPlayer *player_node;
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index d3ad0d92..2af3fe07 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -32,10 +32,16 @@
 #include "../log.h"
 #include "../logindata.h"
 #include "../main.h"
+#include "../extensions.h"
 
 #include "../gui/ok_dialog.h"
 #include "../gui/char_select.h"
 
+/*
+ * Yeah, this is a global.  Get over it.
+ */
+struct EXTENSIONS extensions;
+
 CharServerHandler::CharServerHandler():
     mCharCreateDialog(0)
 {
@@ -56,6 +62,7 @@ CharServerHandler::CharServerHandler():
 void CharServerHandler::handleMessage(MessageIn *msg)
 {
     int slot;
+    int flags;
     LocalPlayer *tempPlayer;
 
     logger->log("CharServerHandler: Packet ID: %x, Length: %d",
@@ -63,8 +70,13 @@ void CharServerHandler::handleMessage(MessageIn *msg)
     switch (msg->getId())
     {
         case 0x006b:
-            // Skip length word and an additional mysterious 20 bytes
-            msg->skip(2 + 20);
+            msg->skip(2); // Length word
+            flags = msg->readInt32();  // Aethyra extensions flags
+            logger->log("Server flags are: %x", flags);
+            extensions.aethyra_inventory = (bool)(flags & 0x01);
+            extensions.aethyra_spells = (bool)(flags & 0x02);
+            extensions.aethyra_misc = (bool)(flags & 0x04);
+            msg->skip(16); // Unused
 
             // Derive number of characters from message length
             n_character = (msg->getLength() - 24) / 106;
diff --git a/src/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp
index 37ae5fb9..44a3256e 100644
--- a/src/net/inventoryhandler.cpp
+++ b/src/net/inventoryhandler.cpp
@@ -47,6 +47,12 @@ InventoryHandler::InventoryHandler()
         SMSG_PLAYER_INVENTORY_REMOVE,
         SMSG_PLAYER_INVENTORY_USE,
         SMSG_ITEM_USE_RESPONSE,
+        SMSG_PLAYER_STORAGE_ITEMS,
+        SMSG_PLAYER_STORAGE_EQUIP,
+        SMSG_PLAYER_STORAGE_STATUS,
+        SMSG_PLAYER_STORAGE_ADD,
+        SMSG_PLAYER_STORAGE_REMOVE,
+        SMSG_PLAYER_STORAGE_CLOSE,
         0
     };
     handledMessages = _messages;
@@ -56,32 +62,68 @@ void InventoryHandler::handleMessage(MessageIn *msg)
 {
     Sint32 number;
     Sint16 index, amount, itemId, equipType, arrow;
+    Sint16 identified, cards[4], itemType;
     Inventory *inventory = player_node->getInventory();
+    Inventory *storage = player_node->getStorage();
 
     switch (msg->getId())
     {
         case SMSG_PLAYER_INVENTORY:
-            // Only called on map load / warp. First reset all items
-            // to not load them twice on map change.
-            inventory->clear();
+        case SMSG_PLAYER_STORAGE_ITEMS:
+        case SMSG_PLAYER_STORAGE_EQUIP:
+            switch (msg->getId()) {
+                case SMSG_PLAYER_INVENTORY:
+                    // Clear inventory - this will be a complete refresh
+                    inventory->clear();
+                    break;
+                case SMSG_PLAYER_STORAGE_ITEMS:
+                    /*
+                     * This packet will always be followed by a
+                     * SMSG_PLAYER_STORAGE_EQUIP packet.  The two packets
+                     * together comprise a complete refresh of storage, so
+                     * clear storage here
+                     */
+                    storage->clear();
+                    logger->log("Received SMSG_PLAYER_STORAGE_ITEMS");
+                    break;
+                default:
+                    logger->log("Received SMSG_PLAYER_STORAGE_EQUIP");
+                    break;
+            }
             msg->readInt16();  // length
             number = (msg->getLength() - 4) / 18;
 
             for (int loop = 0; loop < number; loop++) {
                 index = msg->readInt16();
                 itemId = msg->readInt16();
-                msg->readInt8(); // type
-                msg->readInt8(); // identify flag
-                amount = msg->readInt16();
+                itemType = msg->readInt8();
+                identified = msg->readInt8();
+                if (msg->getId() == SMSG_PLAYER_STORAGE_EQUIP) {
+                    amount = 1;
+                    msg->readInt16();    // Equip Point?
+                } else {
+                    amount = msg->readInt16();
+                }
                 arrow = msg->readInt16();
-                msg->skip(8);    // card (4 shorts)
+                if (msg->getId() == SMSG_PLAYER_STORAGE_EQUIP) {
+                    msg->readInt8();   // Attribute (broken)
+                    msg->readInt8();   // Refine level
+                }
+                for (int i = 0; i < 4; i++)
+                    cards[i] = msg->readInt16();
 
-                inventory->setItem(index, itemId, amount, false);
+                if (msg->getId() == SMSG_PLAYER_INVENTORY) {
+                    inventory->setItem(index, itemId, amount, false);
 
-                // Trick because arrows are not considered equipment
-                if (arrow & 0x8000) {
-                    if (Item *item = inventory->getItem(index))
-                        item->setEquipment(true);
+                    // Trick because arrows are not considered equipment
+                    if (arrow & 0x8000) {
+                        if (Item *item = inventory->getItem(index))
+                            item->setEquipment(true);
+                    }
+                } else {
+                    logger->log("Index:%d, ID:%d, Type:%d, Identified:%d, Qty:%d, Cards:%d, %d, %d, %d",
+                        index, itemId, itemType, identified, amount, cards[0], cards[1], cards[2], cards[3]);
+                    storage->setItem(index, itemId, amount, false);
                 }
             }
             break;
@@ -90,12 +132,13 @@ void InventoryHandler::handleMessage(MessageIn *msg)
             index = msg->readInt16();
             amount = msg->readInt16();
             itemId = msg->readInt16();
-            msg->readInt8();  // identify flag
+            identified = msg->readInt8();
             msg->readInt8();  // attribute
             msg->readInt8();  // refine
-            msg->skip(8);     // card
+            for (int i = 0; i < 4; i++)
+                cards[i] = msg->readInt16();
             equipType = msg->readInt16();
-            msg->readInt8();  // type
+            itemType = msg->readInt8();
 
             if (msg->readInt8() > 0) {
                 chatWindow->chatLog("Unable to pick up item", BY_SERVER);
@@ -147,5 +190,38 @@ void InventoryHandler::handleMessage(MessageIn *msg)
                     item->setQuantity(amount);
             }
             break;
+
+        case SMSG_PLAYER_STORAGE_STATUS:
+            /*
+             * Basic slots used vs total slots info
+             * We don't really need this information, but this is
+             * the closest we get to an "Open Storage" packet
+             * from the server.  It always comes after the two
+             * SMSG_PLAYER_STORAGE_... packets that update
+             * storage contents.
+             */
+            logger->log("Received SMSG_PLAYER_STORAGE_STATUS");
+            player_node->setInStorage(true);
+            break;
+
+        case SMSG_PLAYER_STORAGE_ADD:
+            /*
+             * Move an item into storage
+             */
+            break;
+
+        case SMSG_PLAYER_STORAGE_REMOVE:
+            /*
+              * Move an item out of storage
+              */
+            break;
+
+        case SMSG_PLAYER_STORAGE_CLOSE:
+            /*
+              * Storage access has been closed
+              */
+            player_node->setInStorage(false);
+            logger->log("Received SMSG_PLAYER_STORAGE_CLOSE");
+            break;
     }
 }
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 53f245b5..7d5edf94 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -24,7 +24,9 @@
 #ifndef _TMW_PROTOCOL_
 #define _TMW_PROTOCOL_
 
-// Packets from server to client
+/*********************************
+ * Packets from server to client *
+ *********************************/
 #define SMSG_LOGIN_SUCCESS           0x0073 /**< Contains starting location */
 #define SMSG_SERVER_PING             0x007f /**< Contains server tick */
 #define SMSG_PLAYER_UPDATE_1         0x01d8
@@ -104,7 +106,16 @@
 #define SMSG_PARTY_UPDATE_COORDS     0x0107
 #define SMSG_PARTY_MESSAGE           0x0109
 
-// Packets from client to server
+#define SMSG_PLAYER_STORAGE_ITEMS    0x01f0 /**< Item list for storage */
+#define SMSG_PLAYER_STORAGE_EQUIP    0x00a6 /**< Equipment list for storage */
+#define SMSG_PLAYER_STORAGE_STATUS   0x00f2 /**< Slots used and total slots */
+#define SMSG_PLAYER_STORAGE_ADD      0x00f4 /**< Add item/equip to storage */
+#define SMSG_PLAYER_STORAGE_REMOVE   0x00f6 /**< Remove item/equip from storage */
+#define SMSG_PLAYER_STORAGE_CLOSE    0x00f8 /**< Storage access closed */
+
+/**********************************
+ *  Packets from client to server *
+ **********************************/
 #define CMSG_CLIENT_PING             0x007e /**< Send to server with tick */
 #define CMSG_TRADE_RESPONSE          0x00e6
 #define CMSG_ITEM_PICKUP             0x009f
@@ -138,6 +149,10 @@
 #define CMSG_PARTY_SETTINGS          0x0101
 #define CMSG_PARTY_MESSAGE           0x0108
 
+#define CMSG_MOVE_TO_STORAGE         0x00f3 /** Move item to storage */
+#define CSMG_MOVE_FROM_STORAGE       0x00f5 /** Remove item from storage */
+#define CMSG_CLOSE_STORAGE           0x00f7 /** Request storage close */
+
 /** Encodes coords and direction in 3 bytes data */
 void set_coordinates(char *data, unsigned short x, unsigned short y, unsigned char direction);
 
-- 
cgit v1.2.3-70-g09d2


From 175a930a09c657525e67a1faccd1f9569ec4d28f Mon Sep 17 00:00:00 2001
From: Kevin Day <blame582@gmail.com>
Date: Sat, 13 Sep 2008 21:29:38 +0000
Subject: changed the update host line 169 in main.cpp

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 8df54635..fb4e8f76 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -166,7 +166,7 @@ void setUpdatesDir()
     // If updatesHost is currently empty, fill it from config file
     if (updateHost.empty()) {
         updateHost =
-            config.getValue("updatehost", "http://updates.thanaworld.org");
+            config.getValue("updatehost", "http://209.168.213.109/updates");
     }
 
     // Parse out any "http://" or "ftp://", and set the updates directory
-- 
cgit v1.2.3-70-g09d2


From 176e885ef6c5ae34c8c31c693b65e5a246146f3a Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 15 Sep 2008 17:24:24 +0000
Subject: Commented out getBeingByPixel because it really isn't used, nor is
 there much sense to. Shouldn't make any visible changes to performance yet,
 but I trimmed it out for now anyways.

---
 src/beingmanager.cpp | 4 ++--
 src/beingmanager.h   | 2 +-
 src/gui/viewport.cpp | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index d1a333d0..47729a92 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -124,7 +124,7 @@ Being* BeingManager::findBeing(Uint16 x, Uint16 y, Being::Type type)
     return (i == mBeings.end()) ? NULL : *i;
 }
 
-Being* BeingManager::findBeingByPixel(Uint16 x, Uint16 y)
+/*Being* BeingManager::findBeingByPixel(Uint16 x, Uint16 y)
 {
     BeingIterator itr = mBeings.begin();
     BeingIterator itr_end = mBeings.end();
@@ -144,7 +144,7 @@ Being* BeingManager::findBeingByPixel(Uint16 x, Uint16 y)
     }
 
     return NULL;
-}
+}*/
 
 Being* BeingManager::findBeingByName(std::string name, Being::Type type)
 {
diff --git a/src/beingmanager.h b/src/beingmanager.h
index ff2d1980..f8391855 100644
--- a/src/beingmanager.h
+++ b/src/beingmanager.h
@@ -67,7 +67,7 @@ class BeingManager
          * Return a being at specific coordinates.
          */
         Being* findBeing(Uint16 x, Uint16 y, Being::Type type = Being::UNKNOWN);
-        Being* findBeingByPixel(Uint16 x, Uint16 y);
+        //Being* findBeingByPixel(Uint16 x, Uint16 y);
 
         /**
          * Return a being nearest to specific coordinates.
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index e7fdb522..568c1ea3 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -384,10 +384,10 @@ Viewport::mousePressed(gcn::MouseEvent &event)
         FloorItem *item;
 
         // Interact with some being
-//      if ((being = beingManager->findBeing(tilex, tiley))
-        int x = (int)((float) event.getX() + mPixelViewX);
-        int y = (int)((float) event.getY() + mPixelViewY);
-        if ((being = beingManager->findBeingByPixel(x, y)))
+//      int x = (int)((float) event.getX() + mPixelViewX);
+//      int y = (int)((float) event.getY() + mPixelViewY);
+//      if ((being = beingManager->findBeingByPixel(x, y)))
+        if ((being = beingManager->findBeing(tilex, tiley)))
         {
             switch (being->getType())
             {
-- 
cgit v1.2.3-70-g09d2


From 7d5d53e5f81eb0cc255edc188a955c9571cafb81 Mon Sep 17 00:00:00 2001
From: Kevin Day <blame582@gmail.com>
Date: Tue, 16 Sep 2008 23:44:15 +0000
Subject: changed client gui and added autobuild.sh

---
 AUTHORS                                       |   3 +--
 ChangeLog                                     |   7 +++++-
 INSTALL                                       |  16 ++++++++----
 README                                        |  17 +++++++------
 autobuild.sh                                  |  35 ++++++++++++++++++++++++++
 data/graphics/gui/bg_quad_dis.png             | Bin 5241 -> 5539 bytes
 data/graphics/gui/button.png                  | Bin 374 -> 481 bytes
 data/graphics/gui/button_disabled.png         | Bin 313 -> 358 bytes
 data/graphics/gui/buttonhi.png                | Bin 374 -> 480 bytes
 data/graphics/gui/buttonpress.png             | Bin 377 -> 434 bytes
 data/graphics/gui/checkbox.png                | Bin 696 -> 649 bytes
 data/graphics/gui/close_button.png            | Bin 650 -> 646 bytes
 data/graphics/gui/deepbox.png                 | Bin 270 -> 307 bytes
 data/graphics/gui/hscroll_left_default.png    | Bin 358 -> 402 bytes
 data/graphics/gui/hscroll_left_highlight.png  | Bin 364 -> 382 bytes
 data/graphics/gui/hscroll_left_pressed.png    | Bin 349 -> 356 bytes
 data/graphics/gui/hscroll_right_default.png   | Bin 340 -> 349 bytes
 data/graphics/gui/hscroll_right_highlight.png | Bin 359 -> 379 bytes
 data/graphics/gui/hscroll_right_pressed.png   | Bin 350 -> 351 bytes
 data/graphics/gui/item_shortcut_bgr.png       | Bin 1026 -> 1366 bytes
 data/graphics/gui/menuitemD.png               | Bin 1329 -> 1694 bytes
 data/graphics/gui/menuitemF.png               | Bin 1530 -> 1830 bytes
 data/graphics/gui/menuitemN.png               | Bin 1310 -> 1529 bytes
 data/graphics/gui/menuitemP.png               | Bin 1436 -> 1733 bytes
 data/graphics/gui/radioin.png                 | Bin 454 -> 438 bytes
 data/graphics/gui/radioout.png                | Bin 380 -> 346 bytes
 data/graphics/gui/resize.png                  | Bin 443 -> 518 bytes
 data/graphics/gui/slider.png                  | Bin 571 -> 615 bytes
 data/graphics/gui/thickborder.png             | Bin 530 -> 593 bytes
 data/graphics/gui/vscroll_blue.png            | Bin 395 -> 476 bytes
 data/graphics/gui/vscroll_down_default.png    | Bin 367 -> 350 bytes
 data/graphics/gui/vscroll_down_highlight.png  | Bin 382 -> 378 bytes
 data/graphics/gui/vscroll_down_pressed.png    | Bin 376 -> 369 bytes
 data/graphics/gui/vscroll_grey.png            | Bin 371 -> 452 bytes
 data/graphics/gui/vscroll_red.png             | Bin 394 -> 471 bytes
 data/graphics/gui/vscroll_up_default.png      | Bin 377 -> 359 bytes
 data/graphics/gui/vscroll_up_highlight.png    | Bin 376 -> 381 bytes
 data/graphics/gui/vscroll_up_pressed.png      | Bin 364 -> 345 bytes
 data/help/commands.txt                        |   4 +--
 39 files changed, 63 insertions(+), 19 deletions(-)
 create mode 100755 autobuild.sh

diff --git a/AUTHORS b/AUTHORS
index 71cab2dd..a672e18f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,7 +7,6 @@ Aethyra Dev Team
 == Programmers ==
 
  Sanga            <sanga@aethyra.com>
- Scraggy          <DougABoffey@netscape.net>
  Kraant           <kraant@gmail.com>
  Tametomo
 
@@ -25,7 +24,7 @@ Aethyra Dev Team
 == Inactive ==
 
  Sertraline
-
+ Scraggy          <DougABoffey@netscape.net>
 -----------------------
 The Mana World Dev Team
 -----------------------
diff --git a/ChangeLog b/ChangeLog
index bc9580fa..57448eb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-16  Kevin Day ("Blame")     <blame@aethyra.com>
+
+	* Added autobuild.sh complete build script for the client
+	* Updated the gui graphics for the client for halloween 
+
 2008-09-12 	Lloyd Bryant ("Sanga")	<sanga@aethyra.com>
 
 	* Changed default port for Aethyra to 21001
@@ -15,7 +20,7 @@
 
 	* Added code to change colours in the chatlog
 
-2008-08-30  kevin Day ("blame")     <blame@aethyra.com>
+2008-08-30  Kevin Day ("Blame")     <blame@aethyra.com>
 
 	* Updated the in game help files "/trunk/data/help"
 
diff --git a/INSTALL b/INSTALL
index 5688451b..5e94f0ff 100644
--- a/INSTALL
+++ b/INSTALL
@@ -40,15 +40,21 @@ you to figure this out.
 ===============================================
 
 1) Go to the directory you have extracted the source to.
-2) If you checked out from SVN, run "./autogen.sh" to generate configure.
-3) Run "./configure"
-4) Run "make"
-5) Run "make install" as root
+2) If you checked out from SVN, run "./autobuild.sh" to install the client.
 
 It should have installed Aethyra on your system now, and you can
 run it with "aethyra". By default all files are installed to /usr/local, you can
 pass a different prefix to configure as usual.
 
+    NOTE: if the autobuild.sh fails 
+	1.) ./autogen.sh
+	2.) ./configure
+	3.) make
+	4.) su -c "make install"
+
+	you can get help from A.) IRC channel  irc.freenode.net #aedev or #aethyra
+			      B.) http://forum.aethyra.com
+	Make sure you record the output from the konsole window
 
   NOTE: It is possible to compile Aethyra without support for OpenGL rendering.
   To do this perform step 3 as follows:
@@ -64,4 +70,4 @@ pass a different prefix to configure as usual.
 If you have any problems, you are welcome to post your questions on our forums,
 or talk about them in our IRC channel.
 
-- The Mana Experiment Dev Team
+- Aethyra Dev Team
diff --git a/README b/README
index 517b4a9d..012e1683 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 AETHYRA
 ===================
 
- Version: 0.0.24.1    Date: 7/4/2007
+ Version: 0.0.25    Date: 9/16/2008
 
  Development team:
   - See AUTHORS file for a list
@@ -48,16 +48,15 @@ Use arrow keys to move around. Other keys:
 - F7                 toggle chat window
 - F9                 show setup window
 - F10                toggle debug window
-- Alt + 0-9          show emotions
-- Alt + S            sit down / stand up
+- Alt + 0-9          show emotions / usuable at skill level 2.
+- Alt + S            sit down / stand up / usuable at skill level 3.
 - Alt + F            toggle debug pathfinding feature
 - Alt + P            take screenshot
-- Alt + T            turns on anti-trade function 
+- Alt + T            turns on anti-trade function / usuable at skill level 1.
 - A                  target nearest monster
 - H                  hide all non-sticky windows
 - G or Z             pick up item
 - Enter              focus chat window / send message
-- Shift              hold it when attacking to lock target for auto attack
 
 MOUSE:
 
@@ -75,7 +74,7 @@ context menu. Holding [Left Shift] prevents from walking when attacking.
 - /whisper           send a private msg to another player
                         (format: /whisper <charname> <message>)
                      If the <nick> has spaces in it, enclose it in double
-                        quotes
+                        quotes e.g. /whisper "char name" <message>
 - /record            Records the Chat output 
                      (format: /record <filename to write to> starts the record
                         session /record again 
@@ -122,9 +121,11 @@ level 10: enables not used
 If you're having troubles, please first of all read the FAQ.
 If you can't find a solution to your problem, feel free to check our
 Bugs/Support section of the forum:
-- http://209.168.213.109/forums
+- http://forums.aethyra.com
 or come visit us on our IRC channel:
-- #themanaexperiment @ irc.freenode.net
+- #aethyra @ irc.freenode.net
+- ##aethyra @ irc.freenode.net
+- #aedev @ irc.freenode.net
 
 Otherwise check the AUTHORS file to have a list of developers and how to
 contact them.
diff --git a/autobuild.sh b/autobuild.sh
new file mode 100755
index 00000000..0d8f8b27
--- /dev/null
+++ b/autobuild.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+# auto build script based on fedora but usable for other distros
+#author=Blame <blame@aethyra.com> 
+#last modified date 2008-09-16 Blame
+
+
+echo "Generating build information using aclocal, autoheader, automake and autoconf."
+echo
+
+# Regerate configuration files
+aclocal
+autoheader
+automake --gnu --add-missing --copy
+autoconf
+
+echo
+echo "Now you are ready to run ./configure"
+
+./configure
+
+echo
+echo "now running make"
+
+make
+
+echo
+echo "now running make install please input your root password"
+
+su -c "make install"
+su -c "make clean"
+
+echo "done"
+
+aethyra &
+exit 1;
diff --git a/data/graphics/gui/bg_quad_dis.png b/data/graphics/gui/bg_quad_dis.png
index 3a0354bb..b79b9ca7 100644
Binary files a/data/graphics/gui/bg_quad_dis.png and b/data/graphics/gui/bg_quad_dis.png differ
diff --git a/data/graphics/gui/button.png b/data/graphics/gui/button.png
index 9ebbea63..ff50a908 100644
Binary files a/data/graphics/gui/button.png and b/data/graphics/gui/button.png differ
diff --git a/data/graphics/gui/button_disabled.png b/data/graphics/gui/button_disabled.png
index 0ce3aa6f..cb5a1b01 100644
Binary files a/data/graphics/gui/button_disabled.png and b/data/graphics/gui/button_disabled.png differ
diff --git a/data/graphics/gui/buttonhi.png b/data/graphics/gui/buttonhi.png
index c4772634..da30f283 100644
Binary files a/data/graphics/gui/buttonhi.png and b/data/graphics/gui/buttonhi.png differ
diff --git a/data/graphics/gui/buttonpress.png b/data/graphics/gui/buttonpress.png
index e9cd1765..ed7e5054 100644
Binary files a/data/graphics/gui/buttonpress.png and b/data/graphics/gui/buttonpress.png differ
diff --git a/data/graphics/gui/checkbox.png b/data/graphics/gui/checkbox.png
index 669ecf03..bf8e9052 100644
Binary files a/data/graphics/gui/checkbox.png and b/data/graphics/gui/checkbox.png differ
diff --git a/data/graphics/gui/close_button.png b/data/graphics/gui/close_button.png
index f87cc2a9..8b4a451a 100644
Binary files a/data/graphics/gui/close_button.png and b/data/graphics/gui/close_button.png differ
diff --git a/data/graphics/gui/deepbox.png b/data/graphics/gui/deepbox.png
index ed3231f3..0980f57e 100644
Binary files a/data/graphics/gui/deepbox.png and b/data/graphics/gui/deepbox.png differ
diff --git a/data/graphics/gui/hscroll_left_default.png b/data/graphics/gui/hscroll_left_default.png
index 2f763d30..6d21e7c0 100644
Binary files a/data/graphics/gui/hscroll_left_default.png and b/data/graphics/gui/hscroll_left_default.png differ
diff --git a/data/graphics/gui/hscroll_left_highlight.png b/data/graphics/gui/hscroll_left_highlight.png
index 6be5ae25..e2686c13 100644
Binary files a/data/graphics/gui/hscroll_left_highlight.png and b/data/graphics/gui/hscroll_left_highlight.png differ
diff --git a/data/graphics/gui/hscroll_left_pressed.png b/data/graphics/gui/hscroll_left_pressed.png
index b8ebcb46..92478ec8 100644
Binary files a/data/graphics/gui/hscroll_left_pressed.png and b/data/graphics/gui/hscroll_left_pressed.png differ
diff --git a/data/graphics/gui/hscroll_right_default.png b/data/graphics/gui/hscroll_right_default.png
index 33fdddd0..547a86dd 100644
Binary files a/data/graphics/gui/hscroll_right_default.png and b/data/graphics/gui/hscroll_right_default.png differ
diff --git a/data/graphics/gui/hscroll_right_highlight.png b/data/graphics/gui/hscroll_right_highlight.png
index e9e633ea..ef56538f 100644
Binary files a/data/graphics/gui/hscroll_right_highlight.png and b/data/graphics/gui/hscroll_right_highlight.png differ
diff --git a/data/graphics/gui/hscroll_right_pressed.png b/data/graphics/gui/hscroll_right_pressed.png
index 53972f2b..36cff58a 100644
Binary files a/data/graphics/gui/hscroll_right_pressed.png and b/data/graphics/gui/hscroll_right_pressed.png differ
diff --git a/data/graphics/gui/item_shortcut_bgr.png b/data/graphics/gui/item_shortcut_bgr.png
index e878fc7a..01f1643a 100644
Binary files a/data/graphics/gui/item_shortcut_bgr.png and b/data/graphics/gui/item_shortcut_bgr.png differ
diff --git a/data/graphics/gui/menuitemD.png b/data/graphics/gui/menuitemD.png
index a9fe2222..e6654e97 100644
Binary files a/data/graphics/gui/menuitemD.png and b/data/graphics/gui/menuitemD.png differ
diff --git a/data/graphics/gui/menuitemF.png b/data/graphics/gui/menuitemF.png
index 84142a16..f18a82eb 100644
Binary files a/data/graphics/gui/menuitemF.png and b/data/graphics/gui/menuitemF.png differ
diff --git a/data/graphics/gui/menuitemN.png b/data/graphics/gui/menuitemN.png
index bf25dd61..f813d4c5 100644
Binary files a/data/graphics/gui/menuitemN.png and b/data/graphics/gui/menuitemN.png differ
diff --git a/data/graphics/gui/menuitemP.png b/data/graphics/gui/menuitemP.png
index 060d5a34..ba6e1543 100644
Binary files a/data/graphics/gui/menuitemP.png and b/data/graphics/gui/menuitemP.png differ
diff --git a/data/graphics/gui/radioin.png b/data/graphics/gui/radioin.png
index 12e027fe..9034f469 100644
Binary files a/data/graphics/gui/radioin.png and b/data/graphics/gui/radioin.png differ
diff --git a/data/graphics/gui/radioout.png b/data/graphics/gui/radioout.png
index 5eb67bd8..4e088943 100644
Binary files a/data/graphics/gui/radioout.png and b/data/graphics/gui/radioout.png differ
diff --git a/data/graphics/gui/resize.png b/data/graphics/gui/resize.png
index 6b31ac64..9890f83f 100644
Binary files a/data/graphics/gui/resize.png and b/data/graphics/gui/resize.png differ
diff --git a/data/graphics/gui/slider.png b/data/graphics/gui/slider.png
index 1f6e6b35..32adf4f7 100644
Binary files a/data/graphics/gui/slider.png and b/data/graphics/gui/slider.png differ
diff --git a/data/graphics/gui/thickborder.png b/data/graphics/gui/thickborder.png
index da72c92f..d3844b71 100644
Binary files a/data/graphics/gui/thickborder.png and b/data/graphics/gui/thickborder.png differ
diff --git a/data/graphics/gui/vscroll_blue.png b/data/graphics/gui/vscroll_blue.png
index 397501ce..295ca1a5 100644
Binary files a/data/graphics/gui/vscroll_blue.png and b/data/graphics/gui/vscroll_blue.png differ
diff --git a/data/graphics/gui/vscroll_down_default.png b/data/graphics/gui/vscroll_down_default.png
index c4292489..4bf696b0 100644
Binary files a/data/graphics/gui/vscroll_down_default.png and b/data/graphics/gui/vscroll_down_default.png differ
diff --git a/data/graphics/gui/vscroll_down_highlight.png b/data/graphics/gui/vscroll_down_highlight.png
index ac88f7c7..a7459745 100644
Binary files a/data/graphics/gui/vscroll_down_highlight.png and b/data/graphics/gui/vscroll_down_highlight.png differ
diff --git a/data/graphics/gui/vscroll_down_pressed.png b/data/graphics/gui/vscroll_down_pressed.png
index 9dcc89f6..e6238024 100644
Binary files a/data/graphics/gui/vscroll_down_pressed.png and b/data/graphics/gui/vscroll_down_pressed.png differ
diff --git a/data/graphics/gui/vscroll_grey.png b/data/graphics/gui/vscroll_grey.png
index 87ba8758..4d950a32 100644
Binary files a/data/graphics/gui/vscroll_grey.png and b/data/graphics/gui/vscroll_grey.png differ
diff --git a/data/graphics/gui/vscroll_red.png b/data/graphics/gui/vscroll_red.png
index d7ad4a90..0e50513c 100644
Binary files a/data/graphics/gui/vscroll_red.png and b/data/graphics/gui/vscroll_red.png differ
diff --git a/data/graphics/gui/vscroll_up_default.png b/data/graphics/gui/vscroll_up_default.png
index 1cecc351..c08a2b2a 100644
Binary files a/data/graphics/gui/vscroll_up_default.png and b/data/graphics/gui/vscroll_up_default.png differ
diff --git a/data/graphics/gui/vscroll_up_highlight.png b/data/graphics/gui/vscroll_up_highlight.png
index 7b5009f3..2f5ffade 100644
Binary files a/data/graphics/gui/vscroll_up_highlight.png and b/data/graphics/gui/vscroll_up_highlight.png differ
diff --git a/data/graphics/gui/vscroll_up_pressed.png b/data/graphics/gui/vscroll_up_pressed.png
index 2320ec42..102bac86 100644
Binary files a/data/graphics/gui/vscroll_up_pressed.png and b/data/graphics/gui/vscroll_up_pressed.png differ
diff --git a/data/help/commands.txt b/data/help/commands.txt
index 8303e995..3019ebfc 100644
--- a/data/help/commands.txt
+++ b/data/help/commands.txt
@@ -28,9 +28,7 @@
      ##2H##P                  hide all non-sticky windows
      ##2G or Z##P             pick up item
      ##2Enter##P              focus chat window / send message
-     ##2Shift##P              hold it when attacking to lock target for auto
-                        attack
- 
+
 
 ##2MOUSE:
 
-- 
cgit v1.2.3-70-g09d2


From 0ae7eecb07d4f2cf955df2ddecc9ac5f0795fe98 Mon Sep 17 00:00:00 2001
From: Frictor <frictor@unknown>
Date: Wed, 17 Sep 2008 00:53:16 +0000
Subject: Updated icons, X Pixmap, and Aethyra png.  September 16, 2008 -
 Frictor

---
 data/icons/aethyra.ico | Bin 17542 -> 17542 bytes
 data/icons/aethyra.png | Bin 7645 -> 8760 bytes
 data/icons/aethyra.xpm | 622 +++++++++++++++++++++++++------------------------
 3 files changed, 312 insertions(+), 310 deletions(-)

diff --git a/data/icons/aethyra.ico b/data/icons/aethyra.ico
index e0c12642..016e752f 100644
Binary files a/data/icons/aethyra.ico and b/data/icons/aethyra.ico differ
diff --git a/data/icons/aethyra.png b/data/icons/aethyra.png
index 702a88c6..e686289c 100644
Binary files a/data/icons/aethyra.png and b/data/icons/aethyra.png differ
diff --git a/data/icons/aethyra.xpm b/data/icons/aethyra.xpm
index cf720302..515be72e 100644
--- a/data/icons/aethyra.xpm
+++ b/data/icons/aethyra.xpm
@@ -1,310 +1,312 @@
-/* XPM */
-static char * aethyra_xpm[] = {
-"32 32 275 2",
-"  	c None",
-". 	c #840000",
-"+ 	c #7F0000",
-"@ 	c #4F0000",
-"# 	c #810000",
-"$ 	c #830000",
-"% 	c #790000",
-"& 	c #460000",
-"* 	c #4B0000",
-"= 	c #750000",
-"- 	c #800000",
-"; 	c #880000",
-"> 	c #860000",
-", 	c #820000",
-"' 	c #5C0000",
-") 	c #4A0000",
-"! 	c #6B0000",
-"~ 	c #8C0000",
-"{ 	c #990000",
-"] 	c #950000",
-"^ 	c #700000",
-"/ 	c #6D0000",
-"( 	c #740000",
-"_ 	c #6E0202",
-": 	c #540505",
-"< 	c #420404",
-"[ 	c #450101",
-"} 	c #430000",
-"| 	c #490000",
-"1 	c #4D0000",
-"2 	c #4E0000",
-"3 	c #470000",
-"4 	c #9D0000",
-"5 	c #9B0000",
-"6 	c #710000",
-"7 	c #770000",
-"8 	c #690404",
-"9 	c #480D0D",
-"0 	c #3A0A0A",
-"a 	c #480101",
-"b 	c #440101",
-"c 	c #470101",
-"d 	c #510000",
-"e 	c #520000",
-"f 	c #780000",
-"g 	c #8A0000",
-"h 	c #9A0000",
-"i 	c #930000",
-"j 	c #730404",
-"k 	c #763119",
-"l 	c #8D4518",
-"m 	c #710902",
-"n 	c #640704",
-"o 	c #43100F",
-"p 	c #3C130C",
-"q 	c #551608",
-"r 	c #4F0C03",
-"s 	c #350A0A",
-"t 	c #360909",
-"u 	c #490202",
-"v 	c #500000",
-"w 	c #940000",
-"x 	c #830202",
-"y 	c #692418",
-"z 	c #B29354",
-"A 	c #8C6E25",
-"B 	c #8C661F",
-"C 	c #A67925",
-"D 	c #8D6822",
-"E 	c #D2AF5B",
-"F 	c #886826",
-"G 	c #3E1C0A",
-"H 	c #221A1A",
-"I 	c #231919",
-"J 	c #8D0000",
-"K 	c #720404",
-"L 	c #71481D",
-"M 	c #413719",
-"N 	c #47391B",
-"O 	c #8B6B29",
-"P 	c #4E2207",
-"Q 	c #3B1104",
-"R 	c #C99F35",
-"S 	c #563C0A",
-"T 	c #1F0F0E",
-"U 	c #192525",
-"V 	c #192323",
-"W 	c #271111",
-"X 	c #430202",
-"Y 	c #480000",
-"Z 	c #6B0505",
-"` 	c #412222",
-" .	c #454637",
-"..	c #AA8F48",
-"+.	c #886B33",
-"@.	c #A9864B",
-"#.	c #B7944C",
-"$.	c #D8B762",
-"%.	c #533C0C",
-"&.	c #211614",
-"*.	c #1C2828",
-"=.	c #1A2424",
-"-.	c #241111",
-";.	c #410202",
-">.	c #6B0404",
-",.	c #48211E",
-"'.	c #B39D63",
-").	c #9B7F38",
-"!.	c #6F5923",
-"~.	c #44330F",
-"{.	c #45340F",
-"].	c #B38E2D",
-"^.	c #49360B",
-"/.	c #241E1D",
-"(.	c #222928",
-"_.	c #1B2222",
-":.	c #251010",
-"<.	c #6A0202",
-"[.	c #794C2D",
-"}.	c #997F3E",
-"|.	c #3B3115",
-"1.	c #393834",
-"2.	c #454545",
-"3.	c #555049",
-"4.	c #D2AD4E",
-"5.	c #554210",
-"6.	c #272625",
-"7.	c #252929",
-"8.	c #1C2222",
-"9.	c #4C0000",
-"0.	c #690302",
-"a.	c #B48B4A",
-"b.	c #5F4B17",
-"c.	c #3E4241",
-"d.	c #6C6E6E",
-"e.	c #747676",
-"f.	c #7A7466",
-"g.	c #DAB556",
-"h.	c #574310",
-"i.	c #282725",
-"j.	c #252A2A",
-"k.	c #1A2323",
-"l.	c #231212",
-"m.	c #3D0202",
-"n.	c #750802",
-"o.	c #C59D4A",
-"p.	c #45350E",
-"q.	c #484949",
-"r.	c #6F7171",
-"s.	c #7B7B7B",
-"t.	c #867C60",
-"u.	c #B49543",
-"v.	c #5F480F",
-"w.	c #2E2B25",
-"x.	c #232727",
-"y.	c #1D1E1E",
-"z.	c #2B0F0F",
-"A.	c #400202",
-"B.	c #860B02",
-"C.	c #C59838",
-"D.	c #49330C",
-"E.	c #423C3C",
-"F.	c #626666",
-"G.	c #747471",
-"H.	c #7F6D3E",
-"I.	c #423718",
-"J.	c #40320F",
-"K.	c #322F1D",
-"L.	c #1D2121",
-"M.	c #261313",
-"N.	c #3D0606",
-"O.	c #8C0100",
-"P.	c #BF7E1F",
-"Q.	c #6F4E11",
-"R.	c #3E3333",
-"S.	c #565D5D",
-"T.	c #686A6A",
-"U.	c #585857",
-"V.	c #3C3934",
-"W.	c #413927",
-"X.	c #313224",
-"Y.	c #1B1D1C",
-"Z.	c #2D0A0A",
-"`.	c #900101",
-" +	c #9E3D0A",
-".+	c #AF851C",
-"++	c #473023",
-"@+	c #484B4B",
-"#+	c #5A5C5C",
-"$+	c #81765B",
-"%+	c #957D3D",
-"&+	c #5C4B1C",
-"*+	c #67531B",
-"=+	c #947426",
-"-+	c #471608",
-";+	c #890606",
-">+	c #890701",
-",+	c #A96E13",
-"'+	c #906718",
-")+	c #403633",
-"!+	c #4B514F",
-"~+	c #AE9042",
-"{+	c #695214",
-"]+	c #836B27",
-"^+	c #3C2D13",
-"/+	c #977125",
-"(+	c #855712",
-"_+	c #420000",
-":+	c #7E0909",
-"<+	c #8C0101",
-"[+	c #7D0F01",
-"}+	c #956612",
-"|+	c #8B6B24",
-"1+	c #464942",
-"2+	c #4E4835",
-"3+	c #5D4814",
-"4+	c #5B4813",
-"5+	c #25180C",
-"6+	c #9C793B",
-"7+	c #553709",
-"8+	c #3E0000",
-"9+	c #8E0101",
-"0+	c #640803",
-"a+	c #5F3C11",
-"b+	c #836820",
-"c+	c #74612A",
-"d+	c #645222",
-"e+	c #665321",
-"f+	c #846729",
-"g+	c #644314",
-"h+	c #350900",
-"i+	c #8D0303",
-"j+	c #7A0101",
-"k+	c #4E0909",
-"l+	c #281815",
-"m+	c #26291C",
-"n+	c #2C2B18",
-"o+	c #321F0D",
-"p+	c #350A02",
-"q+	c #3E0100",
-"r+	c #450000",
-"s+	c #840202",
-"t+	c #5F0202",
-"u+	c #351212",
-"v+	c #1D2323",
-"w+	c #191F1F",
-"x+	c #290C0C",
-"y+	c #7C0303",
-"z+	c #710101",
-"A+	c #4C0D0D",
-"B+	c #2A1919",
-"C+	c #241616",
-"D+	c #390707",
-"E+	c #440000",
-"F+	c #7E0202",
-"G+	c #7B0000",
-"H+	c #600505",
-"I+	c #390E0E",
-"J+	c #2F0B0B",
-"K+	c #460202",
-"L+	c #7C0404",
-"M+	c #7C0000",
-"N+	c #670303",
-"O+	c #400D0D",
-"P+	c #340B0B",
-"Q+	c #760000",
-"R+	c #640404",
-"S+	c #420E0E",
-"T+	c #380C0C",
-"U+	c #480202",
-"V+	c #580202",
-"W+	c #460707",
-"X+	c #400606",
-"Y+	c #4C0101",
-"Z+	c #490101",
-"                                                                ",
-"                                                                ",
-"                                                                ",
-"          . +                                     @             ",
-"          # $ %                               & * @             ",
-"          = - ; > ,           ' )           & * @ *             ",
-"          ! % ~ { ] . ^ / ( _ : < [ & } | 1 1 2 @ 3             ",
-"            % ~ 4 5 > / 6 7 8 9 0 a 1 b c d e @ @ |             ",
-"            f g h i j k l m n o p q r s t u v 2 2               ",
-"            ^ > w x y z A B C D E F G H I t ) @ )               ",
-"              # J K L M N O P Q R S T U V W X d Y               ",
-"              - ; Z `  ...+.@.#.$.%.&.*.=.-.;.d                 ",
-"              , > >.,.'.).!.~.{.].^./.(._.:.X v                 ",
-"                $ <.[.}.|.1.2.3.4.5.6.7.8.:.;.9.                ",
-"                - 0.a.b.c.d.e.f.g.h.i.j.k.l.m.                  ",
-"                , n.o.p.q.r.s.t.u.v.w.x.y.z.A.                  ",
-"                  B.C.D.E.F.G.H.I.J.K.L.M.N.Y                   ",
-"                  O.P.Q.R.S.T.U.V.W.X.Y.Z.| 2                   ",
-"                  `. +.+++@+#+$+%+&+*+=+-+9.*                   ",
-"                  ;+>+,+'+)+!+~+{+]+^+/+(+3 _+                  ",
-"                  :+<+[+}+|+1+2+3+4+5+6+7+8+                    ",
-"                    9+g 0+a+b+c+d+e+f+g+h+_+                    ",
-"                    i+J j+k+l+m+n+o+p+q+r+r+                    ",
-"                      s+# t+u+v+w+x+& e 3                       ",
-"                      y+$ z+A+B+C+D+2 @ E+                      ",
-"                        F+G+H+I+J+K+d Y                         ",
-"                        L+M+N+O+P+a v }                         ",
-"                          Q+R+S+T+U+1                           ",
-"                            V+W+X+c                             ",
-"                              Y+Z+                              ",
-"                                                                ",
-"                                                                "};
+/* XPM */
+static char * Aethyra_xpm[] = {
+"32 32 277 2",
+"  	c None",
+". 	c #840000",
+"+ 	c #7E0000",
+"@ 	c #4F0000",
+"# 	c #810000",
+"$ 	c #830000",
+"% 	c #7B0000",
+"& 	c #460000",
+"* 	c #4C0000",
+"= 	c #4B0000",
+"- 	c #750000",
+"; 	c #860000",
+"> 	c #850000",
+", 	c #5D0000",
+"' 	c #490000",
+") 	c #450000",
+"! 	c #4A0000",
+"~ 	c #440000",
+"{ 	c #6A0000",
+"] 	c #7A0000",
+"^ 	c #8B0000",
+"/ 	c #990000",
+"( 	c #960000",
+"_ 	c #720000",
+": 	c #6E0000",
+"< 	c #740000",
+"[ 	c #6B0202",
+"} 	c #550505",
+"| 	c #420404",
+"1 	c #440101",
+"2 	c #4D0000",
+"3 	c #4E0000",
+"4 	c #480000",
+"5 	c #9D0000",
+"6 	c #9B0000",
+"7 	c #6F0000",
+"8 	c #710000",
+"9 	c #760000",
+"0 	c #680404",
+"a 	c #4B0C0C",
+"b 	c #3C0909",
+"c 	c #470202",
+"d 	c #450101",
+"e 	c #500000",
+"f 	c #510000",
+"g 	c #790000",
+"h 	c #890000",
+"i 	c #920000",
+"j 	c #710706",
+"k 	c #7D381F",
+"l 	c #934A1A",
+"m 	c #7B1A09",
+"n 	c #6B1609",
+"o 	c #521E13",
+"p 	c #4F2517",
+"q 	c #5D230F",
+"r 	c #4D0F04",
+"s 	c #350A0A",
+"t 	c #360909",
+"u 	c #470303",
+"v 	c #930000",
+"w 	c #840202",
+"x 	c #712C1C",
+"y 	c #A58248",
+"z 	c #866621",
+"A 	c #835819",
+"B 	c #98681F",
+"C 	c #845C1D",
+"D 	c #BB964A",
+"E 	c #856225",
+"F 	c #3D1B0B",
+"G 	c #241818",
+"H 	c #251717",
+"I 	c #360A0A",
+"J 	c #430000",
+"K 	c #6C0000",
+"L 	c #800000",
+"M 	c #730404",
+"N 	c #6A431E",
+"O 	c #473C1C",
+"P 	c #534420",
+"Q 	c #806125",
+"R 	c #53290B",
+"S 	c #461C09",
+"T 	c #BB9432",
+"U 	c #65490F",
+"V 	c #1F1110",
+"W 	c #1A2323",
+"X 	c #1A2222",
+"Y 	c #261212",
+"Z 	c #440202",
+"` 	c #7F0000",
+" .	c #870000",
+"..	c #6D0505",
+"+.	c #422522",
+"@.	c #454434",
+"#.	c #A18744",
+"$.	c #8F7237",
+"%.	c #A37F48",
+"&.	c #AD8847",
+"*.	c #C6A657",
+"=.	c #644C14",
+"-.	c #211615",
+";.	c #1C2626",
+">.	c #1B2323",
+",.	c #231313",
+"'.	c #420202",
+").	c #6C0404",
+"!.	c #532D23",
+"~.	c #A8915B",
+"{.	c #967C37",
+"].	c #6E5926",
+"^.	c #453512",
+"/.	c #473713",
+"(.	c #A4832A",
+"_.	c #594310",
+":.	c #241F1E",
+"<.	c #232828",
+"[.	c #1C2020",
+"}.	c #241111",
+"|.	c #430202",
+"1.	c #7C5030",
+"2.	c #967C3D",
+"3.	c #3E3318",
+"4.	c #3D3930",
+"5.	c #454442",
+"6.	c #524D44",
+"7.	c #C09E45",
+"8.	c #654F17",
+"9.	c #262524",
+"0.	c #252929",
+"a.	c #410202",
+"b.	c #6B0302",
+"c.	c #A78041",
+"d.	c #6A5621",
+"e.	c #414543",
+"f.	c #696B6B",
+"g.	c #747676",
+"h.	c #7B7566",
+"i.	c #C9A84F",
+"j.	c #665017",
+"k.	c #282725",
+"l.	c #252A2A",
+"m.	c #1B2222",
+"n.	c #3D0202",
+"o.	c #750802",
+"p.	c #B48E41",
+"q.	c #564418",
+"r.	c #4A4B4B",
+"s.	c #6D6F6F",
+"t.	c #797A7A",
+"u.	c #867C62",
+"v.	c #AE9040",
+"w.	c #664F12",
+"x.	c #2D2A25",
+"y.	c #242828",
+"z.	c #1E1E1E",
+"A.	c #291010",
+"B.	c #400202",
+"C.	c #860B02",
+"D.	c #B78C32",
+"E.	c #594013",
+"F.	c #433E3E",
+"G.	c #606464",
+"H.	c #74736C",
+"I.	c #7C6D44",
+"J.	c #433719",
+"K.	c #413311",
+"L.	c #322F1E",
+"M.	c #1C2121",
+"N.	c #271212",
+"O.	c #3C0606",
+"P.	c #8C0200",
+"Q.	c #B5771D",
+"R.	c #765513",
+"S.	c #3F3636",
+"T.	c #555B5B",
+"U.	c #686969",
+"V.	c #5A5957",
+"W.	c #3C3832",
+"X.	c #403826",
+"Y.	c #2F3023",
+"Z.	c #1C1F1D",
+"`.	c #2E0A0A",
+" +	c #460101",
+".+	c #8F0101",
+"++	c #A03F0C",
+"@+	c #AC7E19",
+"#+	c #4B3625",
+"$+	c #474747",
+"%+	c #5B5C5A",
+"&+	c #83775A",
+"*+	c #8C7539",
+"=+	c #67541F",
+"-+	c #6B551C",
+";+	c #8C6D24",
+">+	c #4E1C09",
+",+	c #4A0101",
+"'+	c #8A0606",
+")+	c #8D1203",
+"!+	c #A76713",
+"~+	c #87611B",
+"{+	c #453A32",
+"]+	c #52554E",
+"^+	c #A38A45",
+"/+	c #715818",
+"(+	c #7A6424",
+"_+	c #443212",
+":+	c #947026",
+"<+	c #7D4E11",
+"[+	c #490400",
+"}+	c #420000",
+"|+	c #7F0808",
+"1+	c #8B0101",
+"2+	c #800F01",
+"3+	c #915E11",
+"4+	c #504F40",
+"5+	c #4E4834",
+"6+	c #5A4715",
+"7+	c #5B4814",
+"8+	c #382813",
+"9+	c #917035",
+"0+	c #533209",
+"a+	c #3F0400",
+"b+	c #8E0101",
+"c+	c #8A0000",
+"d+	c #671104",
+"e+	c #663D12",
+"f+	c #786023",
+"g+	c #74612B",
+"h+	c #665320",
+"i+	c #675321",
+"j+	c #785C24",
+"k+	c #684718",
+"l+	c #380B00",
+"m+	c #400000",
+"n+	c #8C0303",
+"o+	c #8D0000",
+"p+	c #780101",
+"q+	c #510808",
+"r+	c #291A16",
+"s+	c #26291C",
+"t+	c #2D2B18",
+"u+	c #321F0E",
+"v+	c #370A02",
+"w+	c #3E0100",
+"x+	c #850202",
+"y+	c #600202",
+"z+	c #331313",
+"A+	c #1E2121",
+"B+	c #1A1E1E",
+"C+	c #270D0D",
+"D+	c #470000",
+"E+	c #7B0404",
+"F+	c #720101",
+"G+	c #4B0D0D",
+"H+	c #2D1717",
+"I+	c #261414",
+"J+	c #380808",
+"K+	c #7E0202",
+"L+	c #5D0606",
+"M+	c #3B0E0E",
+"N+	c #300C0C",
+"O+	c #430303",
+"P+	c #7A0505",
+"Q+	c #7C0000",
+"R+	c #640404",
+"S+	c #430D0D",
+"T+	c #460202",
+"U+	c #610505",
+"V+	c #440E0E",
+"W+	c #390B0B",
+"X+	c #560202",
+"Y+	c #480707",
+"Z+	c #410505",
+"`+	c #4B0101",
+" @	c #480101",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"          . +                                     @             ",
+"          # $ %                               & * @ =           ",
+"          - # ; > $           , '           ) ! @ * ~           ",
+"          { ] ^ / ( $ _ : < [ } | 1 ) ~ ' 2 2 3 3 4             ",
+"            ] ^ 5 6 . 7 8 9 0 a b c * d 4 e f @ 3 4             ",
+"            g h / i j k l m n o p q r s t u e 3 2 4             ",
+"            8 > v w x y z A B C D E F G H I = @ ' J             ",
+"            K L ^ M N O P Q R S T U V W X Y Z e )               ",
+"              `  ...+.@.#.$.%.&.*.=.-.;.>.,.'.e &               ",
+"              ` . ).!.~.{.].^./.(._.:.<.[.}.|.@ 4               ",
+"                # [ 1.2.3.4.5.6.7.8.9.0.[.}.a.=                 ",
+"                ` b.c.d.e.f.g.h.i.j.k.l.m.,.n.)                 ",
+"                L o.p.q.r.s.t.u.v.w.x.y.z.A.B.~                 ",
+"                ; C.D.E.F.G.H.I.J.K.L.M.N.O.4                   ",
+"                  P.Q.R.S.T.U.V.W.X.Y.Z.`. +2                   ",
+"                  .+++@+#+$+%+&+*+=+-+;+>+,+=                   ",
+"                  '+)+!+~+{+]+^+/+(+_+:+<+[+}+                  ",
+"                  |+1+2+3+z 4+5+6+7+8+9+0+a+                    ",
+"                    b+c+d+e+f+g+h+i+j+k+l+m+                    ",
+"                    n+o+p+q+r+s+t+u+v+w+) )                     ",
+"                      x+` y+z+A+B+C+1 e D+                      ",
+"                      E+# F+G+H+I+J+3 @ ~                       ",
+"                        K+% L+M+N+O+e '                         ",
+"                        P+Q+R+S+I T+@ )                         ",
+"                          9 U+V+W+u 2                           ",
+"                            X+Y+Z+ +                            ",
+"                            * `+ @                              ",
+"                                                                ",
+"                                                                "};
-- 
cgit v1.2.3-70-g09d2


From 2dc8eadff1e67bb70b1772ecc19c9e1e2e40a5b4 Mon Sep 17 00:00:00 2001
From: Kevin Day <blame582@gmail.com>
Date: Sun, 21 Sep 2008 07:40:37 +0000
Subject: added an update.sh script and updated the autobuild.sh script

---
 ChangeLog    |  4 ++++
 autobuild.sh | 23 ++++++++++++++++-------
 update.sh    | 27 +++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100755 update.sh

diff --git a/ChangeLog b/ChangeLog
index 57448eb8..0afb019f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-21  Kevin Day ("Blame")     <blame@aethyra.com>
+
+	* Added the update.sh script to work with autobuild.sh
+
 2008-09-16  Kevin Day ("Blame")     <blame@aethyra.com>
 
 	* Added autobuild.sh complete build script for the client
diff --git a/autobuild.sh b/autobuild.sh
index 0d8f8b27..c5160439 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -24,12 +24,21 @@ echo "now running make"
 make
 
 echo
-echo "now running make install please input your root password"
-
-su -c "make install"
-su -c "make clean"
-
+echo "now running make install please input your root password";
+if [ /etc/fedora-release ]; then
+	echo "Fedora found";
+	su -c "make install";
+	su -c "make clean";
+	echo "Done";
+	aethyra &
+	exit 1;
+elif [ /etc/lsb-release ];then
+	echo "ubuntu found";
+	sudo make install;
+	aethyra &
+	exit 1;
+else 
+	echo "login as root and run make install"
+fi
 echo "done"
 
-aethyra &
-exit 1;
diff --git a/update.sh b/update.sh
new file mode 100755
index 00000000..1402fda9
--- /dev/null
+++ b/update.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+#automated script to update aethyra from SVN
+#author=Blame <blame@aethyra.com>
+#last modified 2008-09-21 Blame
+
+# test for the aethyra client 
+if [ ~/src/aethyra ]; then
+	#change to the aethyra directory
+	cd ~/src/aethyra;
+	#issue the svn update command
+	svn up;
+	#issue the autobuild command 
+	./autobuild.sh;
+	echo "Aethyra has been updated"
+	exit 1;
+else 
+	#make directory /home/user-name/src
+	mkdir ~/src
+	#change to directory /home/user-name/src
+	cd ~/src
+	#execute the svn command to download the client files
+	svn co svn://209.168.213.109/client/trunk aethyra
+	#issue the auto build script to compile the client
+	./autobuild
+	echo "congratulations on installing aethyra enjoy"
+	exit 1;
+fi
-- 
cgit v1.2.3-70-g09d2


From 489a429bea6739dfa25503b9329bd9e33bffb856 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 25 Sep 2008 00:15:44 +0000
Subject: Merged the Tametomo branch into trunk.

---
 data/graphics/gui/CMakeLists.txt             |   4 +
 data/graphics/gui/Makefile.am                |   4 +
 data/graphics/gui/buttonpress.png            | Bin 434 -> 424 bytes
 data/graphics/gui/close_button.png           | Bin 646 -> 637 bytes
 data/graphics/gui/hscroll_left_highlight.png | Bin 382 -> 381 bytes
 data/graphics/gui/hscroll_right_default.png  | Bin 349 -> 346 bytes
 data/graphics/gui/mouse.png                  | Bin 4508 -> 4385 bytes
 src/CMakeLists.txt                           |   4 +
 src/Makefile.am                              |   2 +
 src/being.cpp                                | 265 +++++++----
 src/being.h                                  | 125 ++---
 src/beingmanager.cpp                         |  17 +-
 src/beingmanager.h                           |  39 +-
 src/engine.cpp                               |  12 +
 src/engine.h                                 |   7 +-
 src/equipment.cpp                            |   2 -
 src/equipment.h                              |   2 +
 src/flooritemmanager.cpp                     |   4 +-
 src/game.cpp                                 | 678 +++++++++++++--------------
 src/gui/setup.cpp                            |   2 +-
 src/gui/setup_video.cpp                      |  22 +-
 src/gui/shop.cpp                             |   4 +-
 src/gui/skill.cpp                            |   4 +-
 src/gui/textbox.cpp                          |  12 +-
 src/gui/textbox.h                            |  13 +
 src/gui/updatewindow.cpp                     |   2 +-
 src/gui/viewport.cpp                         | 143 +++---
 src/gui/viewport.h                           |  25 +-
 src/gui/widgets/dropdown.cpp                 |   2 +-
 src/gui/window.cpp                           | 246 ++++++++--
 src/gui/window.h                             |  14 +-
 src/gui/windowcontainer.cpp                  |   4 +-
 src/imageparticle.cpp                        |   2 +-
 src/keyboardconfig.cpp                       |   3 +-
 src/keyboardconfig.h                         |   3 +-
 src/localplayer.cpp                          |  22 +-
 src/localplayer.h                            |   2 +-
 src/map.cpp                                  | 226 ++++-----
 src/map.h                                    | 112 +++--
 src/monster.cpp                              |  37 +-
 src/monster.h                                |   2 +-
 src/net/beinghandler.cpp                     |  11 +-
 src/net/equipmenthandler.cpp                 |   7 +
 src/net/loginhandler.cpp                     |   2 +-
 src/net/playerhandler.cpp                    |  60 ++-
 src/npc.cpp                                  |   3 +-
 src/particle.cpp                             |  12 +-
 src/particle.h                               |  17 +-
 src/particleemitter.cpp                      |  29 +-
 src/particleemitter.h                        |   6 +-
 src/player.cpp                               |  12 +
 src/resources/action.cpp                     |   5 +-
 src/resources/imageset.cpp                   |   7 +-
 src/resources/imageset.h                     |   8 +-
 src/resources/itemdb.cpp                     |   6 +-
 src/resources/mapreader.cpp                  | 218 +++++----
 src/resources/mapreader.h                    |   4 +-
 src/resources/monsterdb.cpp                  |   5 +-
 src/resources/monsterinfo.cpp                |   5 +-
 src/resources/spritedef.cpp                  | 100 ++--
 src/resources/spritedef.h                    |   8 +-
 src/sound.h                                  |   2 +-
 src/textparticle.cpp                         |   2 +-
 src/tileset.h                                |   3 +-
 src/utils/dtor.h                             |   8 +
 65 files changed, 1550 insertions(+), 1057 deletions(-)

diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 5cb47b8c..0ad4bd13 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -8,7 +8,9 @@ SET (FILES
     checkbox.png
     close_button.png
     deepbox.png
+    default.png
     fixedfont.png
+    gui.xml
     hits_blue.png
     hits_red.png
     hits_yellow.png
@@ -31,6 +33,8 @@ SET (FILES
     selection.png
     sansserif8.png
     slider.png
+    speech_bubble.png
+    speech_bubble.xml
     target-cursor-blue-l.png
     target-cursor-blue-m.png
     target-cursor-blue-s.png
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index ec99fdf6..f2abf035 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -11,8 +11,10 @@ gui_DATA =				\
 	checkbox.png			\
 	close_button.png		\
 	deepbox.png			\
+	default.png			\
 	emotions.png			\
 	fixedfont.png			\
+	gui.xml				\
 	hits_blue.png			\
 	hits_red.png			\
 	hits_yellow.png			\
@@ -38,6 +40,8 @@ gui_DATA =				\
 	selection.png			\
 	sansserif8.png			\
 	slider.png			\
+	speech_bubble.png		\
+	speechbubble.xml		\
 	target-cursor-blue-l.png	\
 	target-cursor-blue-m.png	\
 	target-cursor-blue-s.png	\
diff --git a/data/graphics/gui/buttonpress.png b/data/graphics/gui/buttonpress.png
index ed7e5054..4c45a45f 100644
Binary files a/data/graphics/gui/buttonpress.png and b/data/graphics/gui/buttonpress.png differ
diff --git a/data/graphics/gui/close_button.png b/data/graphics/gui/close_button.png
index 8b4a451a..a0a6d144 100644
Binary files a/data/graphics/gui/close_button.png and b/data/graphics/gui/close_button.png differ
diff --git a/data/graphics/gui/hscroll_left_highlight.png b/data/graphics/gui/hscroll_left_highlight.png
index e2686c13..1dd79658 100644
Binary files a/data/graphics/gui/hscroll_left_highlight.png and b/data/graphics/gui/hscroll_left_highlight.png differ
diff --git a/data/graphics/gui/hscroll_right_default.png b/data/graphics/gui/hscroll_right_default.png
index 547a86dd..94c0efeb 100644
Binary files a/data/graphics/gui/hscroll_right_default.png and b/data/graphics/gui/hscroll_right_default.png differ
diff --git a/data/graphics/gui/mouse.png b/data/graphics/gui/mouse.png
index 84dc2ad1..6c1b7e8e 100644
Binary files a/data/graphics/gui/mouse.png and b/data/graphics/gui/mouse.png differ
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e6ee7405..e6b9d3b1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -49,6 +49,8 @@ MARK_AS_ADVANCED(SDL_INCLUDE_DIR)
 MARK_AS_ADVANCED(SDL_LIBRARY)
 
 SET(SRCS
+    gui/widgets/dropdown.cpp
+    gui/widgets/dropdown.h
     gui/widgets/resizegrip.cpp
     gui/widgets/resizegrip.h
     gui/box.cpp
@@ -159,6 +161,8 @@ SET(SRCS
     gui/skill.h
     gui/slider.cpp
     gui/slider.h
+    gui/speechbubble.cpp
+    gui/speechbubble.h
     gui/status.cpp
     gui/status.h
     gui/tabbedcontainer.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index d2fd5efb..f6d06536 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -117,6 +117,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/skill.h \
 	      gui/slider.cpp \
 	      gui/slider.h \
+	      gui/speechbubble.cpp \
+	      gui/speechbubble.h \
 	      gui/status.cpp \
 	      gui/status.h \
 	      gui/tabbedcontainer.cpp \
diff --git a/src/being.cpp b/src/being.cpp
index fd1b67fe..1d7f5ee7 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -22,8 +22,8 @@
  */
 #include "being.h"
 
-#include <algorithm>
 #include <cassert>
+#include <cmath>
 
 #include "animatedsprite.h"
 #include "equipment.h"
@@ -32,7 +32,7 @@
 #include "log.h"
 #include "map.h"
 #include "particle.h"
-#include "text.h"
+#include "sound.h"
 #include "localplayer.h"
 
 #include "resources/resourcemanager.h"
@@ -40,20 +40,22 @@
 #include "resources/iteminfo.h"
 
 #include "gui/gui.h"
+#include "gui/speechbubble.h"
 
 #include "utils/dtor.h"
 #include "utils/tostring.h"
 
+#include "utils/xml.h"
+
+#define BEING_EFFECTS_FILE "effects.xml"
+
 int Being::instances = 0;
 ImageSet *Being::emotionSet = NULL;
 
-static const int X_SPEECH_OFFSET = 18;
-static const int Y_SPEECH_OFFSET = 60;
-
 Being::Being(int id, int job, Map *map):
     mJob(job),
     mX(0), mY(0),
-    mAction(0),
+    mAction(STAND),
     mWalkTime(0),
     mEmotion(0), mEmotionTime(0),
     mAttackSpeed(350),
@@ -73,6 +75,8 @@ Being::Being(int id, int job, Map *map):
 {
     setMap(map);
 
+    mSpeechBubble = new SpeechBubble();
+
     if (instances == 0)
     {
         // Load the emotion set
@@ -82,13 +86,13 @@ Being::Being(int id, int job, Map *map):
     }
 
     instances++;
-    mSpeech = 0;
+    mSpeech = "";
     mIsGM = false;
 }
 
 Being::~Being()
 {
-    std::for_each(mSprites.begin(), mSprites.end(), make_dtor(mSprites));
+    delete_all(mSprites);
     clearPath();
 
     for (   std::list<Particle *>::iterator i = mChildParticleEffects.begin();
@@ -107,14 +111,11 @@ Being::~Being()
         emotionSet->decRef();
         emotionSet = NULL;
     }
-    if (mSpeech)
-    {
-        delete mSpeech;
-    }
+
+    delete mSpeechBubble;
 }
 
-void
-Being::setDestination(Uint16 destX, Uint16 destY)
+void Being::setDestination(Uint16 destX, Uint16 destY)
 {
     if (mMap)
     {
@@ -122,14 +123,12 @@ Being::setDestination(Uint16 destX, Uint16 destY)
     }
 }
 
-void
-Being::clearPath()
+void Being::clearPath()
 {
     mPath.clear();
 }
 
-void
-Being::setPath(const Path &path)
+void Being::setPath(const Path &path)
 {
     mPath = path;
 
@@ -140,36 +139,26 @@ Being::setPath(const Path &path)
     }
 }
 
-void
-Being::setHairStyle(int style, int color)
+void Being::setHairStyle(int style, int color)
 {
     mHairStyle = style < 0 ? mHairStyle : style % NR_HAIR_STYLES;
     mHairColor = color < 0 ? mHairColor : color % NR_HAIR_COLORS;
 }
 
-void
-Being::setSprite(int slot, int id, std::string color)
+void Being::setSprite(int slot, int id, std::string color)
 {
     assert(slot >= BASE_SPRITE && slot < VECTOREND_SPRITE);
     mSpriteIDs[slot] = id;
     mSpriteColors[slot] = color;
 }
 
-void
-Being::setSpeech(const std::string &text, Uint32 time)
+void Being::setSpeech(const std::string &text, Uint32 time)
 {
-    if (mSpeech) // don't introduce a memory leak
-    {
-        delete mSpeech;
-    }
-    mSpeech = new Text(text, mPx + X_SPEECH_OFFSET, mPy - Y_SPEECH_OFFSET,
-                       gcn::Graphics::CENTER, speechFont,
-                       gcn::Color(255, 255, 255));
+    mSpeech = text;
     mSpeechTime = 500;
 }
 
-void
-Being::takeDamage(int amount)
+void Being::takeDamage(int amount)
 {
     gcn::Font *font;
     std::string damage = amount ? toString(amount) : "miss";
@@ -200,16 +189,14 @@ Being::takeDamage(int amount)
                                         mPx + 16, mPy + 16);
 }
 
-void
-Being::handleAttack(Being *victim, int damage)
+void Being::handleAttack(Being *victim, int damage)
 {
     setAction(Being::ATTACK);
     mFrame = 0;
     mWalkTime = tick_time;
 }
 
-void
-Being::setMap(Map *map)
+void Being::setMap(Map *map)
 {
     // Remove sprite from potential previous map
     if (mMap)
@@ -229,8 +216,7 @@ Being::setMap(Map *map)
     mChildParticleEffects.clear();
 }
 
-void
-Being::controlParticle(Particle *particle)
+void Being::controlParticle(Particle *particle)
 {
     if (particle)
     {
@@ -240,8 +226,7 @@ Being::controlParticle(Particle *particle)
     }
 }
 
-void
-Being::setAction(Uint8 action)
+void Being::setAction(Action action)
 {
     SpriteAction currentAction = ACTION_INVALID;
     switch (action)
@@ -294,10 +279,11 @@ Being::setAction(Uint8 action)
     }
 }
 
-
-void
-Being::setDirection(Uint8 direction)
+void Being::setDirection(Uint8 direction)
 {
+    if (mDirection == direction)
+        return;
+
     mDirection = direction;
     SpriteDirection dir = getSpriteDirection();
 
@@ -308,8 +294,7 @@ Being::setDirection(Uint8 direction)
     }
 }
 
-SpriteDirection
-Being::getSpriteDirection() const
+SpriteDirection Being::getSpriteDirection() const
 {
     SpriteDirection dir;
 
@@ -325,15 +310,15 @@ Being::getSpriteDirection() const
     {
         dir = DIRECTION_RIGHT;
     }
-    else {
-        dir = DIRECTION_LEFT;
+    else 
+    {
+         dir = DIRECTION_LEFT;
     }
-
+ 
     return dir;
 }
 
-void
-Being::nextStep()
+void Being::nextStep()
 {
     if (mPath.empty())
     {
@@ -368,32 +353,23 @@ Being::nextStep()
     mWalkTime += mWalkSpeed / 10;
 }
 
-void
-Being::logic()
+void Being::logic()
 {
     // Reduce the time that speech is still displayed
-    if (mSpeechTime > 0 && mSpeech)
-    {
-        if (--mSpeechTime == 0)
-        {
-            delete mSpeech;
-            mSpeech = 0;
-        }
-    }
+    if (mSpeechTime > 0)
+         mSpeechTime--;
 
     int oldPx = mPx;
     int oldPy = mPy;
     // Update pixel coordinates
     mPx = mX * 32 + getXOffset();
     mPy = mY * 32 + getYOffset();
+
     if (mPx != oldPx || mPy != oldPy)
     {
-        if (mSpeech)
-        {
-            mSpeech->adviseXY(mPx + X_SPEECH_OFFSET, mPy - Y_SPEECH_OFFSET);
-        }
         updateCoords();
     }
+
     if (mEmotion != 0)
     {
         mEmotionTime--;
@@ -412,25 +388,23 @@ Being::logic()
     }
 
     //Update particle effects
-    for (   std::list<Particle *>::iterator i = mChildParticleEffects.begin();
-            i != mChildParticleEffects.end();
-
-        )
+    for (std::list<Particle *>::iterator i = mChildParticleEffects.begin();
+                                         i != mChildParticleEffects.end();)
     {
         (*i)->setPosition((float)mPx + 16.0f, (float)mPy + 32.0f);
-        if (!(*i)->isAlive())
+        if ((*i)->isExtinct())
         {
             (*i)->kill();
             i = mChildParticleEffects.erase(i);
         }
-        else {
+        else 
+        {
             i++;
         }
     }
 }
 
-void
-Being::draw(Graphics *graphics, int offsetX, int offsetY) const
+void Being::draw(Graphics *graphics, int offsetX, int offsetY) const
 {
     int px = mPx + offsetX;
     int py = mPy + offsetY;
@@ -444,8 +418,7 @@ Being::draw(Graphics *graphics, int offsetX, int offsetY) const
     }
 }
 
-void
-Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
+void Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
 {
     if (!mEmotion)
         return;
@@ -458,17 +431,39 @@ Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
         graphics->drawImage(emotionSet->get(emotionIndex), px, py);
 }
 
-Being::Type
-Being::getType() const
+void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
+{
+    int px = mPx + offsetX;
+    int py = mPy + offsetY;
+
+    // Draw speech above this being
+    if (mSpeechTime > 0)
+    {
+        mSpeechBubble->setCaption(mName);
+        mSpeechBubble->setWindowName(mName);
+        // Not quite centered, but close enough. However, it's not too important to get 
+        // it right right now, as it doesn't take bubble collision into account yet. 
+        mSpeechBubble->setPosition(px - (mSpeechBubble->getWidth() * 4 / 11), py - 70 - 
+                                        (mSpeechBubble->getNumRows()*14));
+        mSpeechBubble->setText( mSpeech );
+        mSpeechBubble->setVisible(true);
+    }
+    else if (mSpeechTime == 0)
+    {
+        mSpeechBubble->setVisible(false);
+    }
+}
+
+Being::Type Being::getType() const
 {
     return UNKNOWN;
 }
 
-int
-Being::getOffset(char pos, char neg) const
+int Being::getOffset(char pos, char neg) const
 {
     // Check whether we're walking in the requested direction
-    if (mAction != WALK || !(mDirection & (pos | neg))) {
+    if (mAction != WALK ||  !(mDirection & (pos | neg))) 
+    {
         return 0;
     }
 
@@ -476,40 +471,132 @@ Being::getOffset(char pos, char neg) const
 
     // We calculate the offset _from_ the _target_ location
     offset -= 32;
-    if (offset > 0) {
+    if (offset > 0) 
+    {
         offset = 0;
     }
 
     // Going into negative direction? Invert the offset.
-    if (mDirection & pos) {
+    if (mDirection & pos) 
+    {
         offset = -offset;
     }
 
     return offset;
 }
 
-
-int
-Being::getWidth() const
+int Being::getWidth() const
 {
     if (mSprites[BASE_SPRITE])
     {
         return mSprites[BASE_SPRITE]->getWidth();
     }
-    else {
+    else 
+    {
         return 0;
     }
 }
 
 
-int
-Being::getHeight() const
+int Being::getHeight() const
 {
     if (mSprites[BASE_SPRITE])
     {
         return mSprites[BASE_SPRITE]->getHeight();
     }
-    else {
+    else 
+    {
         return 0;
     }
 }
+
+struct EffectDescription 
+{
+    std::string mGFXEffect;
+    std::string mSFXEffect;
+};
+
+static EffectDescription *default_effect = NULL;
+static std::map<int, EffectDescription *> effects;
+static bool effects_initialized = false;
+
+static EffectDescription *getEffectDescription(xmlNodePtr node, int *id)
+{
+    EffectDescription *ed = new EffectDescription;
+
+    *id = atoi(XML::getProperty(node, "id", "-1").c_str());
+    ed->mSFXEffect = XML::getProperty(node, "audio", "");
+    ed->mGFXEffect = XML::getProperty(node, "particle", "");
+
+    return ed;
+}
+
+static EffectDescription *getEffectDescription(int effectId)
+{
+    if (!effects_initialized)
+    {
+        XML::Document doc(BEING_EFFECTS_FILE);
+        xmlNodePtr root = doc.rootNode();
+
+        if (!root || !xmlStrEqual(root->name, BAD_CAST "being-effects"))
+        {
+            logger->log("Error loading being effects file: "
+                    BEING_EFFECTS_FILE);
+            return NULL;
+        }
+
+        for_each_xml_child_node(node, root)
+        {
+            int id;
+
+            if (xmlStrEqual(node->name, BAD_CAST "effect"))
+            {
+                EffectDescription *EffectDescription =
+                    getEffectDescription(node, &id);
+                effects[id] = EffectDescription;
+            } else if (xmlStrEqual(node->name, BAD_CAST "default"))
+            {
+                EffectDescription *EffectDescription =
+                    getEffectDescription(node, &id);
+
+                if (default_effect)
+                    delete default_effect;
+
+                default_effect = EffectDescription;
+            }
+        }
+
+        effects_initialized = true;
+    } // done initializing
+
+    EffectDescription *ed = effects[effectId];
+
+    if (!ed)
+        return default_effect;
+    else
+        return ed;
+}
+
+void Being::internalTriggerEffect(int effectId, bool sfx, bool gfx)
+{
+    logger->log("Special effect #%d on %s", effectId,
+                 getId() == player_node->getId() ? "self" : "other");
+
+    EffectDescription *ed = getEffectDescription(effectId);
+ 
+    if (!ed) {
+        logger->log("Unknown special effect and no default recorded");
+        return;
+    }
+
+    if (gfx && ed->mGFXEffect != "") {
+        Particle *selfFX;
+
+        selfFX = particleEngine->addEffect(ed->mGFXEffect, 0, 0);
+        controlParticle(selfFX);
+    }
+
+    if (sfx && ed->mSFXEffect != "") {
+        sound.playSfx(ed->mSFXEffect);
+    }
+}
diff --git a/src/being.h b/src/being.h
index f196f66c..b7f85c63 100644
--- a/src/being.h
+++ b/src/being.h
@@ -25,7 +25,6 @@
 #define _TMW_BEING_H
 
 #include <list>
-#include <memory>
 #include <string>
 #include <SDL_types.h>
 #include <vector>
@@ -34,6 +33,8 @@
 #include "map.h"
 #include "animatedsprite.h"
 
+#include "gui/speechbubble.h"
+
 #define NR_HAIR_STYLES 10
 #define NR_HAIR_COLORS 16
 
@@ -47,7 +48,7 @@ class Map;
 class Graphics;
 class ImageSet;
 class Particle;
-class Text;
+class SpeechBubble;
 
 /**
  * A position along a being's path.
@@ -116,20 +117,17 @@ class Being : public Sprite
         /**
          * Directions, to be used as bitmask values
          */
-        static const char DOWN = 1;
-        static const char LEFT = 2;
-        static const char UP = 4;
-        static const char RIGHT = 8;
+        enum { DOWN = 1, LEFT = 2, UP = 4, RIGHT = 8 };
 
         Uint16 mJob;            /**< Job (player job, npc, monster, ) */
         Uint16 mX, mY;          /**< Tile coordinates */
-        Uint8 mAction;          /**< Action the being is performing */
-        Uint8 mFrame;
+        Action mAction;          /**< Action the being is performing */
+	Uint16 mFrame;
         Uint16 mWalkTime;
         Uint8 mEmotion;         /**< Currently showing emotion */
         Uint8 mEmotionTime;     /**< Time until emotion disappears */
 
-        Uint16 mAttackSpeed;          /**< Attack speed */
+        Uint16 mAttackSpeed;    /**< Attack speed */
 
         /**
          * Constructor.
@@ -165,8 +163,7 @@ class Being : public Sprite
          *
          * @param amount The amount of damage.
          */
-        virtual void
-        takeDamage(int amount);
+        virtual void takeDamage(int amount);
 
         /**
          * Handles an attack of another being by this being.
@@ -174,22 +171,19 @@ class Being : public Sprite
          * @param victim The attacked being.
          * @param damage The amount of damage dealt (0 means miss).
          */
-        virtual void
-        handleAttack(Being *victim, int damage);
+        virtual void handleAttack(Being *victim, int damage);
 
         /**
          * Returns the name of the being.
          */
-        const std::string&
-        getName() const { return mName; }
+        const std::string& getName() const { return mName; }
 
         /**
          * Sets the name for the being.
          *
          * @param name The name that should appear.
          */
-        virtual void
-        setName(const std::string &name) { mName = name; }
+        virtual void setName(const std::string &name) { mName = name; }
 
         /**
          * Gets the hair color for this being.
@@ -206,47 +200,44 @@ class Being : public Sprite
         /**
          * Sets the hair style and color for this being.
          */
-        virtual void
-        setHairStyle(int style, int color);
+        virtual void setHairStyle(int style, int color);
 
         /**
          * Sets visible equipments for this being.
          */
-        virtual void
-        setSprite(int slot, int id, std::string color = "");
+        virtual void setSprite(int slot, int id, std::string color = "");
 
         /**
          * Sets the gender of this being.
          */
-        virtual void
-        setGender(int gender) { mGender = gender; }
+        virtual void setGender(int gender) { mGender = gender; }
 
         /**
          * Gets the gender of this being.
          */
-        int
-        getGender() const { return mGender; }
+        int getGender() const { return mGender; }
 
         /**
          * Makes this being take the next step of his path.
          */
-        virtual void
-        nextStep();
+        virtual void nextStep();
 
-        virtual void
-        setGM() { mIsGM = true; }
+        virtual void setGM() { mIsGM = true; }
 
         /**
          * Performs being logic.
          */
-        virtual void
-        logic();
+        virtual void logic();
+
+        /**
+         * Draws the speech text above the being.
+         */
+        void drawSpeech(Graphics *graphics, int offsetX, int offsetY);
 
         /**
          * Draws the emotion picture above the being.
          */
-        void
-        drawEmotion(Graphics *graphics, int offsetX, int offsetY);
+        void drawEmotion(Graphics *graphics, int offsetX, int offsetY);
 
         /**
          * Returns the type of the being.
@@ -256,26 +247,22 @@ class Being : public Sprite
         /**
          * Gets the walk speed.
          */
-        Uint16
-        getWalkSpeed() const { return mWalkSpeed; }
+        Uint16 getWalkSpeed() const { return mWalkSpeed; }
 
         /**
          * Sets the walk speed.
          */
-        void
-        setWalkSpeed(Uint16 speed) { mWalkSpeed = speed; }
+        void setWalkSpeed(Uint16 speed) { mWalkSpeed = speed; }
 
         /**
          * Gets the sprite id.
          */
-        Uint32
-        getId() const { return mId; }
+        Uint32 getId() const { return mId; }
 
         /**
          * Sets the sprite id.
          */
-        void
-        setId(Uint32 id) { mId = id; }
+        void setId(Uint32 id) { mId = id; }
 
         /**
          * Sets the map the being is on
@@ -285,8 +272,7 @@ class Being : public Sprite
         /**
          * Sets the current action.
          */
-        virtual void
-        setAction(Uint8 action);
+        virtual void setAction(Action action);
 
         /**
          * Returns the current direction.
@@ -298,51 +284,54 @@ class Being : public Sprite
          */
         void setDirection(Uint8 direction);
 
+        /**
+         * Gets the current action.
+         */
+        int getWalkTime() { return mWalkTime; }
+
+        /**
+         * Returns the direction the being is facing.
+         */
+        SpriteDirection getSpriteDirection() const;
+
         /**
          * Draws this being to the given graphics context.
          *
          * @see Sprite::draw(Graphics, int, int)
          */
-        virtual void
-        draw(Graphics *graphics, int offsetX, int offsetY) const;
+        virtual void draw(Graphics *graphics, int offsetX, int offsetY) const;
 
         /**
          * Returns the pixel X coordinate.
          */
-        int
-        getPixelX() const { return mPx; }
+        int getPixelX() const { return mPx; }
 
         /**
          * Returns the pixel Y coordinate.
          *
          * @see Sprite::getPixelY()
          */
-        int
-        getPixelY() const { return mPy; }
+        int getPixelY() const { return mPy; }
 
         /**
          * Get the current X pixel offset.
          */
-        int
-        getXOffset() const { return getOffset(LEFT, RIGHT); }
+        int getXOffset() const { return getOffset(LEFT, RIGHT); }
 
         /**
          * Get the current Y pixel offset.
          */
-        int
-        getYOffset() const { return getOffset(UP, DOWN); }
+        int getYOffset() const { return getOffset(UP, DOWN); }
 
         /**
          * Returns the horizontal size of the current base sprite of the being
          */
-        virtual int
-        getWidth() const;
+        virtual int getWidth() const;
 
         /**
          * Returns the vertical size of the current base sprite of the being
          */
-        virtual int
-        getHeight() const;
+        virtual int getHeight() const;
 
         /**
          * Returns the required size of a target cursor for this being.
@@ -361,6 +350,15 @@ class Being : public Sprite
             mEmotionTime = emote_time;
         }
 
+        /**
+         * Triggers a visual effect, such as `level up'
+         *
+         * Only draws the visual effect, does not play sound effects
+         *
+         * \param effectId ID of the effect to trigger
+         */
+        virtual void triggerEffect(int effectId) { internalTriggerEffect(effectId, false, true); }
+
         const std::auto_ptr<Equipment> mEquipment;
 
     protected:
@@ -375,9 +373,13 @@ class Being : public Sprite
         virtual void updateCoords() {}
 
         /**
-         * Returns the sprite direction of this being.
+         * Trigger visual effect, with components
+         *
+         * \param effectId ID of the effect to trigger
+         * \param sfx Whether to trigger sound effects
+         * \param gfx Whether to trigger graphical effects
          */
-        SpriteDirection getSpriteDirection() const;
+        void internalTriggerEffect(int effectId, bool sfx, bool gfx);
 
         Uint32 mId;                     /**< Unique sprite id */
         Uint16 mWalkSpeed;              /**< Walking speed */
@@ -391,7 +393,7 @@ class Being : public Sprite
         const ItemInfo* mEquippedWeapon;
 
         Path mPath;
-        Text *mSpeech;
+        std::string mSpeech;
         Uint16 mHairStyle, mHairColor;
         Uint8 mGender;
         Uint32 mSpeechTime;
@@ -409,6 +411,9 @@ class Being : public Sprite
          */
         int getOffset(char pos, char neg) const;
 
+        // Speech Bubble components
+        SpeechBubble *mSpeechBubble;
+
         static int instances;           /**< Number of Being instances */
         static ImageSet *emotionSet;    /**< Emoticons used by beings */
 };
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index 47729a92..f0ce9bd3 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -21,7 +21,7 @@
  *  $Id: beingmanager.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
-#include <algorithm>
+#include <cassert>
 
 #include "beingmanager.h"
 
@@ -124,7 +124,7 @@ Being* BeingManager::findBeing(Uint16 x, Uint16 y, Being::Type type)
     return (i == mBeings.end()) ? NULL : *i;
 }
 
-/*Being* BeingManager::findBeingByPixel(Uint16 x, Uint16 y)
+Being* BeingManager::findBeingByPixel(Uint16 x, Uint16 y)
 {
     BeingIterator itr = mBeings.begin();
     BeingIterator itr_end = mBeings.end();
@@ -144,7 +144,7 @@ Being* BeingManager::findBeing(Uint16 x, Uint16 y, Being::Type type)
     }
 
     return NULL;
-}*/
+}
 
 Being* BeingManager::findBeingByName(std::string name, Being::Type type)
 {
@@ -159,8 +159,6 @@ Being* BeingManager::findBeingByName(std::string name, Being::Type type)
     return NULL;
 }
 
-
-
 Beings& BeingManager::getAll()
 {
     return mBeings;
@@ -193,7 +191,7 @@ void BeingManager::clear()
         mBeings.remove(player_node);
     }
 
-    for_each(mBeings.begin(), mBeings.end(), make_dtor(mBeings));
+    delete_all(mBeings);
     mBeings.clear();
 
     if (player_node)
@@ -208,9 +206,12 @@ Being* BeingManager::findNearestLivingBeing(Uint16 x, Uint16 y, int maxdist,
     Being *closestBeing = NULL;
     int dist = 0;
 
-    for (BeingIterator i = mBeings.begin(); i != mBeings.end(); i++)
+    BeingIterator itr = mBeings.begin();
+    BeingIterator itr_end = mBeings.end();
+
+    for (; itr != itr_end; ++itr)
     {
-        Being *being = (*i);
+        Being *being = (*itr);
         int d = abs(being->mX - x) + abs(being->mY - y);
 
         if ((being->getType() == type || type == Being::UNKNOWN)
diff --git a/src/beingmanager.h b/src/beingmanager.h
index f8391855..6942ff54 100644
--- a/src/beingmanager.h
+++ b/src/beingmanager.h
@@ -51,7 +51,7 @@ class BeingManager
         /**
          * Create a being and add it to the list of beings.
          */
-        Being* createBeing(Uint32 id, Uint16 job);
+        Being *createBeing(Uint32 id, Uint16 job);
 
         /**
          * Remove a Being.
@@ -62,33 +62,36 @@ class BeingManager
          * Return a specific id Being.
          */
         Being* findBeing(Uint32 id);
+        Being* findBeingByPixel(Uint16 x, Uint16 y);
 
         /**
-         * Return a being at specific coordinates.
+         * Returns a being at specific coordinates.
          */
         Being* findBeing(Uint16 x, Uint16 y, Being::Type type = Being::UNKNOWN);
-        //Being* findBeingByPixel(Uint16 x, Uint16 y);
 
-        /**
-         * Return a being nearest to specific coordinates.
-         *
-         * \param maxdist maximal distance. If minimal distance is larger,
-         *                no being is returned
-         */
+       /**
+        * Returns a being nearest to specific coordinates.
+        *
+        * @param x       X coordinate.
+        * @param y       Y coordinate.
+        * @param maxdist Maximal distance. If minimal distance is larger,
+        *                no being is returned.
+        * @param type    The type of being to look for.
+        */
         Being* findNearestLivingBeing(Uint16 x, Uint16 y, int maxdist,
                                       Being::Type type = Being::UNKNOWN);
 
-        /**
-         * Finds a being by name and (optionally) by type.
-         */
+       /**
+        * Finds a being by name and (optionally) by type.
+        */
         Being* findBeingByName(std::string name, Being::Type type = Being::UNKNOWN);
 
-        /**
-         * Return a being nearest to another being.
-         *
-         * \param maxdist maximal distance. If minimal distance is larger,
-         *                no being is returned
-         */
+       /**
+        * Returns a being nearest to another being.
+        *
+        * \param maxdist maximal distance. If minimal distance is larger,
+        *                no being is returned
+        */
         Being* findNearestLivingBeing(Being *aroundBeing, int maxdist,
                                       Being::Type type = Being::UNKNOWN);
 
diff --git a/src/engine.cpp b/src/engine.cpp
index d1912b0d..42054ffb 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -96,6 +96,17 @@ void Engine::changeMap(const std::string &mapPath)
     if (newMap->hasProperty("minimap"))
     {
         mapImage = resman->getImage(newMap->getProperty("minimap"));
+
+        // Set the title for the Minimap
+        if (newMap->hasProperty("mapname"))
+        {
+             minimap->setCaption(newMap->getProperty("mapname"));
+        }
+        else
+        {
+             minimap->setCaption("Unknown");
+             logger->log("WARNING: Map file '%s' defines a minimap image but does not define a 'mapname' property", map_path.c_str());
+        }
     }
     minimap->setMapImage(mapImage);
     beingManager->setMap(newMap);
@@ -120,6 +131,7 @@ void Engine::changeMap(const std::string &mapPath)
     }
 
     mCurrentMap = newMap;
+    mMapName = mapPath;
 
     // Send "map loaded"
     MessageOut outMsg(mNetwork);
diff --git a/src/engine.h b/src/engine.h
index ed76a595..52f1e63a 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -18,13 +18,14 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: engine.h 4000 2008-03-23 11:47:52Z b_lindeijer $
+ *  $Id$
  */
 
 #ifndef _ENGINE_H
 #define _ENGINE_H
 
 #include <iosfwd>
+#include <string>
 
 class Map;
 class Network;
@@ -51,6 +52,9 @@ class Engine
          */
         Map *getCurrentMap() { return mCurrentMap; }
 
+        const std::string &getCurrentMapName() { return mMapName; }
+
+
         /**
          * Sets the currently active map.
          */
@@ -64,6 +68,7 @@ class Engine
     private:
         Map *mCurrentMap;
         Network *mNetwork;
+        std::string mMapName;
 };
 
 extern Engine *engine;
diff --git a/src/equipment.cpp b/src/equipment.cpp
index 08e6fad1..491aff0c 100644
--- a/src/equipment.cpp
+++ b/src/equipment.cpp
@@ -41,12 +41,10 @@ Equipment::removeEquipment(Item *item)
     if (i != mEquipment + EQUIPMENT_SIZE) {
         *i = 0;
     }
-    item->setEquipped(false);
 }
 
 void Equipment::removeEquipment(int index)
 {
-    mEquipment[index]->setEquipped(false);
     mEquipment[index] = 0;
 }
 
diff --git a/src/equipment.h b/src/equipment.h
index fd7a9c1e..e497a156 100644
--- a/src/equipment.h
+++ b/src/equipment.h
@@ -24,6 +24,8 @@
 #ifndef _TMW_EQUIPMENT_H_
 #define _TMW_EQUIPMENT_H_
 
+#include <guichan/actionlistener.hpp>
+
 class Item;
 
 #define EQUIPMENT_SIZE 10
diff --git a/src/flooritemmanager.cpp b/src/flooritemmanager.cpp
index f6ad3442..fe64779b 100644
--- a/src/flooritemmanager.cpp
+++ b/src/flooritemmanager.cpp
@@ -21,8 +21,6 @@
  *  $Id: flooritemmanager.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $
  */
 
-#include <algorithm>
-
 #include "flooritemmanager.h"
 
 #include "floor_item.h"
@@ -50,7 +48,7 @@ void FloorItemManager::destroy(FloorItem *item)
 
 void FloorItemManager::clear()
 {
-    for_each(mFloorItems.begin(), mFloorItems.end(), make_dtor(mFloorItems));
+    delete_all(mFloorItems);
     mFloorItems.clear();
 }
 
diff --git a/src/game.cpp b/src/game.cpp
index 0562b75e..5e7ee1e8 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -68,6 +68,7 @@
 #include "gui/status.h"
 #include "gui/trade.h"
 #include "gui/viewport.h"
+
 #include "net/protocol.h"
 #include "net/beinghandler.h"
 #include "net/buysellhandler.h"
@@ -132,19 +133,19 @@ Particle* particleEngine = NULL;
 const int MAX_TIME = 10000;
 
 /**
- * Listener used for exitting handling.
+ * Listener used for exiting handling.
  */
 namespace {
     struct ExitListener : public gcn::ActionListener
     {
-    void action(const gcn::ActionEvent &event)
-    {
-        if (event.getId() == "yes" || event.getId() == "ok") {
-            done = true;
+        void action(const gcn::ActionEvent &event)
+        {
+            if (event.getId() == "yes" || event.getId() == "ok") {
+                done = true;
+            }
+            exitConfirm = NULL;
+            disconnectedDialog = NULL;
         }
-        exitConfirm = NULL;
-        disconnectedDialog = NULL;
-    }
     } exitListener;
 }
 
@@ -171,11 +172,13 @@ Uint32 nextSecond(Uint32 interval, void *param)
 
 int get_elapsed_time(int start_time)
 {
-    if (start_time <= tick_time) {
-    return (tick_time - start_time) * 10;
+    if (start_time <= tick_time) 
+    {
+        return (tick_time - start_time) * 10;
     }
-    else {
-    return (tick_time + (MAX_TIME - start_time)) * 10;
+    else 
+    {
+        return (tick_time + (MAX_TIME - start_time)) * 10;
     }
 }
 
@@ -218,8 +221,9 @@ void createGuiWindows(Network *network)
     chatWindow->setVisible((bool) config.getValue(
         chatWindow->getWindowName() + "Visible", true));
     miniStatusWindow->setVisible((bool) config.getValue(
-        miniStatusWindow->getWindowName() + "Visible",
-        true));
+        miniStatusWindow->getWindowName() + "Visible", true));
+    buyDialog->setVisible(false);
+    sellDialog->setVisible(false);
     menuWindow->setVisible((bool) config.getValue(
         menuWindow->getWindowName() + "Visible", true));
     itemShortcutWindow->setVisible((bool) config.getValue(
@@ -227,7 +231,7 @@ void createGuiWindows(Network *network)
 
     if (config.getValue("logToChat", 0))
     {
-    logger->setChatWindow(chatWindow);
+        logger->setChatWindow(chatWindow);
     }
 }
 
@@ -369,15 +373,15 @@ bool saveScreenshot(SDL_Surface *screenshot)
 
     if (ImageWriter::writePNG(screenshot, filename.str()))
     {
-    std::stringstream chatlogentry;
-    chatlogentry << "Screenshot saved to " << filename.str().c_str();
-    chatWindow->chatLog(chatlogentry.str(), BY_SERVER);
-    return true;
+        std::stringstream chatlogentry;
+        chatlogentry << "Screenshot saved to " << filename.str().c_str();
+        chatWindow->chatLog(chatlogentry.str(), BY_SERVER);
+        return true;
     }
     else
     {
-    chatWindow->chatLog("Saving screenshot failed!", BY_SERVER);
-    return false;
+        chatWindow->chatLog("Saving screenshot failed!", BY_SERVER);
+        return false;
     }
 }
 
@@ -420,18 +424,18 @@ void Game::logic()
         if (!mMinFrameTime ||
             get_elapsed_time(mDrawTime / 10) > mMinFrameTime)
         {
-        frame++;
-        gui->draw();
-        graphics->updateScreen();
-        mDrawTime += mMinFrameTime;
-
-        // Make sure to wrap mDrawTime, since tick_time will wrap.
-        if (mDrawTime > MAX_TIME * 10)
-            mDrawTime -= MAX_TIME * 10;
+            frame++;
+            gui->draw();
+            graphics->updateScreen();
+            mDrawTime += mMinFrameTime;
+
+            // Make sure to wrap mDrawTime, since tick_time will wrap.
+            if (mDrawTime > MAX_TIME * 10)
+                mDrawTime -= MAX_TIME * 10;
         }
         else
         {
-        SDL_Delay(10);
+            SDL_Delay(10);
         }
     }
     else
@@ -448,12 +452,11 @@ void Game::logic()
     {
         if (!disconnectedDialog)
         {
-        disconnectedDialog = new
-            OkDialog("Network Error",
-                     "The connection to the server was lost, the "
-                             "program will now quit");
-        disconnectedDialog->addActionListener(&exitListener);
-        disconnectedDialog->requestMoveToTop();
+            disconnectedDialog = new
+                OkDialog("Network Error",
+                         "The connection to the server was lost, the program will now quit");
+            disconnectedDialog->addActionListener(&exitListener);
+            disconnectedDialog->requestMoveToTop();
         }
     }
     }
@@ -463,273 +466,268 @@ void Game::handleInput()
 {
     if (joystick != NULL)
     {
-    joystick->update();
+        joystick->update();
     }
 
     // Events
     SDL_Event event;
     while (SDL_PollEvent(&event))
     {
-    bool used = false;
-
-    // Keyboard events (for discontinuous keys)
-    if (event.type == SDL_KEYDOWN)
-    {
-        gcn::Window *requestedWindow = NULL;
+        bool used = false;
 
-        if (setupWindow->isVisible() &&
-        keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE)
+        // Keyboard events (for discontinuous keys)
+        if (event.type == SDL_KEYDOWN)
         {
-        keyboard.setNewKey((int) event.key.keysym.sym);
-        keyboard.callbackNewKey();
-        keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
-        return;
-        }
-        // Keys pressed together with Alt/Meta
-        // Emotions and some internal gui windows
-        #ifndef __APPLE__
-        if (event.key.keysym.mod & KMOD_ALT)
-        #else
-        if (event.key.keysym.mod & KMOD_LMETA)
-        #endif
-        {
-        switch (event.key.keysym.sym)
-        {
-            case SDLK_p:
-            // Screenshot (picture, hence the p)
+            gcn::Window *requestedWindow = NULL;
+
+            if (setupWindow->isVisible() && 
+                keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE)
             {
-                SDL_Surface *screenshot =
-                                graphics->getScreenshot();
-                if (!saveScreenshot(screenshot))
-                {
-                logger->
-                                    log("Error: could not save Screenshot.");
-                }
-                SDL_FreeSurface(screenshot);
+                keyboard.setNewKey((int) event.key.keysym.sym);
+                keyboard.callbackNewKey();
+                keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
+                return;
             }
-            used = true;
-            break;
-
-            default:
-            break;
-
-            case SDLK_f:
-            // Find path to mouse (debug purpose)
-            viewport->toggleDebugPath();
-            used = true;
-            break;
-
-            case SDLK_t:
-            // Toggle accepting of incoming trade requests
+            // Keys pressed together with Alt/Meta
+            // Emotions and some internal gui windows
+            #ifndef __APPLE__
+            if (event.key.keysym.mod & KMOD_ALT)
+            #else
+            if (event.key.keysym.mod & KMOD_LMETA)
+            #endif
             {
-                unsigned int deflt = player_relations.getDefault();
-                if (deflt & PlayerRelation::TRADE) {
-                chatWindow->
-                                    chatLog("Ignoring incoming trade requests",
-                                    BY_SERVER);
-                deflt &= ~PlayerRelation::TRADE;
-                } else {
-                chatWindow->chatLog("Accepting incoming trade "
-                                                    "requests", BY_SERVER);
-                deflt |= PlayerRelation::TRADE;
-                }
-
-                player_relations.setDefault(deflt);
+                switch (event.key.keysym.sym)
+                {
+                    case SDLK_p:
+                        // Screenshot (picture, hence the p)
+                        {
+                            SDL_Surface *screenshot = graphics->getScreenshot();
+                            if (!saveScreenshot(screenshot))
+                            {
+                                logger->log("Error: could not save Screenshot.");
+                            }
+                            SDL_FreeSurface(screenshot);
+                        }
+                        used = true;
+                        break;
+
+                    default:
+                        break;
+
+                    case SDLK_f:
+                        // Find path to mouse (debug purpose)
+                        viewport->toggleDebugPath();
+                        used = true;
+                        break;
+
+                    case SDLK_t:
+                        // Toggle accepting of incoming trade requests
+                        {
+                            unsigned int deflt = player_relations.getDefault();
+                            if (deflt & PlayerRelation::TRADE) {
+                                chatWindow->chatLog("Ignoring incoming trade requests", BY_SERVER);
+                                deflt &= ~PlayerRelation::TRADE;
+                            } else {
+                                chatWindow->chatLog("Accepting incoming trade requests", BY_SERVER);
+                                deflt |= PlayerRelation::TRADE;
+                            }
+
+                            player_relations.setDefault(deflt);
+                        }
+                        used = true;
+                        break;
             }
-            used = true;
-            break;
-        }
-
-        // Emotions
-        Uint8 emotion;
-        switch (event.key.keysym.sym)
-        {
-            case SDLK_1: emotion = 1; break;
-            case SDLK_2: emotion = 2; break;
-            case SDLK_3: emotion = 3; break;
-            case SDLK_4: emotion = 4; break;
-            case SDLK_5: emotion = 5; break;
-            case SDLK_6: emotion = 6; break;
-            case SDLK_7: emotion = 7; break;
-            case SDLK_8: emotion = 8; break;
-            case SDLK_9: emotion = 9; break;
-            case SDLK_0: emotion = 10; break;
-            case SDLK_MINUS: emotion = 11; break;
-            case SDLK_EQUALS: emotion = 12; break;
-            default: emotion = 0; break;
         }
 
-        if (emotion)
-        {
-            player_node->emote(emotion);
-            used = true;
-        }
-        }
-        switch (event.key.keysym.sym)
+        // Smilie
+        if (keyboard.isKeyActive(keyboard.KEY_SMILIE))
         {
-        case SDLK_PAGEUP:
-            if (chatWindow->isVisible())
+            // Emotions
+            Uint8 emotion;
+            switch (event.key.keysym.sym)
             {
-            chatWindow->scroll(-DEFAULT_CHAT_WINDOW_SCROLL);
-            used = true;
+                case SDLK_1: emotion = 1; break;
+                case SDLK_2: emotion = 2; break;
+                case SDLK_3: emotion = 3; break;
+                case SDLK_4: emotion = 4; break;
+                case SDLK_5: emotion = 5; break;
+                case SDLK_6: emotion = 6; break;
+                case SDLK_7: emotion = 7; break;
+                case SDLK_8: emotion = 8; break;
+                case SDLK_9: emotion = 9; break;
+                case SDLK_0: emotion = 10; break;
+                case SDLK_MINUS: emotion = 11; break;
+                case SDLK_EQUALS: emotion = 12; break;
+                default: emotion = 0; break;
             }
-            break;
 
-        case SDLK_PAGEDOWN:
-            if (chatWindow->isVisible())
+            if (emotion)
             {
-            chatWindow->scroll(DEFAULT_CHAT_WINDOW_SCROLL);
-            used = true;
+                player_node->emote(emotion);
+                used = true;
             }
-            break;
+        }
+        switch (event.key.keysym.sym)
+        {
+            case SDLK_PAGEUP:
+                if (chatWindow->isVisible())
+                {
+                    chatWindow->scroll(-DEFAULT_CHAT_WINDOW_SCROLL);
+                    used = true;
+                }
+                break;
 
-        case SDLK_F1:
-            // In-game Help
-            if (helpWindow->isVisible())
-            {
-            helpWindow->setVisible(false);
-            }
-            else
-            {
-            helpWindow->loadHelp("index");
-            helpWindow->requestMoveToTop();
-            }
-            used = true;
-            break;
+            case SDLK_PAGEDOWN:
+                if (chatWindow->isVisible())
+                {
+                    chatWindow->scroll(DEFAULT_CHAT_WINDOW_SCROLL);
+                    used = true;
+                }
+                break;
 
-        case SDLK_F2: requestedWindow = statusWindow; break;
-        case SDLK_F3: requestedWindow = inventoryWindow; break;
-        case SDLK_F4: requestedWindow = equipmentWindow; break;
-        case SDLK_F5: requestedWindow = skillDialog; break;
-        case SDLK_F6: requestedWindow = minimap; break;
-        case SDLK_F7: requestedWindow = chatWindow; break;
-        case SDLK_F8: requestedWindow = itemShortcutWindow; break;
-        case SDLK_F9: requestedWindow = setupWindow; break;
-        case SDLK_F10: requestedWindow = debugWindow; break;
-        //case SDLK_F11: requestedWindow = newSkillWindow; break;
-
-        case SDLK_RETURN:
-            // Input chat window
-            if (chatWindow->isInputFocused() ||
-            deathNotice != NULL ||
-            weightNotice != NULL)
-            {
-            break;
-            }
+            case SDLK_F1:
+                // In-game Help
+                if (helpWindow->isVisible())
+                {
+                    helpWindow->setVisible(false);
+                }
+                else
+                {
+                    helpWindow->loadHelp("index");
+                    helpWindow->requestMoveToTop();
+                }
+                used = true;
+                break;
+
+            case SDLK_F2: requestedWindow = statusWindow; break;
+            case SDLK_F3: requestedWindow = inventoryWindow; break;
+            case SDLK_F4: requestedWindow = equipmentWindow; break;
+            case SDLK_F5: requestedWindow = skillDialog; break;
+            case SDLK_F6: requestedWindow = minimap; break;
+            case SDLK_F7: requestedWindow = chatWindow; break;
+            case SDLK_F8: requestedWindow = itemShortcutWindow; break;
+            case SDLK_F9: requestedWindow = setupWindow; break;
+            case SDLK_F10: requestedWindow = debugWindow; break;
+            //case SDLK_F11: requestedWindow = newSkillWindow; break;
+
+            case SDLK_RETURN:
+                // Input chat window
+                if (chatWindow->isInputFocused() ||
+                    deathNotice != NULL ||
+                    weightNotice != NULL)
+                {
+                    break;
+                }
 
-            // Quit by pressing Enter if the exit confirm is there
-            if (exitConfirm)
-            {
-            done = true;
-            }
-            // Close the Browser if opened
-            else if (helpWindow->isVisible())
-            {
-            helpWindow->setVisible(false);
-            }
-            // Close the config window, cancelling changes if opened
-            else if (setupWindow->isVisible())
-            {
-            setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
-            }
-            // Else, open the chat edit box
-            else
-            {
-            chatWindow->requestChatFocus();
-            used = true;
-            }
-            break;
-           // Quitting confirmation dialog
-        case SDLK_ESCAPE:
-            if (!exitConfirm) {
-            exitConfirm = new ConfirmDialog(
-                "Quit", "Are you sure you want to quit?");
-            exitConfirm->addActionListener(&exitListener);
-            exitConfirm->requestMoveToTop();
-            }
-            else
-            {
-            exitConfirm->action(gcn::ActionEvent(NULL, "no"));
-            }
-            break;
+                // Quit by pressing Enter if the exit confirm is there
+                if (exitConfirm)
+                {
+                    done = true;
+                }
+                // Close the Browser if opened
+                else if (helpWindow->isVisible())
+                {
+                    helpWindow->setVisible(false);
+                }
+                // Close the config window, cancelling changes if opened
+                else if (setupWindow->isVisible())
+                {
+                    setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
+                }
+                // Else, open the chat edit box
+                else
+                {
+                    chatWindow->requestChatFocus();
+                    used = true;
+                }
+                break;
+                // Quitting confirmation dialog
+            case SDLK_ESCAPE:
+                if (!exitConfirm) {
+                    exitConfirm = new ConfirmDialog(
+                        "Quit", "Are you sure you want to quit?");
+                    exitConfirm->addActionListener(&exitListener);
+                    exitConfirm->requestMoveToTop();
+                }
+                else
+                {
+                    exitConfirm->action(gcn::ActionEvent(NULL, "no"));
+                }
+                break;
 
-        default:
-            break;
+            default:
+                break;
         }
         if (keyboard.isEnabled() && !chatWindow->isInputFocused())
         {
-        const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
-        // Checks if any item shortcut is pressed.
-        for (int i = KeyboardConfig::KEY_SHORTCUT_0;
-            i <= KeyboardConfig::KEY_SHORTCUT_9;
-            i++)
-        {
-            if (tKey == i && !used) {
-            itemShortcut->useItem(
-                i - KeyboardConfig::KEY_SHORTCUT_0);
-            break;
+            const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
+            // Checks if any item shortcut is pressed.
+            for (int i = KeyboardConfig::KEY_SHORTCUT_0;
+                i <= KeyboardConfig::KEY_SHORTCUT_9;
+                i++)
+            {
+                if (tKey == i && !used) {
+                    itemShortcut->useItem(i - KeyboardConfig::KEY_SHORTCUT_0);
+                    break;
             }
         }
         switch (tKey) {
             case KeyboardConfig::KEY_PICKUP:
             {
-                FloorItem *item =
-                                floorItemManager->findByCoordinates(
-                    player_node->mX, player_node->mY);
+                FloorItem *item = floorItemManager->findByCoordinates(
+                                  player_node->mX, player_node->mY);
 
                 // If none below the player, try the tile in front
                 // of the player
                 if (!item) {
-                Uint16 x = player_node->mX;
-                Uint16 y = player_node->mY;
-                if (player_node->getDirection() & Being::UP)
-                    y--;
-                if (player_node->getDirection() & Being::DOWN)
-                    y++;
-                if (player_node->getDirection() & Being::LEFT)
-                    x--;
-                if (player_node->getDirection() & Being::RIGHT)
-                    x++;
-
-                item = floorItemManager->
-                                    findByCoordinates(x, y);
+                    Uint16 x = player_node->mX;
+                    Uint16 y = player_node->mY;
+                    switch (player_node->getSpriteDirection())
+                    {
+                        case DIRECTION_UP   : --y; break;
+                        case DIRECTION_DOWN : ++y; break;
+                        case DIRECTION_LEFT : --x; break;
+                        case DIRECTION_RIGHT: ++x; break;
+                        default: break;
+                    }
+                    item = floorItemManager->findByCoordinates(x, y);
                 }
 
                 if (item)
-                player_node->pickUp(item);
+                    player_node->pickUp(item);
 
                 used = true;
             }
             break;
             case KeyboardConfig::KEY_SIT:
-            // Player sit action
-            player_node->toggleSit();
-            used = true;
-            break;
+                // Player sit action
+                player_node->toggleSit();
+                used = true;
+                break;
             case KeyboardConfig::KEY_HIDE_WINDOWS:
-             // Hide certain windows
-            if (!chatWindow->isInputFocused())
-            {
-                statusWindow->setVisible(false);
-                inventoryWindow->setVisible(false);
-                skillDialog->setVisible(false);
-                setupWindow->setVisible(false);
-                equipmentWindow->setVisible(false);
-                helpWindow->setVisible(false);
-                debugWindow->setVisible(false);
+                // Hide certain windows
+                if (!chatWindow->isInputFocused())
+                {
+                    statusWindow->setVisible(false);
+                    inventoryWindow->setVisible(false);
+                    skillDialog->setVisible(false);
+                    setupWindow->setVisible(false);
+                    equipmentWindow->setVisible(false);
+                    helpWindow->setVisible(false);
+                    debugWindow->setVisible(false);
+                }
+                break;
             }
-            break;
-        }
         }
 
         if (requestedWindow)
         {
-        requestedWindow->setVisible(!requestedWindow->isVisible());
-        if (requestedWindow->isVisible())
-        {
-            requestedWindow->requestMoveToTop();
-        }
-        used = true;
+            requestedWindow->setVisible(!requestedWindow->isVisible());
+            if (requestedWindow->isVisible())
+            {
+                requestedWindow->requestMoveToTop();
+            }
+            used = true;
         }
 
     }
@@ -745,12 +743,12 @@ void Game::handleInput()
     {
         try
         {
-        guiInput->pushInput(event);
+            guiInput->pushInput(event);
         }
         catch (gcn::Exception e)
         {
-        const char* err = e.getMessage().c_str();
-        logger->log("Warning: guichan input exception: %s", err);
+            const char* err = e.getMessage().c_str();
+            logger->log("Warning: guichan input exception: %s", err);
         }
     }
 
@@ -762,112 +760,106 @@ void Game::handleInput()
     }
     // Moving player around
     if (player_node->mAction != Being::DEAD &&
-    current_npc == 0 &&
-    !chatWindow->isInputFocused())
+        current_npc == 0 &&
+        !chatWindow->isInputFocused())
     {
-    // Get the state of the keyboard keys
-    keyboard.refreshActiveKeys();
+        // Get the state of the keyboard keys
+        keyboard.refreshActiveKeys();
 
-    const Uint16 x = player_node->mX;
-    const Uint16 y = player_node->mY;
-    unsigned char direction = 0;
+        const Uint16 x = player_node->mX;
+        const Uint16 y = player_node->mY;
+        unsigned char direction = 0;
 
-    // Translate pressed keys to movement and direction
-    if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP) ||
-        (joystick && joystick->isUp()))
-    {
-        direction |= Being::UP;
-    }
-    else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) ||
-         (joystick && joystick->isDown()))
-    {
-        direction |= Being::DOWN;
-    }
+        // Translate pressed keys to movement and direction
+        if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP) ||
+            (joystick && joystick->isUp()))
+        {
+            direction |= Being::UP;
+        }
+        else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) ||
+             (joystick && joystick->isDown()))
+        {
+            direction |= Being::DOWN;
+        }
 
-    if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) ||
-        (joystick && joystick->isLeft()))
-    {
-        direction |= Being::LEFT;
-    }
-    else if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) ||
-         (joystick && joystick->isRight()))
-    {
-        direction |= Being::RIGHT;
-    }
+        if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) ||
+            (joystick && joystick->isLeft()))
+        {
+            direction |= Being::LEFT;
+        }
+        else if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) ||
+                 (joystick && joystick->isRight()))
+        {
+            direction |= Being::RIGHT;
+        }
 
-    player_node->setWalkingDir(direction);
+        player_node->setWalkingDir(direction);
 
-    // Attacking monsters
-    if (keyboard.isKeyActive(keyboard.KEY_ATTACK) ||
-        (joystick && joystick->buttonPressed(0)))
-    {
-        Being *target = NULL;
-        bool newTarget = keyboard.isKeyActive(keyboard.KEY_TARGET);
-        // A set target has highest priority
-        if (newTarget || !player_node->getTarget())
+        // Attacking monsters
+        if (keyboard.isKeyActive(keyboard.KEY_ATTACK) ||
+            (joystick && joystick->buttonPressed(0)))
         {
-        Uint16 targetX = x, targetY = y;
-
-        if (player_node->getDirection() & Being::UP)
-            targetY--;
-        if (player_node->getDirection() & Being::DOWN)
-            targetY++;
-        if (player_node->getDirection() & Being::LEFT)
-            targetX--;
-        if (player_node->getDirection() & Being::RIGHT)
-            targetX++;
-
-        // Attack priorioty is: Monster, Player, auto target
-        target = beingManager->findBeing(
-            targetX, targetY, Being::MONSTER);
-        if (!target)
-            target = beingManager->findBeing(
-                targetX, targetY, Being::PLAYER);
-        }
+            Being *target = beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER);
 
-        player_node->attack(target, newTarget);
-    }
+            bool newTarget = keyboard.isKeyActive(keyboard.KEY_TARGET);
+            // A set target has highest priority
+            if (newTarget || !player_node->getTarget())
+            {
+                Uint16 targetX = x, targetY = y;
 
-    // Target the nearest player if 'q' is pressed
-    if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) )
-    //if (keys[SDLK_q])
-    {
-        Being *target =
-        beingManager->
-                    findNearestLivingBeing(player_node, 20, Being::PLAYER);
+                switch (player_node->getSpriteDirection())
+                {
+                    case DIRECTION_UP   : --targetY; break;
+                    case DIRECTION_DOWN : ++targetY; break;
+                    case DIRECTION_LEFT : --targetX; break;
+                    case DIRECTION_RIGHT: ++targetX; break;
+                    default: break;
+                }
 
-        if (target)
-        {
-        player_node->setTarget(target);
-        }
-    }
+                // Attack priorioty is: Monster, Player, auto target
+                target = beingManager->findBeing(targetX, targetY, Being::MONSTER);
+                if (!target)
+                    target = beingManager->findBeing(targetX, targetY, Being::PLAYER);
+            }
 
-    // Target the nearest monster if 'a' pressed
-    if ( keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) )
-    //if (keys[SDLK_a])
-    {
-        Being *target =
-        beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER);
+            player_node->attack(target, newTarget);
+        }
 
-        if (target)
+        // Target the nearest player if 'q' is pressed
+        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) )
         {
-        player_node->setTarget(target);
+            Being *target = beingManager->findNearestLivingBeing(player_node, 20, Being::PLAYER);
+
+            if (target)
+            {
+                player_node->setTarget(target);
+            }
         }
-    }
 
-    if (joystick)
-    {
-        if (joystick->buttonPressed(1))
+        // Target the nearest monster if 'a' pressed
+        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) )
         {
-        FloorItem *item = floorItemManager->findByCoordinates(x, y);
+            Being *target = beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER);
 
-        if (item)
-            player_node->pickUp(item);
+            if (target)
+            {
+                player_node->setTarget(target);
+            }
         }
-        else if (joystick->buttonPressed(2))
+
+        if (joystick)
         {
-        player_node->toggleSit();
+            if (joystick->buttonPressed(1))
+            {
+                FloorItem *item = floorItemManager->findByCoordinates(x, y);
+
+                if (item)
+                    player_node->pickUp(item);
+            }
+            else if (joystick->buttonPressed(2))
+            {
+                player_node->toggleSit();
+            }
         }
     }
-    }
 }
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 9c562b68..8ec3bfd8 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -102,7 +102,7 @@ Setup::Setup():
 
 Setup::~Setup()
 {
-    for_each(mTabs.begin(), mTabs.end(), make_dtor(mTabs));
+    delete_all(mTabs);
 }
 
 void Setup::action(const gcn::ActionEvent &event)
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 0e85138c..dd56ee2f 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -280,15 +280,17 @@ void Setup_Video::apply()
     bool fullscreen = mFsCheckBox->isSelected();
     if (fullscreen != (config.getValue("screen", 0) == 1))
     {
+ 
+        /* Commented  out the openGL test because
+         * the fullscreen mode change works fine, but
+         * will need to test it on windows so not
+         * deleting entirely until then  --kraant*/
 
-        /*Commented  out the openGL test because
- *        the fullscreen mode change works fine, but
- *        will need to test it on windows so not
- *        deleting entirely until then  --kraant*/
-
+#ifdef WIN32
         // checks for opengl usage
-        /*if (!(config.getValue("opengl", 0) == 1))
-        {*/
+        if (!(config.getValue("opengl", 0) == 1))
+        {
+#endif
             if (!graphics->setFullscreen(fullscreen))
             {
                 fullscreen = !fullscreen;
@@ -302,10 +304,12 @@ void Setup_Video::apply()
                     logger->error(error.str());
                 }
             }
-        /*} else {
+#ifdef WIN32
+        } else {
             new OkDialog("Switching to full screen",
                     "Restart needed for changes to take effect.");
-        }*/
+        }
+#endif
         config.setValue("screen", fullscreen ? 1 : 0);
     }
 
diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp
index 015e70d5..e7619547 100644
--- a/src/gui/shop.cpp
+++ b/src/gui/shop.cpp
@@ -25,8 +25,6 @@
 
 #include "../utils/dtor.h"
 
-#include <algorithm>
-
 ShopItems::~ShopItems()
 {
     clear();
@@ -61,7 +59,7 @@ ShopItem* ShopItems::at(int i) const
 
 void ShopItems::clear()
 {
-    std::for_each(mShopItems.begin(), mShopItems.end(), make_dtor(mShopItems));
+    delete_all(mShopItems);
     mShopItems.clear();
 }
 
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index e70fb3ef..8cf1e06d 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -21,8 +21,6 @@
  *  $Id: skill.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $
  */
 
-#include <algorithm>
-
 #include <guichan/widgets/label.hpp>
 
 #include "skill.h"
@@ -186,6 +184,6 @@ void SkillDialog::setSkill(int id, int lvl, int mp)
 
 void SkillDialog::cleanList()
 {
-    for_each(mSkillList.begin(), mSkillList.end(), make_dtor(mSkillList));
+    delete_all(mSkillList);
     mSkillList.clear();
 }
diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp
index 743d88b6..4976549f 100644
--- a/src/gui/textbox.cpp
+++ b/src/gui/textbox.cpp
@@ -60,6 +60,8 @@ void TextBox::setTextWrapped(const std::string &text)
             text.substr(lastNewlinePos, newlinePos - lastNewlinePos);
         std::string::size_type spacePos, lastSpacePos = 0;
         int xpos = 0;
+        mMinWidth = getWidth();
+        bool longWord = false;
 
         do
         {
@@ -75,22 +77,28 @@ void TextBox::setTextWrapped(const std::string &text)
 
             int width = getFont()->getWidth(word);
 
-            if (xpos != 0 && xpos + width < getWidth())
+            if (xpos != 0 && xpos + width + getFont()->getWidth(" ") < getWidth())
             {
                 xpos += width + getFont()->getWidth(" ");
                 wrappedStream << " " << word;
             }
             else if (lastSpacePos == 0)
             {
+                if (xpos > mMinWidth)
+                {
+                    longWord = true;
+                    mMinWidth = xpos;
+                }
                 xpos += width;
                 wrappedStream << word;
             }
             else
             {
+                if ((xpos < mMinWidth) && !longWord && spacePos != line.size())
+                    mMinWidth = xpos;
                 xpos = width;
                 wrappedStream << "\n" << word;
             }
-
             lastSpacePos = spacePos + 1;
         }
         while (spacePos != line.size());
diff --git a/src/gui/textbox.h b/src/gui/textbox.h
index 7df30fd9..09819360 100644
--- a/src/gui/textbox.h
+++ b/src/gui/textbox.h
@@ -44,6 +44,19 @@ class TextBox : public gcn::TextBox {
          * Sets the text after wrapping it to the current width of the widget.
          */
         void setTextWrapped(const std::string &text);
+
+        /**
+         * Get the minimum text width for the text box.
+         */
+        int getMinWidth() { return mMinWidth; }
+
+        /**
+         * Set the minimum text width for the text box.
+         */
+        void setMinWidth(int width) { mMinWidth = width; }
+
+    private:
+        int mMinWidth;
 };
 
 #endif
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 22e361c5..b052e4b6 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -115,7 +115,7 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost,
     mBrowserBox = new BrowserBox();
     mScrollArea = new ScrollArea(mBrowserBox);
     mLabel = new gcn::Label("Connecting...");
-    mProgressBar = new ProgressBar(0.0, w - 10, 20, 37, 70, 200);
+    mProgressBar = new ProgressBar(0.0, w - 10, 20, 168, 116, 31);
     mCancelButton = new Button("Cancel", "cancel", this);
     mPlayButton = new Button("Play", "play", this);
 
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 568c1ea3..95e0d2b6 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -33,6 +33,7 @@
 #include "../configuration.h"
 #include "../flooritemmanager.h"
 #include "../graphics.h"
+#include "../keyboardconfig.h"
 #include "../localplayer.h"
 #include "../map.h"
 #include "../monster.h"
@@ -49,6 +50,8 @@
 
 #include <cassert>
 
+extern volatile int tick_time;
+
 Viewport::Viewport():
     mMap(0),
     mPixelViewX(0.0f),
@@ -112,7 +115,8 @@ Viewport::loadTargetCursor(std::string filename, int width, int height,
         mOutRangeImages[size] = currentImageSet;
         mTargetCursorOutRange[size] = currentCursor;
     }
-    else {
+    else 
+    {
         mInRangeImages[size] = currentImageSet;
         mTargetCursorInRange[size] = currentCursor;
     }
@@ -223,52 +227,46 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     // Draw tiles and sprites
     if (mMap)
     {
-        mMap->draw(graphics, (int) mPixelViewX, (int) mPixelViewY, 0);
-        drawTargetCursor(graphics);
-        mMap->draw(graphics, (int) mPixelViewX, (int) mPixelViewY, 1);
-        mMap->draw(graphics, (int) mPixelViewX, (int) mPixelViewY, 2);
-        mMap->drawOverlay(graphics, mPixelViewX, mPixelViewY,
-                (int) config.getValue("OverlayDetail", 2));
-    }
+        mMap->draw(graphics, (int) mPixelViewX, (int) mPixelViewY);
+        drawTargetCursor(graphics); // TODO: Draw the cursor with the sprite
 
-    // Find a path from the player to the mouse, and draw it. This is for debug
-    // purposes.
-    if (mShowDebugPath && mMap)
-    {
-        // Get the current mouse position
-        int mouseX, mouseY;
-        SDL_GetMouseState(&mouseX, &mouseY);
 
-        int mouseTileX = mouseX / 32 + mTileViewX;
-        int mouseTileY = mouseY / 32 + mTileViewY;
+        // Find a path from the player to the mouse, and draw it. This is for debug
+        // purposes.
+        if (mShowDebugPath) 
+        {
+            // Get the current mouse position
+            int mouseX, mouseY;
+            SDL_GetMouseState(&mouseX, &mouseY);
 
-        Path debugPath = mMap->findPath(
-                player_node->mX, player_node->mY,
-                mouseTileX, mouseTileY);
+            int mouseTileX = mouseX / 32 + mTileViewX;
+            int mouseTileY = mouseY / 32 + mTileViewY;
 
-        graphics->setColor(gcn::Color(255, 0, 0));
-        for (PathIterator i = debugPath.begin(); i != debugPath.end(); i++)
-        {
-            int squareX = i->x * 32 - (int) mPixelViewX + 12;
-            int squareY = i->y * 32 - (int) mPixelViewY + 12;
+            Path debugPath = mMap->findPath(player_node->mX, player_node->mY, mouseTileX, mouseTileY);
 
-            graphics->fillRectangle(gcn::Rectangle(squareX, squareY, 8, 8));
-            graphics->drawText(
-                    toString(mMap->getMetaTile(i->x, i->y)->Gcost),
-                    squareX + 4, squareY + 12, gcn::Graphics::CENTER);
+            graphics->setColor(gcn::Color(255, 0, 0));
+            for (PathIterator i = debugPath.begin(); i != debugPath.end(); i++)
+            {
+                int squareX = i->x * 32 - (int) mPixelViewX + 12;
+                int squareY = i->y * 32 - (int) mPixelViewY + 12;
+
+                graphics->fillRectangle(gcn::Rectangle(squareX, squareY, 8, 8));
+                graphics->drawText(toString(mMap->getMetaTile(i->x, i->y)->Gcost), squareX + 4, squareY + 12, gcn::Graphics::CENTER);
+            }
         }
     }
 
-    // Draw text
+    // Draw names
     if (textManager)
     {
         textManager->draw(graphics, mPixelViewX, mPixelViewY);
     }
 
-    // Draw player nickname, speech, and emotion sprite as needed
+    // Draw player speech, and emotion sprite as needed
     Beings &beings = beingManager->getAll();
     for (BeingIterator i = beings.begin(); i != beings.end(); i++)
     {
+        (*i)->drawSpeech(graphics, -(int) mPixelViewX, -(int) mPixelViewY);
         (*i)->drawEmotion(graphics, -(int) mPixelViewX, -(int) mPixelViewY);
     }
 
@@ -276,8 +274,7 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     WindowContainer::draw(gcnGraphics);
 }
 
-void
-Viewport::logic()
+void Viewport::logic()
 {
     WindowContainer::logic();
 
@@ -295,15 +292,14 @@ Viewport::logic()
         mWalkTime = player_node->mWalkTime;
     }
 
-    for (int i = 0; i < 3; i++)
+    for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
     {
         mTargetCursorInRange[i]->update(10);
         mTargetCursorOutRange[i]->update(10);
     }
 }
 
-void
-Viewport::drawTargetCursor(Graphics *graphics)
+void Viewport::drawTargetCursor(Graphics *graphics)
 {
     // Draw target marker if needed
     Being *target = player_node->getTarget();
@@ -323,7 +319,8 @@ Viewport::drawTargetCursor(Graphics *graphics)
         {
             targetCursor = mTargetCursorOutRange[cursorSize]->getCurrentImage();
         }
-        else {
+        else 
+        {
             targetCursor = mTargetCursorInRange[cursorSize]->getCurrentImage();
         }
 
@@ -332,11 +329,10 @@ Viewport::drawTargetCursor(Graphics *graphics)
         int posY = target->getPixelY() + 16 - targetCursor->getHeight() / 2 - (int) mPixelViewY;
 
         graphics->drawImage(targetCursor, posX, posY);
-    }
+   }
 }
 
-void
-Viewport::mousePressed(gcn::MouseEvent &event)
+void Viewport::mousePressed(gcn::MouseEvent &event)
 {
     // Check if we are alive and kickin'
     if (!mMap || !player_node || player_node->mAction == Being::DEAD)
@@ -348,8 +344,10 @@ Viewport::mousePressed(gcn::MouseEvent &event)
 
     mPlayerFollowMouse = false;
 
-    int tilex = event.getX() / 32 + mTileViewX;
-    int tiley = event.getY() / 32 + mTileViewY;
+    const int tilex = event.getX() / 32 + mTileViewX;
+    const int tiley = event.getY() / 32 + mTileViewY;
+    const int x = (int)((float) event.getX() + mPixelViewX);
+    const int y = (int)((float) event.getY() + mPixelViewY);
 
     // Right click might open a popup
     if (event.getButton() == gcn::MouseEvent::RIGHT)
@@ -357,11 +355,11 @@ Viewport::mousePressed(gcn::MouseEvent &event)
         Being *being;
         FloorItem *floorItem;
 
-        if ((being = beingManager->findBeing(tilex, tiley)) &&
-            being != player_node)
+        if ((being = beingManager->findBeingByPixel(x, y)) &&
+             being != player_node)
         {
-            mPopupMenu->showPopup(event.getX(), event.getY(), being);
-            return;
+           mPopupMenu->showPopup(event.getX(), event.getY(), being);
+           return;
         }
         else if((floorItem = floorItemManager->findByCoordinates(tilex, tiley)))
         {
@@ -382,12 +380,10 @@ Viewport::mousePressed(gcn::MouseEvent &event)
     {
         Being *being;
         FloorItem *item;
-
+ 
         // Interact with some being
-//      int x = (int)((float) event.getX() + mPixelViewX);
-//      int y = (int)((float) event.getY() + mPixelViewY);
-//      if ((being = beingManager->findBeingByPixel(x, y)))
-        if ((being = beingManager->findBeing(tilex, tiley)))
+//        if ((being = beingManager->findBeing(tilex, tiley)))
+        if ((being = beingManager->findBeingByPixel(x, y)))
         {
             switch (being->getType())
             {
@@ -400,59 +396,49 @@ Viewport::mousePressed(gcn::MouseEvent &event)
                     if (being->mAction == Being::DEAD)
                         break;
 
-                    if (player_node->withinAttackRange(being))
+                    if (keyboard.isKeyActive(keyboard.KEY_TARGET) || player_node->withinAttackRange(being))
                     {
+                        player_node->stopAttack();
+                        player_node->setGotoTarget(being);
                         player_node->attack(being, true);
                     }
                     else
                     {
-                        Uint8 *keys = SDL_GetKeyState(NULL);
-                        if (!(keys[SDLK_LSHIFT] || keys[SDLK_RSHIFT]))
-                        {
-                            player_node->stopAttack();
-                            player_node->setGotoTarget(being);
-                        }
+                        player_node->setDestination(tilex, tiley);
+                        player_node->stopAttack();
                     }
                     break;
 
                 default:
                     break;
-            }
+             }
         }
         // Pick up some item
         else if ((item = floorItemManager->findByCoordinates(tilex, tiley)))
         {
-                player_node->pickUp(item);
+            player_node->pickUp(item);
         }
         // Just walk around
         else
         {
-            // XXX XXX XXX REALLY UGLY!
-            Uint8 *keys = SDL_GetKeyState(NULL);
-            if (!(keys[SDLK_LSHIFT] || keys[SDLK_RSHIFT]))
-            {
-                player_node->setDestination(tilex, tiley);
-                player_node->stopAttack();
-            }
+            player_node->stopAttack();
+            player_node->setDestination(tilex, tiley);
             mPlayerFollowMouse = true;
         }
     }
     else if (event.getButton() == gcn::MouseEvent::MIDDLE)
     {
         // Find the being nearest to the clicked position
-        Being *target = beingManager->findNearestLivingBeing(
-                tilex, tiley,
-                20, Being::MONSTER);
-
+        Being *target = beingManager->findBeingByPixel(x, y);
+ 
         if (target)
         {
-            player_node->setTarget(target);
+             player_node->setTarget(target);
         }
     }
 }
 
-void
-Viewport::mouseDragged(gcn::MouseEvent &event)
+void Viewport::mouseDragged(gcn::MouseEvent &event)
 {
     if (!mMap || !player_node)
         return;
@@ -465,20 +451,17 @@ Viewport::mouseDragged(gcn::MouseEvent &event)
     }
 }
 
-void
-Viewport::mouseReleased(gcn::MouseEvent &event)
+void Viewport::mouseReleased(gcn::MouseEvent &event)
 {
     mPlayerFollowMouse = false;
 }
 
-void
-Viewport::showPopup(int x, int y, Item *item)
+void Viewport::showPopup(int x, int y, Item *item)
 {
     mPopupMenu->showPopup(x, y, item);
 }
 
-void
-Viewport::optionChanged(const std::string &name)
+void Viewport::optionChanged(const std::string &name)
 {
     mScrollLaziness = (int) config.getValue("ScrollLaziness", 32);
     mScrollRadius = (int) config.getValue("ScrollRadius", 32);
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 44a877a6..325a7221 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: viewport.h 4247 2008-05-19 10:48:18Z b_lindeijer $
+ *  $Id$
  */
 
 #ifndef _TMW_VIEWPORT_H_
@@ -117,16 +117,16 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         optionChanged(const std::string &name);
 
         /**
-         * Returns camera x offset in tiles.
+         * Returns camera x offset in pixels.
          */
         int
-        getCameraX() { return mTileViewX; }
+        getCameraX() const { return (int) mPixelViewX; }
 
         /**
-         * Returns camera y offset in tiles.
+         * Returns camera y offset in pixels.
          */
         int
-        getCameraY() { return mTileViewY; }
+        getCameraY() const { return (int) mPixelViewY; }
 
         /**
          * Changes viewpoint by relative pixel coordinates.
@@ -138,22 +138,13 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         /**
          * Helper function for loading target cursors
          */
-        void
-        loadTargetCursor(std::string filename, int width, int height,
-                         bool outRange, Being::TargetCursorSize size);
+        void loadTargetCursor(std::string filename, int width, int height,
+                              bool outRange, Being::TargetCursorSize size);
 
         /**
          * Draws range based target cursor
          */
-        void
-        drawTargetCursor(Graphics *graphics);
-
-        /**
-         * Draws target name
-         */
-        void
-        drawTargetName(Graphics *graphics);
-
+        void drawTargetCursor(Graphics *graphics);
 
         Map *mMap;                 /**< The current map. */
 
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index b33a55cf..9bf7452d 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -165,5 +165,5 @@ void DropDown::drawButton(gcn::Graphics *graphics)
     int height = mDroppedDown ? mFoldedUpHeight : getHeight();
 
     static_cast<Graphics*>(graphics)->
-        drawImage(buttons[mDroppedDown][mPushed], getWidth() - height, 1);
+        drawImage(buttons[mDroppedDown][mPushed], getWidth() - height + 2, 1);
 }
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 55dac5e0..1a6f1ac6 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -18,11 +18,12 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: window.cpp 4207 2008-04-29 09:10:43Z b_lindeijer $
+ *  $Id$
  */
 
 #include <algorithm>
 #include <climits>
+#include <cassert>
 
 #include <guichan/exception.hpp>
 #include <guichan/widgets/icon.hpp>
@@ -43,24 +44,28 @@
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
 
+#include "../utils/xml.h"
+
 ConfigListener *Window::windowConfigListener = 0;
 WindowContainer *Window::windowContainer = 0;
 int Window::instances = 0;
 int Window::mouseResize = 0;
 ImageRect Window::border;
 Image *Window::closeImage = NULL;
+bool Window::mAlphaChanged = false;
 
 class WindowConfigListener : public ConfigListener
 {
     void optionChanged(const std::string &)
     {
+        Window::mAlphaChanged = true;
         for_each(Window::border.grid, Window::border.grid + 9,
                 std::bind2nd(std::mem_fun(&Image::setAlpha),
                     config.getValue("guialpha", 0.8)));
     }
 };
 
-Window::Window(const std::string& caption, bool modal, Window *parent):
+Window::Window(const std::string& caption, bool modal, Window *parent, const std::string& skin):
     gcn::Window(caption),
     mGrip(0),
     mParent(parent),
@@ -72,7 +77,8 @@ Window::Window(const std::string& caption, bool modal, Window *parent):
     mMinWinWidth(100),
     mMinWinHeight(40),
     mMaxWinWidth(INT_MAX),
-    mMaxWinHeight(INT_MAX)
+    mMaxWinHeight(INT_MAX),
+    mSkin(skin)
 {
     logger->log("Window::Window(\"%s\")", caption.c_str());
 
@@ -80,23 +86,13 @@ Window::Window(const std::string& caption, bool modal, Window *parent):
         throw GCN_EXCEPTION("Window::Window. no windowContainer set");
     }
 
+    // Loads the skin
+    loadSkin(mSkin);
+
+    setGuiAlpha();
+
     if (instances == 0)
     {
-        // Load static resources
-        ResourceManager *resman = ResourceManager::getInstance();
-        Image *dBorders = resman->getImage("graphics/gui/vscroll_grey.png");
-        border.grid[0] = dBorders->getSubImage(0, 0, 4, 4);
-        border.grid[1] = dBorders->getSubImage(4, 0, 3, 4);
-        border.grid[2] = dBorders->getSubImage(7, 0, 4, 4);
-        border.grid[3] = dBorders->getSubImage(0, 4, 4, 10);
-        border.grid[4] = resman->getImage("graphics/gui/bg_quad_dis.png");
-        border.grid[5] = dBorders->getSubImage(7, 4, 4, 10);
-        border.grid[6] = dBorders->getSubImage(0, 15, 4, 4);
-        border.grid[7] = dBorders->getSubImage(4, 15, 3, 4);
-        border.grid[8] = dBorders->getSubImage(7, 15, 4, 4);
-        dBorders->decRef();
-        closeImage = resman->getImage("graphics/gui/close_button.png");
-
         windowConfigListener = new WindowConfigListener();
         // Send GUI alpha changed for initialization
         windowConfigListener->optionChanged("guialpha");
@@ -135,14 +131,15 @@ Window::~Window()
     const std::string &name = mWindowName;
 
     // Saving X, Y and Width and Height for resizables in the config
-    config.setValue(name + "WinX", getX());
-    config.setValue(name + "WinY", getY());
-    config.setValue(name + "Visible", isVisible());
-
-    if (mGrip)
-    {
-        config.setValue(name + "WinWidth", getWidth());
-        config.setValue(name + "WinHeight", getHeight());
+    if (!name.empty()) {
+        config.setValue(name + "WinX", getX());
+        config.setValue(name + "WinY", getY());
+        config.setValue(name + "Visible", isVisible());
+
+        if (mGrip) {
+            config.setValue(name + "WinWidth", getWidth());
+            config.setValue(name + "WinHeight", getHeight());
+        }
     }
 
     instances--;
@@ -154,15 +151,11 @@ Window::~Window()
         windowConfigListener = NULL;
 
         // Clean up static resources
-        delete border.grid[0];
-        delete border.grid[1];
-        delete border.grid[2];
-        delete border.grid[3];
-        border.grid[4]->decRef();
-        delete border.grid[5];
-        delete border.grid[6];
-        delete border.grid[7];
-        delete border.grid[8];
+        for( int i = 0; i < 9; i++ )
+        {
+            delete border.grid[i];
+            border.grid[i] = NULL;
+        }
         closeImage->decRef();
     }
 
@@ -474,6 +467,7 @@ void
 Window::loadWindowState()
 {
     const std::string &name = mWindowName;
+    assert(!name.empty());
 
     setPosition((int) config.getValue(name + "WinX", mDefaultX),
                 (int) config.getValue(name + "WinY", mDefaultY));
@@ -536,3 +530,185 @@ int Window::getResizeHandles(gcn::MouseEvent &event)
 
     return resizeHandles;
 }
+
+void Window::setGuiAlpha()
+{
+    //logger->log("Window::setGuiAlpha: Alpha Value %f", config.getValue("guialpha", 0.8));
+    for(int i = 0; i < 9; i++)
+    {
+        //logger->log("Window::setGuiAlpha: Border Image (%i)", i);
+        border.grid[i]->setAlpha(config.getValue("guialpha", 0.8));
+    }
+
+    mAlphaChanged = false;
+}
+
+void Window::loadSkin(const std::string filename)
+{
+    const std::string windowId = Window::getId();
+
+    ResourceManager *resman = ResourceManager::getInstance();
+
+    logger->log("Loading Window Skin '%s'.", filename.c_str());
+    logger->log("Loading Window ID '%s'.", windowId.c_str());
+
+
+    if(filename == "")
+        logger->error("Window::loadSkin(): Invalid File Name.");
+
+    // TODO:
+    // If there is an error loading the specified file, we should try to revert
+    // to a 'default' skin file. Only if the 'default' skin file can't be loaded
+    // should we have a terminating error.
+    XML::Document doc(filename);
+    xmlNodePtr rootNode = doc.rootNode();
+
+    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "skinset"))
+    {
+        logger->error("Widget Skinning error");
+    }
+
+    std::string skinSetImage;
+    skinSetImage = XML::getProperty(rootNode, "image", "");
+    Image *dBorders = NULL;
+    if(skinSetImage != "")
+    {
+        logger->log("Window::loadSkin(): <skinset> defines '%s' as a skin image.", skinSetImage.c_str());
+        dBorders = resman->getImage("graphics/gui/" + skinSetImage);//"graphics/gui/speech_bubble.png");
+    }
+    else
+    {
+        logger->error("Window::loadSkin(): Skinset does not define an image!");
+    }
+
+    //iterate <widget>'s
+    for_each_xml_child_node(widgetNode, rootNode)
+    {
+        if (!xmlStrEqual(widgetNode->name, BAD_CAST "widget"))
+            continue;
+
+        std::string widgetType;
+        widgetType = XML::getProperty(widgetNode, "type", "unknown");
+        if (widgetType == "Window")
+        {
+            // Iterate through <part>'s
+            // LEEOR / TODO:
+            // We need to make provisions to load in a CloseButton image. For now it
+            // can just be hard-coded.
+            for_each_xml_child_node(partNode, widgetNode)
+            {
+                if (!xmlStrEqual(partNode->name, BAD_CAST "part"))
+                {
+                    continue;
+                }
+
+                std::string partType;
+                partType = XML::getProperty(partNode, "type", "unknown");
+                // TOP ROW
+                if(partType == "top-left-corner")
+                {
+                    const int xPos = XML::getProperty(partNode, "xpos", 0);
+                    const int yPos = XML::getProperty(partNode, "ypos", 0);
+                    const int width = XML::getProperty(partNode, "width", 1);
+                    const int height = XML::getProperty(partNode, "height", 1);
+
+                    border.grid[0] = dBorders->getSubImage(xPos, yPos, width, height);
+                }
+                else if(partType == "top-edge")
+                {
+                    const int xPos = XML::getProperty(partNode, "xpos", 0);
+                    const int yPos = XML::getProperty(partNode, "ypos", 0);
+                    const int width = XML::getProperty(partNode, "width", 1);
+                    const int height = XML::getProperty(partNode, "height", 1);
+
+                    border.grid[1] = dBorders->getSubImage(xPos, yPos, width, height);
+                }
+                else if(partType == "top-right-corner")
+                {
+                    const int xPos = XML::getProperty(partNode, "xpos", 0);
+                    const int yPos = XML::getProperty(partNode, "ypos", 0);
+                    const int width = XML::getProperty(partNode, "width", 1);
+                    const int height = XML::getProperty(partNode, "height", 1);
+
+                    border.grid[2] = dBorders->getSubImage(xPos, yPos, width, height);
+                }
+
+                // MIDDLE ROW
+                else if(partType == "left-edge")
+                {
+                    const int xPos = XML::getProperty(partNode, "xpos", 0);
+                    const int yPos = XML::getProperty(partNode, "ypos", 0);
+                    const int width = XML::getProperty(partNode, "width", 1);
+                    const int height = XML::getProperty(partNode, "height", 1);
+
+                    border.grid[3] = dBorders->getSubImage(xPos, yPos, width, height);
+                }
+                else if(partType == "bg-quad")
+                {
+                    const int xPos = XML::getProperty(partNode, "xpos", 0);
+                    const int yPos = XML::getProperty(partNode, "ypos", 0);
+                    const int width = XML::getProperty(partNode, "width", 1);
+                    const int height = XML::getProperty(partNode, "height", 1);
+
+                    border.grid[4] = dBorders->getSubImage(xPos, yPos, width, height);
+                }
+                else if(partType == "right-edge")
+                {
+                    const int xPos = XML::getProperty(partNode, "xpos", 0);
+                    const int yPos = XML::getProperty(partNode, "ypos", 0);
+                    const int width = XML::getProperty(partNode, "width", 1);
+                    const int height = XML::getProperty(partNode, "height", 1);
+
+                    border.grid[5] = dBorders->getSubImage(xPos, yPos, width, height);
+                }
+
+                // BOTTOM ROW
+                else if(partType == "bottom-left-corner")
+                {
+                    const int xPos = XML::getProperty(partNode, "xpos", 0);
+                    const int yPos = XML::getProperty(partNode, "ypos", 0);
+                    const int width = XML::getProperty(partNode, "width", 1);
+                    const int height = XML::getProperty(partNode, "height", 1);
+
+                    border.grid[6] = dBorders->getSubImage(xPos, yPos, width, height);
+                }
+                else if(partType == "bottom-edge")
+                {
+                    const int xPos = XML::getProperty(partNode, "xpos", 0);
+                    const int yPos = XML::getProperty(partNode, "ypos", 0);
+                    const int width = XML::getProperty(partNode, "width", 1);
+                    const int height = XML::getProperty(partNode, "height", 1);
+
+                    border.grid[7] = dBorders->getSubImage(xPos, yPos, width, height);
+                }
+                else if(partType == "bottom-right-corner")
+                {
+                    const int xPos = XML::getProperty(partNode, "xpos", 0);
+                    const int yPos = XML::getProperty(partNode, "ypos", 0);
+                    const int width = XML::getProperty(partNode, "width", 1);
+                    const int height = XML::getProperty(partNode, "height", 1);
+
+                    border.grid[8] = dBorders->getSubImage(xPos, yPos, width, height);
+                }
+
+                // Part is of an uknown type.
+                else
+                {
+                    logger->log("Window::loadSkin(): Unknown Part Type '%s'", partType.c_str());
+                }
+            }
+        }
+        // Widget is of an uknown type.
+        else
+        {
+            logger->log("Window::loadSkin(): Unknown Widget Type '%s'", widgetType.c_str());
+        }
+    }
+    dBorders->decRef();
+
+    logger->log("Finished loading Window Skin.");
+
+    // Hard-coded for now until we update the above code to look for window buttons.
+    closeImage = resman->getImage("graphics/gui/close_button.png");
+}
+
diff --git a/src/gui/window.h b/src/gui/window.h
index 8f288991..228cc37b 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: window.h 4207 2008-04-29 09:10:43Z b_lindeijer $
+ *  $Id$
  */
 
 #ifndef _TMW_WINDOW_H__
@@ -56,9 +56,10 @@ class Window : public gcn::Window, gcn::WidgetListener
          * @param parent  The parent window. This is the window standing above
          *                this one in the window hiearchy. When reordering,
          *                a window will never go below its parent window.
+         * @param skin    The location where the window's skin XML can be found.
          */
         Window(const std::string &caption = "Window", bool modal = false,
-                Window *parent = NULL);
+                Window *parent = NULL, const std::string &skin = "graphics/gui/gui.xml");
 
         /**
          * Destructor.
@@ -237,6 +238,11 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         virtual void resetToDefaultSize();
 
+        /**
+         * Loads a window skin
+         */
+        void loadSkin(const std::string filename);
+
         enum ResizeHandles
         {
             TOP    = 0x01,
@@ -255,6 +261,8 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         int getResizeHandles(gcn::MouseEvent &event);
 
+        void setGuiAlpha();
+
         GCContainer *mChrome;      /**< Contained container */
         ResizeGrip *mGrip;         /**< Resize grip */
         Window *mParent;           /**< The parent window */
@@ -263,6 +271,7 @@ class Window : public gcn::Window, gcn::WidgetListener
         bool mModal;               /**< Window is modal */
         bool mCloseButton;         /**< Window has a close button */
         bool mSticky;              /**< Window resists minimization */
+        static bool mAlphaChanged; /**< Whether the alpha percent was changed */
         int mMinWinWidth;          /**< Minimum window width */
         int mMinWinHeight;         /**< Minimum window height */
         int mMaxWinWidth;          /**< Maximum window width */
@@ -271,6 +280,7 @@ class Window : public gcn::Window, gcn::WidgetListener
         int mDefaultY;             /**< Default window Y position */
         int mDefaultWidth;         /**< Default window width */
         int mDefaultHeight;        /**< Default window height */
+        std::string mSkin;         /**< Name of the skin to use */
 
         /** The window container windows add themselves to. */
         static WindowContainer *windowContainer;
diff --git a/src/gui/windowcontainer.cpp b/src/gui/windowcontainer.cpp
index 0a0a0a55..05c2b5e9 100644
--- a/src/gui/windowcontainer.cpp
+++ b/src/gui/windowcontainer.cpp
@@ -21,15 +21,13 @@
  *  $Id: windowcontainer.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $
  */
 
-#include <algorithm>
-
 #include "windowcontainer.h"
 
 #include "../utils/dtor.h"
 
 void WindowContainer::logic()
 {
-    for_each(mDeathList.begin(), mDeathList.end(), make_dtor(mDeathList));
+    delete_all(mDeathList);
     mDeathList.clear();
 
     gcn::Container::logic();
diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp
index d4ff8f02..965434b0 100644
--- a/src/imageparticle.cpp
+++ b/src/imageparticle.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: imageparticle.cpp 4360 2008-06-23 14:44:20Z crush_tmw $
+ *  $Id$
  */
 
 #include "imageparticle.h"
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 5534b96e..9f558883 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: keyboardconfig.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
+ *  $Id$
  */
 
 #include "keyboardconfig.h"
@@ -43,6 +43,7 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
     {"keyMoveLeft", SDLK_LEFT, "Move Left"},
     {"keyMoveRight", SDLK_RIGHT, "Move Right"},
     {"keyAttack", SDLK_LCTRL, "Attack"},
+    {"keySmilie", SDLK_LALT, "Smilie"},
     {"keyTarget", SDLK_LSHIFT, "Target"},
     {"keyTargetClosest", SDLK_a, "Target Closest"},
     {"keyTargetPlayer", SDLK_q, "Target Player"},
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index b98fcb7a..b57136dc 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: keyboardconfig.h 4255 2008-05-21 21:44:27Z crush_tmw $
+ *  $Id$
  */
 
 #ifndef _TMW_KEYBOARDCONFIG_H
@@ -151,6 +151,7 @@ class KeyboardConfig
             KEY_MOVE_LEFT,
             KEY_MOVE_RIGHT,
             KEY_ATTACK,
+            KEY_SMILIE,
             KEY_TARGET,
             KEY_TARGET_CLOSEST,
             KEY_TARGET_PLAYER,
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 554c52a6..66d37ddf 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: localplayer.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
+ *  $Id$
  */
 
 #include "localplayer.h"
@@ -48,8 +48,8 @@ LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map):
     mAttackRange(0),
     mXp(0), mNetwork(0),
     mTarget(NULL), mPickUpTarget(NULL),
-    mTrading(false), mInStorage(false),
-    mGoingToTarget(false), mLastAction(-1),
+    mTrading(false), mGoingToTarget(false),
+    mLastAction(-1),
     mWalkingDir(0), mDestX(0), mDestY(0),
     mInventory(new Inventory(INVENTORY_SIZE)),
     mStorage(new Inventory(STORAGE_SIZE))
@@ -65,6 +65,18 @@ LocalPlayer::~LocalPlayer()
 void LocalPlayer::logic()
 {
     switch (mAction) {
+        case STAND:
+           break;
+
+        case SIT:
+           break;
+
+        case DEAD:
+           break;
+
+        case HURT:
+           break;
+
         case WALK:
             mFrame = (get_elapsed_time(mWalkTime) * 6) / mWalkSpeed;
             if (mFrame >= 6) {
@@ -144,6 +156,9 @@ void LocalPlayer::unequipItem(Item *item)
     MessageOut outMsg(mNetwork);
     outMsg.writeInt16(CMSG_PLAYER_UNEQUIP);
     outMsg.writeInt16(item->getInvIndex());
+
+    // Tidy equipment directly to avoid weapon still shown bug, for instance
+    mEquipment->removeEquipment(item);
 }
 
 void LocalPlayer::useItem(Item *item)
@@ -183,7 +198,6 @@ void LocalPlayer::pickUp(FloorItem *item)
 
 void LocalPlayer::walk(unsigned char dir)
 {
-
     if (!mMap || !dir)
         return;
 
diff --git a/src/localplayer.h b/src/localplayer.h
index 1d865824..757c70eb 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: localplayer.h 4347 2008-06-12 09:06:01Z b_lindeijer $
+ *  $Id$
  */
 
 #ifndef _TMW_LOCALPLAYER_H
diff --git a/src/map.cpp b/src/map.cpp
index d9d3a319..ef622ad0 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -23,10 +23,11 @@
 
 #include "map.h"
 
-#include <algorithm>
 #include <queue>
+#include <cassert>
 
 #include "beingmanager.h"
+#include "configuration.h"
 #include "game.h"
 #include "graphics.h"
 #include "particle.h"
@@ -40,6 +41,8 @@
 #include "utils/dtor.h"
 #include "utils/tostring.h"
 
+extern volatile int tick_time;
+
 /**
  * A location on a tile map. Used for pathfinding, open list.
  */
@@ -62,6 +65,80 @@ struct Location
     MetaTile *tile;
 };
 
+MapLayer::MapLayer(int x, int y, int width, int height, bool isFringeLayer):
+    mX(x), mY(y),
+    mWidth(width), mHeight(height),
+    mIsFringeLayer(isFringeLayer)
+{
+    const int size = mWidth * mHeight;
+    mTiles = new Image*[size];
+    std::fill_n(mTiles, size, (Image*) 0);
+}
+	  	 
+MapLayer::~MapLayer()
+{
+    delete[] mTiles;
+}
+ 	  	 
+void MapLayer::setTile(int x, int y, Image *img)
+{
+    mTiles[x + y * mWidth] = img;
+}
+ 	  	 
+Image* MapLayer::getTile(int x, int y) const
+{
+    return mTiles[x + y * mWidth];
+}
+	  	 
+void MapLayer::draw(Graphics *graphics,
+                    int startX, int startY,
+                    int endX, int endY,
+                    int scrollX, int scrollY,
+                    const Sprites &sprites) const
+{
+    startX -= mX;
+    startY -= mY;
+    endX -= mX;
+    endY -= mY;
+ 	  	 
+    if (startX < 0) startX = 0;
+    if (startY < 0) startY = 0;
+    if (endX > mWidth) endX = mWidth;
+    if (endY > mHeight) endY = mHeight;
+ 	  	 
+    Sprites::const_iterator si = sprites.begin();
+	  	 
+    for (int y = startY; y < endY; y++)
+    {
+        // If drawing the fringe layer, make sure all sprites above this row of
+        // tiles have been drawn
+        if (mIsFringeLayer) {
+             while (si != sprites.end() && (*si)->getPixelY() <= y * 32 - 32) {
+                 (*si)->draw(graphics, -scrollX, -scrollY);
+                 si++;
+             }
+        }
+
+        for (int x = startX; x < endX; x++)
+        {
+             Image *img = getTile(x, y);
+             if (img) {
+                 const int px = (x + mX) * 32 - scrollX;
+                 const int py = (y + mY) * 32 - scrollY + 32 - img->getHeight();
+                 graphics->drawImage(img, px, py);
+             }
+         }
+    }
+ 	  	 
+    // Draw any remaining sprites
+    if (mIsFringeLayer) {
+         while (si != sprites.end()) {
+             (*si)->draw(graphics, -scrollX, -scrollY);
+             si++;
+         }
+    }
+}
+
 Map::Map(int width, int height, int tileWidth, int tileHeight):
     mWidth(width), mHeight(height),
     mTileWidth(tileWidth), mTileHeight(tileHeight),
@@ -69,23 +146,18 @@ Map::Map(int width, int height, int tileWidth, int tileHeight):
     mOnClosedList(1), mOnOpenList(2),
     mLastScrollX(0.0f), mLastScrollY(0.0f)
 {
-    int size = mWidth * mHeight;
+    const int size = mWidth * mHeight;
 
     mMetaTiles = new MetaTile[size];
-    mTiles = new Image*[size * 3];
-    std::fill_n(mTiles, size * 3, (Image*)0);
 }
 
 Map::~Map()
 {
-    // clean up map data
+    // delete metadata, layers, tilesets and overlays
     delete[] mMetaTiles;
-    delete[] mTiles;
-    // clean up tilesets
-    for_each(mTilesets.begin(), mTilesets.end(), make_dtor(mTilesets));
-    mTilesets.clear();
-    // clean up overlays
-    for_each(mOverlays.begin(), mOverlays.end(), make_dtor(mOverlays));
+    delete_all(mLayers);
+    delete_all(mTilesets);
+    delete_all(mOverlays);
 }
 
 void Map::initializeOverlays()
@@ -99,9 +171,9 @@ void Map::initializeOverlays()
         const std::string name = "overlay" + toString(i);
 
         Image *img = resman->getImage(getProperty(name + "image"));
-        float speedX = getFloatProperty(name + "scrollX");
-        float speedY = getFloatProperty(name + "scrollY");
-        float parallax = getFloatProperty(name + "parallax");
+        const float speedX = getFloatProperty(name + "scrollX");
+        const float speedY = getFloatProperty(name + "scrollY");
+        const float parallax = getFloatProperty(name + "parallax");
 
         if (img)
         {
@@ -114,6 +186,11 @@ void Map::initializeOverlays()
     }
 }
 
+void Map::addLayer(MapLayer *layer)
+{
+     mLayers.push_back(layer);
+}
+
 void Map::addTileset(Tileset *tileset)
 {
     mTilesets.push_back(tileset);
@@ -127,63 +204,32 @@ bool spriteCompare(const Sprite *a, const Sprite *b)
     return a->getPixelY() < b->getPixelY();
 }
 
-void Map::draw(Graphics *graphics, int scrollX, int scrollY, int layer)
+void Map::draw(Graphics *graphics, int scrollX, int scrollY)
 {
     int endPixelY = graphics->getHeight() + scrollY + mTileHeight - 1;
 
-    // If drawing the fringe layer, make sure sprites are sorted
-    SpriteIterator si;
-    if (layer == 1)
-    {
-        mSprites.sort(spriteCompare);
-        si = mSprites.begin();
-        endPixelY += mMaxTileHeight - mTileHeight;
-    }
+    // TODO: Do this per-layer
+    endPixelY += mMaxTileHeight - mTileHeight;
 
     int startX = scrollX / mTileWidth;
     int startY = scrollY / mTileHeight;
     int endX = (graphics->getWidth() + scrollX + mTileWidth - 1) / mTileWidth;
     int endY = endPixelY / mTileHeight;
 
-    if (startX < 0) startX = 0;
-    if (startY < 0) startY = 0;
-    if (endX > mWidth) endX = mWidth;
-    if (endY > mHeight) endY = mHeight;
+    // Make sure sprites are sorted
+    mSprites.sort(spriteCompare);
 
-    for (int y = startY; y < endY; y++)
+    Layers::const_iterator layeri = mLayers.begin();
+    for (; layeri != mLayers.end(); ++layeri)
     {
-        // If drawing the fringe layer, make sure all sprites above this row of
-        // tiles have been drawn
-        if (layer == 1)
-        {
-            while (si != mSprites.end() && (*si)->getPixelY() <= y * 32 - 32)
-            {
-                (*si)->draw(graphics, -scrollX, -scrollY);
-                si++;
-            }
-        }
-
-        for (int x = startX; x < endX; x++)
-        {
-            Image *img = getTile(x, y, layer);
-            if (img) {
-                graphics->drawImage(img,
-                        x * mTileWidth - scrollX,
-                        y * mTileHeight - scrollY +
-                            mTileHeight - img->getHeight());
-            }
-        }
+        (*layeri)->draw(graphics,
+                   startX, startY, endX, endY,
+                   scrollX, scrollY,
+                   mSprites);
     }
 
-    // Draw any remaining sprites
-    if (layer == 1)
-    {
-        while (si != mSprites.end())
-        {
-            (*si)->draw(graphics, -scrollX, -scrollY);
-            si++;
-        }
-    }
+    drawOverlay(graphics, scrollX, scrollY,
+            (int) config.getValue("OverlayDetail", 2));
 }
 
 void Map::drawOverlay(Graphics *graphics,
@@ -226,23 +272,10 @@ void Map::drawOverlay(Graphics *graphics,
     };
 }
 
-void Map::setTileWithGid(int x, int y, int layer, int gid)
-{
-    if (layer == 3)
-    {
-        Tileset *set = getTilesetWithGid(gid);
-        setWalk(x, y, (!set || (gid - set->getFirstGid() == 0)));
-    }
-    else if (layer < 3)
-    {
-        setTile(x, y, layer, getTileWithGid(gid));
-    }
-}
-
 class ContainsGidFunctor
 {
     public:
-        bool operator() (Tileset* set)
+        bool operator() (Tileset* set) const
         {
             return (set->getFirstGid() <= gid &&
                     gid - set->getFirstGid() < (int)set->size());
@@ -255,27 +288,16 @@ Tileset* Map::getTilesetWithGid(int gid) const
     containsGid.gid = gid;
 
     Tilesets::const_iterator i = find_if(mTilesets.begin(), mTilesets.end(),
-            containsGid);
+              containsGid);
 
     return (i == mTilesets.end()) ? NULL : *i;
 }
 
-Image* Map::getTileWithGid(int gid) const
-{
-    Tileset *set = getTilesetWithGid(gid);
-
-    if (set) {
-        return set->get(gid - set->getFirstGid());
-    }
-
-    return NULL;
-}
-
 void Map::setWalk(int x, int y, bool walkable)
 {
     mMetaTiles[x + y * mWidth].walkable = walkable;
 }
-
+ 
 bool Map::occupied(int x, int y) const
 {
     Beings &beings = beingManager->getAll();
@@ -293,7 +315,7 @@ bool Map::occupied(int x, int y) const
 
 bool Map::tileCollides(int x, int y) const
 {
-    return !(contains(x, y) && mMetaTiles[x + y * mWidth].walkable);
+     return !(contains(x, y) && mMetaTiles[x + y * mWidth].walkable);
 }
 
 bool Map::contains(int x, int y) const
@@ -301,16 +323,6 @@ bool Map::contains(int x, int y) const
     return x >= 0 && y >= 0 && x < mWidth && y < mHeight;
 }
 
-void Map::setTile(int x, int y, int layer, Image *img)
-{
-    mTiles[x + y * mWidth + layer * (mWidth * mHeight)] = img;
-}
-
-Image* Map::getTile(int x, int y, int layer)
-{
-    return mTiles[x + y * mWidth + layer * (mWidth * mHeight)];
-}
-
 MetaTile* Map::getMetaTile(int x, int y)
 {
     return &mMetaTiles[x + y * mWidth];
@@ -327,6 +339,8 @@ void Map::removeSprite(SpriteIterator iterator)
     mSprites.erase(iterator);
 }
 
+static int const basicCost = 100;
+
 Path Map::findPath(int startX, int startY, int destX, int destY)
 {
     // Path to be built up (empty by default)
@@ -367,8 +381,8 @@ Path Map::findPath(int startX, int startY, int destX, int destY)
             for (int dx = -1; dx <= 1; dx++)
             {
                 // Calculate location of tile to check
-                int x = curr.x + dx;
-                int y = curr.y + dy;
+                const int x = curr.x + dx;
+                const int y = curr.y + dy;
 
                 // Skip if if we're checking the same tile we're leaving from,
                 // or if the new location falls outside of the map boundaries
@@ -379,7 +393,8 @@ Path Map::findPath(int startX, int startY, int destX, int destY)
 
                 MetaTile *newTile = getMetaTile(x, y);
 
-                // Skip if the tile is on the closed list or collides unless its the destination tile
+                // Skip if the tile is on the closed list or collides unless
+                // its the destination tile
                 if (newTile->whichList == mOnClosedList ||
                         (tileCollides(x, y) && !(x == destX && y == destY)))
                 {
@@ -404,13 +419,6 @@ Path Map::findPath(int startX, int startY, int destX, int destY)
                 // 14 for moving diagonal (sqrt(200) = 14.1421...)
                 int Gcost = curr.tile->Gcost + ((dx == 0 || dy == 0) ? 10 : 14);
 
-                // It costs extra to walk through a being (needs to be enough
-                // to make it more attractive to walk around).
-                if (occupied(x, y))
-                {
-                    Gcost += 30;
-                }
-
                 // Skip if Gcost becomes too much
                 // Warning: probably not entirely accurate
                 if (Gcost > 200)
@@ -430,7 +438,7 @@ Path Map::findPath(int startX, int startY, int destX, int destY)
 
                     // Update Gcost and Fcost of new tile
                     newTile->Gcost = Gcost;
-                    newTile->Fcost = newTile->Gcost + newTile->Hcost;
+                    newTile->Fcost = Gcost + newTile->Hcost;
 
                     if (x != destX || y != destY) {
                         // Add this tile to the open list
@@ -447,7 +455,7 @@ Path Map::findPath(int startX, int startY, int destX, int destY)
                     // Found a shorter route.
                     // Update Gcost and Fcost of the new tile
                     newTile->Gcost = Gcost;
-                    newTile->Fcost = newTile->Gcost + newTile->Hcost;
+                    newTile->Fcost = Gcost + newTile->Hcost;
 
                     // Set the current tile as the parent of the new tile
                     newTile->parentX = curr.x;
@@ -488,7 +496,7 @@ Path Map::findPath(int startX, int startY, int destX, int destY)
     return path;
 }
 
-void Map::addParticleEffect (std::string effectFile, int x, int y)
+void Map::addParticleEffect(const std::string &effectFile, int x, int y)
 {
     ParticleEffectData newEffect;
     newEffect.file = effectFile;
diff --git a/src/map.h b/src/map.h
index 7695ba31..95532eb3 100644
--- a/src/map.h
+++ b/src/map.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: map.h 3887 2008-02-12 19:49:37Z umperio $
+ *  $Id$
  */
 
 #ifndef _TMW_MAP_H_
@@ -32,6 +32,7 @@
 class AmbientOverlay;
 class Graphics;
 class Image;
+class MapLayer;
 class Particle;
 class Sprite;
 class Tileset;
@@ -41,8 +42,7 @@ struct PATH_NODE;
 typedef std::vector<Tileset*> Tilesets;
 typedef std::list<Sprite*> Sprites;
 typedef Sprites::iterator SpriteIterator;
-
-extern volatile int tick_time;
+typedef std::vector<MapLayer*> Layers;
 
 /**
  * A meta tile stores additional information about a location on a tile map.
@@ -66,6 +66,56 @@ struct MetaTile
     bool walkable;          /**< Can beings walk on this tile */
 };
 
+/**
+ * A map layer. Stores a grid of tiles and their offset, and implements layer
+ * rendering.
+ */
+class MapLayer
+{
+    public:
+        /**
+         * Constructor, taking layer origin, size and whether this layer is the
+         * fringe layer. The fringe layer is the layer that draws the sprites.
+         * There can be only one fringe layer per map.
+         */
+        MapLayer(int x, int y, int width, int height, bool isFringeLayer);
+
+        /**
+         * Destructor.
+         */
+        ~MapLayer();
+
+        /**
+         * Set tile image, with x and y in layer coordinates.
+         */
+        void setTile(int x, int y, Image *img);
+
+        /**
+         * Get tile image, with x and y in layer coordinates.
+         */
+        Image *getTile(int x, int y) const;
+
+        /**
+         * Draws this layer to the given graphics context. The coordinates are
+         * expected to be in map range and will be translated to local layer
+         * coordinates and clipped to the layer's dimensions.
+         *
+         * The given sprites are only drawn when this layer is the fringe
+         * layer.
+         */
+        void draw(Graphics *graphics,
+                  int startX, int startY,
+                  int endX, int endY,
+                  int scrollX, int scrollY,
+                  const Sprites &sprites) const;
+
+    private:
+        int mX, mY;
+        int mWidth, mHeight;
+        bool mIsFringeLayer;    /**< Whether the sprites are drawn. */
+        Image **mTiles;
+};
+
 /**
  * A tile map.
  */
@@ -89,39 +139,30 @@ class Map : public Properties
         void initializeOverlays();
 
         /**
-         * Draws a map layer to the given graphics output.
-         */
-        void draw(Graphics *graphics, int scrollX, int scrollY, int layer);
-
-        /**
-         * Draws the overlay graphic to the given graphics output.
-         */
-        void
-        drawOverlay(Graphics *graphics, float scrollX, float scrollY,
-                    int detail);
-
-        /**
-         * Adds a tileset to this map.
+         * Draws the map to the given graphics output. This method draws all
+         * layers, sprites and overlay effects.
+         *
+         * TODO: For efficiency reasons, this method could take into account
+         * the clipping rectangle set on the Graphics object. However,
+         * currently the map is always drawn full-screen.
          */
-        void
-        addTileset(Tileset *tileset);
+        void draw(Graphics *graphics, int scrollX, int scrollY);
 
         /**
-         * Sets a tile using a global tile id. Used by the layer loading
-         * routine.
+         * Adds a layer to this map. The map takes ownership of the layer.
          */
-        void
-        setTileWithGid(int x, int y, int layer, int gid);
+        void addLayer(MapLayer *layer);
 
         /**
-         * Set tile ID.
+         * Adds a tileset to this map. The map takes ownership of the tileset.
          */
-        void setTile(int x, int y, int layer, Image *img);
+        void addTileset(Tileset *tileset);
 
         /**
-         * Get tile ID.
+         * Finds the tile set that a tile with the given global id is part of.
          */
-        Image *getTile(int x, int y, int layer);
+        Tileset*
+        getTilesetWithGid(int gid) const;
 
         /**
          * Get tile reference.
@@ -183,7 +224,7 @@ class Map : public Properties
         /**
          * Adds a particle effect
          */
-        void addParticleEffect (std::string effectFile, int x, int y);
+        void addParticleEffect(const std::string &effectFile, int x, int y);
 
         /**
          * Initializes all added particle effects
@@ -193,15 +234,11 @@ class Map : public Properties
 
     private:
         /**
-         * Converts a global tile id to the Image* pointing to the associated
-         * tile image.
-         */
-        Image* getTileWithGid(int gid) const;
-
-        /**
-         * Finds the tile set that a tile with the given global id is part of.
+         * Draws the overlay graphic to the given graphics output.
          */
-        Tileset* getTilesetWithGid(int gid) const;
+        void
+        drawOverlay(Graphics *graphics, float scrollX, float scrollY,
+                    int detail);
 
         /**
          * Tells whether a tile is occupied by a being.
@@ -217,15 +254,14 @@ class Map : public Properties
         int mTileWidth, mTileHeight;
         int mMaxTileHeight;
         MetaTile *mMetaTiles;
-        Image **mTiles;
-
+        Layers mLayers;
         Tilesets mTilesets;
         Sprites mSprites;
 
         // Pathfinding members
         int mOnClosedList, mOnOpenList;
 
-        // Overlay Data
+        // Overlay data
         std::list<AmbientOverlay*> mOverlays;
         float mLastScrollX;
         float mLastScrollY;
diff --git a/src/monster.cpp b/src/monster.cpp
index d3e52520..2b6fadce 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -74,15 +74,13 @@ Monster::Monster(Uint32 id, Uint16 job, Map *map):
     }
 }
 
-Monster::~Monster() {
-
+Monster::~Monster() 
+{
     if (mText)
         delete mText;
-
 }
 
-void
-Monster::logic()
+void Monster::logic()
 {
     if (mAction != STAND)
     {
@@ -97,14 +95,12 @@ Monster::logic()
     Being::logic();
 }
 
-Being::Type
-Monster::getType() const
+Being::Type Monster::getType() const
 {
     return MONSTER;
 }
 
-void
-Monster::setAction(Uint8 action)
+void Monster::setAction(Action action)
 {
     SpriteAction currentAction = ACTION_INVALID;
 
@@ -122,11 +118,14 @@ Monster::setAction(Uint8 action)
             mSprites[BASE_SPRITE]->reset();
             break;
         case STAND:
-            currentAction = ACTION_STAND;
-            break;
+           currentAction = ACTION_STAND;
+           break;
         case HURT:
-            // Not implemented yet
-            break;
+           // Not implemented yet
+           break;
+        case SIT:
+           // Also not implemented yet
+           break;
     }
 
     if (currentAction != ACTION_INVALID)
@@ -142,8 +141,7 @@ Monster::setAction(Uint8 action)
     }
 }
 
-void
-Monster::handleAttack(Being *victim, int damage)
+void Monster::handleAttack(Being *victim, int damage)
 {
     Being::handleAttack(victim, damage);
 
@@ -151,21 +149,18 @@ Monster::handleAttack(Being *victim, int damage)
     sound.playSfx(mi.getSound((damage > 0) ? MONSTER_EVENT_HIT : MONSTER_EVENT_MISS));
 }
 
-void
-Monster::takeDamage(int amount)
+void Monster::takeDamage(int amount)
 {
     if (amount > 0) sound.playSfx(getInfo().getSound(MONSTER_EVENT_HURT));
     Being::takeDamage(amount);
 }
 
-Being::TargetCursorSize
-Monster::getTargetCursorSize() const
+Being::TargetCursorSize Monster::getTargetCursorSize() const
 {
     return getInfo().getTargetCursorSize();
 }
 
-const MonsterInfo&
-Monster::getInfo() const
+const MonsterInfo& Monster::getInfo() const
 {
     return MonsterDB::get(mJob - 1002);
 }
diff --git a/src/monster.h b/src/monster.h
index b613e96d..4839966a 100644
--- a/src/monster.h
+++ b/src/monster.h
@@ -38,7 +38,7 @@ class Monster : public Being
 
         virtual void logic();
 
-        virtual void setAction(Uint8 action);
+        virtual void setAction(Action action);
 
         virtual Type getType() const;
 
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index fbef02bd..7c9b8afd 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -23,6 +23,7 @@
 
 #include "beinghandler.h"
 
+#include <iostream>
 #include <SDL_types.h>
 
 #include "messagein.h"
@@ -37,6 +38,7 @@
 #include "../particle.h"
 #include "../sound.h"
 #include "../player_relations.h"
+#include "../npc.h"
 
 const int EMOTION_TIME = 150;    /**< Duration of emotion icon */
 
@@ -203,8 +205,13 @@ void BeingHandler::handleMessage(MessageIn *msg)
                 break;
 
             // If this is player's current target, clear it.
-            if (player_node->getTarget() == dstBeing)
+            if (dstBeing == player_node->getTarget())
+            {
                 player_node->stopAttack();
+            }
+
+            if (dstBeing == current_npc)
+                current_npc = NULL;
 
             if (msg->readInt8() == 1)
             {
@@ -464,7 +471,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
             msg->readInt8();   // unknown
 
             dstBeing->mWalkTime = tick_time;
-            dstBeing->mFrame = 0;
+            //dstBeing->mFrame = 0;
             break;
 
         case SMSG_PLAYER_STOP:
diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index cc5d016c..0fc98175 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.cpp
@@ -156,6 +156,12 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
                     mask <<= 1;
                     position++;
                 }
+
+                item = inventory->getItem(index);
+                if (!item)
+                    break;
+
+                item->setEquipped(false);
                 player_node->mEquipment->removeEquipment(position);
             }
             logger->log("Unequipping: %i %i(%i) %i",
@@ -174,6 +180,7 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
 
             item = inventory->getItem(index);
             if (item) {
+                item->setEquipped(true);
                 player_node->mEquipment->setArrows(item);
                 logger->log("Arrows equipped: %i", index);
             }
diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp
index 6505e39f..737d1762 100644
--- a/src/net/loginhandler.cpp
+++ b/src/net/loginhandler.cpp
@@ -113,7 +113,7 @@ void LoginHandler::handleMessage(MessageIn *msg)
                     errorMessage = "You have been blocked by the GM Team";
                     break;
                 case 6:
-                    errorMessage = "You have been banned for 5 minutes";
+                    errorMessage = "You have been temporarily banned from the game. Please contact the GM team";
                     break;
                 case 9:
                     errorMessage = "This user name is already taken";
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index e871b670..61e68295 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -52,6 +52,9 @@ extern BuyDialog *buyDialog;
 extern SellDialog *sellDialog;
 extern Window *buySellDialog;
 
+static const int MAP_TELEPORT_SCROLL_DISTANCE = 8; /* Max. distance we are willing to scroll after a teleport;
+                                                    * everything beyond will reset the port hard. */
+
 /**
  * Listener used for handling the overweigth message.
  */
@@ -113,17 +116,13 @@ void PlayerHandler::handleMessage(MessageIn *msg)
              * This client assumes that all walk messages succeed,
              * and that the server will send a correction notice
              * otherwise.
-             *
-             * Note that this packet is also used by eAthena to notify
-             * the client of a server-generated auto-move.  A patch has
-             * been submitted to Mantis to eliminate these auto moves,
-             * since they're inconsistent with the client design.
              */
             break;
 
         case SMSG_PLAYER_WARP:
             {
                 std::string mapPath = msg->readString(16);
+                bool nearby;
                 Uint16 x = msg->readInt16();
                 Uint16 y = msg->readInt16();
 
@@ -135,13 +134,23 @@ void PlayerHandler::handleMessage(MessageIn *msg)
                  */
                 player_node->stopAttack();
 
+                nearby = (engine->getCurrentMapName() == mapPath);
                 // Switch the actual map, deleting the previous one
                 engine->changeMap(mapPath);
 
                 current_npc = 0;
 
-                float scrollOffsetX = (x - player_node->mX) * 32;
-                float scrollOffsetY = (y - player_node->mY) * 32;
+                float scrollOffsetX = 0.0f;
+                float scrollOffsetY = 0.0f;
+
+                /* Scroll if neccessary */
+                if (!nearby
+                    || (abs(x - player_node->mX) > MAP_TELEPORT_SCROLL_DISTANCE)
+                    || (abs(y - player_node->mY) > MAP_TELEPORT_SCROLL_DISTANCE)) 
+                {
+                    scrollOffsetX = (x - player_node->mX) * 32;
+                    scrollOffsetY = (y - player_node->mY) * 32;
+                }
 
                 player_node->setAction(Being::STAND);
                 player_node->mFrame = 0;
@@ -204,8 +213,39 @@ void PlayerHandler::handleMessage(MessageIn *msg)
 
                 if (player_node->mHp == 0 && deathNotice == NULL)
                 {
-                    deathNotice = new OkDialog("Message",
-                            "You're now dead, press ok to restart");
+                    static char const *const deadMsg[] =
+                    {
+                        "You are dead.",
+                        "We regret to inform you that your character was killed in battle.",
+                        "You are not that alive anymore.",
+                        "The cold hands of the grim reaper are grabbing for your soul.",
+                        "Game Over!",
+                        "Insert coin to continue",
+                        "No, kids. Your character did not really die. It... err... went to a better place.",
+                        "Your plan of breaking your enemies weapon by bashing it with your throat failed.",
+                        "I guess this did not run too well.",
+                        "Do you want your possessions identified?", // Nethack reference
+                        "Sadly, no trace of you was ever found...", // Secret of Mana reference
+                        "Annihilated.", // Final Fantasy VI reference
+                        "Looks like you got your head handed to you.", //Earthbound reference
+                        "You screwed up again, dump your body down the tubes and get you another one.", // Leisure Suit Larry 1 Reference
+                        "You're not dead yet. You're just resting.", // Monty Python reference from a couple of skits
+                        "You are no more.",  // Monty Python reference from the dead parrot sketch starting now
+                        "You have ceased to be.",
+                        "You've expired and gone to meet your maker.",
+                        "You're a stiff.",
+                        "Bereft of life, you rest in peace.",
+                        "If you weren't so animated, you'd be pushing up the daisies.",
+                        "Your metabolic processes are now history.",
+                        "You're off the twig.",
+                        "You've kicked the bucket.",
+                        "You've shuffled off your mortal coil, run down the curtain and joined the bleedin' choir invisibile.",
+                        "You are an ex-player.",
+                        "You're pining for the fjords." // Monty Python reference from the dead parrot sketch
+                    };
+                    std::string message(deadMsg[rand()%27]);
+
+                    deathNotice = new OkDialog("Message", message);
                     deathNotice->addActionListener(&deathListener);
                     player_node->setAction(Being::DEAD);
                 }
@@ -288,7 +328,7 @@ void PlayerHandler::handleMessage(MessageIn *msg)
             }
             break;
 
-            // Updates stats and status points
+        // Updates stats and status points
         case SMSG_PLAYER_STAT_UPDATE_5:
             player_node->mStatsPointsToAttribute = msg->readInt16();
             player_node->mAttr[LocalPlayer::STR] = msg->readInt8();
diff --git a/src/npc.cpp b/src/npc.cpp
index 1615ecd6..fe0b4598 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -86,7 +86,8 @@ void NPC::setName(const std::string &name)
     mName = new Text(name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET,
                      gcn::Graphics::CENTER, npcNameFont,
                      gcn::Color(200, 200, 255));
-                 }
+    Being::setName(name + " (NPC)");
+}
 
 Being::Type
 NPC::getType() const
diff --git a/src/particle.cpp b/src/particle.cpp
index 651fae41..8591838f 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: particle.cpp 4362 2008-06-24 12:29:33Z crush_tmw $
+ *  $Id$
  */
 
 #include <algorithm>
@@ -61,7 +61,7 @@ Particle::Particle(Map *map):
     mAutoDelete(true),
     mMap(map),
     mGravity(0.0f),
-    mRandomnes(0),
+    mRandomness(0),
     mBounce(0.0f),
     mFollow(false),
     mTarget(NULL),
@@ -139,11 +139,11 @@ Particle::update()
             }
         }
 
-        if (mRandomnes > 0)
+        if (mRandomness > 0)
         {
-            mVelocity.x += (rand()%mRandomnes - rand()%mRandomnes) / 1000.0f;
-            mVelocity.y += (rand()%mRandomnes - rand()%mRandomnes) / 1000.0f;
-            mVelocity.z += (rand()%mRandomnes - rand()%mRandomnes) / 1000.0f;
+            mVelocity.x += (rand()%mRandomness - rand()%mRandomness) / 1000.0f;
+            mVelocity.y += (rand()%mRandomness - rand()%mRandomness) / 1000.0f;
+            mVelocity.z += (rand()%mRandomness - rand()%mRandomness) / 1000.0f;
         }
 
         mVelocity.z -= mGravity;
diff --git a/src/particle.h b/src/particle.h
index d4a671c7..f281864d 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: particle.h 4362 2008-06-24 12:29:33Z crush_tmw $
+ *  $Id$
  */
 
 #ifndef _PARTICLE_H
@@ -160,6 +160,9 @@ class Particle : public Sprite
         moveBy(float x, float y, float z)
         { mPos.x += x; mPos.y += y; mPos.z += z; }
 
+        void
+        moveChildren(Vector change);
+
         void
         moveBy (Vector change)
         { mPos += change; }
@@ -227,8 +230,8 @@ class Particle : public Sprite
          * Sets the ammount of random vector changes
          */
         void
-        setRandomnes(int r)
-        { mRandomnes = r; }
+        setRandomness(int r)
+        { mRandomness = r; }
 
         /**
          * Sets the ammount of velocity particles retain after
@@ -270,6 +273,12 @@ class Particle : public Sprite
         bool isAlive()
         { return mAlive; }
 
+        /**
+         * Determines whether the particle and its children are all dead
+         */
+        bool isExtinct()
+        { return !isAlive() && mChildParticles.empty(); }
+
         /**
          * Manually marks the particle for deletion.
          */
@@ -303,7 +312,7 @@ class Particle : public Sprite
         // dynamic particle
         Vector mVelocity;           /**< Speed in pixels per game-tick. */
         float mGravity;             /**< Downward acceleration in pixels per game-tick. */
-        int mRandomnes;             /**< Ammount of random vector change */
+        int mRandomness;            /**< Ammount of random vector change */
         float mBounce;              /**< How much the particle bounces off when hitting the ground */
         bool mFollow;               /**< is this particle moved when its parent particle moves? */
 
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index 996e3396..3e0a3d75 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: particleemitter.cpp 4362 2008-06-24 12:29:33Z crush_tmw $
+ *  $Id$
  */
 
 #include "particleemitter.h"
@@ -39,6 +39,7 @@
 #define DEG_RAD_FACTOR 0.017453293f
 
 ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *map):
+    mOutputPauseLeft(0),
     mParticleImage(0)
 {
     mMap = map;
@@ -52,7 +53,7 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *
     mParticleAngleVertical.set(0.0f);
     mParticlePower.set(0.0f);
     mParticleGravity.set(0.0f);
-    mParticleRandomnes.set(0);
+    mParticleRandomness.set(0);
     mParticleBounce.set(0.0f);
     mParticleFollow = false;
     mParticleAcceleration.set(0.0f);
@@ -62,6 +63,7 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *
     mParticleFadeOut.set(0);
     mParticleFadeIn.set(0);
     mOutput.set(1);
+    mOutputPause.set(0);
     mParticleAlpha.set(1.0f);
 
     for_each_xml_child_node(propertyNode, emitterNode)
@@ -117,9 +119,9 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *
             {
                 mParticleGravity = readMinMax(propertyNode, 0.0f);
             }
-            else if (name == "randomnes")
+            else if (name == "randomnes" || name == "randomness") // legacy bug
             {
-                mParticleRandomnes = readMinMax(propertyNode, 0);
+                mParticleRandomness = readMinMax(propertyNode, 0);
             }
             else if (name == "bounce")
             {
@@ -135,6 +137,11 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *
                 mOutput = readMinMax(propertyNode, 0);
                 mOutput.maxVal +=1;
             }
+            else if (name == "output-pause")
+            {
+                mOutputPause = readMinMax(propertyNode, 0);
+                mOutputPauseLeft = mOutputPause.value();
+            }
             else if (name == "acceleration")
             {
                 mParticleAcceleration = readMinMax(propertyNode, 0.0f);
@@ -261,7 +268,7 @@ ParticleEmitter & ParticleEmitter::operator=(const ParticleEmitter &o)
     mParticleAngleVertical = o.mParticleAngleVertical;
     mParticlePower = o.mParticlePower;
     mParticleGravity = o.mParticleGravity;
-    mParticleRandomnes = o.mParticleRandomnes;
+    mParticleRandomness = o.mParticleRandomness;
     mParticleBounce = o.mParticleBounce;
     mParticleFollow = o.mParticleFollow;
     mParticleTarget = o.mParticleTarget;
@@ -274,10 +281,13 @@ ParticleEmitter & ParticleEmitter::operator=(const ParticleEmitter &o)
     mParticleAlpha = o.mParticleAlpha;
     mMap = o.mMap;
     mOutput = o.mOutput;
+    mOutputPause = o.mOutputPause;
     mParticleImage = o.mParticleImage;
     mParticleAnimation = o.mParticleAnimation;
     mParticleChildEmitters = o.mParticleChildEmitters;
 
+    mOutputPauseLeft = 0;
+
     if (mParticleImage) mParticleImage->incRef();
 
     return *this;
@@ -308,6 +318,13 @@ ParticleEmitter::createParticles()
 {
     std::list<Particle *> newParticles;
 
+    if (mOutputPauseLeft > 0)
+    {
+        mOutputPauseLeft--;
+        return newParticles;
+    }
+    mOutputPauseLeft = mOutputPause.value();
+
     for (int i = mOutput.value(); i > 0; i--)
     {
         // Limit maximum particles
@@ -342,7 +359,7 @@ ParticleEmitter::createParticles()
                 sin(angleH) * cos(angleV) * power,
                 sin(angleV) * power);
 
-        newParticle->setRandomnes(mParticleRandomnes.value());
+        newParticle->setRandomness(mParticleRandomness.value());
         newParticle->setGravity(mParticleGravity.value());
         newParticle->setBounce(mParticleBounce.value());
         newParticle->setFollow(mParticleFollow);
diff --git a/src/particleemitter.h b/src/particleemitter.h
index 481d4b44..5cf3fd46 100644
--- a/src/particleemitter.h
+++ b/src/particleemitter.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: particleemitter.h 4362 2008-06-24 12:29:33Z crush_tmw $
+ *  $Id$
  */
 
 #ifndef _PARTICLEEMITTER_H
@@ -97,7 +97,7 @@ class ParticleEmitter
          * Vector changing of particles:
          */
         MinMax<float> mParticleGravity;
-        MinMax<int> mParticleRandomnes;
+        MinMax<int> mParticleRandomness;
         MinMax<float> mParticleBounce;
         bool mParticleFollow;
 
@@ -119,6 +119,8 @@ class ParticleEmitter
         Map *mMap;             /**< Map the particles are spawned on */
 
         MinMax<int> mOutput;   /**< Number of particles spawned per update */
+        MinMax<int> mOutputPause; /**< Pause in frames between two spawns */
+        int mOutputPauseLeft;
 
         /*
          * Graphical representation of the particle
diff --git a/src/player.cpp b/src/player.cpp
index 125407de..8380fdfe 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -75,6 +75,18 @@ void
 Player::logic()
 {
     switch (mAction) {
+        case STAND:
+           break;
+
+        case SIT:
+           break;
+
+        case DEAD:
+           break;
+
+        case HURT:
+           break;
+
         case WALK:
             mFrame = (get_elapsed_time(mWalkTime) * 6) / mWalkSpeed;
             if (mFrame >= 6) {
diff --git a/src/resources/action.cpp b/src/resources/action.cpp
index facd23fb..8ed099ea 100644
--- a/src/resources/action.cpp
+++ b/src/resources/action.cpp
@@ -23,8 +23,6 @@
 
 #include "action.h"
 
-#include <algorithm>
-
 #include "animation.h"
 
 #include "../utils/dtor.h"
@@ -36,8 +34,7 @@ Action::Action()
 
 Action::~Action()
 {
-    std::for_each(mAnimations.begin(), mAnimations.end(),
-                  make_dtor(mAnimations));
+    delete_all(mAnimations);
 }
 
 Animation*
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index 6228f4e4..b7263ec3 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.cpp
@@ -21,8 +21,6 @@
  *  $Id: imageset.cpp 4209 2008-04-29 12:58:21Z b_lindeijer $
  */
 
-#include <algorithm>
-
 #include "imageset.h"
 
 #include "../log.h"
@@ -46,11 +44,10 @@ ImageSet::ImageSet(Image *img, int width, int height)
 
 ImageSet::~ImageSet()
 {
-    for_each(mImages.begin(), mImages.end(), make_dtor(mImages));
+    delete_all(mImages);
 }
 
-Image*
-ImageSet::get(size_type i)
+Image* ImageSet::get(size_type i) const
 {
     if (i >= mImages.size())
     {
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index 719e9769..e276dd06 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.h
@@ -47,12 +47,18 @@ class ImageSet : public Resource
          */
         ~ImageSet();
 
+        /**
+         * Returns the width of the images in the image set.
+         */
         int getWidth() { return mWidth; };
 
+        /**
+         * Returns the height of the images in the image set.
+         */
         int getHeight() { return mHeight; };
 
         typedef std::vector<Image*>::size_type size_type;
-        Image* get(size_type i);
+        Image* get(size_type i) const;
 
         size_type size() { return mImages.size(); }
 
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 6ae7b499..8999f651 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -21,7 +21,6 @@
  *  $Id: itemdb.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
-#include <algorithm>
 #include <cassert>
 #include <libxml/tree.h>
 
@@ -146,7 +145,7 @@ void ItemDB::unload()
     delete mUnknown;
     mUnknown = NULL;
 
-    for_each(mItemInfos.begin(), mItemInfos.end(), make_dtor(mItemInfos));
+    delete_all(mItemInfos);
     mItemInfos.clear();
     mLoaded = false;
 }
@@ -177,8 +176,7 @@ void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node)
     {
         itemInfo->setSprite(filename, 0);
     }
-
-    if (gender == "female" || gender == "unisex")
+    else
     {
         itemInfo->setSprite(filename, 1);
     }
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index e2b47e66..ab3b0cae 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -145,8 +145,7 @@ inflateMemory(unsigned char *in, unsigned int inLength,
     return outLength;
 }
 
-Map*
-MapReader::readMap(const std::string &filename)
+Map* MapReader::readMap(const std::string &filename)
 {
     // Load the file through resource manager
     ResourceManager *resman = ResourceManager::getInstance();
@@ -206,19 +205,13 @@ MapReader::readMap(const std::string &filename)
 Map*
 MapReader::readMap(xmlNodePtr node, const std::string &path)
 {
-    xmlChar *prop;
-
     // Take the filename off the path
-    std::string pathDir = path.substr(0, path.rfind("/") + 1);
-
-    prop = xmlGetProp(node, BAD_CAST "version");
-    xmlFree(prop);
+    const std::string pathDir = path.substr(0, path.rfind("/") + 1);
 
-    int w = XML::getProperty(node, "width", 0);
-    int h = XML::getProperty(node, "height", 0);
-    int tilew = XML::getProperty(node, "tilewidth", DEFAULT_TILE_WIDTH);
-    int tileh = XML::getProperty(node, "tileheight", DEFAULT_TILE_HEIGHT);
-    int layerNr = 0;
+    const int w = XML::getProperty(node, "width", 0);
+    const int h = XML::getProperty(node, "height", 0);
+    const int tilew = XML::getProperty(node, "tilewidth", DEFAULT_TILE_WIDTH);
+    const int tileh = XML::getProperty(node, "tileheight", DEFAULT_TILE_HEIGHT);
     Map *map = new Map(w, h, tilew, tileh);
 
     for_each_xml_child_node(childNode, node)
@@ -232,9 +225,7 @@ MapReader::readMap(xmlNodePtr node, const std::string &path)
         }
         else if (xmlStrEqual(childNode->name, BAD_CAST "layer"))
         {
-            logger->log("- Loading layer %d", layerNr);
-            readLayer(childNode, map, layerNr);
-            layerNr++;
+            readLayer(childNode, map);
         }
         else if (xmlStrEqual(childNode->name, BAD_CAST "properties"))
         {
@@ -246,15 +237,29 @@ MapReader::readMap(xmlNodePtr node, const std::string &path)
             {
                 if (xmlStrEqual(objectNode->name, BAD_CAST "object"))
                 {
-                    std::string objName = XML::getProperty(objectNode, "name", "");
-                    std::string objType = XML::getProperty(objectNode, "type", "");
-                    int objX = XML::getProperty(objectNode, "x", 0);
-                    int objY = XML::getProperty(objectNode, "y", 0);
+                    const std::string objType = XML::getProperty(objectNode, "type", "");
+
+                    if (objType == "WARP" || objType == "NPC" ||
+                        objType == "SCRIPT" || objType == "SPAWN")
+                    {
+                        // Silently skip server-side objects.
+                        continue;
+                    }
+
+                    const std::string objName = XML::getProperty(objectNode, "name", "");
+                    const int objX = XML::getProperty(objectNode, "x", 0);
+                    const int objY = XML::getProperty(objectNode, "y", 0);
 
                     logger->log("- Loading object name: %s type: %s at %d:%d",
                                 objName.c_str(), objType.c_str(), objX, objY);
+
                     if (objType == "PARTICLE_EFFECT")
                     {
+                        if (objName.empty()) {
+                            logger->log("   Warning: No particle file given");
+                            continue;
+                        }
+
                         map->addParticleEffect(objName, objX, objY);
                     }
                     else
@@ -271,8 +276,7 @@ MapReader::readMap(xmlNodePtr node, const std::string &path)
     return map;
 }
 
-void
-MapReader::readProperties(xmlNodePtr node, Properties* props)
+void MapReader::readProperties(xmlNodePtr node, Properties* props)
 {
     for_each_xml_child_node(childNode, node)
     {
@@ -280,43 +284,65 @@ MapReader::readProperties(xmlNodePtr node, Properties* props)
             continue;
 
         // Example: <property name="name" value="value"/>
-        xmlChar *name = xmlGetProp(childNode, BAD_CAST "name");
-        xmlChar *value = xmlGetProp(childNode, BAD_CAST "value");
+        const std::string name = XML::getProperty(childNode, "name", "");
+        const std::string value = XML::getProperty(childNode, "value", "");
 
-        if (name && value) {
-            props->setProperty((const char*)name, (const char*)value);
-        }
-
-        if (name) xmlFree(name);
-        if (value) xmlFree(value);
+        if (!name.empty() && !value.empty())
+            props->setProperty(name, value);
     }
 }
 
-void
-MapReader::readLayer(xmlNodePtr node, Map *map, int layer)
+static void setTile(Map *map, MapLayer *layer, int x, int y, int gid)
+{
+    const Tileset * const set = map->getTilesetWithGid(gid);
+    if (layer) {
+        // Set regular tile on a layer
+        Image * const img = set ? set->get(gid - set->getFirstGid()) : 0;
+        layer->setTile(x, y, img);
+     } else {
+        // Set collision tile
+        map->setWalk(x, y, (!set || (gid - set->getFirstGid() == 0)));
+     }
+}
+
+void MapReader::readLayer(xmlNodePtr node, Map *map)
 {
-    int h = map->getHeight();
-    int w = map->getWidth();
+    // Layers are not necessarily the same size as the map
+    const int w = XML::getProperty(node, "width", map->getWidth());
+    const int h = XML::getProperty(node, "height", map->getHeight());
+    const int offsetX = XML::getProperty(node, "xoffset", 0);
+    const int offsetY = XML::getProperty(node, "yoffset", 0);
+    const std::string name = XML::getProperty(node, "name", "");
+
+    const bool isFringeLayer = (name.substr(0,6) == "Fringe");
+    const bool isCollisionLayer = (name.substr(0,9) == "Collision");
+
+    MapLayer *layer = 0;
+
+    if (!isCollisionLayer) {
+         layer = new MapLayer(offsetX, offsetY, w, h, isFringeLayer);
+         map->addLayer(layer);
+    }
+
+    logger->log("- Loading layer \"%s\"", name.c_str());
     int x = 0;
     int y = 0;
-
-    // Load the tile data. Layers are assumed to be map size, with (0,0) as
-    // origin.
+ 
+    // Load the tile data
     for_each_xml_child_node(childNode, node)
     {
         if (!xmlStrEqual(childNode->name, BAD_CAST "data"))
-            continue;
-
-        xmlChar *encoding = xmlGetProp(childNode, BAD_CAST "encoding");
-        xmlChar *compression = xmlGetProp(childNode, BAD_CAST "compression");
-
-        if (encoding && xmlStrEqual(encoding, BAD_CAST "base64"))
+             continue;
+ 
+        const std::string encoding =
+              XML::getProperty(childNode, "encoding", "");
+        const std::string compression =
+              XML::getProperty(childNode, "compression", "");
+  
+        if (encoding == "base64")
         {
-            xmlFree(encoding);
-
-            if (compression && !xmlStrEqual(compression, BAD_CAST "gzip")) {
+            if (!compression.empty() && compression != "gzip") {
                 logger->log("Warning: only gzip layer compression supported!");
-                xmlFree(compression);
                 return;
             }
 
@@ -324,15 +350,15 @@ MapReader::readLayer(xmlNodePtr node, Map *map, int layer)
             xmlNodePtr dataChild = childNode->xmlChildrenNode;
             if (!dataChild)
                 continue;
-
+ 
             int len = strlen((const char*)dataChild->content) + 1;
             unsigned char *charData = new unsigned char[len + 1];
             const char *charStart = (const char*)dataChild->content;
             unsigned char *charIndex = charData;
-
+ 
             while (*charStart) {
                 if (*charStart != ' ' && *charStart != '\t' &&
-                        *charStart != '\n')
+                    *charStart != '\n')
                 {
                     *charIndex = *charStart;
                     charIndex++;
@@ -348,40 +374,34 @@ MapReader::readLayer(xmlNodePtr node, Map *map, int layer)
             delete[] charData;
 
             if (binData) {
-                if (compression) {
-                    if (xmlStrEqual(compression, BAD_CAST "gzip")) {
-                        // Inflate the gzipped layer data
-                        unsigned char *inflated;
-                        unsigned int inflatedSize =
-                            inflateMemory(binData, binLen, inflated);
-
-                        free(binData);
-                        binData = inflated;
-                        binLen = inflatedSize;
-
-                        if (inflated == NULL)
-                        {
-                            logger->log("Error: Could not decompress layer!");
-                            xmlFree(compression);
-                            return;
-                        }
+                if (compression == "gzip") {
+                    // Inflate the gzipped layer data
+                    unsigned char *inflated;
+                    unsigned int inflatedSize =
+                        inflateMemory(binData, binLen, inflated);
+ 
+                    free(binData);
+                    binData = inflated;
+                    binLen = inflatedSize;
+ 
+                    if (!inflated) {
+                        logger->log("Error: Could not decompress layer!");
+                        return;
                     }
-                    xmlFree(compression);
                 }
 
                 for (int i = 0; i < binLen - 3; i += 4) {
-                    int gid = binData[i] |
+                    const int gid = binData[i] |
                         binData[i + 1] << 8 |
                         binData[i + 2] << 16 |
                         binData[i + 3] << 24;
 
-                    map->setTileWithGid(x, y, layer, gid);
-
+                    setTile(map, layer, x, y, gid);
+  
                     x++;
-                    if (x == w) {
+                    if (x == w) 
+                    {
                         x = 0; y++;
-
-                        // When we're done, don't crash on too much data
                         if (y == h)
                             break;
                     }
@@ -390,29 +410,29 @@ MapReader::readLayer(xmlNodePtr node, Map *map, int layer)
             }
         }
         else {
-            // Read plain XML map file
-            for_each_xml_child_node(childNode2, childNode)
-            {
-                if (!xmlStrEqual(childNode2->name, BAD_CAST "tile"))
+             // Read plain XML map file
+             for_each_xml_child_node(childNode2, childNode)
+             {
+                 if (!xmlStrEqual(childNode2->name, BAD_CAST "tile"))
                     continue;
-
-                int gid = XML::getProperty(childNode2, "gid", -1);
-                map->setTileWithGid(x, y, layer, gid);
-
-                x++;
-                if (x == w) {
-                    x = 0; y++;
-                    if (y >= h)
-                        break;
-                }
-            }
+ 
+                 const int gid = XML::getProperty(childNode2, "gid", -1);
+                 setTile(map, layer, x, y, gid);
+ 
+                 x++;
+                 if (x == w) {
+                     x = 0; y++;
+                     if (y >= h)
+                         break;
+                 }
+             }
         }
-
+ 
         if (y < h)
             std::cerr << "TOO SMALL!\n";
         if (x)
             std::cerr << "TOO SMALL!\n";
-
+ 
         // There can be only one data element
         break;
     }
@@ -429,20 +449,20 @@ MapReader::readTileset(xmlNodePtr node,
         return NULL;
     }
 
-    int firstGid = XML::getProperty(node, "firstgid", 0);
-    int tw = XML::getProperty(node, "tilewidth", map->getTileWidth());
-    int th = XML::getProperty(node, "tileheight", map->getTileHeight());
+    const int firstGid = XML::getProperty(node, "firstgid", 0);
+    const int tw = XML::getProperty(node, "tilewidth", map->getTileWidth());
+    const int th = XML::getProperty(node, "tileheight", map->getTileHeight());
 
     for_each_xml_child_node(childNode, node)
     {
         if (!xmlStrEqual(childNode->name, BAD_CAST "image"))
             continue;
 
-        xmlChar* source = xmlGetProp(childNode, BAD_CAST "source");
+        const std::string source = XML::getProperty(childNode, "source", "");
 
-        if (source)
+        if (!source.empty())
         {
-            std::string sourceStr = std::string((const char*)source);
+            std::string sourceStr = source;
             sourceStr.erase(0, 3);  // Remove "../"
 
             ResourceManager *resman = ResourceManager::getInstance();
@@ -452,14 +472,14 @@ MapReader::readTileset(xmlNodePtr node,
             {
                 Tileset *set = new Tileset(tilebmp, tw, th, firstGid);
                 tilebmp->decRef();
-                xmlFree(source);
                 return set;
             }
             else {
-                logger->log("Warning: Failed to load tileset (%s)", source);
+                logger->log("Warning: Failed to load tileset (%s)", source.c_str());
             }
         }
 
+        // Only one image element expected
         break;
     }
 
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index 0d59fc9f..eb0d4873 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -63,10 +63,10 @@ class MapReader
         readProperties(xmlNodePtr node, Properties* props);
 
         /**
-         * Reads a map layer.
+         * Reads a map layer and adds it to the given map.
          */
         static void
-        readLayer(xmlNodePtr node, Map *map, int layer);
+        readLayer(xmlNodePtr node, Map *map);
 
         /**
          * Reads a tile set.
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 847b99fe..73e9d666 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -21,8 +21,6 @@
  *  $Id: monsterdb.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
-#include <algorithm>
-
 #include "monsterdb.h"
 
 #include "resourcemanager.h"
@@ -143,8 +141,7 @@ MonsterDB::load()
 void
 MonsterDB::unload()
 {
-    for_each(mMonsterInfos.begin(), mMonsterInfos.end(),
-             make_dtor(mMonsterInfos));
+    delete_all(mMonsterInfos);
     mMonsterInfos.clear();
 
     mLoaded = false;
diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp
index e492ccd3..19f2990b 100644
--- a/src/resources/monsterinfo.cpp
+++ b/src/resources/monsterinfo.cpp
@@ -21,8 +21,6 @@
  *  $Id: monsterinfo.cpp 2650 2006-09-03 15:00:47Z b_lindeijer $
  */
 
-#include <algorithm>
-
 #include "monsterinfo.h"
 
 #include "../utils/dtor.h"
@@ -35,8 +33,7 @@ MonsterInfo::MonsterInfo()
 MonsterInfo::~MonsterInfo()
 {
     // kill vectors in mSoundEffects
-    for_each (mSounds.begin(), mSounds.end(),
-              make_dtor(mSounds));
+    delete_all(mSounds);
     mSounds.clear();
 }
 
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 550b2d1c..ebc60240 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: spritedef.cpp 4332 2008-06-05 07:33:12Z b_lindeijer $
+ *  $Id$
  */
 
 #include <set>
@@ -70,33 +70,8 @@ SpriteDef *SpriteDef::load(std::string const &animationFile, int variant)
         }
     }
 
-    // Get the variant
-    int variant_num = XML::getProperty(rootNode, "variants", 0);
-    int variant_offset = 0;
-
-    if (variant_num > 0 && variant < variant_num)
-    {
-        variant_offset = variant * XML::getProperty(rootNode, "variant_offset", 0);
-    }
-
     SpriteDef *def = new SpriteDef;
-
-    for_each_xml_child_node(node, rootNode)
-    {
-        if (xmlStrEqual(node->name, BAD_CAST "imageset"))
-        {
-            def->loadImageSet(node, palettes);
-        }
-        else if (xmlStrEqual(node->name, BAD_CAST "action"))
-        {
-            def->loadAction(node, variant_offset);
-        }
-        else if (xmlStrEqual(node->name, BAD_CAST "include"))
-        {
-            def->includeSprite(node);
-        }
-    }
-
+    def->loadSprite(rootNode, variant, palettes);
     def->substituteActions();
     return def;
 }
@@ -119,11 +94,47 @@ void SpriteDef::substituteActions()
     substituteAction(ACTION_DEAD, ACTION_HURT);
 }
 
+void SpriteDef::loadSprite(xmlNodePtr spriteNode, int variant,
+                           const std::string &palettes)
+{
+    // Get the variant
+    const int variantCount = XML::getProperty(spriteNode, "variants", 0);
+    int variant_offset = 0;
+
+    if (variantCount > 0 && variant < variantCount)
+    {
+        variant_offset =
+            variant * XML::getProperty(spriteNode, "variant_offset", 0);
+    }
+
+    for_each_xml_child_node(node, spriteNode)
+    {
+        if (xmlStrEqual(node->name, BAD_CAST "imageset"))
+        {
+            loadImageSet(node, palettes);
+        }
+        else if (xmlStrEqual(node->name, BAD_CAST "action"))
+        {
+            loadAction(node, variant_offset);
+        }
+        else if (xmlStrEqual(node->name, BAD_CAST "include"))
+        {
+            includeSprite(node);
+        }
+    }
+}
+
 void SpriteDef::loadImageSet(xmlNodePtr node, std::string const &palettes)
 {
-    int width = XML::getProperty(node, "width", 0);
-    int height = XML::getProperty(node, "height", 0);
-    std::string name = XML::getProperty(node, "name", "");
+    const std::string name = XML::getProperty(node, "name", "");
+
+    // We don't allow redefining image sets. This way, an included sprite
+    // definition will use the already loaded image set with the same name.
+    if (mImageSets.find(name) != mImageSets.end())
+        return;
+
+    const int width = XML::getProperty(node, "width", 0);
+    const int height = XML::getProperty(node, "height", 0);
     std::string imageSrc = XML::getProperty(node, "src", "");
     Dye::instantiate(imageSrc, palettes);
 
@@ -184,9 +195,9 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
                          Action *action, ImageSet *imageSet,
                          int variant_offset)
 {
-    std::string directionName =
+    const std::string directionName =
         XML::getProperty(animationNode, "direction", "");
-    SpriteDirection directionType = makeSpriteDirection(directionName);
+    const SpriteDirection directionType = makeSpriteDirection(directionName);
 
     if (directionType == DIRECTION_INVALID)
     {
@@ -201,7 +212,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
     // Get animation frames
     for_each_xml_child_node(frameNode, animationNode)
     {
-        int delay = XML::getProperty(frameNode, "delay", 0);
+        const int delay = XML::getProperty(frameNode, "delay", 0);
         int offsetX = XML::getProperty(frameNode, "offsetX", 0);
         int offsetY = XML::getProperty(frameNode, "offsetY", 0);
         offsetY -= imageSet->getHeight() - 32;
@@ -209,7 +220,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
 
         if (xmlStrEqual(frameNode->name, BAD_CAST "frame"))
         {
-            int index = XML::getProperty(frameNode, "index", -1);
+            const int index = XML::getProperty(frameNode, "index", -1);
 
             if (index < 0)
             {
@@ -230,7 +241,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
         else if (xmlStrEqual(frameNode->name, BAD_CAST "sequence"))
         {
             int start = XML::getProperty(frameNode, "start", -1);
-            int end = XML::getProperty(frameNode, "end", -1);
+            const int end = XML::getProperty(frameNode, "end", -1);
 
             if (start < 0 || end < 0)
             {
@@ -263,12 +274,23 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
 void
 SpriteDef::includeSprite(xmlNodePtr includeNode)
 {
+    // TODO: Perform circular dependency check, since it's easy to crash the
+    // client this way.
     const std::string filename = XML::getProperty(includeNode, "file", "");
-    ResourceManager *resman = ResourceManager::getInstance();
-    SpriteDef *sprite = resman->getSprite("graphics/sprites/" + filename);
 
-    // TODO: Somehow implement actually including it
-    sprite->decRef();
+    if (filename.empty())
+        return;
+
+    XML::Document doc("graphics/sprites/" + filename);
+    xmlNodePtr rootNode = doc.rootNode();
+
+    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "sprite"))
+    {
+        logger->log("Error, no sprite root node in %s", filename.c_str());
+        return;
+    }
+
+    loadSprite(rootNode, 0);
 }
 
 void
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 2872af06..72c2566f 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: spritedef.h 4255 2008-05-21 21:44:27Z crush_tmw $
+ *  $Id$
  */
 
 #ifndef _TMW_SPRITEDEF_H
@@ -91,6 +91,12 @@ class SpriteDef : public Resource
          */
         ~SpriteDef();
 
+        /**
+         * Loads a sprite element.
+         */
+        void loadSprite(xmlNodePtr spriteNode, int variant,
+                        const std::string &palettes = "");
+
         /**
          * Loads an imageset element.
          */
diff --git a/src/sound.h b/src/sound.h
index 038f299e..ebcd6442 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: sound.h 3606 2007-09-27 14:54:09Z b_lindeijer $
+ *  $Id$
  */
 
 #ifndef _TMW_SOUND_H
diff --git a/src/textparticle.cpp b/src/textparticle.cpp
index c4b432f3..89466006 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: textparticle.cpp 4360 2008-06-23 14:44:20Z crush_tmw $
+ *  $Id$
  */
 
 #include "textparticle.h"
diff --git a/src/tileset.h b/src/tileset.h
index 6272d64a..fb5593ef 100644
--- a/src/tileset.h
+++ b/src/tileset.h
@@ -44,8 +44,7 @@ class Tileset : public ImageSet
         /**
          * Returns the first gid.
          */
-        int
-        getFirstGid()
+        int getFirstGid() const
         {
             return mFirstGid;
         }
diff --git a/src/utils/dtor.h b/src/utils/dtor.h
index 3b8aeb0e..29cde178 100644
--- a/src/utils/dtor.h
+++ b/src/utils/dtor.h
@@ -24,6 +24,7 @@
 #ifndef _TMW_UTILS_DTOR_H
 #define _TMW_UTILS_DTOR_H
 
+#include <algorithm>
 #include <functional>
 #include <utility>
 
@@ -46,4 +47,11 @@ inline dtor<typename Cont::value_type> make_dtor(Cont const&)
     return dtor<typename Cont::value_type>();
 }
 
+template<typename Container>
+inline void delete_all(Container &c)
+{
+    std::for_each(c.begin(), c.end(), make_dtor(c));
+}
+
+
 #endif
-- 
cgit v1.2.3-70-g09d2


From c6db9aaac28138dcd6bdfb49fdc98afb36cb9c54 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 25 Sep 2008 00:20:43 +0000
Subject: Forgot to merge in the new files and resources into trunk.

---
 data/graphics/gui/Makefile.in       | 385 ++++++++++++++++++++++++++++++++++++
 data/graphics/gui/default.png       | Bin 0 -> 1461 bytes
 data/graphics/gui/gui.xml           |  18 ++
 data/graphics/gui/speech_bubble.png | Bin 0 -> 2031 bytes
 data/graphics/gui/speechbubble.xml  |  18 ++
 src/gui/itempopup.cpp               | 115 +++++++++++
 src/gui/itempopup.h                 |  53 +++++
 src/gui/speechbubble.cpp            |  92 +++++++++
 src/gui/speechbubble.h              |  47 +++++
 9 files changed, 728 insertions(+)
 create mode 100644 data/graphics/gui/Makefile.in
 create mode 100644 data/graphics/gui/default.png
 create mode 100644 data/graphics/gui/gui.xml
 create mode 100644 data/graphics/gui/speech_bubble.png
 create mode 100644 data/graphics/gui/speechbubble.xml
 create mode 100644 src/gui/itempopup.cpp
 create mode 100644 src/gui/itempopup.h
 create mode 100644 src/gui/speechbubble.cpp
 create mode 100644 src/gui/speechbubble.h

diff --git a/data/graphics/gui/Makefile.in b/data/graphics/gui/Makefile.in
new file mode 100644
index 00000000..1b14bfc1
--- /dev/null
+++ b/data/graphics/gui/Makefile.in
@@ -0,0 +1,385 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = data/graphics/gui
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(guidir)"
+guiDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(gui_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBSDL_CFLAGS = @LIBSDL_CFLAGS@
+LIBSDL_CONFIG = @LIBSDL_CONFIG@
+LIBSDL_LIBS = @LIBSDL_LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CXX = @ac_ct_CXX@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+guidir = $(pkgdatadir)/data/graphics/gui
+gui_DATA = \
+	bg_quad_dis.png			\
+	browserfont.png			\
+	button.png			\
+	button_disabled.png		\
+	buttonhi.png			\
+	buttonpress.png			\
+	checkbox.png			\
+	close_button.png		\
+	deepbox.png			\
+	default.png			\
+	emotions.png			\
+	fixedfont.png			\
+	gui.xml				\
+	hits_blue.png			\
+	hits_red.png			\
+	hits_yellow.png			\
+	hscroll_left_default.png	\
+	hscroll_left_highlight.png	\
+	hscroll_left_pressed.png	\
+	hscroll_right_default.png	\
+	hscroll_right_highlight.png	\
+	hscroll_right_pressed.png	\
+	item_shortcut_bgr.png		\
+	mouse.png			\
+	menuitemD.png			\
+	menuitemF.png			\
+	menuitemN.png			\
+	menuitemP.png			\
+	radioin.png			\
+	radioout.png			\
+	resize.png			\
+	rpgfont_wider.png		\
+	selection.png			\
+	sansserif8.png			\
+	slider.png			\
+	speech_bubble.png		\
+	speechbubble.xml		\
+	target-cursor-blue-l.png	\
+	target-cursor-blue-m.png	\
+	target-cursor-blue-s.png	\
+	target-cursor-red-l.png		\
+	target-cursor-red-m.png		\
+	target-cursor-red-s.png		\
+	thickborder.png			\
+	unknown-item.png		\
+	vscroll_blue.png		\
+	vscroll_down_default.png	\
+	vscroll_down_highlight.png	\
+	vscroll_down_pressed.png	\
+	vscroll_grey.png		\
+	vscroll_red.png			\
+	vscroll_up_default.png		\
+	vscroll_up_highlight.png	\
+	vscroll_up_pressed.png
+
+EXTRA_DIST = \
+	$(gui_DATA)
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/graphics/gui/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/graphics/gui/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-guiDATA: $(gui_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(guidir)" || $(MKDIR_P) "$(DESTDIR)$(guidir)"
+	@list='$(gui_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(guiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(guidir)/$$f'"; \
+	  $(guiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(guidir)/$$f"; \
+	done
+
+uninstall-guiDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(gui_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(guidir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(guidir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(guidir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-guiDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-guiDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-guiDATA \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+	uninstall-am uninstall-guiDATA
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/data/graphics/gui/default.png b/data/graphics/gui/default.png
new file mode 100644
index 00000000..29353df8
Binary files /dev/null and b/data/graphics/gui/default.png differ
diff --git a/data/graphics/gui/gui.xml b/data/graphics/gui/gui.xml
new file mode 100644
index 00000000..fe62528e
--- /dev/null
+++ b/data/graphics/gui/gui.xml
@@ -0,0 +1,18 @@
+<skinset name="Default" image="default.png">
+    <widget type="Window">
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="4" height="4" />
+		<part type="top-edge" xpos="4" ypos="0" width="3" height="4" />
+		<part type="top-right-corner" xpos="7" ypos="0" width="4" height="4" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="4" width="4" height="10" />
+		<part type="bg-quad" xpos="11" ypos="0" width="32" height="32" />
+		<part type="right-edge" xpos="7" ypos="4" width="4" height="10" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="15" width="4" height="4" />
+		<part type="bottom-edge" xpos="4" ypos="15" width="3" height="4" />
+		<part type="bottom-right-corner" xpos="7" ypos="15" width="4" height="4" />
+	</widget>
+</skinset>
\ No newline at end of file
diff --git a/data/graphics/gui/speech_bubble.png b/data/graphics/gui/speech_bubble.png
new file mode 100644
index 00000000..3e678099
Binary files /dev/null and b/data/graphics/gui/speech_bubble.png differ
diff --git a/data/graphics/gui/speechbubble.xml b/data/graphics/gui/speechbubble.xml
new file mode 100644
index 00000000..1b11ea85
--- /dev/null
+++ b/data/graphics/gui/speechbubble.xml
@@ -0,0 +1,18 @@
+<skinset name="SpeechBubble" image="speech_bubble.png">
+    <widget type="Window">
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="14" height="14" />
+		<part type="top-edge" xpos="15" ypos="0" width="1" height="14" />
+		<part type="top-right-corner" xpos="17" ypos="0" width="17" height="14" />
+
+		<!-- Middle Row -->
+		<part type="left-edge" xpos="0" ypos="15" width="14" height="1" />
+		<part type="bg-quad" xpos="34" ypos="0" width="32" height="32" />
+		<part type="right-edge" xpos="17" ypos="15" width="17" height="1" />
+
+		<!-- Bottom Row -->
+		<part type="bottom-left-corner" xpos="0" ypos="17" width="14" height="17" />
+		<part type="bottom-edge" xpos="15" ypos="17" width="1" height="17" />
+		<part type="bottom-right-corner" xpos="17" ypos="17" width="17" height="17" />
+	</widget>
+</skinset>
\ No newline at end of file
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
new file mode 100644
index 00000000..aab9fd9d
--- /dev/null
+++ b/src/gui/itempopup.cpp
@@ -0,0 +1,115 @@
+/*
+ *  The Legend of Mazzeroth
+ *  Copyright (C) 2008, The Legend of Mazzeroth Development Team
+ *
+ *  This file is part of The Legend of Mazzeroth based on original code
+ *  from The Mana World.
+ *
+ *  The Legend of Mazzeroth is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Legend of Mazzeroth is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Legend of Mazzeroth; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "itempopup.h"
+#include <guichan/widgets/label.hpp>
+#include "widgets/layout.h"
+
+#include "gui.h"
+
+#include "../resources/image.h"
+#include "../resources/resourcemanager.h"
+#include "../resources/iteminfo.h"
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
+
+
+ItemPopup::ItemPopup()
+{
+
+    setResizable(false);
+    setTitleBarHeight(0);
+
+    // Item Name
+    mItemName = new gcn::Label("Label");
+    mItemName->setFont(gui->getFont());
+    mItemName->setPosition(2, 2);
+    mItemName->setWidth(getWidth() - 4);
+
+    // Item Description
+    mItemDesc = new TextBox();
+    mItemDesc->setEditable(false);
+    mItemDescScroll = new ScrollArea(mItemDesc);
+
+    mItemDescScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mItemDescScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mItemDescScroll->setDimension(gcn::Rectangle(0, 0, 196, 14));
+    mItemDescScroll->setOpaque(false);
+    mItemDescScroll->setPosition(2, 15);
+
+    // Item Effect
+    mItemEffect = new TextBox();
+    mItemEffect->setEditable(false);
+    mItemEffectScroll = new ScrollArea(mItemEffect);
+
+    mItemEffectScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mItemEffectScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mItemEffectScroll->setDimension(gcn::Rectangle(0, 0, 196, 14));
+    mItemEffectScroll->setOpaque(false);
+    mItemEffectScroll->setPosition(2, 35);
+
+    add(mItemName);
+    add(mItemDescScroll);
+    add(mItemEffectScroll);
+
+    setLocationRelativeTo(getParent());
+
+    // LEEOR / TODO: This causes an exception error.
+    //moveToBottom(getParent());
+
+    mItemDesc->setTextWrapped( "" );
+    mItemEffect->setTextWrapped( "" );
+}
+
+void ItemPopup::setItem(Item *item)
+{
+
+    ItemInfo const *info = item ? &item->getInfo() : NULL;
+
+    mItemName->setCaption(info->getName());
+    mItemDesc->setTextWrapped( info->getDescription() );
+    mItemEffect->setTextWrapped( info->getEffect() );
+
+    int numRowsDesc = mItemDesc->getNumberOfRows();
+    int numRowsEffect = mItemEffect->getNumberOfRows();
+
+    if(info->getEffect() == "")
+    {
+        setContentSize(200, (numRowsDesc * 14) + 30);
+    } else {
+        setContentSize(200, (numRowsDesc * 14) + (numRowsEffect*14) + 30);
+    }
+
+    mItemDescScroll->setDimension(gcn::Rectangle(2, 0, 196, numRowsDesc * 14));
+
+    mItemEffectScroll->setDimension(gcn::Rectangle(2, 0, 196, numRowsEffect * 14));
+
+    mItemDescScroll->setPosition(2, 20);
+    mItemEffectScroll->setPosition(2, (numRowsDesc * 15) + 25);
+}
+
+unsigned int ItemPopup::getNumRows()
+{
+    return mItemDesc->getNumberOfRows(), mItemEffect->getNumberOfRows();
+}
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
new file mode 100644
index 00000000..499b2e0a
--- /dev/null
+++ b/src/gui/itempopup.h
@@ -0,0 +1,53 @@
+/*
+*
+ *  The Legend of Mazzeroth
+ *  Copyright (C) 2008, The Legend of Mazzeroth Development Team
+ *
+ *  This file is part of The Legend of Mazzeroth based on original code
+ *  from The Mana World.
+ *
+ *  The Legend of Mazzeroth is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Legend of Mazzeroth is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Legend of Mazzeroth; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _LOM_ITEMPOPUP_H__
+#define _LOM_ITEMPOPUP_H__
+
+#include "textbox.h"
+#include "scrollarea.h"
+#include "window.h"
+
+#include "../item.h"
+
+class ItemPopup : public Window
+	{
+    public:
+
+		ItemPopup();
+
+		void setItem(Item *item);
+		unsigned int getNumRows();
+
+    private:
+		gcn::Label *mItemName;
+		TextBox *mItemDesc;
+		TextBox *mItemEffect;
+		ScrollArea *mItemDescScroll;
+		ScrollArea *mItemEffectScroll;
+
+	};
+
+#endif
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
new file mode 100644
index 00000000..d71ceedf
--- /dev/null
+++ b/src/gui/speechbubble.cpp
@@ -0,0 +1,92 @@
+/*
+ *  The Legend of Mazzeroth
+ *  Copyright (C) 2008, The Legend of Mazzeroth Development Team
+ *
+ *  This file is part of The Legend of Mazzeroth based on original code
+ *  from The Mana World.
+ *
+ *  The Legend of Mazzeroth is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Legend of Mazzeroth is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Legend of Mazzeroth; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include <guichan/font.hpp>
+
+#include "speechbubble.h"
+
+#include "../resources/image.h"
+#include "../resources/resourcemanager.h"
+
+// TODO: Fix windows so that they can each load their own skins without the
+// other windows overriding another window's skin.
+SpeechBubble::SpeechBubble()//:
+//    Window("Message", false, NULL, "graphics/gui/speechbubble.xml")
+{
+    mSpeechBox = new TextBox();
+    mSpeechBox->setEditable(false);
+    mSpeechBox->setOpaque(false);
+
+    mSpeechArea = new ScrollArea(mSpeechBox);
+
+    // Height == Top Graphic (14px) + 1 Row of Text (15px) + Bottom Graphic (17px)
+    setContentSize(140, 46);
+    setTitleBarHeight(5);
+
+    mSpeechArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mSpeechArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mSpeechArea->setDimension(gcn::Rectangle(4, 15, 130, 28));
+    mSpeechArea->setOpaque(false);
+
+    add(mSpeechArea);
+
+    setLocationRelativeTo(getParent());
+
+    // LEEOR / TODO: This causes an exception error.
+    //moveToBottom(getParent());
+
+    mSpeechBox->setTextWrapped( "" );
+}
+
+void SpeechBubble::setText(const std::string mText)
+{
+    mSpeechBox->setTextWrapped( mText );
+    mSpeechBox->setMinWidth(140);
+
+    int numRows = mSpeechBox->getNumberOfRows();
+
+    if (numRows > 1)
+    {
+        // 15 == height of each line of text (based on font heights)
+        // 14 == speechbubble Top + Bottom graphic pixel heights
+        setContentSize(mSpeechBox->getMinWidth() + 15, 15 + (numRows * 15));
+        mSpeechArea->setDimension(gcn::Rectangle(4, 15, mSpeechBox->getMinWidth() + 5, 
+                                  3 +(numRows * 14)));
+    }
+    else
+    {
+        int width;
+        if (this->getCaption().length() > mText.length())
+            width = getFont()->getWidth(this->getCaption());
+        else
+            width = getFont()->getWidth(mText);
+        setContentSize(width + 15, 30);
+        mSpeechArea->setDimension(gcn::Rectangle(4, 15, width + 5, 17));
+    }
+}
+
+unsigned int SpeechBubble::getNumRows()
+{
+    return mSpeechBox->getNumberOfRows();
+}
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
new file mode 100644
index 00000000..c4ca9109
--- /dev/null
+++ b/src/gui/speechbubble.h
@@ -0,0 +1,47 @@
+/*
+ *  The Legend of Mazzeroth
+ *  Copyright (C) 2008, The Legend of Mazzeroth Development Team
+ *
+ *  This file is part of The Legend of Mazzeroth based on original code
+ *  from The Mana World.
+ *
+ *  The Legend of Mazzeroth is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Legend of Mazzeroth is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Legend of Mazzeroth; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _LOM_SPEECHBUBBLE_H__
+#define _LOM_SPEECHBUBBLE_H__
+
+#include "textbox.h"
+#include "scrollarea.h"
+#include "window.h"
+
+class SpeechBubble : public Window
+{
+    public:
+
+	SpeechBubble();
+
+	void setText(const std::string mText);
+	void setLocation(int x, int y);
+	unsigned int getNumRows();
+
+    private:
+	TextBox *mSpeechBox;
+	ScrollArea *mSpeechArea;
+};
+
+#endif
-- 
cgit v1.2.3-70-g09d2


From 5bf2acfff7bef677790f435f5b8509453d4e55ca Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 25 Sep 2008 01:32:17 +0000
Subject: Fixed a bug that prevents compilation in some compilers.

---
 data/graphics/gui/Makefile.in | 385 ------------------------------------------
 src/being.h                   |   1 +
 2 files changed, 1 insertion(+), 385 deletions(-)
 delete mode 100644 data/graphics/gui/Makefile.in

diff --git a/data/graphics/gui/Makefile.in b/data/graphics/gui/Makefile.in
deleted file mode 100644
index 1b14bfc1..00000000
--- a/data/graphics/gui/Makefile.in
+++ /dev/null
@@ -1,385 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = data/graphics/gui
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(guidir)"
-guiDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(gui_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CPPFLAGS = @CPPFLAGS@
-CURL_CFLAGS = @CURL_CFLAGS@
-CURL_LIBS = @CURL_LIBS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBSDL_CFLAGS = @LIBSDL_CFLAGS@
-LIBSDL_CONFIG = @LIBSDL_CONFIG@
-LIBSDL_LIBS = @LIBSDL_LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CXX = @ac_ct_CXX@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-guidir = $(pkgdatadir)/data/graphics/gui
-gui_DATA = \
-	bg_quad_dis.png			\
-	browserfont.png			\
-	button.png			\
-	button_disabled.png		\
-	buttonhi.png			\
-	buttonpress.png			\
-	checkbox.png			\
-	close_button.png		\
-	deepbox.png			\
-	default.png			\
-	emotions.png			\
-	fixedfont.png			\
-	gui.xml				\
-	hits_blue.png			\
-	hits_red.png			\
-	hits_yellow.png			\
-	hscroll_left_default.png	\
-	hscroll_left_highlight.png	\
-	hscroll_left_pressed.png	\
-	hscroll_right_default.png	\
-	hscroll_right_highlight.png	\
-	hscroll_right_pressed.png	\
-	item_shortcut_bgr.png		\
-	mouse.png			\
-	menuitemD.png			\
-	menuitemF.png			\
-	menuitemN.png			\
-	menuitemP.png			\
-	radioin.png			\
-	radioout.png			\
-	resize.png			\
-	rpgfont_wider.png		\
-	selection.png			\
-	sansserif8.png			\
-	slider.png			\
-	speech_bubble.png		\
-	speechbubble.xml		\
-	target-cursor-blue-l.png	\
-	target-cursor-blue-m.png	\
-	target-cursor-blue-s.png	\
-	target-cursor-red-l.png		\
-	target-cursor-red-m.png		\
-	target-cursor-red-s.png		\
-	thickborder.png			\
-	unknown-item.png		\
-	vscroll_blue.png		\
-	vscroll_down_default.png	\
-	vscroll_down_highlight.png	\
-	vscroll_down_pressed.png	\
-	vscroll_grey.png		\
-	vscroll_red.png			\
-	vscroll_up_default.png		\
-	vscroll_up_highlight.png	\
-	vscroll_up_pressed.png
-
-EXTRA_DIST = \
-	$(gui_DATA)
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/graphics/gui/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  data/graphics/gui/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-guiDATA: $(gui_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(guidir)" || $(MKDIR_P) "$(DESTDIR)$(guidir)"
-	@list='$(gui_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(guiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(guidir)/$$f'"; \
-	  $(guiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(guidir)/$$f"; \
-	done
-
-uninstall-guiDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(gui_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(guidir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(guidir)/$$f"; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(guidir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-guiDATA
-
-install-dvi: install-dvi-am
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-guiDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-guiDATA \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-guiDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/being.h b/src/being.h
index b7f85c63..cc6ba427 100644
--- a/src/being.h
+++ b/src/being.h
@@ -25,6 +25,7 @@
 #define _TMW_BEING_H
 
 #include <list>
+#include <memory>
 #include <string>
 #include <SDL_types.h>
 #include <vector>
-- 
cgit v1.2.3-70-g09d2


From a14a4fa368e91956a411337bf333451abd6b326a Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 25 Sep 2008 22:53:40 +0000
Subject: Changed textfield behavior cause a windows build didn't like it.

---
 src/gui/textfield.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index 21c3adbc..b128701b 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -24,6 +24,7 @@
 #include <algorithm>
 
 #include <guichan/font.hpp>
+#include <guichan/sdl/sdlinput.hpp>
 
 #include "textfield.h"
 
@@ -135,9 +136,9 @@ void TextField::keyPressed(gcn::KeyEvent &keyEvent)
                 break;
             }
             int value = key.getValue();
-            if (value == gcn::Key::LEFT || value == gcn::Key::RIGHT ||
-                value == gcn::Key::HOME || value == gcn::Key::END ||
-                value == gcn::Key::BACKSPACE || value == gcn::Key::DELETE)
+            if (value == SDLK_LEFT || value == SDLK_RIGHT ||
+                value == SDLK_HOME || value == SDLK_END ||
+                value == SDLK_BACKSPACE || value == SDLK_DELETE)
             {
                 break;
             }
-- 
cgit v1.2.3-70-g09d2


From 9ae618b143023609a1f085162ca935167677e1ca Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 26 Sep 2008 05:44:45 +0000
Subject: Made /msg an alias for /whisper.

---
 src/gui/chat.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 918b4dbe..316669c2 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -345,7 +345,7 @@ void ChatWindow::chatSend(const std::string & nick, std::string msg)
         mTextOutput->clearRows();
         return;
     }
-    if (command == "whisper") {
+    if (command == "whisper" || command == "msg") {
         std::string recvnick = "";
 
         if (msg.substr(0, 1) == "\"") {
@@ -704,7 +704,7 @@ void ChatWindow::help(const std::string & msg1, const std::string & msg2)
                 BY_SERVER);
         return;
     }
-    if (msg1 == "whisper") {
+    if (msg1 == "whisper" || msg1 == "msg") {
         chatLog("Command: /whisper <nick> <msg>", BY_SERVER);
         chatLog("This command sends the message <msg> to <nick.", BY_SERVER);
         chatLog("If the <nick> has spaces in it, enclose it in "
-- 
cgit v1.2.3-70-g09d2


From 7aa0b5cadf9f37c7d9395aa44e0c461e2b539763 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 29 Sep 2008 23:03:41 +0000
Subject: Modified the client so that it displays both servers as server
 choices, as well as changing the default server to point to www.aethyra.org
 instead of Slinker's IP address now.

---
 src/gui/login.cpp | 26 +++++++++++++++-----------
 src/gui/login.h   |  4 ++--
 src/main.cpp      |  6 +++---
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 6a4cfeb7..c553d56e 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -24,6 +24,7 @@
 #include "login.h"
 
 #include <string>
+#include <vector>
 
 #include <guichan/widgets/label.hpp>
 
@@ -50,9 +51,13 @@ LoginDialog::LoginDialog(LoginData *loginData):
     gcn::Label *passLabel = new gcn::Label("Password:");
     gcn::Label *serverLabel = new gcn::Label("Server:");
     gcn::Label *portLabel = new gcn::Label("Port:");
-    mServerList = new DropDownList("MostRecent00",
-                                   "209.168.213.109",
-                                   "21001",
+    std::vector<std::string> dfltServer;
+    dfltServer.push_back("www.aethyra.org"); 
+    dfltServer.push_back("www.aethyra.org");
+    std::vector<std::string> dfltPort;
+    dfltPort.push_back("22001");
+    dfltPort.push_back("21001");
+    mServerList = new DropDownList("MostRecent00", dfltServer, dfltPort,
                                    MAX_SERVER_LIST_SIZE);
     mServerListBox = new gcn::ListBox(mServerList);
     mServerScrollArea = new ScrollArea();
@@ -193,8 +198,8 @@ LoginDialog::action(const gcn::ActionEvent &event)
         }
         else
         {
-        mLoginData->port = 6901;
-    }
+            mLoginData->port = 6901;
+        }
         mLoginData->username = mUserField->getText();
         mLoginData->password = mPassField->getText();
 
@@ -271,8 +276,8 @@ LoginDialog::DropDownList::saveEntry(const std::string &server,
 }
 
 LoginDialog::DropDownList::DropDownList(std::string prefix,
-                                        std::string dflt,
-                    std::string dfltPort,
+                                        std::vector<std::string> dflt,
+                                        std::vector<std::string> dfltPort,
                                         int maxEntries) :
                                         mConfigPrefix(prefix),
                                         mMaxEntries(maxEntries)
@@ -287,7 +292,7 @@ LoginDialog::DropDownList::DropDownList(std::string prefix,
                                      toString(i), "");
         }
         std::string port = config.getValue(mConfigPrefix + "Port" +
-                                           toString(i), dfltPort);
+                                           toString(i), dfltPort.front());
 
         if (server != "")
         {
@@ -297,10 +302,9 @@ LoginDialog::DropDownList::DropDownList(std::string prefix,
     }
     if (mServers.size() == 0)
     {
-        mServers.push_back(dflt);
-        mPorts.push_back(dfltPort);
+        mServers.assign(dflt.begin(), dflt.end());
+        mPorts.assign(dfltPort.begin(), dfltPort.end());
     }
-
 }
 
 void
diff --git a/src/gui/login.h b/src/gui/login.h
index 8a228b5f..3550d82b 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -124,8 +124,8 @@ class LoginDialog : public Window, public gcn::ActionListener,
 			       const std::string &port, int &saved);
             public:
                 DropDownList(std::string prefix,
-                             std::string dfltServer,
-			     std::string dfltPort,
+                             std::vector<std::string> dfltServer,
+			     std::vector<std::string> dfltPort,
                              int maxEntries);
                 void save(const std::string &server, const std::string &port);
                 int getNumberOfElements();
diff --git a/src/main.cpp b/src/main.cpp
index fb4e8f76..4427b4d4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -166,7 +166,7 @@ void setUpdatesDir()
     // If updatesHost is currently empty, fill it from config file
     if (updateHost.empty()) {
         updateHost =
-            config.getValue("updatehost", "http://209.168.213.109/updates");
+            config.getValue("updatehost", "http://www.aethyra.org/updates");
     }
 
     // Parse out any "http://" or "ftp://", and set the updates directory
@@ -279,7 +279,7 @@ void init_engine(const Options &options)
 
     // Fill configuration with defaults
     logger->log("Initializing configuration...");
-    config.setValue("host", "209.168.213.109");
+    config.setValue("host", "www.aethyra.org");
     config.setValue("port", 21001);
     config.setValue("hwaccel", 0);
 #if (defined __APPLE__ || defined WIN32) && defined USE_OPENGL
@@ -294,7 +294,7 @@ void init_engine(const Options &options)
     config.setValue("sfxVolume", 100);
     config.setValue("musicVolume", 60);
     config.setValue("fpslimit", 60);
-    config.setValue("updatehost", "http://209.168.213.109/updates");
+    config.setValue("updatehost", "http://www.aethyra.org/updates");
     config.setValue("customcursor", 1);
     config.setValue("ChatLogLength", 128);
 
-- 
cgit v1.2.3-70-g09d2


From b87bcbd23760e33ec3a20e0faaf2e5ef4a85d6ad Mon Sep 17 00:00:00 2001
From: Kevin Day <blame582@gmail.com>
Date: Tue, 30 Sep 2008 09:15:17 +0000
Subject: fixed the update.sh and autobuild.sh

---
 autobuild.sh | 13 ++++++++-----
 update.sh    | 15 ++++++++-------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/autobuild.sh b/autobuild.sh
index c5160439..d15bd853 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -1,8 +1,10 @@
 #!/bin/sh
 # auto build script based on fedora but usable for other distros
-#author=Blame <blame@aethyra.com> 
-#last modified date 2008-09-16 Blame
-
+#author=Blame <blame582@gmail.com> 
+#last modified date 2008-09-29 Blameu
+# right now thes should be ok for testing 
+file=/etc/fedora-release
+file1=/etc/lsb-release
 
 echo "Generating build information using aclocal, autoheader, automake and autoconf."
 echo
@@ -25,14 +27,15 @@ make
 
 echo
 echo "now running make install please input your root password";
-if [ /etc/fedora-release ]; then
+# we must test for fedora first otherwise we get an error
+if [ -e $file ]; then
 	echo "Fedora found";
 	su -c "make install";
 	su -c "make clean";
 	echo "Done";
 	aethyra &
 	exit 1;
-elif [ /etc/lsb-release ];then
+elif [ -e $file1 ];then
 	echo "ubuntu found";
 	sudo make install;
 	aethyra &
diff --git a/update.sh b/update.sh
index 1402fda9..34c64969 100755
--- a/update.sh
+++ b/update.sh
@@ -2,11 +2,12 @@
 #automated script to update aethyra from SVN
 #author=Blame <blame@aethyra.com>
 #last modified 2008-09-21 Blame
-
-# test for the aethyra client 
-if [ ~/src/aethyra ]; then
+file=~/src/aethyra
+file1=~/src
+# test for the aethyra client folder 
+if [ -e $file ]; then
 	#change to the aethyra directory
-	cd ~/src/aethyra;
+	cd $file;
 	#issue the svn update command
 	svn up;
 	#issue the autobuild command 
@@ -15,11 +16,11 @@ if [ ~/src/aethyra ]; then
 	exit 1;
 else 
 	#make directory /home/user-name/src
-	mkdir ~/src
+	mkdir $file1
 	#change to directory /home/user-name/src
-	cd ~/src
+	cd $file1
 	#execute the svn command to download the client files
-	svn co svn://209.168.213.109/client/trunk aethyra
+	svn co svn://www.aethyra.org/client/trunk aethyra
 	#issue the auto build script to compile the client
 	./autobuild
 	echo "congratulations on installing aethyra enjoy"
-- 
cgit v1.2.3-70-g09d2


From 9dd496ef1a395cada1f7fec08d4785728b2602d2 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 1 Oct 2008 02:54:24 +0000
Subject: Fixed female sprites not showing all equipment.

---
 src/net/beinghandler.cpp | 2 +-
 src/resources/itemdb.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 7c9b8afd..87e4c8a4 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -471,7 +471,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
             msg->readInt8();   // unknown
 
             dstBeing->mWalkTime = tick_time;
-            //dstBeing->mFrame = 0;
+            dstBeing->mFrame = 0;
             break;
 
         case SMSG_PLAYER_STOP:
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 8999f651..4d78aa1c 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -176,7 +176,7 @@ void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node)
     {
         itemInfo->setSprite(filename, 0);
     }
-    else
+    if (gender == "female" || gender == "unisex")
     {
         itemInfo->setSprite(filename, 1);
     }
-- 
cgit v1.2.3-70-g09d2


From ad4b0d0b8e32e61798ade9c256f850e8f96575f3 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 1 Oct 2008 18:04:15 +0000
Subject: Possible fix for the arrow crashing bug. Confirmation needed.

---
 src/equipment.cpp            |  3 ++-
 src/map.cpp                  |  9 +++------
 src/net/equipmenthandler.cpp | 28 ++++++++++++++--------------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/equipment.cpp b/src/equipment.cpp
index 491aff0c..9a87c6b5 100644
--- a/src/equipment.cpp
+++ b/src/equipment.cpp
@@ -45,7 +45,8 @@ Equipment::removeEquipment(Item *item)
 
 void Equipment::removeEquipment(int index)
 {
-    mEquipment[index] = 0;
+    if (index >= 0 && index < EQUIPMENT_SIZE)
+        mEquipment[index] = 0;
 }
 
 void Equipment::setEquipment(int index, Item *item)
diff --git a/src/map.cpp b/src/map.cpp
index ef622ad0..3adc3498 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -24,7 +24,6 @@
 #include "map.h"
 
 #include <queue>
-#include <cassert>
 
 #include "beingmanager.h"
 #include "configuration.h"
@@ -223,9 +222,9 @@ void Map::draw(Graphics *graphics, int scrollX, int scrollY)
     for (; layeri != mLayers.end(); ++layeri)
     {
         (*layeri)->draw(graphics,
-                   startX, startY, endX, endY,
-                   scrollX, scrollY,
-                   mSprites);
+                        startX, startY, endX, endY,
+                        scrollX, scrollY,
+                        mSprites);
     }
 
     drawOverlay(graphics, scrollX, scrollY,
@@ -339,8 +338,6 @@ void Map::removeSprite(SpriteIterator iterator)
     mSprites.erase(iterator);
 }
 
-static int const basicCost = 100;
-
 Path Map::findPath(int startX, int startY, int destX, int destY)
 {
     // Path to be built up (empty by default)
diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index 0fc98175..b5c9fe2b 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.cpp
@@ -146,22 +146,22 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
                 break;
             }
 
-            if (equipPoint & 0x8000) {    // Arrows
-                player_node->mEquipment->setArrows(NULL);
-                position = 11;
-            } else {
-                mask = 1;
-                position = 0;
-                while (!(equipPoint & mask)) {
-                    mask <<= 1;
-                    position++;
-                }
+            mask = 1;
+            position = 0;
+            while (!(equipPoint & mask)) {
+                mask <<= 1;
+                position++;
+            }
 
-                item = inventory->getItem(index);
-                if (!item)
-                    break;
+            item = inventory->getItem(index);
+            if (!item)
+                break;
 
-                item->setEquipped(false);
+            item->setEquipped(false);
+            if (equipPoint & 0x8000) {    // Arrows
+                player_node->mEquipment->setArrows(NULL);
+            }
+            else {
                 player_node->mEquipment->removeEquipment(position);
             }
             logger->log("Unequipping: %i %i(%i) %i",
-- 
cgit v1.2.3-70-g09d2


From 593fe4be5b47a5c25087315667c43125070b2e97 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 1 Oct 2008 22:20:24 +0000
Subject: Reduced arrow equipping so that it only does what it needs to do.
 Hopefully, this is the arrow bug. If not, then there's no way that this bug
 is not shared by both TMW and Aethyra.

---
 src/equipment.cpp | 11 -----------
 src/equipment.h   |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/equipment.cpp b/src/equipment.cpp
index 9a87c6b5..b2d5e609 100644
--- a/src/equipment.cpp
+++ b/src/equipment.cpp
@@ -54,14 +54,3 @@ void Equipment::setEquipment(int index, Item *item)
     mEquipment[index] = item;
     item->setEquipped(true);
 }
-
-void Equipment::setArrows(Item *arrows)
-{
-    if (mArrows)
-        mArrows->setEquipped(false);
-
-    mArrows = arrows;
-
-    if (arrows)
-        arrows->setEquipped(true);
-}
diff --git a/src/equipment.h b/src/equipment.h
index e497a156..7977894a 100644
--- a/src/equipment.h
+++ b/src/equipment.h
@@ -71,7 +71,7 @@ class Equipment
          * Set the item used in the arrow slot.
          */
         void
-        setArrows(Item *arrows);
+        setArrows(Item *arrows) {mArrows = arrows;}
 
     private:
         Item *mEquipment[EQUIPMENT_SIZE];
-- 
cgit v1.2.3-70-g09d2


From 7d49605c2828bd544173f57e86e5bcdbe6e6c565 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 2 Oct 2008 14:58:01 +0000
Subject: No guarantees that this works, but this file is a lot closer to
 working than the previous build. Most of the files needed to compile Aethyra
 in visual studios were missing from the file.

---
 Aethyra.vcproj | 690 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 655 insertions(+), 35 deletions(-)

diff --git a/Aethyra.vcproj b/Aethyra.vcproj
index 6612e1a1..7a42b19d 100644
--- a/Aethyra.vcproj
+++ b/Aethyra.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="ManaExperiment"
+	Name="Aethyra"
 	ProjectGUID="{DE31E83E-62BD-460E-8E6A-648CF98CC5A4}"
-	RootNamespace="ManaExperimet"
+	RootNamespace="Aethyra"
 	Keyword="Win32Proj"
 	SignManifests="true"
 	>
@@ -65,11 +65,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="physfs.lib sdl.lib sdlmain.lib sdl_image.lib sdl_mixer.lib guichan.lib guichan_sdl.lib ws2_32.lib libxml2.lib iconv.lib zlib.lib libcurl.lib"
-				OutputFile="$(OutDir)/ManaExperiment.exe"
+				OutputFile="$(OutDir)/Aethyra.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="libc.lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/ManaExperiment.pdb"
+				ProgramDatabaseFile="$(OutDir)/Aethyra.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="physfs.lib alleg.lib guichan.lib guichan_sdl.lib sdl.lib sdlmain.lib sdl_mixer.lib sdl_image.lib ws2_32.lib libxml2.lib iconv.lib zlib.lib libcurl.lib"
-				OutputFile="tmw.exe"
+				OutputFile="aethyra.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="LIBC.lib"
 				GenerateDebugInformation="true"
@@ -254,11 +254,19 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\src\base64.cpp"
+				RelativePath=".\src\animatedsprite.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\base64.h"
+				RelativePath=".\src\animatedsprite.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\animationparticle.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\animationparticle.h"
 				>
 			</File>
 			<File
@@ -269,6 +277,18 @@
 				RelativePath=".\src\being.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\beingmanager.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\beingmanager.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\configlistener.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\configuration.cpp"
 				>
@@ -285,6 +305,18 @@
 				RelativePath=".\src\engine.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\equipment.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\equipment.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\extensions.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\floor_item.cpp"
 				>
@@ -309,6 +341,66 @@
 				RelativePath=".\src\graphics.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\guichanfwd.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\imageparticle.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\imageparticle.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\inventory.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\inventory.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\item.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\item.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\itemshortcut.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\itemshortcut.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\joystick.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\joystick.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\keyboardconfig.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\keyboardconfig.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\localplayer.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\localplayer.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\log.cpp"
 				>
@@ -317,6 +409,10 @@
 				RelativePath=".\src\log.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\logindata.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\main.cpp"
 				>
@@ -333,6 +429,102 @@
 				RelativePath=".\src\map.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\monster.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\monster.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\npc.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\npc.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\openglgraphics.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\openglgraphics.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\particle.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\particle.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\particleemitter.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\particleemitter.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\party.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\party.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\player.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\player.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\player_relations.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\player_relations.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\properties.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\recorder.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\recorder.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\serverinfo.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\shopitem.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\shopitem.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\simpleanimation.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\simpleanimation.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\sound.cpp"
 				>
@@ -342,20 +534,104 @@
 				>
 			</File>
 			<Filter
-				Name="graphic"
+				Name="net"
 				>
 				<File
-					RelativePath=".\src\graphic\spriteset.cpp"
+					RelativePath=".\src\net\beinghandler.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\graphic\spriteset.h"
+					RelativePath=".\src\net\beinghandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\buysellhandler.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\buysellhandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\charservhandler.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\charservhandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\chathandler.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\chathandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\equipmenthandler.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\equipmenthandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\inventoryhandler.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\inventoryhandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\itemhandler.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\itemhandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\loginhandler.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\loginhandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\maploginhandler.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\maploginhandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\messagehandler.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\messagehandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\messagein.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\messagein.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\messageout.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\messageout.h"
 					>
 				</File>
-			</Filter>
-			<Filter
-				Name="net"
-				>
 				<File
 					RelativePath=".\src\net\network.cpp"
 					>
@@ -364,6 +640,30 @@
 					RelativePath=".\src\net\network.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\net\npchandler.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\npchandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\partyhandler.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\partyhandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\playerhandler.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\playerhandler.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\net\protocol.cpp"
 					>
@@ -373,15 +673,19 @@
 					>
 				</File>
 				<File
-					RelativePath=".\src\net\win2linux.h"
+					RelativePath=".\src\net\skillhandler.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\net\skillhandler.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\net\win2mac.cpp"
+					RelativePath=".\src\net\tradehandler.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\net\win2mac.h"
+					RelativePath=".\src\net\tradehandler.h"
 					>
 				</File>
 			</Filter>
@@ -405,19 +709,19 @@
 					>
 				</File>
 				<File
-					RelativePath=".\src\gui\buddywindow.cpp"
+					RelativePath=".\src\gui\button.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\gui\buddywindow.h"
+					RelativePath=".\src\gui\button.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\gui\button.cpp"
+					RelativePath=".\src\gui\buttonbox.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\gui\button.h"
+					RelativePath=".\src\gui\buttonbox.h"
 					>
 				</File>
 				<File
@@ -493,11 +797,35 @@
 					>
 				</File>
 				<File
-					RelativePath=".\src\gui\equipment.cpp"
+					RelativePath=".\src\gui\connection.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\gui\equipment.h"
+					RelativePath=".\src\gui\connection.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\coulor.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\coulor.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\debugwindow.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\debugwindow.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\equipmentwindow.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\equipmentwindow.h"
 					>
 				</File>
 				<File
@@ -508,6 +836,14 @@
 					RelativePath=".\src\gui\focushandler.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\gui\gccontainer.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\gccontainer.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\gui\gui.cpp"
 					>
@@ -541,11 +877,11 @@
 					>
 				</File>
 				<File
-					RelativePath=".\src\gui\inventory.cpp"
+					RelativePath=".\src\gui\inventorywindow.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\gui\inventory.h"
+					RelativePath=".\src\gui\inventorywindow.h"
 					>
 				</File>
 				<File
@@ -564,6 +900,22 @@
 					RelativePath=".\src\gui\itemcontainer.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\gui\itemshortcutcontainer.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\itemshortcutcontainer.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\itemshortcutwindow.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\itemshortcutwindow.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\gui\linkhandler.h"
 					>
@@ -584,6 +936,14 @@
 					RelativePath=".\src\gui\login.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\gui\menuwindow.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\menuwindow.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\gui\minimap.cpp"
 					>
@@ -592,6 +952,14 @@
 					RelativePath=".\src\gui\minimap.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\gui\ministatus.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\ministatus.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\gui\newskill.cpp"
 					>
@@ -601,11 +969,11 @@
 					>
 				</File>
 				<File
-					RelativePath=".\src\gui\npc.cpp"
+					RelativePath=".\src\gui\npclistdialogue.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\gui\npc.h"
+					RelativePath=".\src\gui\npclistdialogue.h"
 					>
 				</File>
 				<File
@@ -665,11 +1033,11 @@
 					>
 				</File>
 				<File
-					RelativePath=".\src\gui\requesttrade.cpp"
+					RelativePath=".\src\gui\register.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\gui\requesttrade.h"
+					RelativePath=".\src\gui\register.h"
 					>
 				</File>
 				<File
@@ -696,6 +1064,58 @@
 					RelativePath=".\src\gui\setup.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\gui\setup_audio.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\setup_audio.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\setup_colours.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\setup_colours.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\setup_joystick.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\setup_joystick.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\setup_keyboard.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\setup_keyboard.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\setup_players.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\setup_players.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\setup_video.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\setup_video.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\setuptab.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\gui\shop.cpp"
 					>
@@ -704,6 +1124,14 @@
 					RelativePath=".\src\gui\shop.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\gui\shoplistbox.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\shoplistbox.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\gui\skill.cpp"
 					>
@@ -721,11 +1149,11 @@
 					>
 				</File>
 				<File
-					RelativePath=".\src\gui\stats.cpp"
+					RelativePath=".\src\gui\speechbubble.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\gui\stats.h"
+					RelativePath=".\src\gui\speechbubble.h"
 					>
 				</File>
 				<File
@@ -736,6 +1164,30 @@
 					RelativePath=".\src\gui\status.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\gui\tabbedcontainer.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\tabbedcontainer.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\table.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\table.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\table_model.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\table_model.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\gui\textbox.cpp"
 					>
@@ -776,6 +1228,14 @@
 					RelativePath=".\src\gui\vbox.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\gui\viewport.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\gui\viewport.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\gui\window.cpp"
 					>
@@ -792,10 +1252,58 @@
 					RelativePath=".\src\gui\windowcontainer.h"
 					>
 				</File>
+				<Filter
+					Name="widgets"
+					>
+					<File
+						RelativePath=".\src\gui\dropdown.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\src\gui\dropdown.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\gui\gettext.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\gui\resizegrip.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\src\gui\resizegrip.h"
+						>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="resources"
 				>
+				<File
+					RelativePath=".\src\resources\action.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\action.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\ambiantoverlay.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\ambiantoverlay.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\animation.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\animation.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\resources\buddylist.cpp"
 					>
@@ -804,6 +1312,14 @@
 					RelativePath=".\src\resources\buddylist.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\resources\dye.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\dye.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\resources\image.cpp"
 					>
@@ -813,19 +1329,43 @@
 					>
 				</File>
 				<File
-					RelativePath=".\src\resources\iteminfo.cpp"
+					RelativePath=".\src\resources\imageloader.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\resources\iteminfo.h"
+					RelativePath=".\src\resources\imageloader.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\imageset.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\imageset.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\imagewriter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\resources\itemmanager.cpp"
+					RelativePath=".\src\resources\imagewriter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\resources\itemmanager.h"
+					RelativePath=".\src\resources\itemdb.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\itemdb.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\iteminfo.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\iteminfo.h"
 					>
 				</File>
 				<File
@@ -836,6 +1376,22 @@
 					RelativePath=".\src\resources\mapreader.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\resources\monsterdb.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\monsterdb.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\monsterinfo.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\monsterinfo.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\resources\music.cpp"
 					>
@@ -844,6 +1400,14 @@
 					RelativePath=".\src\resources\music.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\resources\npcdb.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\npcdb.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\resources\resource.cpp"
 					>
@@ -868,6 +1432,62 @@
 					RelativePath=".\src\resources\soundeffect.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\resources\spritedef.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\resources\spritedef.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="utils"
+				>
+				<File
+					RelativePath=".\src\utils\base64.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\utils\base64.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\utils\dtor.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\utils\fastsqrt.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\utils\minmax.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\utils\strprintf.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\utils\strprintf.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\utils\tostring.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\utils\trim.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\utils\xml.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\utils\xml.h"
+					>
+				</File>
 			</Filter>
 		</Filter>
 	</Files>
-- 
cgit v1.2.3-70-g09d2


From 0edd8dd17c324ac0c0eec1109e0819e42b916731 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 3 Oct 2008 05:37:02 +0000
Subject: Made a new Windows binary, as well as fix some files to make the
 Windows build work (although there might be a bit too many guichanfwd.h
 references. But that's ok. I'm too lazy to track down which ones are
 necessary and which ones aren't at the moment).

---
 src/gui/button.h                | 2 ++
 src/gui/buttonbox.h             | 2 ++
 src/gui/buysell.h               | 2 ++
 src/gui/chargedialog.h          | 2 ++
 src/gui/chatinput.h             | 2 ++
 src/gui/checkbox.h              | 2 ++
 src/gui/colour.h                | 2 ++
 src/gui/confirm_dialog.h        | 1 +
 src/gui/equipmentwindow.h       | 2 ++
 src/gui/gccontainer.h           | 2 ++
 src/gui/hbox.h                  | 2 ++
 src/gui/inttextbox.h            | 2 ++
 src/gui/itemcontainer.h         | 2 ++
 src/gui/itemshortcutcontainer.h | 2 ++
 src/gui/itemshortcutwindow.h    | 2 ++
 src/gui/listbox.h               | 2 ++
 src/gui/minimap.h               | 2 ++
 src/gui/npc_text.h              | 2 ++
 src/gui/ok_dialog.h             | 2 ++
 src/gui/passwordfield.h         | 2 ++
 src/gui/playerbox.h             | 2 ++
 src/gui/progressbar.h           | 2 ++
 src/gui/radiobutton.h           | 3 ++-
 src/gui/scrollarea.h            | 2 ++
 src/gui/setup.h                 | 2 ++
 src/gui/shop.h                  | 1 +
 src/gui/shoplistbox.h           | 2 ++
 src/gui/slider.h                | 2 ++
 src/gui/textbox.h               | 2 ++
 src/gui/textfield.h             | 2 ++
 src/gui/vbox.h                  | 2 ++
 src/gui/viewport.h              | 1 +
 src/gui/widgets/dropdown.h      | 1 +
 src/gui/widgets/resizegrip.h    | 2 ++
 src/gui/windowcontainer.h       | 2 ++
 src/recorder.h                  | 2 +-
 src/text.h                      | 1 +
 37 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/src/gui/button.h b/src/gui/button.h
index 8e045a74..bbd26010 100644
--- a/src/gui/button.h
+++ b/src/gui/button.h
@@ -28,6 +28,8 @@
 
 #include <guichan/widgets/button.hpp>
 
+#include "../guichanfwd.h"
+
 class ImageRect;
 
 /**
diff --git a/src/gui/buttonbox.h b/src/gui/buttonbox.h
index 1b76e619..5fc9f88d 100644
--- a/src/gui/buttonbox.h
+++ b/src/gui/buttonbox.h
@@ -28,6 +28,8 @@
 
 #include <guichan/actionlistener.hpp>
 
+#include "../guichanfwd.h"
+
 #include "window.h"
 
 class ButtonBoxListener
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index 64c37e39..0966ec03 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -26,6 +26,8 @@
 
 #include <guichan/actionlistener.hpp>
 
+#include "../guichanfwd.h"
+
 #include "window.h"
 
 /**
diff --git a/src/gui/chargedialog.h b/src/gui/chargedialog.h
index c09c692c..222fb3b5 100644
--- a/src/gui/chargedialog.h
+++ b/src/gui/chargedialog.h
@@ -25,6 +25,8 @@
 
 #include "window.h"
 
+#include "../guichanfwd.h"
+
 class ProgressBar;
 
 #define CHARGE_TIME 1000 // time in milliseconds it takes to charge up an attack
diff --git a/src/gui/chatinput.h b/src/gui/chatinput.h
index 6ac8c1a5..043244b9 100644
--- a/src/gui/chatinput.h
+++ b/src/gui/chatinput.h
@@ -26,6 +26,8 @@
 
 #include "textfield.h"
 
+#include "../guichanfwd.h"
+
 #include <guichan/focuslistener.hpp>
 
 /**
diff --git a/src/gui/checkbox.h b/src/gui/checkbox.h
index 36083390..160a2bf4 100644
--- a/src/gui/checkbox.h
+++ b/src/gui/checkbox.h
@@ -28,6 +28,8 @@
 
 #include <guichan/widgets/checkbox.hpp>
 
+#include "../guichanfwd.h"
+
 class Image;
 
 /**
diff --git a/src/gui/colour.h b/src/gui/colour.h
index 69253f95..ac75f08b 100644
--- a/src/gui/colour.h
+++ b/src/gui/colour.h
@@ -27,6 +27,8 @@
 
 #include <guichan/listmodel.hpp>
 
+#include "../guichanfwd.h"
+
 class Colour : public gcn::ListModel
 {
     public:
diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h
index 3115485d..b8e385f6 100644
--- a/src/gui/confirm_dialog.h
+++ b/src/gui/confirm_dialog.h
@@ -28,6 +28,7 @@
 
 #include "window.h"
 
+#include "../guichanfwd.h"
 
 /**
  * An option dialog.
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 0cb5cb24..bb8eb32f 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -26,6 +26,8 @@
 
 #include "window.h"
 
+#include "../guichanfwd.h"
+
 class Equipment;
 
 /**
diff --git a/src/gui/gccontainer.h b/src/gui/gccontainer.h
index 6c6bee80..660111fc 100644
--- a/src/gui/gccontainer.h
+++ b/src/gui/gccontainer.h
@@ -28,6 +28,8 @@
 
 #include <guichan/widgets/container.hpp>
 
+#include "../guichanfwd.h"
+
 /**
  * A garbage collecting container. Childs added to this container are
  * automatically deleted when the container is deleted.
diff --git a/src/gui/hbox.h b/src/gui/hbox.h
index 99364866..93ac270d 100644
--- a/src/gui/hbox.h
+++ b/src/gui/hbox.h
@@ -26,6 +26,8 @@
 
 #include "box.h"
 
+#include "../guichanfwd.h"
+
 class HBox : public Box
 {
  public:
diff --git a/src/gui/inttextbox.h b/src/gui/inttextbox.h
index 64351f48..6ade7e71 100644
--- a/src/gui/inttextbox.h
+++ b/src/gui/inttextbox.h
@@ -26,6 +26,8 @@
 
 #include "textbox.h"
 
+#include "../guichanfwd.h"
+
 /**
  * TextBox which only accepts numbers as input.
  */
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index 78301669..5562023f 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -30,6 +30,8 @@
 
 #include <list>
 
+#include "../guichanfwd.h"
+
 class Image;
 class Inventory;
 class Item;
diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h
index 7698755b..cc4e830a 100644
--- a/src/gui/itemshortcutcontainer.h
+++ b/src/gui/itemshortcutcontainer.h
@@ -28,6 +28,8 @@
 #include <guichan/widget.hpp>
 #include <guichan/widgetlistener.hpp>
 
+#include "../guichanfwd.h"
+
 class Image;
 class Item;
 
diff --git a/src/gui/itemshortcutwindow.h b/src/gui/itemshortcutwindow.h
index 5f7ba3d7..112c39d9 100644
--- a/src/gui/itemshortcutwindow.h
+++ b/src/gui/itemshortcutwindow.h
@@ -26,6 +26,8 @@
 
 #include "window.h"
 
+#include "../guichanfwd.h"
+
 class ItemShortcutContainer;
 class ScrollArea;
 
diff --git a/src/gui/listbox.h b/src/gui/listbox.h
index ec95734d..2f501a6c 100644
--- a/src/gui/listbox.h
+++ b/src/gui/listbox.h
@@ -26,6 +26,8 @@
 
 #include <guichan/widgets/listbox.hpp>
 
+#include "../guichanfwd.h"
+
 class SelectionListener;
 
 /**
diff --git a/src/gui/minimap.h b/src/gui/minimap.h
index d2640caa..0ec13e67 100644
--- a/src/gui/minimap.h
+++ b/src/gui/minimap.h
@@ -26,6 +26,8 @@
 
 #include "window.h"
 
+#include "../guichanfwd.h"
+
 class Image;
 
 /**
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 9e2b4ecd..c9f13454 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -29,6 +29,8 @@
 
 #include "window.h"
 
+#include "../guichanfwd.h"
+
 class TextBox;
 
 /**
diff --git a/src/gui/ok_dialog.h b/src/gui/ok_dialog.h
index 1c8e0c18..47a0c780 100644
--- a/src/gui/ok_dialog.h
+++ b/src/gui/ok_dialog.h
@@ -28,6 +28,8 @@
 
 #include "window.h"
 
+#include "../guichanfwd.h"
+
 /**
  * An 'Ok' button dialog.
  *
diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h
index 725bfbcf..8228bfe2 100644
--- a/src/gui/passwordfield.h
+++ b/src/gui/passwordfield.h
@@ -26,6 +26,8 @@
 
 #include "textfield.h"
 
+#include "../guichanfwd.h"
+
 /**
  * A password field.
  *
diff --git a/src/gui/playerbox.h b/src/gui/playerbox.h
index 0aa48a2c..86cdf064 100644
--- a/src/gui/playerbox.h
+++ b/src/gui/playerbox.h
@@ -26,6 +26,8 @@
 
 #include <guichan/widgets/scrollarea.hpp>
 
+#include "../guichanfwd.h"
+
 class ImageRect;
 class Player;
 
diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h
index ed8eace4..df825a5d 100644
--- a/src/gui/progressbar.h
+++ b/src/gui/progressbar.h
@@ -28,6 +28,8 @@
 
 #include <SDL_types.h>
 
+#include "../guichanfwd.h"
+
 class ImageRect;
 
 
diff --git a/src/gui/radiobutton.h b/src/gui/radiobutton.h
index bab4a9dc..ef87dccd 100644
--- a/src/gui/radiobutton.h
+++ b/src/gui/radiobutton.h
@@ -26,8 +26,9 @@
 
 #include <guichan/widgets/radiobutton.hpp>
 
-class Image;
+#include "../guichanfwd.h"
 
+class Image;
 
 /*
  * Guichan based RadioButton with custom look
diff --git a/src/gui/scrollarea.h b/src/gui/scrollarea.h
index b3fa17f3..32a192fc 100644
--- a/src/gui/scrollarea.h
+++ b/src/gui/scrollarea.h
@@ -26,6 +26,8 @@
 
 #include <guichan/widgets/scrollarea.hpp>
 
+#include "../guichanfwd.h"
+
 class Image;
 class ImageRect;
 
diff --git a/src/gui/setup.h b/src/gui/setup.h
index d4f0857b..c24b8cb9 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -30,6 +30,8 @@
 
 #include "window.h"
 
+#include "../guichanfwd.h"
+
 class SetupTab;
 
 /**
diff --git a/src/gui/shop.h b/src/gui/shop.h
index 78276610..8dfda67e 100644
--- a/src/gui/shop.h
+++ b/src/gui/shop.h
@@ -32,6 +32,7 @@
 #include "../resources/image.h"
 
 #include "../shopitem.h"
+#include "../guichanfwd.h"
 
 class ShopItems : public gcn::ListModel
 {
diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h
index 837f745f..5840e47f 100644
--- a/src/gui/shoplistbox.h
+++ b/src/gui/shoplistbox.h
@@ -27,6 +27,8 @@
 #include "listbox.h"
 #include "shop.h"
 
+#include "../guichanfwd.h"
+
 /**
  * A list box, meant to be used inside a scroll area. Same as the Guichan list
  * box except this one doesn't have a background, instead completely relying
diff --git a/src/gui/slider.h b/src/gui/slider.h
index 524d8799..5700d64d 100644
--- a/src/gui/slider.h
+++ b/src/gui/slider.h
@@ -26,6 +26,8 @@
 
 #include <guichan/widgets/slider.hpp>
 
+#include "../guichanfwd.h"
+
 class Image;
 
 
diff --git a/src/gui/textbox.h b/src/gui/textbox.h
index 09819360..6f4db7dd 100644
--- a/src/gui/textbox.h
+++ b/src/gui/textbox.h
@@ -26,6 +26,8 @@
 
 #include <guichan/widgets/textbox.hpp>
 
+#include "../guichanfwd.h"
+
 /**
  * A text box, meant to be used inside a scroll area. Same as the Guichan text
  * box except this one doesn't have a background or border, instead completely
diff --git a/src/gui/textfield.h b/src/gui/textfield.h
index 0fc53f39..60766676 100644
--- a/src/gui/textfield.h
+++ b/src/gui/textfield.h
@@ -26,6 +26,8 @@
 
 #include <guichan/widgets/textfield.hpp>
 
+#include "../guichanfwd.h"
+
 class ImageRect;
 
 class TextField;
diff --git a/src/gui/vbox.h b/src/gui/vbox.h
index ff52717b..fd029143 100644
--- a/src/gui/vbox.h
+++ b/src/gui/vbox.h
@@ -26,6 +26,8 @@
 
 #include "box.h"
 
+#include "../guichanfwd.h"
+
 class VBox : public Box
 {
     public:
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 325a7221..70ac1bea 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -30,6 +30,7 @@
 
 #include "../configlistener.h"
 #include "../being.h"
+#include "../guichanfwd.h"
 
 class Map;
 class FloorItem;
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index d0dab7d2..9f6491b7 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -29,6 +29,7 @@
 #include <guichan/widgets/dropdown.hpp>
 #include "../scrollarea.h"
 #include "../listbox.h"
+#include "../../guichanfwd.h"
 
 class Image;
 class ImageRect;
diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h
index dab720dd..03a9228f 100644
--- a/src/gui/widgets/resizegrip.h
+++ b/src/gui/widgets/resizegrip.h
@@ -26,6 +26,8 @@
 
 #include <guichan/widget.hpp>
 
+#include "../../guichanfwd.h"
+
 class Image;
 
 /**
diff --git a/src/gui/windowcontainer.h b/src/gui/windowcontainer.h
index 294c855b..c9728230 100644
--- a/src/gui/windowcontainer.h
+++ b/src/gui/windowcontainer.h
@@ -26,6 +26,8 @@
 
 #include <guichan/widgets/container.hpp>
 
+#include "../guichanfwd.h"
+
 /**
  * A window container. This container adds functionality for more convenient
  * widget (windows in particular) destruction.
diff --git a/src/recorder.h b/src/recorder.h
index 2795cd53..de8e7f3e 100644
--- a/src/recorder.h
+++ b/src/recorder.h
@@ -40,7 +40,7 @@ class Recorder : public ButtonBoxListener
 	void help() const;
 	void help(const std::string &args) const;
 	void buttonBoxRespond();
-	bool isRecording() const {return mStream.is_open();}
+	bool isRecording() const {return mStream;}
         ~Recorder();
     private:
 	ChatWindow *mChat;
diff --git a/src/text.h b/src/text.h
index 19d75018..67454e30 100644
--- a/src/text.h
+++ b/src/text.h
@@ -23,6 +23,7 @@
 #define _AETHYRA_TEXT_H
 
 #include "graphics.h"
+#include "guichanfwd.h"
 
 #include <list>
 
-- 
cgit v1.2.3-70-g09d2


From b8bd8233525d03a575323eaf2933edcc347be860 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 4 Oct 2008 00:48:05 +0000
Subject: Changed minimap code to take minimaps twice the TMW size, added map
 names on all of the maps, and redid minimaps to fit the new minimap code.

---
 src/gui/minimap.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index dc7df9b9..9f4df73c 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -35,8 +35,6 @@ Minimap::Minimap():
     mMapImage(NULL)
 {
     setWindowName("MiniMap");
-    setDefaultSize(5, 25, 100, 100);
-    loadWindowState();
 }
 
 Minimap::~Minimap()
@@ -59,6 +57,8 @@ void Minimap::setMapImage(Image *img)
     if (mMapImage)
     {
         mMapImage->setAlpha(0.7);
+    	setDefaultSize(5, 25, img->getWidth(), img->getHeight());
+        loadWindowState();
     }
 }
 
@@ -103,11 +103,11 @@ void Minimap::draw(gcn::Graphics *graphics)
                 continue;
         }
 
-        int offset = (dotSize - 1) / 2;
+        int offset = (dotSize - 1);
 
         graphics->fillRectangle(gcn::Rectangle(
-                    being->mX / 2 + getPadding() - offset,
-                    being->mY / 2 + getTitleBarHeight() - offset,
+                    being->mX + getPadding() - offset,
+                    being->mY + getTitleBarHeight() - offset,
                     dotSize, dotSize));
     }
 }
-- 
cgit v1.2.3-70-g09d2


From 0b709da73d0657fd3754f8bf1f871ca76cd2c95b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 6 Oct 2008 21:40:50 +0000
Subject: Changed map reader code to allow for pixel offsets, based on TMW's
 trunk client change.

---
 src/resources/mapreader.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index ab3b0cae..c24c3690 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -233,6 +233,12 @@ MapReader::readMap(xmlNodePtr node, const std::string &path)
         }
         else if (xmlStrEqual(childNode->name, BAD_CAST "objectgroup"))
         {
+            // The object group offset is applied to each object individually
+            const int tileOffsetX = XML::getProperty(childNode, "x", 0);
+            const int tileOffsetY = XML::getProperty(childNode, "y", 0);
+            const int offsetX = tileOffsetX * tw;
+            const int offsetY = tileOffsetY * th;
+
             for_each_xml_child_node(objectNode, childNode)
             {
                 if (xmlStrEqual(objectNode->name, BAD_CAST "object"))
@@ -260,7 +266,7 @@ MapReader::readMap(xmlNodePtr node, const std::string &path)
                             continue;
                         }
 
-                        map->addParticleEffect(objName, objX, objY);
+                        map->addParticleEffect(objName, objX + offsetX, objY + offsetY);
                     }
                     else
                     {
@@ -310,8 +316,8 @@ void MapReader::readLayer(xmlNodePtr node, Map *map)
     // Layers are not necessarily the same size as the map
     const int w = XML::getProperty(node, "width", map->getWidth());
     const int h = XML::getProperty(node, "height", map->getHeight());
-    const int offsetX = XML::getProperty(node, "xoffset", 0);
-    const int offsetY = XML::getProperty(node, "yoffset", 0);
+    const int offsetX = XML::getProperty(node, "x", 0);
+    const int offsetY = XML::getProperty(node, "y", 0);
     const std::string name = XML::getProperty(node, "name", "");
 
     const bool isFringeLayer = (name.substr(0,6) == "Fringe");
-- 
cgit v1.2.3-70-g09d2


From 8d27447b01407d6605b1fed89fcd556572d8cfca Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 7 Oct 2008 00:11:25 +0000
Subject: Fixed a compile error that I accidently caused (sorry).

---
 src/resources/mapreader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index c24c3690..f3d78ae9 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -236,8 +236,8 @@ MapReader::readMap(xmlNodePtr node, const std::string &path)
             // The object group offset is applied to each object individually
             const int tileOffsetX = XML::getProperty(childNode, "x", 0);
             const int tileOffsetY = XML::getProperty(childNode, "y", 0);
-            const int offsetX = tileOffsetX * tw;
-            const int offsetY = tileOffsetY * th;
+            const int offsetX = tileOffsetX * tilew;
+            const int offsetY = tileOffsetY * tileh;
 
             for_each_xml_child_node(objectNode, childNode)
             {
-- 
cgit v1.2.3-70-g09d2


From 7729faaadff2e6f92d24f43e52d085f4b11be315 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 10 Oct 2008 17:48:27 +0000
Subject: Did a little bit of code cleanup (mostly from TMW changes) as well as
 properly implemented line wrapping. Now, there are no more visual artifacts
 for speech boxes, and it always chooses the most optimal box size (which
 required that npc_text use it also. Do any other gui classes use the textbox
 class?).

---
 src/animatedsprite.cpp      | 16 ++--------------
 src/being.cpp               |  2 +-
 src/gui/npc_text.cpp        |  2 ++
 src/gui/speechbubble.cpp    |  8 +++-----
 src/gui/textbox.cpp         | 22 +++++++++++-----------
 src/gui/updatewindow.cpp    |  4 ++--
 src/particleemitter.cpp     |  5 ++---
 src/resources/spritedef.cpp |  5 ++---
 src/simpleanimation.cpp     |  5 ++---
 9 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index dd43e0f1..34ea60f4 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -195,23 +195,11 @@ AnimatedSprite::setDirection(SpriteDirection direction)
 int
 AnimatedSprite::getWidth() const
 {
-    if (mFrame)
-    {
-        return mFrame->image->getWidth();
-    }
-    else {
-        return 0;
-    }
+    return mframe ? mFrame->image->getWidth() : 0;
 }
 
 int
 AnimatedSprite::getHeight() const
 {
-    if (mFrame)
-    {
-        return mFrame->image->getHeight();
-    }
-    else {
-        return 0;
-    }
+    return mFrame ? mFrame->image->getHeight() : 0;
 }
diff --git a/src/being.cpp b/src/being.cpp
index 1d7f5ee7..a30bf465 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -443,9 +443,9 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
         mSpeechBubble->setWindowName(mName);
         // Not quite centered, but close enough. However, it's not too important to get 
         // it right right now, as it doesn't take bubble collision into account yet. 
+        mSpeechBubble->setText( mSpeech );
         mSpeechBubble->setPosition(px - (mSpeechBubble->getWidth() * 4 / 11), py - 70 - 
                                         (mSpeechBubble->getNumRows()*14));
-        mSpeechBubble->setText( mSpeech );
         mSpeechBubble->setVisible(true);
     }
     else if (mSpeechTime == 0)
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 52f35a88..d51698fb 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -57,12 +57,14 @@ NpcTextDialog::NpcTextDialog():
 void
 NpcTextDialog::setText(const std::string &text)
 {
+    mTextBox->setMinWidth(230);
     mTextBox->setTextWrapped(text);
 }
 
 void
 NpcTextDialog::addText(const std::string &text)
 {
+    mTextBox->setMinWidth(230);
     mTextBox->setTextWrapped(mTextBox->getText() + text + "\n");
 }
 
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index d71ceedf..c5c653e7 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -61,8 +61,8 @@ SpeechBubble::SpeechBubble()//:
 
 void SpeechBubble::setText(const std::string mText)
 {
-    mSpeechBox->setTextWrapped( mText );
     mSpeechBox->setMinWidth(140);
+    mSpeechBox->setTextWrapped( mText );
 
     int numRows = mSpeechBox->getNumberOfRows();
 
@@ -76,10 +76,8 @@ void SpeechBubble::setText(const std::string mText)
     }
     else
     {
-        int width;
-        if (this->getCaption().length() > mText.length())
-            width = getFont()->getWidth(this->getCaption());
-        else
+        int width = getFont()->getWidth(this->getCaption());
+        if (width < getFont()->getWidth(mText))
             width = getFont()->getWidth(mText);
         setContentSize(width + 15, 30);
         mSpeechArea->setDimension(gcn::Rectangle(4, 15, width + 5, 17));
diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp
index 4976549f..e779a9bb 100644
--- a/src/gui/textbox.cpp
+++ b/src/gui/textbox.cpp
@@ -45,6 +45,7 @@ void TextBox::setTextWrapped(const std::string &text)
 
     std::stringstream wrappedStream;
     std::string::size_type newlinePos, lastNewlinePos = 0;
+    int minWidth = 0;
 
     do
     {
@@ -60,8 +61,6 @@ void TextBox::setTextWrapped(const std::string &text)
             text.substr(lastNewlinePos, newlinePos - lastNewlinePos);
         std::string::size_type spacePos, lastSpacePos = 0;
         int xpos = 0;
-        mMinWidth = getWidth();
-        bool longWord = false;
 
         do
         {
@@ -77,25 +76,26 @@ void TextBox::setTextWrapped(const std::string &text)
 
             int width = getFont()->getWidth(word);
 
-            if (xpos != 0 && xpos + width + getFont()->getWidth(" ") < getWidth())
+            if (xpos != 0 && xpos + width + getFont()->getWidth(" ") <= mMinWidth)
             {
                 xpos += width + getFont()->getWidth(" ");
                 wrappedStream << " " << word;
             }
             else if (lastSpacePos == 0)
             {
-                if (xpos > mMinWidth)
-                {
-                    longWord = true;
-                    mMinWidth = xpos;
-                }
                 xpos += width;
                 wrappedStream << word;
             }
             else
             {
-                if ((xpos < mMinWidth) && !longWord && spacePos != line.size())
-                    mMinWidth = xpos;
+                if (xpos > minWidth)
+                {
+                    minWidth = xpos;
+                    if (minWidth > mMinWidth)
+                    {
+                        mMinWidth = minWidth;
+                    }
+                }
                 xpos = width;
                 wrappedStream << "\n" << word;
             }
@@ -107,10 +107,10 @@ void TextBox::setTextWrapped(const std::string &text)
         {
             wrappedStream << "\n";
         }
-
         lastNewlinePos = newlinePos + 1;
     }
     while (newlinePos != text.size());
+    mMinWidth = minWidth;
 
     gcn::TextBox::setText(wrappedStream.str());
 }
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index b052e4b6..5e9baa32 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -58,9 +58,9 @@ unsigned long fadler32(FILE *file)
 
     // Calculate Adler-32 checksum
     char *buffer = (char*) malloc(fileSize);
-    fread(buffer, 1, fileSize, file);
+    const size_t read = fread(buffer, 1, fileSize, file);
     unsigned long adler = adler32(0L, Z_NULL, 0);
-    adler = adler32(adler, (Bytef*) buffer, fileSize);
+    adler = adler32(adler, (Bytef*) buffer, read);
     free(buffer);
 
     return adler;
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index 3e0a3d75..816a5d28 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -213,7 +213,7 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *
 
                     if (!img)
                     {
-                        logger->log("No image at index " + (index));
+                        logger->log("No image at index %d", index);
                         continue;
                     }
 
@@ -236,8 +236,7 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *
 
                         if (!img)
                         {
-                            logger->log("No image at index " +
-                                    (start));
+                            logger->log("No image at index %d", start);
                             continue;
                         }
 
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index ebc60240..a6d8891e 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -232,7 +232,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
 
             if (!img)
             {
-                logger->log("No image at index " + (index + variant_offset));
+                logger->log("No image at index %d", index + variant_offset);
                 continue;
             }
 
@@ -255,8 +255,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
 
                 if (!img)
                 {
-                    logger->log("No image at index " +
-                            (start + variant_offset));
+                    logger->log("No image at index %d", start + variant_offset);
                     continue;
                 }
 
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index db1c0c91..a75a3392 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -68,7 +68,7 @@ SimpleAnimation::SimpleAnimation(xmlNodePtr animationNode):
 
             if (!img)
             {
-                logger->log("No image at index " + (index));
+                logger->log("No image at index %d", index);
                 continue;
             }
 
@@ -91,8 +91,7 @@ SimpleAnimation::SimpleAnimation(xmlNodePtr animationNode):
 
                 if (!img)
                 {
-                    logger->log("No image at index " +
-                            (start));
+                    logger->log("No image at index %d", start);
                     continue;
                 }
 
-- 
cgit v1.2.3-70-g09d2


From aede5be60657a6a5d9aa6989a454cedde3230b75 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 10 Oct 2008 17:51:34 +0000
Subject: Fixed a small code typo (thought I copied and compiled animatedsprite
 before committing. Oh well)

---
 src/animatedsprite.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 34ea60f4..92c4e3f3 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -195,7 +195,7 @@ AnimatedSprite::setDirection(SpriteDirection direction)
 int
 AnimatedSprite::getWidth() const
 {
-    return mframe ? mFrame->image->getWidth() : 0;
+    return mFrame ? mFrame->image->getWidth() : 0;
 }
 
 int
-- 
cgit v1.2.3-70-g09d2


From d5736cdc5700994520a53fdd560fd7ea946f6e63 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 10 Oct 2008 20:51:00 +0000
Subject: Fixed the text box so that it now checks the last line as well for
 the minimum length for the text box (it didn't do that before)

---
 src/gui/textbox.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp
index e779a9bb..1a689ad5 100644
--- a/src/gui/textbox.cpp
+++ b/src/gui/textbox.cpp
@@ -46,6 +46,7 @@ void TextBox::setTextWrapped(const std::string &text)
     std::stringstream wrappedStream;
     std::string::size_type newlinePos, lastNewlinePos = 0;
     int minWidth = 0;
+    int xpos;
 
     do
     {
@@ -60,7 +61,7 @@ void TextBox::setTextWrapped(const std::string &text)
         std::string line =
             text.substr(lastNewlinePos, newlinePos - lastNewlinePos);
         std::string::size_type spacePos, lastSpacePos = 0;
-        int xpos = 0;
+        xpos = 0;
 
         do
         {
@@ -110,7 +111,15 @@ void TextBox::setTextWrapped(const std::string &text)
         lastNewlinePos = newlinePos + 1;
     }
     while (newlinePos != text.size());
-    mMinWidth = minWidth;
+
+    if (xpos > minWidth)
+    {
+        minWidth = xpos;
+    }
+    if (minWidth > mMinWidth)
+    {
+        mMinWidth = minWidth;
+    }
 
     gcn::TextBox::setText(wrappedStream.str());
 }
-- 
cgit v1.2.3-70-g09d2


From 9f5f8e5c6579f3ecc7a6c245e063d5f2d96c62ff Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 12 Oct 2008 06:39:34 +0000
Subject: This commit contains three things: one, after looking over how TMW
 was handling the effects through the level up system, I determined that it
 wasn't bad, so I pulled it from TMW's SVN. Two, I edited the web page css so
 that it better matches the forum. And three, I patched text wrapping so that
 it'll fix up its display size based on all previous lines, except for the
 last line. That fix will come later, but for now, it'll be seen as a special
 case. While you'd like to think that just resending the string and starting
 the function over again would fix it, you'd be wrong. So it won't be patched
 until I think of a better way to handle that case.

---
 src/gui/speechbubble.cpp |  7 ++++++-
 src/gui/speechbubble.h   |  2 +-
 src/gui/textbox.cpp      | 31 +++++++++++++++++++++++++------
 src/main.cpp             | 14 +++++++++-----
 src/net/beinghandler.cpp | 28 +++++++++-------------------
 src/net/protocol.h       |  2 +-
 src/player.h             |  9 +++++++++
 src/resources/itemdb.cpp | 14 +++++++-------
 8 files changed, 67 insertions(+), 40 deletions(-)

diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index c5c653e7..0ccbebc0 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -59,8 +59,13 @@ SpeechBubble::SpeechBubble()//:
     mSpeechBox->setTextWrapped( "" );
 }
 
-void SpeechBubble::setText(const std::string mText)
+void SpeechBubble::setText(std::string mText)
 {
+    while (mText[0] == ' ')
+    {
+        mText = mText.substr(1, mText.size());
+    }
+
     mSpeechBox->setMinWidth(140);
     mSpeechBox->setTextWrapped( mText );
 
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
index c4ca9109..7a2a73b8 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -35,7 +35,7 @@ class SpeechBubble : public Window
 
 	SpeechBubble();
 
-	void setText(const std::string mText);
+	void setText(std::string mText);
 	void setLocation(int x, int y);
 	unsigned int getNumRows();
 
diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp
index 1a689ad5..f2d9b6ee 100644
--- a/src/gui/textbox.cpp
+++ b/src/gui/textbox.cpp
@@ -92,13 +92,31 @@ void TextBox::setTextWrapped(const std::string &text)
                 if (xpos > minWidth)
                 {
                     minWidth = xpos;
-                    if (minWidth > mMinWidth)
-                    {
-                        mMinWidth = minWidth;
-                    }
+                }
+                // The window wasn't big enough. Resize it and try again.
+                if (minWidth > mMinWidth)
+                {
+                    mMinWidth = minWidth;
+                    // This is a reaaaly ugly hack for getting the string stream
+                    // to clear itself. Don't mess with the spacer in the stream
+                    // reset, as well as removing the break. These are all there
+                    // because there are several compilers that I have tried 
+                    // that do not properly reset the string stream. 
+                    // You have been warned!
+                    wrappedStream.str(" ");
+                    spacePos = 0;
+                    lastNewlinePos = 0;
+                    newlinePos = text.find("\n", lastNewlinePos);
+                    line = text.substr(lastNewlinePos, newlinePos -
+                                       lastNewlinePos);
+                    width = 0;
+                    break;
+                }
+                else
+                {
+                    wrappedStream << "\n" << word;
                 }
                 xpos = width;
-                wrappedStream << "\n" << word;
             }
             lastSpacePos = spacePos + 1;
         }
@@ -116,9 +134,10 @@ void TextBox::setTextWrapped(const std::string &text)
     {
         minWidth = xpos;
     }
+    mMinWidth = minWidth;
     if (minWidth > mMinWidth)
     {
-        mMinWidth = minWidth;
+        setTextWrapped(text);
     }
 
     gcn::TextBox::setText(wrappedStream.str());
diff --git a/src/main.cpp b/src/main.cpp
index 4427b4d4..f9061c42 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -163,6 +163,8 @@ struct Options
  */
 void setUpdatesDir()
 {
+    std::stringstream updates;
+
     // If updatesHost is currently empty, fill it from config file
     if (updateHost.empty()) {
         updateHost =
@@ -174,8 +176,9 @@ void setUpdatesDir()
     pos = updateHost.find("://");
     if (pos != updateHost.npos) {
         if (pos + 3 < updateHost.length()) {
-            updatesDir =
-                "updates/" + updateHost.substr(pos + 3);
+            updates << "updates/" << updateHost.substr(pos + 3) 
+                    << "-" << loginData.port;
+            updatesDir = updates.str();
         } else {
             logger->log("Error: Invalid update host: %s", updateHost.c_str());
             errorMessage = "Invalid update host: " + updateHost;
@@ -183,7 +186,8 @@ void setUpdatesDir()
         }
     } else {
         logger->log("Warning: no protocol was specified for the update host");
-        updatesDir = "updates/" + updateHost;
+        updates << "updates/" << updateHost  << "-" << loginData.port;
+        updatesDir = updates.str();
     }
 
     ResourceManager *resman = ResourceManager::getInstance();
@@ -708,8 +712,8 @@ int main(int argc, char *argv[])
     if (!options.password.empty()) {
         loginData.password = options.password;
     }
-    loginData.hostname = config.getValue("host", "216.139.126.36");
-    loginData.port = (short)config.getValue("port", 0);
+    loginData.hostname = config.getValue("host", "www.aethyra.org");
+    loginData.port = (short)config.getValue("port", 21001);
     loginData.remember = config.getValue("remember", 0);
     loginData.registerLogin = false;
 
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 87e4c8a4..baca0cfc 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -51,7 +51,7 @@ BeingHandler::BeingHandler(bool enableSync):
         SMSG_BEING_MOVE2,
         SMSG_BEING_REMOVE,
         SMSG_BEING_ACTION,
-        SMSG_BEING_LEVELUP,
+        SMSG_BEING_SELFEFFECT,
         SMSG_BEING_EMOTION,
         SMSG_BEING_CHANGE_LOOKS,
         SMSG_BEING_CHANGE_LOOKS2,
@@ -263,27 +263,17 @@ void BeingHandler::handleMessage(MessageIn *msg)
             }
             break;
 
-        case SMSG_BEING_LEVELUP:
+        case SMSG_BEING_SELFEFFECT: {
             id = (Uint32)msg->readInt32();
+            if (!beingManager->findBeing(id))
+                break;
+
+            int effectType = msg->readInt32();
+
+            beingManager->findBeing(id)->triggerEffect(effectType);
 
-            if (id == player_node->getId()) {
-                logger->log("Level up");
-                sound.playSfx("sfx/levelup.ogg");
-            }
-            else {
-                logger->log("Someone else went level up");
-            }
-            Particle *levelupFX;
-            if (msg->readInt32() == 0) { // type
-                levelupFX = particleEngine->addEffect(
-                        "graphics/particles/levelup.particle.xml", 0, 0);
-            }
-            else {
-                levelupFX = particleEngine->addEffect(
-                        "graphics/particles/skillup.particle.xml", 0, 0);
-            }
-            beingManager->findBeing(id)->controlParticle(levelupFX);
             break;
+        }
 
         case SMSG_BEING_EMOTION:
             if (!(dstBeing = beingManager->findBeing(msg->readInt32())))
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 7d5edf94..5e1d3c62 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -65,7 +65,7 @@
 #define SMSG_BEING_REMOVE            0x0080
 #define SMSG_BEING_CHANGE_LOOKS      0x00c3
 #define SMSG_BEING_CHANGE_LOOKS2     0x01d7 /**< Same as 0x00c3, but 16 bit ID */
-#define SMSG_BEING_LEVELUP           0x019b
+#define SMSG_BEING_SELFEFFECT        0x019b
 #define SMSG_BEING_EMOTION           0x00c0
 #define SMSG_BEING_ACTION            0x008a /**< Attack, sit, stand up, ... */
 #define SMSG_BEING_CHAT              0x008d /**< A being talks */
diff --git a/src/player.h b/src/player.h
index fdca64e8..6def34a5 100644
--- a/src/player.h
+++ b/src/player.h
@@ -79,6 +79,15 @@ class Player : public Being
          * Flash the player's name
          */
         void flash(int time);
+
+        /**
+         * Triggers a visual/audio effect, such as `level up'
+         *
+         * \param effect_id ID of the effect to trigger
+         */
+        virtual void
+        triggerEffect(int effectId) { internalTriggerEffect(effectId, true, true); }
+
     protected:
         void updateCoords();
     private:
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 4d78aa1c..fbab5380 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -84,14 +84,14 @@ void ItemDB::load()
         }
 
         int type = XML::getProperty(node, "type", 0);
-        int weight = XML::getProperty(node, "weight", 0);
+        //int weight = XML::getProperty(node, "weight", 0);
         int view = XML::getProperty(node, "view", 0);
 
         std::string name = XML::getProperty(node, "name", "");
         std::string image = XML::getProperty(node, "image", "");
         std::string description = XML::getProperty(node, "description", "");
-        std::string effect = XML::getProperty(node, "effect", "");
-        int weaponType = XML::getProperty(node, "weapon_type", 0);
+        //std::string effect = XML::getProperty(node, "effect", ""); // Not used by Aethyra
+        //int weaponType = XML::getProperty(node, "weapon_type", 0);
 
         if (id)
         {
@@ -99,11 +99,11 @@ void ItemDB::load()
             itemInfo->setImageName(image);
             itemInfo->setName((name == "") ? "Unnamed" : name);
             itemInfo->setDescription(description);
-            itemInfo->setEffect(effect);
+            //itemInfo->setEffect(effect);
             itemInfo->setType(type);
             itemInfo->setView(view);
-            itemInfo->setWeight(weight);
-            itemInfo->setWeaponType(weaponType);
+            //itemInfo->setWeight(weight);
+            //itemInfo->setWeaponType(weaponType);
 
             for_each_xml_child_node(itemChild, node)
             {
@@ -127,7 +127,7 @@ void ItemDB::load()
         CHECK_PARAM(name, "");
         CHECK_PARAM(image, "");
         CHECK_PARAM(description, "");
-        CHECK_PARAM(effect, "");
+        //CHECK_PARAM(effect, "");
         // CHECK_PARAM(type, 0);
         // CHECK_PARAM(weight, 0);
         // CHECK_PARAM(slot, 0);
-- 
cgit v1.2.3-70-g09d2


From 59270a5883ed88e3abe07dc8aae1397d0841b314 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 12 Oct 2008 07:18:17 +0000
Subject: Trimmed out an unneeded line in the text wrapping code. If it was
 working properly (which calling the function again with a wider window size
 should do), it'd do something, but since it doesn't do what it was intended
 to do, there's no reason to waste CPU cycles over it .

---
 src/gui/textbox.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp
index f2d9b6ee..3507273a 100644
--- a/src/gui/textbox.cpp
+++ b/src/gui/textbox.cpp
@@ -135,10 +135,6 @@ void TextBox::setTextWrapped(const std::string &text)
         minWidth = xpos;
     }
     mMinWidth = minWidth;
-    if (minWidth > mMinWidth)
-    {
-        setTextWrapped(text);
-    }
 
     gcn::TextBox::setText(wrappedStream.str());
 }
-- 
cgit v1.2.3-70-g09d2


From 1c337aae30b334d99a5ec81269f2c6d35b8004ea Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 12 Oct 2008 21:28:46 +0000
Subject: Added in a new tileset, as well as some new artwork, changed the
 update handler to store updates in a subfolder based on port (so that if one
 server domain hosts multiple update folders, that it doesn't have to
 redownload an update should an update have the same name as the other server,
 as well as a different checksum), and made the inventory window display the
 units of measurement (for all of those people that wanted to know exactly
 what those units were supposed to be).

---
 src/gui/inventorywindow.cpp | 4 ++--
 src/main.cpp                | 4 ++--
 src/resources/itemdb.cpp    | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 8866515f..0f7b6792 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -94,8 +94,8 @@ void InventoryWindow::logic()
 
     // Update weight information
     mWeightLabel->setCaption(
-        "Total Weight: " + toString(player_node->mTotalWeight) + " - " +
-        "Maximum Weight: " + toString(player_node->mMaxWeight));
+        "Total Weight: " + toString(player_node->mTotalWeight) + " g - " +
+        "Maximum Weight: " + toString(player_node->mMaxWeight) + " g");
 }
 
 void InventoryWindow::action(const gcn::ActionEvent &event)
diff --git a/src/main.cpp b/src/main.cpp
index f9061c42..3755ad03 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -177,7 +177,7 @@ void setUpdatesDir()
     if (pos != updateHost.npos) {
         if (pos + 3 < updateHost.length()) {
             updates << "updates/" << updateHost.substr(pos + 3) 
-                    << "-" << loginData.port;
+                    << "/" << loginData.port;
             updatesDir = updates.str();
         } else {
             logger->log("Error: Invalid update host: %s", updateHost.c_str());
@@ -186,7 +186,7 @@ void setUpdatesDir()
         }
     } else {
         logger->log("Warning: no protocol was specified for the update host");
-        updates << "updates/" << updateHost  << "-" << loginData.port;
+        updates << "updates/" << updateHost  << "/" << loginData.port;
         updatesDir = updates.str();
     }
 
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index fbab5380..ad9eda01 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -90,8 +90,8 @@ void ItemDB::load()
         std::string name = XML::getProperty(node, "name", "");
         std::string image = XML::getProperty(node, "image", "");
         std::string description = XML::getProperty(node, "description", "");
-        //std::string effect = XML::getProperty(node, "effect", ""); // Not used by Aethyra
-        //int weaponType = XML::getProperty(node, "weapon_type", 0);
+        std::string effect = XML::getProperty(node, "effect", "");
+        //int weaponType = XML::getProperty(node, "weapon_type", 0);// Not used by Aethyra
 
         if (id)
         {
@@ -99,7 +99,7 @@ void ItemDB::load()
             itemInfo->setImageName(image);
             itemInfo->setName((name == "") ? "Unnamed" : name);
             itemInfo->setDescription(description);
-            //itemInfo->setEffect(effect);
+            itemInfo->setEffect(effect);
             itemInfo->setType(type);
             itemInfo->setView(view);
             //itemInfo->setWeight(weight);
@@ -127,7 +127,7 @@ void ItemDB::load()
         CHECK_PARAM(name, "");
         CHECK_PARAM(image, "");
         CHECK_PARAM(description, "");
-        //CHECK_PARAM(effect, "");
+        // CHECK_PARAM(effect, "");
         // CHECK_PARAM(type, 0);
         // CHECK_PARAM(weight, 0);
         // CHECK_PARAM(slot, 0);
-- 
cgit v1.2.3-70-g09d2


From a4d2f2c0373848fa8a886c1dddc6247b81527df3 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 13 Oct 2008 09:34:46 +0000
Subject: Added mob particle attack effects to mobs. Inspired by the TMW patch
 in their trunk client.

---
 src/monster.cpp             | 21 +++++++++++++++++++++
 src/particle.cpp            |  4 ++--
 src/particle.h              |  4 ++--
 src/particleemitter.cpp     |  4 +++-
 src/particleemitter.h       |  2 +-
 src/resources/monsterdb.cpp |  6 ++++++
 src/resources/monsterinfo.h |  8 ++++++++
 7 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/src/monster.cpp b/src/monster.cpp
index 2b6fadce..61f1f5c3 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -46,6 +46,7 @@ Monster::Monster(Uint32 id, Uint16 job, Map *map):
 
     // Setup Monster sprites
     int c = BASE_SPRITE;
+
     const std::list<std::string> &sprites = info.getSprites();
     for (std::list<std::string>::const_iterator i = sprites.begin();
          i != sprites.end();
@@ -103,6 +104,8 @@ Being::Type Monster::getType() const
 void Monster::setAction(Action action)
 {
     SpriteAction currentAction = ACTION_INVALID;
+    int rotation = 0;
+    std::string particleEffect;
 
     switch (action)
     {
@@ -116,6 +119,24 @@ void Monster::setAction(Action action)
         case ATTACK:
             currentAction = ACTION_ATTACK;
             mSprites[BASE_SPRITE]->reset();
+
+            //attack particle effect
+            particleEffect = getInfo().getAttackParticleEffect();
+            if (particleEffect != "")
+            {
+                switch (mDirection)
+                {
+                    case DOWN: rotation = 0; break;
+                    case LEFT: rotation = 90; break;
+                    case UP: rotation = 180; break;
+                    case RIGHT: rotation = 270; break;
+                    default: break;
+                }
+                Particle *p;
+                p = particleEngine->addEffect(
+                                    particleEffect, 0, 0, rotation);
+                controlParticle(p);
+            }
             break;
         case STAND:
            currentAction = ACTION_STAND;
diff --git a/src/particle.cpp b/src/particle.cpp
index 8591838f..703b34c3 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -226,7 +226,7 @@ Particle::update()
 
 Particle*
 Particle::addEffect(const std::string &particleEffectFile,
-                    int pixelX, int pixelY)
+                    int pixelX, int pixelY, int rotation)
 {
     Particle *newParticle = NULL;
 
@@ -290,7 +290,7 @@ Particle::addEffect(const std::string &particleEffectFile,
                 continue;
 
             ParticleEmitter *newEmitter;
-            newEmitter = new ParticleEmitter(emitterNode, newParticle, mMap);
+            newEmitter = new ParticleEmitter(emitterNode, newParticle, mMap, rotation);
             newParticle->addEmitter(newEmitter);
         }
 
diff --git a/src/particle.h b/src/particle.h
index f281864d..a21fe88b 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -109,7 +109,7 @@ class Particle : public Sprite
          */
         Particle*
         addEffect(const std::string &particleEffectFile,
-                  int pixelX, int pixelY);
+                  int pixelX, int pixelY, int rotation = 0);
 
         /**
          * Creates a standalone text particle.
@@ -318,7 +318,7 @@ class Particle : public Sprite
 
         // follow-point particles
         Particle *mTarget;          /**< The particle that attracts this particle*/
-        float mAcceleration;        /**< Acceleration towards the target particle in pixels per game-tick�*/
+        float mAcceleration;        /**< Acceleration towards the target particle in pixels per game-tick�*/
         float mInvDieDistance;      /**< Distance in pixels from the target particle that causes the destruction of the particle*/
         float mMomentum;            /**< How much speed the particle retains after each game tick*/
 };
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index 816a5d28..08944cdd 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -38,7 +38,7 @@
 #define SIN45 0.707106781f
 #define DEG_RAD_FACTOR 0.017453293f
 
-ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *map):
+ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *map, int rotation):
     mOutputPauseLeft(0),
     mParticleImage(0)
 {
@@ -102,7 +102,9 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *
             else if (name == "horizontal-angle")
             {
                 mParticleAngleHorizontal = readMinMax(propertyNode, 0.0f);
+                mParticleAngleHorizontal.minVal += rotation;
                 mParticleAngleHorizontal.minVal *= DEG_RAD_FACTOR;
+                mParticleAngleHorizontal.maxVal += rotation;
                 mParticleAngleHorizontal.maxVal *= DEG_RAD_FACTOR;
             }
             else if (name == "vertical-angle")
diff --git a/src/particleemitter.h b/src/particleemitter.h
index 5cf3fd46..c237c1ba 100644
--- a/src/particleemitter.h
+++ b/src/particleemitter.h
@@ -45,7 +45,7 @@ class ParticleEmitter
         /**
          * Constructor.
          */
-        ParticleEmitter(xmlNodePtr emitterNode,  Particle *target, Map *map);
+        ParticleEmitter(xmlNodePtr emitterNode,  Particle *target, Map *map, int rotation = 0);
 
         /**
          * Copy Constructor (necessary for reference counting of particle images)
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 73e9d666..8d8dd133 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -126,6 +126,12 @@ MonsterDB::load()
                 }
             }
 
+            if (xmlStrEqual(spriteNode->name, BAD_CAST "attack"))
+            {
+                std::string event = XML::getProperty(spriteNode, "particle-effect", "");
+                currentInfo->addAttackParticleEffect(event);
+            }
+
             if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx"))
             {
                 currentInfo->addParticleEffect(
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index 2f690756..c5345bd8 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -87,11 +87,19 @@ class MonsterInfo
         std::string
         getSound(MonsterSoundEvent event) const;
 
+        std::string 
+        getAttackParticleEffect() const { return mAttackParticle; }
+
+        void 
+        addAttackParticleEffect(const std::string &particleEffect)
+        { mAttackParticle = particleEffect; }
+
         const std::list<std::string>&
         getParticleEffects() const { return mParticleEffects; }
 
     private:
         std::string mName;
+        std::string mAttackParticle;
         std::list<std::string> mSprites;
         Being::TargetCursorSize mTargetCursorSize;
         std::map<MonsterSoundEvent, std::vector<std::string>* > mSounds;
-- 
cgit v1.2.3-70-g09d2


From 8003fcc9f42a42170a16bdf976bb73fdf34a761e Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 13 Oct 2008 17:34:42 +0000
Subject: Changed minimap code so that it allows us to have larger minimaps,
 while putting back in backwards compatibility with TMW style minimaps. While
 this might seem like a big deal, it also allows us to make minimaps as big as
 we'd like, which is a huge perk for really large maps or really small ones.

---
 src/engine.cpp      |  6 ++++++
 src/gui/minimap.cpp | 15 ++++++++++-----
 src/gui/minimap.h   |  6 ++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/engine.cpp b/src/engine.cpp
index 42054ffb..e4361f96 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -107,6 +107,12 @@ void Engine::changeMap(const std::string &mapPath)
              minimap->setCaption("Unknown");
              logger->log("WARNING: Map file '%s' defines a minimap image but does not define a 'mapname' property", map_path.c_str());
         }
+        // How many pixels equal one tile. .5 (which is the TMW default) is 2 tiles to a pixel, 
+        // while 1 is 1 tile to 1 pixel
+        if (newMap->hasProperty("minimapproportion"))
+        {
+             minimap->setProportion(atof(newMap->getProperty("minimapproportion").c_str()));
+        }
     }
     minimap->setMapImage(mapImage);
     beingManager->setMap(newMap);
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 9f4df73c..1f3a903c 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -32,7 +32,8 @@
 
 Minimap::Minimap():
     Window("Map"),
-    mMapImage(NULL)
+    mMapImage(NULL),
+    mProportion(0.5)
 {
     setWindowName("MiniMap");
 }
@@ -57,9 +58,13 @@ void Minimap::setMapImage(Image *img)
     if (mMapImage)
     {
         mMapImage->setAlpha(0.7);
-    	setDefaultSize(5, 25, img->getWidth(), img->getHeight());
+        setDefaultSize(5, 25, mMapImage->getWidth(), mMapImage->getHeight());
         loadWindowState();
     }
+    else
+    {
+        setVisible(false);
+    }
 }
 
 void Minimap::draw(gcn::Graphics *graphics)
@@ -103,11 +108,11 @@ void Minimap::draw(gcn::Graphics *graphics)
                 continue;
         }
 
-        int offset = (dotSize - 1);
+        int offset = (dotSize - 1) * mProportion;
 
         graphics->fillRectangle(gcn::Rectangle(
-                    being->mX + getPadding() - offset,
-                    being->mY + getTitleBarHeight() - offset,
+                    (being->mX * mProportion) + getPadding() - offset,
+                    (being->mY * mProportion) + getTitleBarHeight() - offset,
                     dotSize, dotSize));
     }
 }
diff --git a/src/gui/minimap.h b/src/gui/minimap.h
index 0ec13e67..a3b14729 100644
--- a/src/gui/minimap.h
+++ b/src/gui/minimap.h
@@ -53,6 +53,11 @@ class Minimap : public Window
          */
         void setMapImage(Image *img);
 
+        /**
+         * Sets the map proportion (1 means 1 tile to one pixel, .5 means 2 tiles to 1 pixel, etc.)
+         */
+        void setProportion(float proportion) { mProportion = proportion; }
+
         /**
          * Draws the minimap.
          */
@@ -60,6 +65,7 @@ class Minimap : public Window
 
     private:
         Image *mMapImage;
+        float mProportion;
 };
 
 extern Minimap *minimap;
-- 
cgit v1.2.3-70-g09d2


From fc8760599dfd730d416bb2c646e17c5dd7dd132e Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 13 Oct 2008 17:44:46 +0000
Subject: Minor fix for a situation thatwe shouldn't ever need to encounter,
 but is nice to have anyways.

---
 src/engine.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/engine.cpp b/src/engine.cpp
index e4361f96..c8fee995 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -113,6 +113,10 @@ void Engine::changeMap(const std::string &mapPath)
         {
              minimap->setProportion(atof(newMap->getProperty("minimapproportion").c_str()));
         }
+        else
+        {
+             minimap->setProportion(0.5);
+        }
     }
     minimap->setMapImage(mapImage);
     beingManager->setMap(newMap);
-- 
cgit v1.2.3-70-g09d2


From dc3c5d595e60a8498e44affb8ec05b91709d34fc Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 14 Oct 2008 21:04:46 +0000
Subject: Early addition of a particle effect disabling option. Would like to
 change this in the future to update instantaneously.

---
 src/being.cpp           | 31 ++++++++++++++++++-------------
 src/being.h             |  3 +++
 src/gui/setup_video.cpp | 15 +++++++++++++++
 src/gui/setup_video.h   |  2 ++
 src/map.cpp             | 13 ++++++++-----
 src/monster.cpp         | 16 +++++++++-------
 src/npc.cpp             | 15 +++++++++------
 7 files changed, 64 insertions(+), 31 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index a30bf465..c4723f79 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -34,6 +34,7 @@
 #include "particle.h"
 #include "sound.h"
 #include "localplayer.h"
+#include "configuration.h"
 
 #include "resources/resourcemanager.h"
 #include "resources/imageset.h"
@@ -71,7 +72,8 @@ Being::Being(int id, int job, Map *map):
     mPx(0), mPy(0),
     mSprites(VECTOREND_SPRITE, NULL),
     mSpriteIDs(VECTOREND_SPRITE, 0),
-    mSpriteColors(VECTOREND_SPRITE, "")
+    mSpriteColors(VECTOREND_SPRITE, ""),
+    mParticleEffects(config.getValue("particleeffects", 1))
 {
     setMap(map);
 
@@ -387,19 +389,22 @@ void Being::logic()
         }
     }
 
-    //Update particle effects
-    for (std::list<Particle *>::iterator i = mChildParticleEffects.begin();
-                                         i != mChildParticleEffects.end();)
+    if (mParticleEffects)
     {
-        (*i)->setPosition((float)mPx + 16.0f, (float)mPy + 32.0f);
-        if ((*i)->isExtinct())
+        //Update particle effects
+        for (std::list<Particle *>::iterator i = mChildParticleEffects.begin();
+                                             i != mChildParticleEffects.end();)
         {
-            (*i)->kill();
-            i = mChildParticleEffects.erase(i);
-        }
-        else 
-        {
-            i++;
+            (*i)->setPosition((float)mPx + 16.0f, (float)mPy + 32.0f);
+            if ((*i)->isExtinct())
+            {
+                (*i)->kill();
+                i = mChildParticleEffects.erase(i);
+            }
+            else 
+            {
+                i++;
+            }
         }
     }
 }
@@ -589,7 +594,7 @@ void Being::internalTriggerEffect(int effectId, bool sfx, bool gfx)
         return;
     }
 
-    if (gfx && ed->mGFXEffect != "") {
+    if (gfx && ed->mGFXEffect != "" && mParticleEffects) {
         Particle *selfFX;
 
         selfFX = particleEngine->addEffect(ed->mGFXEffect, 0, 0);
diff --git a/src/being.h b/src/being.h
index cc6ba427..05a49d9a 100644
--- a/src/being.h
+++ b/src/being.h
@@ -405,6 +405,9 @@ class Being : public Sprite
         std::vector<std::string> mSpriteColors;
         std::list<Particle *> mChildParticleEffects;
 
+    protected:
+        bool mParticleEffects;          /**< Whether to display particles or not */
+
     private:
         /**
          * Calculates the offset in the given directions.
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index dd56ee2f..e065edae 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -106,6 +106,7 @@ Setup_Video::Setup_Video():
     mFullScreenEnabled(config.getValue("screen", 0)),
     mOpenGLEnabled(config.getValue("opengl", 0)),
     mCustomCursorEnabled(config.getValue("customcursor", 1)),
+    mParticleEffectsEnabled(config.getValue("particleeffects", 1)),
     mOpacity(config.getValue("guialpha", 0.8)),
     mFps((int)config.getValue("fpslimit", 60)),
     mModeListModel(new ModeListModel()),
@@ -113,6 +114,7 @@ Setup_Video::Setup_Video():
     mFsCheckBox(new CheckBox("Full screen", mFullScreenEnabled)),
     mOpenGLCheckBox(new CheckBox("OpenGL", mOpenGLEnabled)),
     mCustomCursorCheckBox(new CheckBox("Custom cursor", mCustomCursorEnabled)),
+    mParticleEffectsCheckBox(new CheckBox("Particle effects", mParticleEffectsEnabled)),
     mAlphaSlider(new Slider(0.2, 1.0)),
     mFpsCheckBox(new CheckBox("FPS Limit: ")),
     mFpsSlider(new Slider(10, 200)),
@@ -144,6 +146,7 @@ Setup_Video::Setup_Video():
     scrollArea->setDimension(gcn::Rectangle(10, 10, 90, 50));
     mFsCheckBox->setPosition(110, 10);
     mOpenGLCheckBox->setPosition(110, 30);
+    mParticleEffectsCheckBox->setPosition(175, 30);
     mCustomCursorCheckBox->setPosition(110, 50);
     mAlphaSlider->setDimension(gcn::Rectangle(10, 80, 100, 10));
     alphaLabel->setPosition(20 + mAlphaSlider->getWidth(),
@@ -163,6 +166,7 @@ Setup_Video::Setup_Video():
     mFpsCheckBox->setSelected(mFps > 0);
 
     mCustomCursorCheckBox->setActionEventId("customcursor");
+    mParticleEffectsCheckBox->setActionEventId("particleeffects");
     mAlphaSlider->setActionEventId("guialpha");
     mFpsCheckBox->setActionEventId("fpslimitcheckbox");
     mFpsSlider->setActionEventId("fpslimitslider");
@@ -176,6 +180,7 @@ Setup_Video::Setup_Video():
     mParticleDetailField->setActionEventId("particledetailfield");
 
     mCustomCursorCheckBox->addActionListener(this);
+    mParticleEffectsCheckBox->addActionListener(this);
     mAlphaSlider->addActionListener(this);
     mFpsCheckBox->addActionListener(this);
     mFpsSlider->addActionListener(this);
@@ -250,6 +255,7 @@ Setup_Video::Setup_Video():
     add(mFsCheckBox);
     add(mOpenGLCheckBox);
     add(mCustomCursorCheckBox);
+    add(mParticleEffectsCheckBox);
     add(mAlphaSlider);
     add(alphaLabel);
     add(mFpsCheckBox);
@@ -371,6 +377,8 @@ void Setup_Video::cancel()
 
     config.setValue("screen", mFullScreenEnabled ? 1 : 0);
     config.setValue("customcursor", mCustomCursorEnabled ? 1 : 0);
+    config.setValue("particleeffects", mParticleEffectsEnabled ? 1 : 0);
+    config.setValue("screen", mParticleEffectsEnabled ? 1 : 0);
     config.setValue("guialpha", mOpacity);
     config.setValue("opengl", mOpenGLEnabled ? 1 : 0);
 }
@@ -386,6 +394,13 @@ void Setup_Video::action(const gcn::ActionEvent &event)
         config.setValue("customcursor",
                 mCustomCursorCheckBox->isSelected() ? 1 : 0);
     }
+    else if (event.getId() == "particleeffects")
+    {
+        config.setValue("particleeffects",
+                mParticleEffectsCheckBox->isSelected() ? 1 : 0);
+        new OkDialog("Particle effect settings changed",
+                     "Restart your client or change maps for the change to take effect.");
+    }
     else if (event.getId() == "fpslimitslider")
     {
         mFps = (int) mFpsSlider->getValue();
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index 0d7ea700..7eb872d4 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -51,6 +51,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
         bool mFullScreenEnabled;
         bool mOpenGLEnabled;
         bool mCustomCursorEnabled;
+        bool mParticleEffectsEnabled;
         double mOpacity;
         int mFps;
 
@@ -60,6 +61,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
         gcn::CheckBox *mFsCheckBox;
         gcn::CheckBox *mOpenGLCheckBox;
         gcn::CheckBox *mCustomCursorCheckBox;
+        gcn::CheckBox *mParticleEffectsCheckBox;
 
         gcn::Slider *mAlphaSlider;
         gcn::CheckBox *mFpsCheckBox;
diff --git a/src/map.cpp b/src/map.cpp
index 3adc3498..f9454187 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -504,11 +504,14 @@ void Map::addParticleEffect(const std::string &effectFile, int x, int y)
 
 void Map::initializeParticleEffects(Particle* particleEngine)
 {
-    for (std::list<ParticleEffectData>::iterator i = particleEffects.begin();
-         i != particleEffects.end();
-         i++
-        )
+    if (config.getValue("particleeffects", 1))
     {
-        particleEngine->addEffect(i->file, i->x, i->y);
+        for (std::list<ParticleEffectData>::iterator i = particleEffects.begin();
+             i != particleEffects.end();
+             i++
+            )
+        {
+            particleEngine->addEffect(i->file, i->x, i->y);
+        }
     }
 }
diff --git a/src/monster.cpp b/src/monster.cpp
index 61f1f5c3..be22bed3 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -65,13 +65,15 @@ Monster::Monster(Uint32 id, Uint16 job, Map *map):
         mSprites[c] = AnimatedSprite::load("graphics/sprites/error.xml");
     }
 
-    const std::list<std::string> &particleEffects = info.getParticleEffects();
-    for (   std::list<std::string>::const_iterator i = particleEffects.begin();
-            i != particleEffects.end();
-            i++
-        )
+    if (mParticleEffects)
     {
-        controlParticle(particleEngine->addEffect((*i), 0, 0));
+        const std::list<std::string> &particleEffects = info.getParticleEffects();
+        for (   std::list<std::string>::const_iterator i = particleEffects.begin();
+                i != particleEffects.end(); i++
+            )
+        {
+            controlParticle(particleEngine->addEffect((*i), 0, 0));
+        }
     }
 }
 
@@ -122,7 +124,7 @@ void Monster::setAction(Action action)
 
             //attack particle effect
             particleEffect = getInfo().getAttackParticleEffect();
-            if (particleEffect != "")
+            if (particleEffect != "" && mParticleEffects)
             {
                 switch (mDirection)
                 {
diff --git a/src/npc.cpp b/src/npc.cpp
index fe0b4598..3f9a1601 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -58,13 +58,16 @@ NPC::NPC(Uint32 id, Uint16 job, Map *map, Network *network):
         c++;
     }
 
-    //setup particle effects
-    for (std::list<std::string>::const_iterator i = info.particles.begin();
-         i != info.particles.end();
-         i++)
+    if (mParticleEffects)
     {
-        Particle *p = particleEngine->addEffect(*i, 0, 0);
-        this->controlParticle(p);
+        //setup particle effects
+        for (std::list<std::string>::const_iterator i = info.particles.begin();
+             i != info.particles.end();
+             i++)
+        {
+            Particle *p = particleEngine->addEffect(*i, 0, 0);
+            this->controlParticle(p);
+        }
     }
     mName = 0;
 }
-- 
cgit v1.2.3-70-g09d2


From 0ce8857e4e3fbd69c48f7db9123293bdcbcd9751 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 14 Oct 2008 21:16:29 +0000
Subject: Accidently left in a copied line. Must be slightly tired to not
 notice this while testing. Oh well.

---
 src/gui/setup_video.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index e065edae..612de09f 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -378,7 +378,6 @@ void Setup_Video::cancel()
     config.setValue("screen", mFullScreenEnabled ? 1 : 0);
     config.setValue("customcursor", mCustomCursorEnabled ? 1 : 0);
     config.setValue("particleeffects", mParticleEffectsEnabled ? 1 : 0);
-    config.setValue("screen", mParticleEffectsEnabled ? 1 : 0);
     config.setValue("guialpha", mOpacity);
     config.setValue("opengl", mOpenGLEnabled ? 1 : 0);
 }
-- 
cgit v1.2.3-70-g09d2


From d3f84af9d22814db0ec67e87805b3d1054afd606 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 15 Oct 2008 15:23:21 +0000
Subject: De-hardcoded colors in trunk. Now, all colors are loaded from
 colors.xml.

---
 src/CMakeLists.txt        |   2 +
 src/Makefile.am           |   2 +
 src/being.cpp             |   2 +-
 src/being.h               |   8 ++--
 src/gui/char_select.cpp   |   8 +++-
 src/localplayer.cpp       |   1 +
 src/player.cpp            |  23 +--------
 src/resources/colordb.cpp | 119 ++++++++++++++++++++++++++++++++++++++++++++++
 src/resources/colordb.h   |  52 ++++++++++++++++++++
 9 files changed, 188 insertions(+), 29 deletions(-)
 create mode 100644 src/resources/colordb.cpp
 create mode 100644 src/resources/colordb.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e6b9d3b1..d7ff67a8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -227,6 +227,8 @@ SET(SRCS
     resources/animation.h
     resources/buddylist.cpp
     resources/buddylist.h
+    resources/colordb.cpp
+    resources/colordb.h
     resources/dye.cpp
     resources/dye.h
     resources/image.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index f6d06536..0f12579f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -189,6 +189,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      resources/animation.h \
 	      resources/buddylist.cpp \
 	      resources/buddylist.h \
+	      resources/colordb.cpp \
+	      resources/colordb.h \
 	      resources/dye.cpp \
 	      resources/dye.h \
 	      resources/image.cpp \
diff --git a/src/being.cpp b/src/being.cpp
index c4723f79..97ccd42e 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -144,7 +144,7 @@ void Being::setPath(const Path &path)
 void Being::setHairStyle(int style, int color)
 {
     mHairStyle = style < 0 ? mHairStyle : style % NR_HAIR_STYLES;
-    mHairColor = color < 0 ? mHairColor : color % NR_HAIR_COLORS;
+    mHairColor = color;
 }
 
 void Being::setSprite(int slot, int id, std::string color)
diff --git a/src/being.h b/src/being.h
index 05a49d9a..f5f1a1a7 100644
--- a/src/being.h
+++ b/src/being.h
@@ -36,8 +36,9 @@
 
 #include "gui/speechbubble.h"
 
+#include "resources/colordb.h"
+
 #define NR_HAIR_STYLES 10
-#define NR_HAIR_COLORS 16
 
 #define FIRST_IGNORE_EMOTE 14
 
@@ -362,6 +363,7 @@ class Being : public Sprite
 
         const std::auto_ptr<Equipment> mEquipment;
 
+
     protected:
         /**
          * Sets the new path for this being.
@@ -389,6 +391,7 @@ class Being : public Sprite
         std::string mName;              /**< Name of character */
         SpriteIterator mSpriteIterator;
         bool mIsGM;
+        bool mParticleEffects;          /**< Whether to display particles or not */
 
         /** Engine-related infos about weapon. */
         const ItemInfo* mEquippedWeapon;
@@ -405,9 +408,6 @@ class Being : public Sprite
         std::vector<std::string> mSpriteColors;
         std::list<Particle *> mChildParticleEffects;
 
-    protected:
-        bool mParticleEffects;          /**< Whether to display particles or not */
-
     private:
         /**
          * Calculates the offset in the given directions.
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index c4b1d89e..65d0159f 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -256,7 +256,10 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network,
 {
     mPlayer = new Player(0, 0, NULL);
     mPlayer->setGender(gender);
-    mPlayer->setHairStyle(rand() % NR_HAIR_STYLES, rand() % NR_HAIR_COLORS);
+
+    int numberOfHairColors = ColorDB::size();
+
+    mPlayer->setHairStyle(rand() % NR_HAIR_STYLES, rand() % numberOfHairColors);
 
     mNameField = new TextField("");
     mNameLabel = new gcn::Label("Name:");
@@ -322,6 +325,7 @@ CharCreateDialog::~CharCreateDialog()
 void
 CharCreateDialog::action(const gcn::ActionEvent &event)
 {
+    int numberOfColors = ColorDB::size();
     if (event.getId() == "create") {
         if (getName().length() >= 4) {
             // Attempt to create the character
@@ -340,7 +344,7 @@ CharCreateDialog::action(const gcn::ActionEvent &event)
         mPlayer->setHairStyle(-1, mPlayer->getHairColor() + 1);
     }
     else if (event.getId() == "prevcolor") {
-        mPlayer->setHairStyle(-1, mPlayer->getHairColor() + NR_HAIR_COLORS - 1);
+        mPlayer->setHairStyle(-1, mPlayer->getHairColor() + numberOfColors - 1);
     }
     else if (event.getId() == "nextstyle") {
         mPlayer->setHairStyle(mPlayer->getHairStyle() + 1, -1);
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 66d37ddf..d83bd254 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -54,6 +54,7 @@ LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map):
     mInventory(new Inventory(INVENTORY_SIZE)),
     mStorage(new Inventory(STORAGE_SIZE))
 {
+    ColorDB::load();
 }
 
 LocalPlayer::~LocalPlayer()
diff --git a/src/player.cpp b/src/player.cpp
index 8380fdfe..37badcdc 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -160,32 +160,11 @@ void Player::setGender(int gender)
 void Player::setHairStyle(int style, int color)
 {
     style = style < 0 ? mHairStyle : style % NR_HAIR_STYLES;
-    color = color < 0 ? mHairColor : color % NR_HAIR_COLORS;
     if (style == mHairStyle && color == mHairColor) return;
 
     Being::setHairStyle(style, color);
 
-    static char const *const colors[NR_HAIR_COLORS] =
-    {
-        "#8c4b41,da9041,ffffff", // light brown
-        "#06372b,489e25,fdedcc", // green
-        "#5f0b33,91191c,f9ad81", // dark red
-        "#602486,934cc3,fdc689", // purple
-        "#805e74,c6b09b,ffffff", // white
-        "#8c6625,dab425,ffffff", // yellow
-        "#1d2d6d,1594a3,fdedcc", // blue
-        "#831f2d,be4f2d,f8cc8b", // brown
-        "#432482,584bbc,dae8e5", // light blue
-        "#460850,611967,e7b4ae", // dark purple
-        "#8f3e21,bc522b,ff946c", // orange
-        "#9c6b84,d272a3,ffcae5", // pink
-        "#1d1d1d,414141,6f6f6f", // charcoal
-        "#525252,99999b,cacaca", // silver
-        "#841413,aa2829,ffaeb1", // light red
-        "#a82513,ffa525,ffffff", // strawberry blond
-    };
-
-    setSprite(HAIR_SPRITE, style * -1, colors[color]);
+    setSprite(HAIR_SPRITE, style * -1, ColorDB::get(color));
 
     setAction(mAction);
 }
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
new file mode 100644
index 00000000..837561ed
--- /dev/null
+++ b/src/resources/colordb.cpp
@@ -0,0 +1,119 @@
+/*
+ *  Aethyra
+ *  Copyright 2008 Aethyra Development Team
+ *
+ *  This file is part of Aethyra.
+ *
+ *  Aethyra is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  Aethyra is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Aethyra; if not, write to the Free Software Foundation, 
+ *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <cassert>
+#include <libxml/tree.h>
+
+#include "colordb.h"
+
+#include "../log.h"
+
+#include "../utils/dtor.h"
+#include "../utils/xml.h"
+
+#define HAIR_COLOR_FILE "colors.xml"
+
+namespace
+{
+    ColorDB::Colors mColors;
+    bool mLoaded = false;
+    std::string mFail = "";
+}
+
+void ColorDB::load()
+{
+    if (mLoaded)
+    {
+        return;
+    }
+
+    XML::Document doc(HAIR_COLOR_FILE);
+    xmlNodePtr root = doc.rootNode();
+
+    if (!root || !xmlStrEqual(root->name, BAD_CAST "colors"))
+    {
+        logger->log("Error loading colors file: "
+                    HAIR_COLOR_FILE);
+
+        // Provide "legacy" support for the TMW server that
+        // doesn't seperate out hair colors from the actual
+        // code. Seriously, this is freaking annoying.
+        mColors[0] = "#8c4b41,da9041,ffffff"; // light brown
+        mColors[1] = "#06372b,489e25,fdedcc"; // green
+        mColors[2] = "#5f0b33,91191c,f9ad81"; // dark red
+        mColors[3] = "#602486,934cc3,fdc689"; // purple
+        mColors[4] = "#805e74,c6b09b,ffffff"; // white
+        mColors[5] = "#8c6625,dab425,ffffff"; // yellow
+        mColors[6] = "#1d2d6d,1594a3,fdedcc"; // blue
+        mColors[7] = "#831f2d,be4f2d,f8cc8b"; // brown
+        mColors[8] = "#432482,584bbc,dae8e5"; // light blue
+        mColors[9] = "#460850,611967,e7b4ae"; // dark purple
+    }
+    else
+    {
+        for_each_xml_child_node(node, root)
+        {
+            if (xmlStrEqual(node->name, BAD_CAST "color"))
+            {
+                int id = XML::getProperty(node, "id", 0);
+
+                if (mColors.find(id) != mColors.end())
+                {
+                    logger->log("ColorDB: Redefinition of dye ID %d", id);
+                }
+
+                mColors[id] = XML::getProperty(node, "dye", "");
+            }
+        }
+    }
+
+    mLoaded = true;
+}
+
+void ColorDB::unload()
+{
+    logger->log("Unloading color database...");
+
+    mColors.clear();
+    mLoaded = false;
+}
+
+std::string& ColorDB::get(int id)
+{
+    assert(mLoaded);
+
+    ColorIterator i = mColors.find(id);
+
+    if (i == mColors.end())
+    {
+        logger->log("ColorDB: Error, unknown dye ID# %d", id);
+        return mFail;
+    }
+    else
+    {
+        return i->second;
+    }
+}
+
+const int& ColorDB::size()
+{
+    return mColors.size();
+}
diff --git a/src/resources/colordb.h b/src/resources/colordb.h
new file mode 100644
index 00000000..43398af4
--- /dev/null
+++ b/src/resources/colordb.h
@@ -0,0 +1,52 @@
+/*
+ *  Aethyra
+ *  Copyright 2008 Aethyra Development Team
+ *
+ *  This file is part of Aethyra.
+ *
+ *  Aethyra is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  Aethyra is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Aethyra; if not, write to the Free Software Foundation, 
+ *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _AETHYRA_COLOR_MANAGER_H
+#define _AETHYRA_COLOR_MANAGER_H
+
+#include <string>
+#include <map>
+
+/**
+ * The class that holds the color information.
+ */
+namespace ColorDB
+{
+    /**
+     * Loads the color data from <code>colors.xml</code>.
+     */
+    void load();
+
+    /**
+     * Clear the color data
+     */
+    void unload();
+
+    std::string& get(int id);
+
+    const int& size();
+
+    // Color DB
+    typedef std::map<int, std::string> Colors;
+    typedef Colors::iterator ColorIterator;
+};
+
+#endif
-- 
cgit v1.2.3-70-g09d2


From f07fdcc9668cc446d31ce2539e3934c40d103ae3 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 15 Oct 2008 17:57:54 +0000
Subject: Added patch so that players can turn on or off speech bubbles.

---
 src/being.cpp             | 26 ++++++++++++++++++++++++-
 src/being.h               |  2 ++
 src/gui/setup.cpp         |  2 +-
 src/gui/setup_players.cpp |  2 +-
 src/gui/setup_video.cpp   | 48 ++++++++++++++++++++++++++++++-----------------
 src/gui/setup_video.h     |  2 ++
 6 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index 97ccd42e..4958700f 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -35,6 +35,7 @@
 #include "sound.h"
 #include "localplayer.h"
 #include "configuration.h"
+#include "text.h"
 
 #include "resources/resourcemanager.h"
 #include "resources/imageset.h"
@@ -53,6 +54,9 @@
 int Being::instances = 0;
 ImageSet *Being::emotionSet = NULL;
 
+static const int X_SPEECH_OFFSET = 18;
+static const int Y_SPEECH_OFFSET = 60;
+
 Being::Being(int id, int job, Map *map):
     mJob(job),
     mX(0), mY(0),
@@ -90,6 +94,7 @@ Being::Being(int id, int job, Map *map):
     instances++;
     mSpeech = "";
     mIsGM = false;
+    mText = 0;
 }
 
 Being::~Being()
@@ -115,6 +120,7 @@ Being::~Being()
     }
 
     delete mSpeechBubble;
+    delete mText;
 }
 
 void Being::setDestination(Uint16 destX, Uint16 destY)
@@ -157,6 +163,17 @@ void Being::setSprite(int slot, int id, std::string color)
 void Being::setSpeech(const std::string &text, Uint32 time)
 {
     mSpeech = text;
+
+    if (!config.getValue("speechbubble", 1))
+    {
+        // don't introduce a memory leak
+        delete mText;
+
+        mText = new Text(text, mPx + X_SPEECH_OFFSET, mPy - Y_SPEECH_OFFSET,
+                         gcn::Graphics::CENTER, speechFont,
+                         gcn::Color(255, 255, 255));
+    }
+
     mSpeechTime = 500;
 }
 
@@ -361,6 +378,13 @@ void Being::logic()
     if (mSpeechTime > 0)
          mSpeechTime--;
 
+    // Remove text if speech boxes aren't being used
+    if (mSpeechTime == 0 && mText)
+    {
+        delete mText;
+        mText = 0;
+    }
+
     int oldPx = mPx;
     int oldPy = mPy;
     // Update pixel coordinates
@@ -442,7 +466,7 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
     int py = mPy + offsetY;
 
     // Draw speech above this being
-    if (mSpeechTime > 0)
+    if (mSpeechTime > 0 && config.getValue("speechbubble", 1))
     {
         mSpeechBubble->setCaption(mName);
         mSpeechBubble->setWindowName(mName);
diff --git a/src/being.h b/src/being.h
index f5f1a1a7..cceebc3c 100644
--- a/src/being.h
+++ b/src/being.h
@@ -51,6 +51,7 @@ class Graphics;
 class ImageSet;
 class Particle;
 class SpeechBubble;
+class Text;
 
 /**
  * A position along a being's path.
@@ -398,6 +399,7 @@ class Being : public Sprite
 
         Path mPath;
         std::string mSpeech;
+        Text *mText;
         Uint16 mHairStyle, mHairColor;
         Uint8 mGender;
         Uint32 mSpeechTime;
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 8ec3bfd8..4faa8a86 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -50,7 +50,7 @@ Setup::Setup():
 {
     setCloseButton(true);
     int width = 310;
-    int height = 290;
+    int height = 310;
     setContentSize(width, height);
 
     const char *buttonNames[] = {
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 809364ea..ed1facc7 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -48,7 +48,7 @@
 
 #define WIDGET_AT(row, column) (((row) * COLUMNS_NR) + column)
 
-static std::string table_titles[COLUMNS_NR] = {"name", "relation"};
+static std::string table_titles[COLUMNS_NR] = {" name", "relation "};
 
 static const std::string RELATION_NAMES[PlayerRelation::RELATIONS_NR] = {
     "neutral", "friend", "disregarded", "ignored"
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 612de09f..6a246501 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -107,6 +107,7 @@ Setup_Video::Setup_Video():
     mOpenGLEnabled(config.getValue("opengl", 0)),
     mCustomCursorEnabled(config.getValue("customcursor", 1)),
     mParticleEffectsEnabled(config.getValue("particleeffects", 1)),
+    mSpeechBubbleEnabled(config.getValue("speechbubble", 1)),
     mOpacity(config.getValue("guialpha", 0.8)),
     mFps((int)config.getValue("fpslimit", 60)),
     mModeListModel(new ModeListModel()),
@@ -115,6 +116,7 @@ Setup_Video::Setup_Video():
     mOpenGLCheckBox(new CheckBox("OpenGL", mOpenGLEnabled)),
     mCustomCursorCheckBox(new CheckBox("Custom cursor", mCustomCursorEnabled)),
     mParticleEffectsCheckBox(new CheckBox("Particle effects", mParticleEffectsEnabled)),
+    mSpeechBubbleCheckBox(new CheckBox("Speech bubbles", mSpeechBubbleEnabled)),
     mAlphaSlider(new Slider(0.2, 1.0)),
     mFpsCheckBox(new CheckBox("FPS Limit: ")),
     mFpsSlider(new Slider(10, 200)),
@@ -142,17 +144,18 @@ Setup_Video::Setup_Video():
     mOpenGLCheckBox->setEnabled(false);
 #endif
 
-    mModeList->setDimension(gcn::Rectangle(0, 0, 60, 50));
-    scrollArea->setDimension(gcn::Rectangle(10, 10, 90, 50));
+    mModeList->setDimension(gcn::Rectangle(0, 0, 60, 70));
+    scrollArea->setDimension(gcn::Rectangle(10, 10, 90, 70));
     mFsCheckBox->setPosition(110, 10);
     mOpenGLCheckBox->setPosition(110, 30);
     mParticleEffectsCheckBox->setPosition(175, 30);
     mCustomCursorCheckBox->setPosition(110, 50);
-    mAlphaSlider->setDimension(gcn::Rectangle(10, 80, 100, 10));
+    mSpeechBubbleCheckBox->setPosition(110, 70);
+    mAlphaSlider->setDimension(gcn::Rectangle(10, 100, 100, 10));
     alphaLabel->setPosition(20 + mAlphaSlider->getWidth(),
                             mAlphaSlider->getY());
-    mFpsCheckBox->setPosition(90, 100);
-    mFpsSlider->setDimension(gcn::Rectangle(10, 100, 75, 10));
+    mFpsCheckBox->setPosition(90, 120);
+    mFpsSlider->setDimension(gcn::Rectangle(10, 120, 75, 10));
     mFpsField->setPosition(100 + mFpsCheckBox->getWidth(), 100);
     mFpsField->setWidth(30);
 
@@ -167,6 +170,7 @@ Setup_Video::Setup_Video():
 
     mCustomCursorCheckBox->setActionEventId("customcursor");
     mParticleEffectsCheckBox->setActionEventId("particleeffects");
+    mSpeechBubbleCheckBox->setActionEventId("speechbubble");
     mAlphaSlider->setActionEventId("guialpha");
     mFpsCheckBox->setActionEventId("fpslimitcheckbox");
     mFpsSlider->setActionEventId("fpslimitslider");
@@ -181,6 +185,7 @@ Setup_Video::Setup_Video():
 
     mCustomCursorCheckBox->addActionListener(this);
     mParticleEffectsCheckBox->addActionListener(this);
+    mSpeechBubbleCheckBox->addActionListener(this);
     mAlphaSlider->addActionListener(this);
     mFpsCheckBox->addActionListener(this);
     mFpsSlider->addActionListener(this);
@@ -194,26 +199,26 @@ Setup_Video::Setup_Video():
     mParticleDetailSlider->addActionListener(this);
     mParticleDetailField->addKeyListener(this);
 
-    mScrollRadiusSlider->setDimension(gcn::Rectangle(10, 120, 75, 10));
+    mScrollRadiusSlider->setDimension(gcn::Rectangle(10, 140, 75, 10));
     gcn::Label *scrollRadiusLabel = new gcn::Label("Scroll radius");
-    scrollRadiusLabel->setPosition(90, 120);
-    mScrollRadiusField->setPosition(mFpsField->getX(), 120);
+    scrollRadiusLabel->setPosition(90, 140);
+    mScrollRadiusField->setPosition(mFpsField->getX(), 140);
     mScrollRadiusField->setWidth(30);
     mScrollRadiusField->setText(toString(mOriginalScrollRadius));
     mScrollRadiusSlider->setValue(mOriginalScrollRadius);
 
-    mScrollLazinessSlider->setDimension(gcn::Rectangle(10, 140, 75, 10));
+    mScrollLazinessSlider->setDimension(gcn::Rectangle(10, 160, 75, 10));
     gcn::Label *scrollLazinessLabel = new gcn::Label("Scroll laziness");
-    scrollLazinessLabel->setPosition(90, 140);
-    mScrollLazinessField->setPosition(mFpsField->getX(), 140);
+    scrollLazinessLabel->setPosition(90, 160);
+    mScrollLazinessField->setPosition(mFpsField->getX(), 160);
     mScrollLazinessField->setWidth(30);
     mScrollLazinessField->setText(toString(mOriginalScrollLaziness));
     mScrollLazinessSlider->setValue(mOriginalScrollLaziness);
 
-    mOverlayDetailSlider->setDimension(gcn::Rectangle(10, 160, 75, 10));
+    mOverlayDetailSlider->setDimension(gcn::Rectangle(10, 180, 75, 10));
     gcn::Label *overlayDetailLabel = new gcn::Label("Ambient FX");
-    overlayDetailLabel->setPosition(90, 160);
-    mOverlayDetailField->setPosition(180, 160);
+    overlayDetailLabel->setPosition(90, 180);
+    mOverlayDetailField->setPosition(180, 180);
     mOverlayDetailField->setWidth(30);
     switch (mOverlayDetail)
     {
@@ -229,10 +234,10 @@ Setup_Video::Setup_Video():
     }
     mOverlayDetailSlider->setValue(mOverlayDetail);
 
-    mParticleDetailSlider->setDimension(gcn::Rectangle(10, 180, 75, 10));
+    mParticleDetailSlider->setDimension(gcn::Rectangle(10, 200, 75, 10));
     gcn::Label *particleDetailLabel = new gcn::Label("Particle Detail");
-    particleDetailLabel->setPosition(90, 180);
-    mParticleDetailField->setPosition(180, 180);
+    particleDetailLabel->setPosition(90, 200);
+    mParticleDetailField->setPosition(180, 200);
     mParticleDetailField->setWidth(60);
     switch (mParticleDetail)
     {
@@ -256,6 +261,7 @@ Setup_Video::Setup_Video():
     add(mOpenGLCheckBox);
     add(mCustomCursorCheckBox);
     add(mParticleEffectsCheckBox);
+    add(mSpeechBubbleCheckBox);
     add(mAlphaSlider);
     add(alphaLabel);
     add(mFpsCheckBox);
@@ -335,6 +341,8 @@ void Setup_Video::apply()
     // We sync old and new values at apply time
     mFullScreenEnabled = config.getValue("screen", 0);
     mCustomCursorEnabled = config.getValue("customcursor", 1);
+    mParticleEffectsEnabled = config.getValue("particleeffects", 1);
+    mSpeechBubbleEnabled = config.getValue("speechbubble", 1);
     mOpacity = config.getValue("guialpha", 0.8);
     mOverlayDetail = (int)config.getValue("OverlayDetail", 2);
     mOpenGLEnabled = config.getValue("opengl", 0);
@@ -378,6 +386,7 @@ void Setup_Video::cancel()
     config.setValue("screen", mFullScreenEnabled ? 1 : 0);
     config.setValue("customcursor", mCustomCursorEnabled ? 1 : 0);
     config.setValue("particleeffects", mParticleEffectsEnabled ? 1 : 0);
+    config.setValue("speechbubble", mSpeechBubbleEnabled ? 1 : 0);
     config.setValue("guialpha", mOpacity);
     config.setValue("opengl", mOpenGLEnabled ? 1 : 0);
 }
@@ -400,6 +409,11 @@ void Setup_Video::action(const gcn::ActionEvent &event)
         new OkDialog("Particle effect settings changed",
                      "Restart your client or change maps for the change to take effect.");
     }
+    else if (event.getId() == "speechbubble")
+    {
+        config.setValue("speechbubble",
+                mSpeechBubbleCheckBox->isSelected() ? 1 : 0);
+    }
     else if (event.getId() == "fpslimitslider")
     {
         mFps = (int) mFpsSlider->getValue();
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index 7eb872d4..d0a19cb6 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -52,6 +52,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
         bool mOpenGLEnabled;
         bool mCustomCursorEnabled;
         bool mParticleEffectsEnabled;
+        bool mSpeechBubbleEnabled;
         double mOpacity;
         int mFps;
 
@@ -62,6 +63,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
         gcn::CheckBox *mOpenGLCheckBox;
         gcn::CheckBox *mCustomCursorCheckBox;
         gcn::CheckBox *mParticleEffectsCheckBox;
+        gcn::CheckBox *mSpeechBubbleCheckBox;
 
         gcn::Slider *mAlphaSlider;
         gcn::CheckBox *mFpsCheckBox;
-- 
cgit v1.2.3-70-g09d2


From 11e74c7299895136b366c2ea344a7ae98b374b96 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 15 Oct 2008 21:04:58 +0000
Subject: Added new Windows build.

---
 AethyraLin2WinXcompile.cbp | 641 +++++++++++++++++++++++----------------------
 1 file changed, 333 insertions(+), 308 deletions(-)

diff --git a/AethyraLin2WinXcompile.cbp b/AethyraLin2WinXcompile.cbp
index 6b5e9a16..f2711040 100644
--- a/AethyraLin2WinXcompile.cbp
+++ b/AethyraLin2WinXcompile.cbp
@@ -4,22 +4,27 @@
 	<Project>
 		<Option title="Aethyra" />
 		<Option pch_mode="0" />
-		<Option compiler="mingw" />
+		<Option default_target="default" />
+		<Option compiler="gcc" />
 		<Build>
 			<Target title="default">
 				<Option output="aethyra.exe" prefix_auto="0" extension_auto="0" />
 				<Option type="0" />
-				<Option compiler="mingw" />
+				<Option compiler="gcc" />
 				<Option projectResourceIncludeDirsRelation="0" />
 				<Compiler>
+					<Add option="-fexpensive-optimizations" />
+					<Add option="-Os" />
+					<Add option="-O3" />
 					<Add option="-Wall" />
 					<Add option="-DUSE_OPENGL" />
 					<Add option="-DNOGDI" />
-					<Add directory="../../../../../../mingw/include/SDL" />
-					<Add directory="/home/kraant/manaworld/Windows/tmw-svn-0.0.x/include" />
-					<Add directory="/home/kraant/manaworld/Windows/tmw-svn-0.0.x/include/SDL" />
+					<Add directory="..\..\..\..\..\..\mingw\include\SDL" />
+					<Add directory="..\aethyra\builds\windows\LinuxXcompileBuildSupport\include" />
+					<Add directory="..\aethyra\builds\windows\LinuxXcompileBuildSupport\include\SDL" />
 				</Compiler>
 				<Linker>
+					<Add option="-s" />
 					<Add library="guichan" />
 					<Add library="guichan_sdl" />
 					<Add library="guichan_opengl" />
@@ -36,7 +41,7 @@
 					<Add library="z.dll" />
 					<Add library="physfs" />
 					<Add library="curl.dll" />
-					<Add directory="/home/kraant/manaworld/Windows/tmw-svn-0.0.x/lib" />
+					<Add directory="..\aethyra\builds\windows\LinuxXcompileBuildSupport\lib" />
 				</Linker>
 			</Target>
 			<Target title="unix">
@@ -48,7 +53,7 @@
 					<Add option="-Wall" />
 					<Add option="-g" />
 					<Add option="`sdl-config --cflags`" />
-					<Add directory="/usr/local/include/libxml2" />
+					<Add directory="\usr\local\include\libxml2" />
 				</Compiler>
 				<Linker>
 					<Add option="`sdl-config --libs`" />
@@ -69,312 +74,332 @@
 		<VirtualTargets>
 			<Add alias="All" targets="default;" />
 		</VirtualTargets>
-		<Unit filename="src/animatedsprite.cpp" />
-		<Unit filename="src/animatedsprite.h" />
-		<Unit filename="src/animationparticle.cpp" />
-		<Unit filename="src/animationparticle.h" />
-		<Unit filename="src/being.cpp" />
-		<Unit filename="src/being.h" />
-		<Unit filename="src/beingmanager.cpp" />
-		<Unit filename="src/beingmanager.h" />
-		<Unit filename="src/configlistener.h" />
-		<Unit filename="src/configuration.cpp" />
-		<Unit filename="src/configuration.h" />
-		<Unit filename="src/engine.cpp" />
-		<Unit filename="src/engine.h" />
-		<Unit filename="src/equipment.cpp" />
-		<Unit filename="src/equipment.h" />
-		<Unit filename="src/floor_item.cpp" />
-		<Unit filename="src/floor_item.h" />
-		<Unit filename="src/flooritemmanager.cpp" />
-		<Unit filename="src/flooritemmanager.h" />
-		<Unit filename="src/game.cpp" />
-		<Unit filename="src/game.h" />
-		<Unit filename="src/graphics.cpp" />
-		<Unit filename="src/graphics.h" />
-		<Unit filename="src/gui/box.cpp" />
-		<Unit filename="src/gui/box.h" />
-		<Unit filename="src/gui/browserbox.cpp" />
-		<Unit filename="src/gui/browserbox.h" />
-		<Unit filename="src/gui/button.cpp" />
-		<Unit filename="src/gui/button.h" />
-		<Unit filename="src/gui/buttonbox.cpp" />
-		<Unit filename="src/gui/buttonbox.h" />
-		<Unit filename="src/gui/buy.cpp" />
-		<Unit filename="src/gui/buy.h" />
-		<Unit filename="src/gui/buysell.cpp" />
-		<Unit filename="src/gui/buysell.h" />
-		<Unit filename="src/gui/char_select.cpp" />
-		<Unit filename="src/gui/char_select.h" />
-		<Unit filename="src/gui/char_server.cpp" />
-		<Unit filename="src/gui/char_server.h" />
-		<Unit filename="src/gui/chat.cpp" />
-		<Unit filename="src/gui/chat.h" />
-		<Unit filename="src/gui/chatinput.cpp" />
-		<Unit filename="src/gui/chatinput.h" />
-		<Unit filename="src/gui/checkbox.cpp" />
-		<Unit filename="src/gui/checkbox.h" />
-		<Unit filename="src/gui/confirm_dialog.cpp" />
-		<Unit filename="src/gui/confirm_dialog.h" />
-		<Unit filename="src/gui/connection.cpp" />
-		<Unit filename="src/gui/connection.h" />
-		<Unit filename="src/gui/debugwindow.cpp" />
-		<Unit filename="src/gui/debugwindow.h" />
-		<Unit filename="src/gui/equipmentwindow.cpp" />
-		<Unit filename="src/gui/equipmentwindow.h" />
-		<Unit filename="src/gui/focushandler.cpp" />
-		<Unit filename="src/gui/focushandler.h" />
-		<Unit filename="src/gui/gccontainer.cpp" />
-		<Unit filename="src/gui/gccontainer.h" />
-		<Unit filename="src/gui/gui.cpp" />
-		<Unit filename="src/gui/gui.h" />
-		<Unit filename="src/gui/hbox.cpp" />
-		<Unit filename="src/gui/hbox.h" />
-		<Unit filename="src/gui/help.cpp" />
-		<Unit filename="src/gui/help.h" />
-		<Unit filename="src/gui/inttextbox.cpp" />
-		<Unit filename="src/gui/inttextbox.h" />
-		<Unit filename="src/gui/inventorywindow.cpp" />
-		<Unit filename="src/gui/inventorywindow.h" />
-		<Unit filename="src/gui/item_amount.cpp" />
-		<Unit filename="src/gui/item_amount.h" />
-		<Unit filename="src/gui/itemcontainer.cpp" />
-		<Unit filename="src/gui/itemcontainer.h" />
-		<Unit filename="src/gui/itemshortcutcontainer.cpp" />
-		<Unit filename="src/gui/itemshortcutcontainer.h" />
-		<Unit filename="src/gui/itemshortcutwindow.cpp" />
-		<Unit filename="src/gui/itemshortcutwindow.h" />
-		<Unit filename="src/gui/linkhandler.h" />
-		<Unit filename="src/gui/listbox.cpp" />
-		<Unit filename="src/gui/listbox.h" />
-		<Unit filename="src/gui/login.cpp" />
-		<Unit filename="src/gui/login.h" />
-		<Unit filename="src/gui/menuwindow.cpp" />
-		<Unit filename="src/gui/menuwindow.h" />
-		<Unit filename="src/gui/minimap.cpp" />
-		<Unit filename="src/gui/minimap.h" />
-		<Unit filename="src/gui/ministatus.cpp" />
-		<Unit filename="src/gui/ministatus.h" />
-		<Unit filename="src/gui/npc_text.cpp" />
-		<Unit filename="src/gui/npc_text.h" />
-		<Unit filename="src/gui/npclistdialog.cpp" />
-		<Unit filename="src/gui/npclistdialog.h" />
-		<Unit filename="src/gui/ok_dialog.cpp" />
-		<Unit filename="src/gui/ok_dialog.h" />
-		<Unit filename="src/gui/passwordfield.cpp" />
-		<Unit filename="src/gui/passwordfield.h" />
-		<Unit filename="src/gui/playerbox.cpp" />
-		<Unit filename="src/gui/playerbox.h" />
-		<Unit filename="src/gui/popup_box.h" />
-		<Unit filename="src/gui/popupmenu.cpp" />
-		<Unit filename="src/gui/popupmenu.h" />
-		<Unit filename="src/gui/progressbar.cpp" />
-		<Unit filename="src/gui/progressbar.h" />
-		<Unit filename="src/gui/radiobutton.cpp" />
-		<Unit filename="src/gui/radiobutton.h" />
-		<Unit filename="src/gui/register.cpp" />
-		<Unit filename="src/gui/register.h" />
-		<Unit filename="src/gui/scrollarea.cpp" />
-		<Unit filename="src/gui/scrollarea.h" />
-		<Unit filename="src/gui/sell.cpp" />
-		<Unit filename="src/gui/sell.h" />
-		<Unit filename="src/gui/setup.cpp" />
-		<Unit filename="src/gui/setup.h" />
-		<Unit filename="src/gui/setup_audio.cpp" />
-		<Unit filename="src/gui/setup_audio.h" />
-		<Unit filename="src/gui/setup_joystick.cpp" />
-		<Unit filename="src/gui/setup_joystick.h" />
-		<Unit filename="src/gui/setup_keyboard.cpp" />
-		<Unit filename="src/gui/setup_keyboard.h" />
-		<Unit filename="src/gui/setup_players.cpp" />
-		<Unit filename="src/gui/setup_players.h" />
-		<Unit filename="src/gui/setup_video.cpp" />
-		<Unit filename="src/gui/setup_video.h" />
-		<Unit filename="src/gui/setuptab.h" />
-		<Unit filename="src/gui/shop.cpp" />
-		<Unit filename="src/gui/shop.h" />
-		<Unit filename="src/gui/shoplistbox.cpp" />
-		<Unit filename="src/gui/shoplistbox.h" />
-		<Unit filename="src/gui/skill.cpp" />
-		<Unit filename="src/gui/skill.h" />
-		<Unit filename="src/gui/slider.cpp" />
-		<Unit filename="src/gui/slider.h" />
-		<Unit filename="src/gui/status.cpp" />
-		<Unit filename="src/gui/status.h" />
-		<Unit filename="src/gui/tabbedcontainer.cpp" />
-		<Unit filename="src/gui/tabbedcontainer.h" />
-		<Unit filename="src/gui/table.cpp" />
-		<Unit filename="src/gui/table.h" />
-		<Unit filename="src/gui/table_model.cpp" />
-		<Unit filename="src/gui/table_model.h" />
-		<Unit filename="src/gui/textbox.cpp" />
-		<Unit filename="src/gui/textbox.h" />
-		<Unit filename="src/gui/textfield.cpp" />
-		<Unit filename="src/gui/textfield.h" />
-		<Unit filename="src/gui/trade.cpp" />
-		<Unit filename="src/gui/trade.h" />
-		<Unit filename="src/gui/updatewindow.cpp" />
-		<Unit filename="src/gui/updatewindow.h" />
-		<Unit filename="src/gui/vbox.cpp" />
-		<Unit filename="src/gui/vbox.h" />
-		<Unit filename="src/gui/viewport.cpp" />
-		<Unit filename="src/gui/viewport.h" />
-		<Unit filename="src/gui/widgets/dropdown.cpp" />
-		<Unit filename="src/gui/widgets/dropdown.h" />
-		<Unit filename="src/gui/widgets/resizegrip.cpp" />
-		<Unit filename="src/gui/widgets/resizegrip.h" />
-		<Unit filename="src/gui/window.cpp" />
-		<Unit filename="src/gui/window.h" />
-		<Unit filename="src/gui/windowcontainer.cpp" />
-		<Unit filename="src/gui/windowcontainer.h" />
-		<Unit filename="src/guichanfwd.h" />
-		<Unit filename="src/imageparticle.cpp" />
-		<Unit filename="src/imageparticle.h" />
-		<Unit filename="src/inventory.cpp" />
-		<Unit filename="src/inventory.h" />
-		<Unit filename="src/item.cpp" />
-		<Unit filename="src/item.h" />
-		<Unit filename="src/itemshortcut.cpp" />
-		<Unit filename="src/itemshortcut.h" />
-		<Unit filename="src/joystick.cpp" />
-		<Unit filename="src/joystick.h" />
-		<Unit filename="src/keyboardconfig.cpp" />
-		<Unit filename="src/keyboardconfig.h" />
-		<Unit filename="src/localplayer.cpp" />
-		<Unit filename="src/localplayer.h" />
-		<Unit filename="src/lockedarray.h" />
-		<Unit filename="src/log.cpp" />
-		<Unit filename="src/log.h" />
-		<Unit filename="src/logindata.h" />
-		<Unit filename="src/main.cpp" />
-		<Unit filename="src/main.h" />
-		<Unit filename="src/map.cpp" />
-		<Unit filename="src/map.h" />
-		<Unit filename="src/monster.cpp" />
-		<Unit filename="src/monster.h" />
-		<Unit filename="src/net/beinghandler.cpp" />
-		<Unit filename="src/net/beinghandler.h" />
-		<Unit filename="src/net/buysellhandler.cpp" />
-		<Unit filename="src/net/buysellhandler.h" />
-		<Unit filename="src/net/charserverhandler.cpp" />
-		<Unit filename="src/net/charserverhandler.h" />
-		<Unit filename="src/net/chathandler.cpp" />
-		<Unit filename="src/net/chathandler.h" />
-		<Unit filename="src/net/equipmenthandler.cpp" />
-		<Unit filename="src/net/equipmenthandler.h" />
-		<Unit filename="src/net/inventoryhandler.cpp" />
-		<Unit filename="src/net/inventoryhandler.h" />
-		<Unit filename="src/net/itemhandler.cpp" />
-		<Unit filename="src/net/itemhandler.h" />
-		<Unit filename="src/net/loginhandler.cpp" />
-		<Unit filename="src/net/loginhandler.h" />
-		<Unit filename="src/net/maploginhandler.cpp" />
-		<Unit filename="src/net/maploginhandler.h" />
-		<Unit filename="src/net/messagehandler.cpp" />
-		<Unit filename="src/net/messagehandler.h" />
-		<Unit filename="src/net/messagein.cpp" />
-		<Unit filename="src/net/messagein.h" />
-		<Unit filename="src/net/messageout.cpp" />
-		<Unit filename="src/net/messageout.h" />
-		<Unit filename="src/net/network.cpp" />
-		<Unit filename="src/net/network.h" />
-		<Unit filename="src/net/npchandler.cpp" />
-		<Unit filename="src/net/npchandler.h" />
-		<Unit filename="src/net/playerhandler.cpp" />
-		<Unit filename="src/net/playerhandler.h" />
-		<Unit filename="src/net/protocol.cpp" />
-		<Unit filename="src/net/protocol.h" />
-		<Unit filename="src/net/skillhandler.cpp" />
-		<Unit filename="src/net/skillhandler.h" />
-		<Unit filename="src/net/tradehandler.cpp" />
-		<Unit filename="src/net/tradehandler.h" />
-		<Unit filename="src/npc.cpp" />
-		<Unit filename="src/npc.h" />
-		<Unit filename="src/openglgraphics.cpp" />
-		<Unit filename="src/openglgraphics.h" />
-		<Unit filename="src/particle.cpp" />
-		<Unit filename="src/particle.h" />
-		<Unit filename="src/particleemitter.cpp" />
-		<Unit filename="src/particleemitter.h" />
-		<Unit filename="src/party.cpp" />
-		<Unit filename="src/party.h" />
-		<Unit filename="src/player.cpp" />
-		<Unit filename="src/player.h" />
-		<Unit filename="src/player_relations.cpp" />
-		<Unit filename="src/player_relations.h" />
-		<Unit filename="src/properties.h" />
-		<Unit filename="src/recorder.cpp" />
-		<Unit filename="src/recorder.h" />
-		<Unit filename="src/resources/action.cpp" />
-		<Unit filename="src/resources/action.h" />
-		<Unit filename="src/resources/ambientoverlay.cpp" />
-		<Unit filename="src/resources/ambientoverlay.h" />
-		<Unit filename="src/resources/animation.cpp" />
-		<Unit filename="src/resources/animation.h" />
-		<Unit filename="src/resources/dye.cpp" />
-		<Unit filename="src/resources/dye.h" />
-		<Unit filename="src/resources/image.cpp" />
-		<Unit filename="src/resources/image.h" />
-		<Unit filename="src/resources/imageloader.cpp" />
-		<Unit filename="src/resources/imageloader.h" />
-		<Unit filename="src/resources/imageset.cpp" />
-		<Unit filename="src/resources/imageset.h" />
-		<Unit filename="src/resources/imagewriter.cpp" />
-		<Unit filename="src/resources/imagewriter.h" />
-		<Unit filename="src/resources/itemdb.cpp" />
-		<Unit filename="src/resources/itemdb.h" />
-		<Unit filename="src/resources/iteminfo.cpp" />
-		<Unit filename="src/resources/iteminfo.h" />
-		<Unit filename="src/resources/mapreader.cpp" />
-		<Unit filename="src/resources/mapreader.h" />
-		<Unit filename="src/resources/monsterdb.cpp" />
-		<Unit filename="src/resources/monsterdb.h" />
-		<Unit filename="src/resources/monsterinfo.cpp" />
-		<Unit filename="src/resources/monsterinfo.h" />
-		<Unit filename="src/resources/music.cpp" />
-		<Unit filename="src/resources/music.h" />
-		<Unit filename="src/resources/npcdb.cpp" />
-		<Unit filename="src/resources/npcdb.h" />
-		<Unit filename="src/resources/resource.cpp" />
-		<Unit filename="src/resources/resource.h" />
-		<Unit filename="src/resources/resourcemanager.cpp" />
-		<Unit filename="src/resources/resourcemanager.h" />
-		<Unit filename="src/resources/soundeffect.cpp" />
-		<Unit filename="src/resources/soundeffect.h" />
-		<Unit filename="src/resources/spritedef.cpp" />
-		<Unit filename="src/resources/spritedef.h" />
-		<Unit filename="src/serverinfo.h" />
-		<Unit filename="src/shopitem.cpp" />
-		<Unit filename="src/shopitem.h" />
-		<Unit filename="src/simpleanimation.cpp" />
-		<Unit filename="src/simpleanimation.h" />
-		<Unit filename="src/sound.cpp" />
-		<Unit filename="src/sound.h" />
-		<Unit filename="src/sprite.h" />
-		<Unit filename="src/text.cpp" />
-		<Unit filename="src/text.h" />
-		<Unit filename="src/textmanager.cpp" />
-		<Unit filename="src/textmanager.h" />
-		<Unit filename="src/textparticle.cpp" />
-		<Unit filename="src/textparticle.h" />
-		<Unit filename="src/tileset.h" />
-		<Unit filename="src/aethyra.rc">
+		<Unit filename="src\aethyra.rc">
 			<Option compilerVar="WINDRES" />
-			<Option target="&lt;{~None~}&gt;" />
-		</Unit>
-		<Unit filename="src/utils/base64.cpp" />
-		<Unit filename="src/utils/base64.h" />
-		<Unit filename="src/utils/dtor.h" />
-		<Unit filename="src/utils/tostring.h" />
-		<Unit filename="src/utils/xml.cpp" />
-		<Unit filename="src/utils/xml.h" />
-		<Unit filename="src/winver.h">
-			<Option target="unix" />
 		</Unit>
+		<Unit filename="src\animatedsprite.cpp" />
+		<Unit filename="src\animatedsprite.h" />
+		<Unit filename="src\animationparticle.cpp" />
+		<Unit filename="src\animationparticle.h" />
+		<Unit filename="src\being.cpp" />
+		<Unit filename="src\being.h" />
+		<Unit filename="src\beingmanager.cpp" />
+		<Unit filename="src\beingmanager.h" />
+		<Unit filename="src\configlistener.h" />
+		<Unit filename="src\configuration.cpp" />
+		<Unit filename="src\configuration.h" />
+		<Unit filename="src\engine.cpp" />
+		<Unit filename="src\engine.h" />
+		<Unit filename="src\equipment.cpp" />
+		<Unit filename="src\equipment.h" />
+		<Unit filename="src\extensions.h" />
+		<Unit filename="src\floor_item.cpp" />
+		<Unit filename="src\floor_item.h" />
+		<Unit filename="src\flooritemmanager.cpp" />
+		<Unit filename="src\flooritemmanager.h" />
+		<Unit filename="src\game.cpp" />
+		<Unit filename="src\game.h" />
+		<Unit filename="src\graphics.cpp" />
+		<Unit filename="src\graphics.h" />
+		<Unit filename="src\gui\box.cpp" />
+		<Unit filename="src\gui\box.h" />
+		<Unit filename="src\gui\browserbox.cpp" />
+		<Unit filename="src\gui\browserbox.h" />
+		<Unit filename="src\gui\button.cpp" />
+		<Unit filename="src\gui\button.h" />
+		<Unit filename="src\gui\buttonbox.cpp" />
+		<Unit filename="src\gui\buttonbox.h" />
+		<Unit filename="src\gui\buy.cpp" />
+		<Unit filename="src\gui\buy.h" />
+		<Unit filename="src\gui\buysell.cpp" />
+		<Unit filename="src\gui\buysell.h" />
+		<Unit filename="src\gui\char_select.cpp" />
+		<Unit filename="src\gui\char_select.h" />
+		<Unit filename="src\gui\char_server.cpp" />
+		<Unit filename="src\gui\char_server.h" />
+		<Unit filename="src\gui\chargedialog.cpp" />
+		<Unit filename="src\gui\chargedialog.h" />
+		<Unit filename="src\gui\chat.cpp" />
+		<Unit filename="src\gui\chat.h" />
+		<Unit filename="src\gui\chatinput.cpp" />
+		<Unit filename="src\gui\chatinput.h" />
+		<Unit filename="src\gui\checkbox.cpp" />
+		<Unit filename="src\gui\checkbox.h" />
+		<Unit filename="src\gui\colour.cpp" />
+		<Unit filename="src\gui\colour.h" />
+		<Unit filename="src\gui\confirm_dialog.cpp" />
+		<Unit filename="src\gui\confirm_dialog.h" />
+		<Unit filename="src\gui\connection.cpp" />
+		<Unit filename="src\gui\connection.h" />
+		<Unit filename="src\gui\debugwindow.cpp" />
+		<Unit filename="src\gui\debugwindow.h" />
+		<Unit filename="src\gui\equipmentwindow.cpp" />
+		<Unit filename="src\gui\equipmentwindow.h" />
+		<Unit filename="src\gui\focushandler.cpp" />
+		<Unit filename="src\gui\focushandler.h" />
+		<Unit filename="src\gui\gccontainer.cpp" />
+		<Unit filename="src\gui\gccontainer.h" />
+		<Unit filename="src\gui\gui.cpp" />
+		<Unit filename="src\gui\gui.h" />
+		<Unit filename="src\gui\hbox.cpp" />
+		<Unit filename="src\gui\hbox.h" />
+		<Unit filename="src\gui\help.cpp" />
+		<Unit filename="src\gui\help.h" />
+		<Unit filename="src\gui\inttextbox.cpp" />
+		<Unit filename="src\gui\inttextbox.h" />
+		<Unit filename="src\gui\inventorywindow.cpp" />
+		<Unit filename="src\gui\inventorywindow.h" />
+		<Unit filename="src\gui\item_amount.cpp" />
+		<Unit filename="src\gui\item_amount.h" />
+		<Unit filename="src\gui\itemcontainer.cpp" />
+		<Unit filename="src\gui\itemcontainer.h" />
+		<Unit filename="src\gui\itemshortcutcontainer.cpp" />
+		<Unit filename="src\gui\itemshortcutcontainer.h" />
+		<Unit filename="src\gui\itemshortcutwindow.cpp" />
+		<Unit filename="src\gui\itemshortcutwindow.h" />
+		<Unit filename="src\gui\linkhandler.h" />
+		<Unit filename="src\gui\listbox.cpp" />
+		<Unit filename="src\gui\listbox.h" />
+		<Unit filename="src\gui\login.cpp" />
+		<Unit filename="src\gui\login.h" />
+		<Unit filename="src\gui\menuwindow.cpp" />
+		<Unit filename="src\gui\menuwindow.h" />
+		<Unit filename="src\gui\minimap.cpp" />
+		<Unit filename="src\gui\minimap.h" />
+		<Unit filename="src\gui\ministatus.cpp" />
+		<Unit filename="src\gui\ministatus.h" />
+		<Unit filename="src\gui\newskill.cpp" />
+		<Unit filename="src\gui\newskill.h" />
+		<Unit filename="src\gui\npc_text.cpp" />
+		<Unit filename="src\gui\npc_text.h" />
+		<Unit filename="src\gui\npclistdialog.cpp" />
+		<Unit filename="src\gui\npclistdialog.h" />
+		<Unit filename="src\gui\ok_dialog.cpp" />
+		<Unit filename="src\gui\ok_dialog.h" />
+		<Unit filename="src\gui\passwordfield.cpp" />
+		<Unit filename="src\gui\passwordfield.h" />
+		<Unit filename="src\gui\playerbox.cpp" />
+		<Unit filename="src\gui\playerbox.h" />
+		<Unit filename="src\gui\popup_box.h" />
+		<Unit filename="src\gui\popupmenu.cpp" />
+		<Unit filename="src\gui\popupmenu.h" />
+		<Unit filename="src\gui\progressbar.cpp" />
+		<Unit filename="src\gui\progressbar.h" />
+		<Unit filename="src\gui\radiobutton.cpp" />
+		<Unit filename="src\gui\radiobutton.h" />
+		<Unit filename="src\gui\register.cpp" />
+		<Unit filename="src\gui\register.h" />
+		<Unit filename="src\gui\scrollarea.cpp" />
+		<Unit filename="src\gui\scrollarea.h" />
+		<Unit filename="src\gui\sell.cpp" />
+		<Unit filename="src\gui\sell.h" />
+		<Unit filename="src\gui\setup.cpp" />
+		<Unit filename="src\gui\setup.h" />
+		<Unit filename="src\gui\setup_audio.cpp" />
+		<Unit filename="src\gui\setup_audio.h" />
+		<Unit filename="src\gui\setup_colours.cpp" />
+		<Unit filename="src\gui\setup_colours.h" />
+		<Unit filename="src\gui\setup_joystick.cpp" />
+		<Unit filename="src\gui\setup_joystick.h" />
+		<Unit filename="src\gui\setup_keyboard.cpp" />
+		<Unit filename="src\gui\setup_keyboard.h" />
+		<Unit filename="src\gui\setup_players.cpp" />
+		<Unit filename="src\gui\setup_players.h" />
+		<Unit filename="src\gui\setup_video.cpp" />
+		<Unit filename="src\gui\setup_video.h" />
+		<Unit filename="src\gui\setuptab.h" />
+		<Unit filename="src\gui\shop.cpp" />
+		<Unit filename="src\gui\shop.h" />
+		<Unit filename="src\gui\shoplistbox.cpp" />
+		<Unit filename="src\gui\shoplistbox.h" />
+		<Unit filename="src\gui\skill.cpp" />
+		<Unit filename="src\gui\skill.h" />
+		<Unit filename="src\gui\slider.cpp" />
+		<Unit filename="src\gui\slider.h" />
+		<Unit filename="src\gui\speechbubble.cpp" />
+		<Unit filename="src\gui\speechbubble.h" />
+		<Unit filename="src\gui\status.cpp" />
+		<Unit filename="src\gui\status.h" />
+		<Unit filename="src\gui\tabbedcontainer.cpp" />
+		<Unit filename="src\gui\tabbedcontainer.h" />
+		<Unit filename="src\gui\table.cpp" />
+		<Unit filename="src\gui\table.h" />
+		<Unit filename="src\gui\table_model.cpp" />
+		<Unit filename="src\gui\table_model.h" />
+		<Unit filename="src\gui\textbox.cpp" />
+		<Unit filename="src\gui\textbox.h" />
+		<Unit filename="src\gui\textfield.cpp" />
+		<Unit filename="src\gui\textfield.h" />
+		<Unit filename="src\gui\trade.cpp" />
+		<Unit filename="src\gui\trade.h" />
+		<Unit filename="src\gui\updatewindow.cpp" />
+		<Unit filename="src\gui\updatewindow.h" />
+		<Unit filename="src\gui\vbox.cpp" />
+		<Unit filename="src\gui\vbox.h" />
+		<Unit filename="src\gui\viewport.cpp" />
+		<Unit filename="src\gui\viewport.h" />
+		<Unit filename="src\gui\widgets\dropdown.cpp" />
+		<Unit filename="src\gui\widgets\dropdown.h" />
+		<Unit filename="src\gui\widgets\gettext.h" />
+		<Unit filename="src\gui\widgets\layout.cpp" />
+		<Unit filename="src\gui\widgets\layout.h" />
+		<Unit filename="src\gui\widgets\resizegrip.cpp" />
+		<Unit filename="src\gui\widgets\resizegrip.h" />
+		<Unit filename="src\gui\window.cpp" />
+		<Unit filename="src\gui\window.h" />
+		<Unit filename="src\gui\windowcontainer.cpp" />
+		<Unit filename="src\gui\windowcontainer.h" />
+		<Unit filename="src\guichanfwd.h" />
+		<Unit filename="src\imageparticle.cpp" />
+		<Unit filename="src\imageparticle.h" />
+		<Unit filename="src\inventory.cpp" />
+		<Unit filename="src\inventory.h" />
+		<Unit filename="src\item.cpp" />
+		<Unit filename="src\item.h" />
+		<Unit filename="src\itemshortcut.cpp" />
+		<Unit filename="src\itemshortcut.h" />
+		<Unit filename="src\joystick.cpp" />
+		<Unit filename="src\joystick.h" />
+		<Unit filename="src\keyboardconfig.cpp" />
+		<Unit filename="src\keyboardconfig.h" />
+		<Unit filename="src\localplayer.cpp" />
+		<Unit filename="src\localplayer.h" />
+		<Unit filename="src\lockedarray.h" />
+		<Unit filename="src\log.cpp" />
+		<Unit filename="src\log.h" />
+		<Unit filename="src\logindata.h" />
+		<Unit filename="src\main.cpp" />
+		<Unit filename="src\main.h" />
+		<Unit filename="src\map.cpp" />
+		<Unit filename="src\map.h" />
+		<Unit filename="src\monster.cpp" />
+		<Unit filename="src\monster.h" />
+		<Unit filename="src\net\beinghandler.cpp" />
+		<Unit filename="src\net\beinghandler.h" />
+		<Unit filename="src\net\buysellhandler.cpp" />
+		<Unit filename="src\net\buysellhandler.h" />
+		<Unit filename="src\net\charserverhandler.cpp" />
+		<Unit filename="src\net\charserverhandler.h" />
+		<Unit filename="src\net\chathandler.cpp" />
+		<Unit filename="src\net\chathandler.h" />
+		<Unit filename="src\net\equipmenthandler.cpp" />
+		<Unit filename="src\net\equipmenthandler.h" />
+		<Unit filename="src\net\inventoryhandler.cpp" />
+		<Unit filename="src\net\inventoryhandler.h" />
+		<Unit filename="src\net\itemhandler.cpp" />
+		<Unit filename="src\net\itemhandler.h" />
+		<Unit filename="src\net\loginhandler.cpp" />
+		<Unit filename="src\net\loginhandler.h" />
+		<Unit filename="src\net\maploginhandler.cpp" />
+		<Unit filename="src\net\maploginhandler.h" />
+		<Unit filename="src\net\messagehandler.cpp" />
+		<Unit filename="src\net\messagehandler.h" />
+		<Unit filename="src\net\messagein.cpp" />
+		<Unit filename="src\net\messagein.h" />
+		<Unit filename="src\net\messageout.cpp" />
+		<Unit filename="src\net\messageout.h" />
+		<Unit filename="src\net\network.cpp" />
+		<Unit filename="src\net\network.h" />
+		<Unit filename="src\net\npchandler.cpp" />
+		<Unit filename="src\net\npchandler.h" />
+		<Unit filename="src\net\playerhandler.cpp" />
+		<Unit filename="src\net\playerhandler.h" />
+		<Unit filename="src\net\protocol.cpp" />
+		<Unit filename="src\net\protocol.h" />
+		<Unit filename="src\net\skillhandler.cpp" />
+		<Unit filename="src\net\skillhandler.h" />
+		<Unit filename="src\net\tradehandler.cpp" />
+		<Unit filename="src\net\tradehandler.h" />
+		<Unit filename="src\npc.cpp" />
+		<Unit filename="src\npc.h" />
+		<Unit filename="src\openglgraphics.cpp" />
+		<Unit filename="src\openglgraphics.h" />
+		<Unit filename="src\particle.cpp" />
+		<Unit filename="src\particle.h" />
+		<Unit filename="src\particleemitter.cpp" />
+		<Unit filename="src\particleemitter.h" />
+		<Unit filename="src\party.cpp" />
+		<Unit filename="src\party.h" />
+		<Unit filename="src\player.cpp" />
+		<Unit filename="src\player.h" />
+		<Unit filename="src\player_relations.cpp" />
+		<Unit filename="src\player_relations.h" />
+		<Unit filename="src\properties.h" />
+		<Unit filename="src\recorder.cpp" />
+		<Unit filename="src\recorder.h" />
+		<Unit filename="src\resources\action.cpp" />
+		<Unit filename="src\resources\action.h" />
+		<Unit filename="src\resources\ambientoverlay.cpp" />
+		<Unit filename="src\resources\ambientoverlay.h" />
+		<Unit filename="src\resources\animation.cpp" />
+		<Unit filename="src\resources\animation.h" />
+		<Unit filename="src\resources\buddylist.cpp" />
+		<Unit filename="src\resources\colordb.cpp" />
+		<Unit filename="src\resources\colordb.h" />
+		<Unit filename="src\resources\dye.cpp" />
+		<Unit filename="src\resources\dye.h" />
+		<Unit filename="src\resources\image.cpp" />
+		<Unit filename="src\resources\image.h" />
+		<Unit filename="src\resources\imageloader.cpp" />
+		<Unit filename="src\resources\imageloader.h" />
+		<Unit filename="src\resources\imageset.cpp" />
+		<Unit filename="src\resources\imageset.h" />
+		<Unit filename="src\resources\imagewriter.cpp" />
+		<Unit filename="src\resources\imagewriter.h" />
+		<Unit filename="src\resources\itemdb.cpp" />
+		<Unit filename="src\resources\itemdb.h" />
+		<Unit filename="src\resources\iteminfo.cpp" />
+		<Unit filename="src\resources\iteminfo.h" />
+		<Unit filename="src\resources\mapreader.cpp" />
+		<Unit filename="src\resources\mapreader.h" />
+		<Unit filename="src\resources\monsterdb.cpp" />
+		<Unit filename="src\resources\monsterdb.h" />
+		<Unit filename="src\resources\monsterinfo.cpp" />
+		<Unit filename="src\resources\monsterinfo.h" />
+		<Unit filename="src\resources\music.cpp" />
+		<Unit filename="src\resources\music.h" />
+		<Unit filename="src\resources\npcdb.cpp" />
+		<Unit filename="src\resources\npcdb.h" />
+		<Unit filename="src\resources\resource.cpp" />
+		<Unit filename="src\resources\resource.h" />
+		<Unit filename="src\resources\resourcemanager.cpp" />
+		<Unit filename="src\resources\resourcemanager.h" />
+		<Unit filename="src\resources\soundeffect.cpp" />
+		<Unit filename="src\resources\soundeffect.h" />
+		<Unit filename="src\resources\spritedef.cpp" />
+		<Unit filename="src\resources\spritedef.h" />
+		<Unit filename="src\serverinfo.h" />
+		<Unit filename="src\shopitem.cpp" />
+		<Unit filename="src\shopitem.h" />
+		<Unit filename="src\simpleanimation.cpp" />
+		<Unit filename="src\simpleanimation.h" />
+		<Unit filename="src\sound.cpp" />
+		<Unit filename="src\sound.h" />
+		<Unit filename="src\sprite.h" />
+		<Unit filename="src\text.cpp" />
+		<Unit filename="src\text.h" />
+		<Unit filename="src\textmanager.cpp" />
+		<Unit filename="src\textmanager.h" />
+		<Unit filename="src\textparticle.cpp" />
+		<Unit filename="src\textparticle.h" />
+		<Unit filename="src\tileset.h" />
+		<Unit filename="src\utils\base64.cpp" />
+		<Unit filename="src\utils\base64.h" />
+		<Unit filename="src\utils\dtor.h" />
+		<Unit filename="src\utils\tostring.h" />
+		<Unit filename="src\utils\xml.cpp" />
+		<Unit filename="src\utils\xml.h" />
+		<Unit filename="src\vector.h" />
+		<Unit filename="src\winver.h" />
 		<Extensions>
 			<code_completion />
-			<envvars />
+			<envvars set="default" />
 			<debugger />
+			<AutoVersioning>
+				<Scheme minor_max="10" build_max="0" rev_max="0" rev_rand_max="10" build_times_to_increment_minor="100" />
+				<Settings autoincrement="1" date_declarations="1" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />
+				<Changes_Log show_changes_editor="0" app_title="released version %M.%m.%b of %p" changeslog_path="ChangesLog.txt" />
+			</AutoVersioning>
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
-- 
cgit v1.2.3-70-g09d2


From be1af40e371845bcad1337cc59e5f5ac0f991f02 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 16 Oct 2008 01:20:24 +0000
Subject: Fixed a width that I accidently messed up earlier, as well as made
 text and speech bubble transitions smoother.

---
 src/being.cpp           | 30 ++++++++++++++++++++----------
 src/gui/setup_video.cpp |  2 +-
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index 4958700f..f05652f3 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -164,16 +164,6 @@ void Being::setSpeech(const std::string &text, Uint32 time)
 {
     mSpeech = text;
 
-    if (!config.getValue("speechbubble", 1))
-    {
-        // don't introduce a memory leak
-        delete mText;
-
-        mText = new Text(text, mPx + X_SPEECH_OFFSET, mPy - Y_SPEECH_OFFSET,
-                         gcn::Graphics::CENTER, speechFont,
-                         gcn::Color(255, 255, 255));
-    }
-
     mSpeechTime = 500;
 }
 
@@ -468,6 +458,12 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
     // Draw speech above this being
     if (mSpeechTime > 0 && config.getValue("speechbubble", 1))
     {
+        if (mText)
+        {
+            delete mText;
+            mText = 0;
+        }
+
         mSpeechBubble->setCaption(mName);
         mSpeechBubble->setWindowName(mName);
         // Not quite centered, but close enough. However, it's not too important to get 
@@ -477,6 +473,20 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
                                         (mSpeechBubble->getNumRows()*14));
         mSpeechBubble->setVisible(true);
     }
+    else if (!config.getValue("speechbubble", 1))
+    {
+        mSpeechBubble->setVisible(false);
+        // don't introduce a memory leak
+        if (mText)
+        {
+            delete mText;
+            mText = 0;
+        }
+
+        mText = new Text(mSpeech, mPx + X_SPEECH_OFFSET, mPy - Y_SPEECH_OFFSET,
+                         gcn::Graphics::CENTER, speechFont,
+                         gcn::Color(255, 255, 255));
+    }
     else if (mSpeechTime == 0)
     {
         mSpeechBubble->setVisible(false);
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 6a246501..879a3066 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -151,7 +151,7 @@ Setup_Video::Setup_Video():
     mParticleEffectsCheckBox->setPosition(175, 30);
     mCustomCursorCheckBox->setPosition(110, 50);
     mSpeechBubbleCheckBox->setPosition(110, 70);
-    mAlphaSlider->setDimension(gcn::Rectangle(10, 100, 100, 10));
+    mAlphaSlider->setDimension(gcn::Rectangle(10, 100, 75, 10));
     alphaLabel->setPosition(20 + mAlphaSlider->getWidth(),
                             mAlphaSlider->getY());
     mFpsCheckBox->setPosition(90, 120);
-- 
cgit v1.2.3-70-g09d2


From e57f4ec64f53091dd254c2ee2db9592d30a5af0b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 19 Oct 2008 23:07:35 +0000
Subject: Fixed a small error that I didn't notice before with de-hardcoding
 the colors. Thanks goes to paks for noticing this.

---
 src/being.cpp             | 3 ---
 src/gui/char_select.cpp   | 3 +++
 src/player.cpp            | 1 +
 src/resources/colordb.cpp | 2 +-
 src/resources/colordb.h   | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index f05652f3..07c0716d 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -478,10 +478,7 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
         mSpeechBubble->setVisible(false);
         // don't introduce a memory leak
         if (mText)
-        {
             delete mText;
-            mText = 0;
-        }
 
         mText = new Text(mSpeech, mPx + X_SPEECH_OFFSET, mPy - Y_SPEECH_OFFSET,
                          gcn::Graphics::CENTER, speechFont,
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 65d0159f..628ab35f 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -257,8 +257,11 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network,
     mPlayer = new Player(0, 0, NULL);
     mPlayer->setGender(gender);
 
+    ColorDB::load();
     int numberOfHairColors = ColorDB::size();
 
+    printf("%d\n", numberOfHairColors);
+
     mPlayer->setHairStyle(rand() % NR_HAIR_STYLES, rand() % numberOfHairColors);
 
     mNameField = new TextField("");
diff --git a/src/player.cpp b/src/player.cpp
index 37badcdc..4025f8f4 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -44,6 +44,7 @@ Player::Player(int id, int job, Map *map):
 {
     mName = 0;
     mIsGM = false;
+    ColorDB::load();
 }
 
 Player::~Player()
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index 837561ed..f738b471 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -113,7 +113,7 @@ std::string& ColorDB::get(int id)
     }
 }
 
-const int& ColorDB::size()
+int ColorDB::size()
 {
     return mColors.size();
 }
diff --git a/src/resources/colordb.h b/src/resources/colordb.h
index 43398af4..1f8b191c 100644
--- a/src/resources/colordb.h
+++ b/src/resources/colordb.h
@@ -42,7 +42,7 @@ namespace ColorDB
 
     std::string& get(int id);
 
-    const int& size();
+    int size();
 
     // Color DB
     typedef std::map<int, std::string> Colors;
-- 
cgit v1.2.3-70-g09d2


From 7a88c394584cb02cec8d1d7eb70ac2020e033d41 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 23 Oct 2008 11:46:21 +0000
Subject: Cleaned up ColorDB code so that it loads with all other databases, as
 well as fixed color cycling.

---
 src/gui/char_select.cpp   | 9 ++++-----
 src/localplayer.cpp       | 1 -
 src/main.cpp              | 3 +++
 src/player.cpp            | 1 -
 src/resources/colordb.cpp | 3 ++-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 628ab35f..b83f98de 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -257,7 +257,6 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network,
     mPlayer = new Player(0, 0, NULL);
     mPlayer->setGender(gender);
 
-    ColorDB::load();
     int numberOfHairColors = ColorDB::size();
 
     printf("%d\n", numberOfHairColors);
@@ -344,16 +343,16 @@ CharCreateDialog::action(const gcn::ActionEvent &event)
         scheduleDelete();
     }
     else if (event.getId() == "nextcolor") {
-        mPlayer->setHairStyle(-1, mPlayer->getHairColor() + 1);
+        mPlayer->setHairStyle(mPlayer->getHairStyle(), (mPlayer->getHairColor() + 1) % numberOfColors);
     }
     else if (event.getId() == "prevcolor") {
-        mPlayer->setHairStyle(-1, mPlayer->getHairColor() + numberOfColors - 1);
+        mPlayer->setHairStyle(mPlayer->getHairStyle(), (mPlayer->getHairColor() + numberOfColors - 1) % numberOfColors);
     }
     else if (event.getId() == "nextstyle") {
-        mPlayer->setHairStyle(mPlayer->getHairStyle() + 1, -1);
+        mPlayer->setHairStyle(mPlayer->getHairStyle() + 1, mPlayer->getHairColor());
     }
     else if (event.getId() == "prevstyle") {
-        mPlayer->setHairStyle(mPlayer->getHairStyle() + NR_HAIR_STYLES - 1, -1);
+        mPlayer->setHairStyle(mPlayer->getHairStyle() + NR_HAIR_STYLES - 1, mPlayer->getHairColor());
     }
 }
 
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index d83bd254..66d37ddf 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -54,7 +54,6 @@ LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map):
     mInventory(new Inventory(INVENTORY_SIZE)),
     mStorage(new Inventory(STORAGE_SIZE))
 {
-    ColorDB::load();
 }
 
 LocalPlayer::~LocalPlayer()
diff --git a/src/main.cpp b/src/main.cpp
index 3755ad03..b92a4b2d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -81,6 +81,7 @@
 #include "net/messageout.h"
 #include "net/network.h"
 
+#include "resources/colordb.h"
 #include "resources/image.h"
 #include "resources/itemdb.h"
 #include "resources/monsterdb.h"
@@ -421,6 +422,7 @@ void exit_engine()
     sound.close();
 
     // Unload XML databases
+    ColorDB::unload();
     ItemDB::unload();
     MonsterDB::unload();
     NPCDB::unload();
@@ -838,6 +840,7 @@ int main(int argc, char *argv[])
                         false);
 
                     // Load XML databases
+                    ColorDB::load();
                     ItemDB::load();
                     MonsterDB::load();
                     NPCDB::load();
diff --git a/src/player.cpp b/src/player.cpp
index 4025f8f4..37badcdc 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -44,7 +44,6 @@ Player::Player(int id, int job, Map *map):
 {
     mName = 0;
     mIsGM = false;
-    ColorDB::load();
 }
 
 Player::~Player()
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index f738b471..caa1fbda 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -98,7 +98,8 @@ void ColorDB::unload()
 
 std::string& ColorDB::get(int id)
 {
-    assert(mLoaded);
+    if(!mLoaded)
+        load();
 
     ColorIterator i = mColors.find(id);
 
-- 
cgit v1.2.3-70-g09d2


From 5b70e7729229317acfd1b8f79e8eb1b90870827b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 23 Oct 2008 12:08:44 +0000
Subject: Removed a few compiler warnings.

---
 src/being.cpp |  6 +++---
 src/text.cpp  | 11 +++++++++++
 src/text.h    |  7 ++++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index 07c0716d..519be4cc 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -69,6 +69,8 @@ Being::Being(int id, int job, Map *map):
     mWalkSpeed(150),
     mDirection(DOWN),
     mMap(NULL),
+    mIsGM(false),
+    mParticleEffects(config.getValue("particleeffects", 1)),
     mEquippedWeapon(NULL),
     mHairStyle(1), mHairColor(0),
     mGender(2),
@@ -76,8 +78,7 @@ Being::Being(int id, int job, Map *map):
     mPx(0), mPy(0),
     mSprites(VECTOREND_SPRITE, NULL),
     mSpriteIDs(VECTOREND_SPRITE, 0),
-    mSpriteColors(VECTOREND_SPRITE, ""),
-    mParticleEffects(config.getValue("particleeffects", 1))
+    mSpriteColors(VECTOREND_SPRITE, "")
 {
     setMap(map);
 
@@ -93,7 +94,6 @@ Being::Being(int id, int job, Map *map):
 
     instances++;
     mSpeech = "";
-    mIsGM = false;
     mText = 0;
 }
 
diff --git a/src/text.cpp b/src/text.cpp
index 545c1c0e..7967b56f 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -100,3 +100,14 @@ void FlashText::draw(Graphics *graphics, int xOff, int yOff)
     }
     Text::draw(graphics, xOff, yOff);
 }
+
+FlashText::~FlashText()
+{
+    mTime = 0;
+    textManager->removeText(this);
+    if (--mInstances == 0)
+    {
+        delete textManager;
+        textManager = 0;
+    }
+}
diff --git a/src/text.h b/src/text.h
index 67454e30..0de495e0 100644
--- a/src/text.h
+++ b/src/text.h
@@ -57,7 +57,7 @@ class Text
         virtual void
         draw(Graphics *graphics, int xOff, int yOff);
 
-    private:
+    protected:
 
         int mX; /**< Actual x-value of left of text written */
         int mY; /**< Actual y-value of top of text written */
@@ -77,6 +77,11 @@ class FlashText : public Text
                   gcn::Graphics::Alignment alignment, gcn::Font *font,
                   gcn::Color colour);
 
+        /**
+         * Remove the text from the screen
+         */
+        ~FlashText();
+
         /**
          * Flash the text for so many refreshes
          */
-- 
cgit v1.2.3-70-g09d2


From ba4a95460650b93deca7b7dcff6775f013b73119 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 23 Oct 2008 12:30:04 +0000
Subject: A few more compiler warnings fixed.

---
 src/gui/minimap.cpp  | 6 +++---
 src/gui/viewport.cpp | 2 +-
 src/recorder.h       | 2 +-
 src/text.h           | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 1f3a903c..8640fdb0 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -108,11 +108,11 @@ void Minimap::draw(gcn::Graphics *graphics)
                 continue;
         }
 
-        int offset = (dotSize - 1) * mProportion;
+        int offset = (dotSize - 1) * (int) mProportion;
 
         graphics->fillRectangle(gcn::Rectangle(
-                    (being->mX * mProportion) + getPadding() - offset,
-                    (being->mY * mProportion) + getTitleBarHeight() - offset,
+                    (being->mX * (int) mProportion) + getPadding() - offset,
+                    (being->mY * (int) mProportion) + getTitleBarHeight() - offset,
                     dotSize, dotSize));
     }
 }
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 95e0d2b6..f6361ef7 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -259,7 +259,7 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     // Draw names
     if (textManager)
     {
-        textManager->draw(graphics, mPixelViewX, mPixelViewY);
+        textManager->draw(graphics, (int) mPixelViewX, (int) mPixelViewY);
     }
 
     // Draw player speech, and emotion sprite as needed
diff --git a/src/recorder.h b/src/recorder.h
index de8e7f3e..75d86f88 100644
--- a/src/recorder.h
+++ b/src/recorder.h
@@ -41,7 +41,7 @@ class Recorder : public ButtonBoxListener
 	void help(const std::string &args) const;
 	void buttonBoxRespond();
 	bool isRecording() const {return mStream;}
-        ~Recorder();
+        virtual ~Recorder();
     private:
 	ChatWindow *mChat;
 	std::ofstream mStream;
diff --git a/src/text.h b/src/text.h
index 0de495e0..67bb23ae 100644
--- a/src/text.h
+++ b/src/text.h
@@ -49,7 +49,7 @@ class Text
         /**
          * Remove the text from the screen
          */
-        ~Text();
+        virtual ~Text();
 
         /**
          * Draws the text
@@ -80,7 +80,7 @@ class FlashText : public Text
         /**
          * Remove the text from the screen
          */
-        ~FlashText();
+        virtual ~FlashText();
 
         /**
          * Flash the text for so many refreshes
-- 
cgit v1.2.3-70-g09d2


From aae1df481432c4ea162641e5ff5fdc5c385afd62 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 23 Oct 2008 16:22:25 +0000
Subject: Added a patch by peavey over on TMW to disallow adding items to trade
 if the trade partner doesn't have room for them.

---
 src/net/playerhandler.cpp | 8 ++++----
 src/net/tradehandler.cpp  | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 61e68295..ea561a81 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -177,6 +177,9 @@ void PlayerHandler::handleMessage(MessageIn *msg)
                     case 0x0006: player_node->mMaxHp = value; break;
                     case 0x0007: player_node->mMp = value; break;
                     case 0x0008: player_node->mMaxMp = value; break;
+                    case 0x0009:
+                                 player_node->mStatsPointsToAttribute = value;
+                                 break;
                     case 0x000b: player_node->mLevel = value; break;
                     case 0x000c:
                                  player_node->mSkillPoint = value;
@@ -197,10 +200,6 @@ void PlayerHandler::handleMessage(MessageIn *msg)
                                  player_node->mTotalWeight = value;
                                  break;
                     case 0x0019: player_node->mMaxWeight = value; break;
-                    case 0x0037: player_node->mJobLevel = value; break;
-                    case 0x0009:
-                                 player_node->mStatsPointsToAttribute = value;
-                                 break;
                     case 0x0029: player_node->ATK = value; break;
                     case 0x002b: player_node->MATK = value; break;
                     case 0x002d: player_node->DEF = value; break;
@@ -209,6 +208,7 @@ void PlayerHandler::handleMessage(MessageIn *msg)
                     case 0x0031: player_node->HIT = value; break;
                     case 0x0032: player_node->FLEE = value; break;
                     case 0x0035: player_node->mAttackSpeed = value; break;
+                    case 0x0037: player_node->mJobLevel = value; break;
                 }
 
                 if (player_node->mHp == 0 && deathNotice == NULL)
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index cfd24977..9174d846 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -189,6 +189,12 @@ void TradeHandler::handleMessage(MessageIn *msg)
                                 "partner is over weighted.",
                                 BY_SERVER);
                         break;
+                     case 2:
+                         // Add item failed - player has no free slot
+                         chatWindow->chatLog("Failed adding item. Trade "
+                                             "partner has no free slot.",
+                                             BY_SERVER);
+                         break;
                     default:
                         chatWindow->chatLog("Failed adding item for "
                                 "unknown reason.", BY_SERVER);
-- 
cgit v1.2.3-70-g09d2


From c4a46650d7416b63a6fdcb4b2791839d15ca73d6 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 23 Oct 2008 17:49:34 +0000
Subject: Fixed a crash that I caused earlier when I was fixing compiler
 warnings. Caused by adding a new destructor.

---
 src/text.cpp | 11 -----------
 src/text.h   |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/text.cpp b/src/text.cpp
index 7967b56f..545c1c0e 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -100,14 +100,3 @@ void FlashText::draw(Graphics *graphics, int xOff, int yOff)
     }
     Text::draw(graphics, xOff, yOff);
 }
-
-FlashText::~FlashText()
-{
-    mTime = 0;
-    textManager->removeText(this);
-    if (--mInstances == 0)
-    {
-        delete textManager;
-        textManager = 0;
-    }
-}
diff --git a/src/text.h b/src/text.h
index 67bb23ae..a370771d 100644
--- a/src/text.h
+++ b/src/text.h
@@ -80,7 +80,7 @@ class FlashText : public Text
         /**
          * Remove the text from the screen
          */
-        virtual ~FlashText();
+        virtual ~FlashText() {}
 
         /**
          * Flash the text for so many refreshes
-- 
cgit v1.2.3-70-g09d2


From cd7415bd8ec7f9dc1ec91edbe052df97a7f644bf Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 25 Oct 2008 16:45:50 +0000
Subject: Changed NPC name logic so that it filters out all content past the #
 delimiter. This behavior is specified as being a Safray client feature, and
 not being a server feature, and we haven't implemented it before because of
 not having a good reason to at the time.

---
 src/npc.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/npc.cpp b/src/npc.cpp
index 3f9a1601..5efee873 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -86,10 +86,12 @@ void NPC::setName(const std::string &name)
     {
         delete mName;
     }
-    mName = new Text(name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET,
+    std::string displayName = name.substr(0, name.find('#', 0));
+
+    mName = new Text(displayName, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET,
                      gcn::Graphics::CENTER, npcNameFont,
                      gcn::Color(200, 200, 255));
-    Being::setName(name + " (NPC)");
+    Being::setName(displayName + " (NPC)");
 }
 
 Being::Type
-- 
cgit v1.2.3-70-g09d2


From 0288225cf876d787a29f5b1d4e5885cc1d759e6f Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 25 Oct 2008 20:36:09 +0000
Subject: Made the ok dialogue use code that's similar to the speech bubble, so
 that it can take advantage of the text box's wrapping code.

---
 src/gui/npc_text.cpp  |  3 ++-
 src/gui/ok_dialog.cpp | 54 ++++++++++++++++++++++++++++++++++++++-------------
 src/gui/ok_dialog.h   | 10 ++++++++++
 3 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index d51698fb..8324a196 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -36,8 +36,9 @@ NpcTextDialog::NpcTextDialog():
 {
     mTextBox = new TextBox;
     mTextBox->setEditable(false);
+
     gcn::ScrollArea *scrollArea = new ScrollArea(mTextBox);
-    Button *okButton = new Button("OK", "ok", this);
+    gcn::Button *okButton = new Button("OK", "ok", this);
 
     setContentSize(260, 175);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index c49bb6bb..13124c3c 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -23,31 +23,52 @@
 
 #include "ok_dialog.h"
 
-#include <guichan/widgets/label.hpp>
-
-#include "button.h"
+#include <guichan/font.hpp>
 
 
 OkDialog::OkDialog(const std::string &title, const std::string &msg,
         Window *parent):
     Window(title, true, parent)
 {
-    gcn::Label *textLabel = new gcn::Label(msg);
-    gcn::Button *okButton = new Button("Ok", "ok", this);
+    mTextBox = new TextBox();
+    mTextBox->setEditable(false);
+    mTextBox->setOpaque(false);
+
+    mTextArea = new ScrollArea(mTextBox);
+    okButton = new Button("Ok", "ok", this);
+
+    mTextArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mTextArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mTextArea->setOpaque(false);
 
-    int w = textLabel->getWidth() + 20;
-    int h = textLabel->getHeight() + 25 + okButton->getHeight();
+    mTextBox->setMinWidth(260);
+    mTextBox->setTextWrapped(msg);
 
-    if (okButton->getWidth() + 10 > w) {
-        w = okButton->getWidth() + 10;
+    int numRows = mTextBox->getNumberOfRows();
+
+    if (numRows > 1)
+    {
+        // 15 == height of each line of text (based on font heights)
+        // 14 == row top + bottom graphic pixel heights
+        setContentSize(mTextBox->getMinWidth() + 15, 15 + (numRows * 15));
+        mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5, 
+                                               3 + (numRows * 14)));
+    }
+    else
+    {
+        int width = getFont()->getWidth(title);
+        if (width < getFont()->getWidth(msg))
+            width = getFont()->getWidth(msg);
+        if (width < okButton->getWidth())
+            width = okButton->getWidth();
+        setContentSize(width + 15, 30 + okButton->getHeight());
+        mTextArea->setDimension(gcn::Rectangle(4, 5, width + 5, 17));
     }
 
-    setContentSize(w, h);
-    textLabel->setPosition(10, 10);
-    okButton->setPosition((w - okButton->getWidth()) / 2,
-                          h - 5 - okButton->getHeight());
+    okButton->setPosition((mTextBox->getMinWidth() - okButton->getWidth()) / 2,
+                          (numRows * 14) + okButton->getHeight() - 8);
 
-    add(textLabel);
+    add(mTextArea);
     add(okButton);
 
     setLocationRelativeTo(getParent());
@@ -55,6 +76,11 @@ OkDialog::OkDialog(const std::string &title, const std::string &msg,
     okButton->requestFocus();
 }
 
+unsigned int OkDialog::getNumRows()
+{
+    return mTextBox->getNumberOfRows();
+}
+
 void OkDialog::action(const gcn::ActionEvent &event)
 {
     // Proxy button events to our listeners
diff --git a/src/gui/ok_dialog.h b/src/gui/ok_dialog.h
index 47a0c780..426da538 100644
--- a/src/gui/ok_dialog.h
+++ b/src/gui/ok_dialog.h
@@ -26,6 +26,9 @@
 
 #include <guichan/actionlistener.hpp>
 
+#include "button.h"
+#include "scrollarea.h"
+#include "textbox.h"
 #include "window.h"
 
 #include "../guichanfwd.h"
@@ -45,10 +48,17 @@ class OkDialog : public Window, public gcn::ActionListener {
         OkDialog(const std::string &title, const std::string &msg,
                 Window *parent = NULL);
 
+        unsigned int getNumRows();
+
         /**
          * Called when receiving actions from the widgets.
          */
         void action(const gcn::ActionEvent &event);
+
+    private:
+        TextBox *mTextBox;
+        ScrollArea *mTextArea;
+        gcn::Button *okButton;
 };
 
 #endif
-- 
cgit v1.2.3-70-g09d2


From bea2e395de77924e9bf88e4629249a1882e41963 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 25 Oct 2008 20:42:04 +0000
Subject: Added in TMW's patch to display how long a ban is in effect.

---
 src/net/loginhandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp
index 737d1762..946f4a21 100644
--- a/src/net/loginhandler.cpp
+++ b/src/net/loginhandler.cpp
@@ -113,7 +113,7 @@ void LoginHandler::handleMessage(MessageIn *msg)
                     errorMessage = "You have been blocked by the GM Team";
                     break;
                 case 6:
-                    errorMessage = "You have been temporarily banned from the game. Please contact the GM team";
+                    errorMessage = "You have been temporarily banned from the game until " + msg->readString(20) + ".\n Please contact the GM team";
                     break;
                 case 9:
                     errorMessage = "This user name is already taken";
-- 
cgit v1.2.3-70-g09d2


From f6ddb12a5c6eb85830a1f2d8188addfd14b5e1f1 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 25 Oct 2008 20:52:41 +0000
Subject: Imported --data parameter from TMW.

---
 src/main.cpp | 66 ++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 37 insertions(+), 29 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index b92a4b2d..b57027d6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -265,6 +265,9 @@ void init_engine(const Options &options)
     resman->addToSearchPath(homeDir, false);
 
     // Add the main data directory to our PhysicsFS search path
+    if (!options.dataPath.empty()) {
+        resman->addToSearchPath(options.dataPath, true);
+    }
     resman->addToSearchPath("data", true);
 #if defined __APPLE__
     CFBundleRef mainBundle = CFBundleGetMainBundle();
@@ -436,16 +439,17 @@ void printHelp()
     std::cout
         << "aethyra" << std::endl << std::endl
         << "Options: " << std::endl
-        << "  -h --help       : Display this help" << std::endl
-        << "  -v --version    : Display the version" << std::endl
-        << "  -u --skipupdate : Skip the update downloads" << std::endl
-        << "  -U --username   : Login with this username" << std::endl
-        << "  -P --password   : Login with this password" << std::endl
+        << "  -C --configfile : Configuration file to use" << std::endl
+        << "  -d --data       : Directory to load game data from" << std::endl
         << "  -D --default    : Bypass the login process with default "
                                 "settings" << std::endl
-        << "  -p --playername : Login with this player" << std::endl
-        << "  -C --configfile : Configuration file to use" << std::endl
+        << "  -h --help       : Display this help" << std::endl
         << "  -H --updatehost : Use this update host" << std::endl;
+        << "  -p --playername : Login with this player" << std::endl
+        << "  -P --password   : Login with this password" << std::endl
+        << "  -u --skipupdate : Skip the update downloads" << std::endl
+        << "  -U --username   : Login with this username" << std::endl
+        << "  -v --version    : Display the version" << std::endl
 }
 
 void printVersion()
@@ -464,15 +468,16 @@ void parseOptions(int argc, char *argv[], Options &options)
     const char *optstring = "hvuU:P:Dp:C:H:";
 
     const struct option long_options[] = {
-        { "help",       no_argument,       0, 'h' },
-        { "version",    no_argument,       0, 'v' },
-        { "skipupdate", no_argument,       0, 'u' },
-        { "username",   required_argument, 0, 'U' },
-        { "password",   required_argument, 0, 'P' },
+        { "configfile", required_argument, 0, 'C' },
+        { "data",       required_argument, 0, 'd' },
         { "default",    no_argument,       0, 'D' },
         { "playername", required_argument, 0, 'p' },
-        { "configfile", required_argument, 0, 'C' },
+        { "password",   required_argument, 0, 'P' },
+        { "help",       no_argument,       0, 'h' },
         { "updatehost", required_argument, 0, 'H' },
+        { "skipupdate", no_argument,       0, 'u' },
+        { "username",   required_argument, 0, 'U' },
+        { "version",    no_argument,       0, 'v' },
         { 0 }
     };
 
@@ -485,33 +490,36 @@ void parseOptions(int argc, char *argv[], Options &options)
         }
 
         switch (result) {
+            case 'C':
+                options.configPath = optarg;
+                break;
+            case 'd':
+                options.dataPath = optarg;
+                break;
+            case 'D':
+                options.chooseDefault = true;
+                break;
             default: // Unknown option
             case 'h':
                 options.printHelp = true;
                 break;
-            case 'v':
-                options.printVersion = true;
-                break;
-            case 'u':
-                options.skipUpdate = true;
+            case 'H':
+                options.updateHost = optarg;
                 break;
-            case 'U':
-                options.username = optarg;
+            case 'p':
+                options.playername = optarg;
                 break;
             case 'P':
                 options.password = optarg;
                 break;
-            case 'D':
-                options.chooseDefault = true;
-                break;
-            case 'p':
-                options.playername = optarg;
+            case 'u':
+                options.skipUpdate = true;
                 break;
-            case 'C':
-                options.configPath = optarg;
+            case 'U':
+                options.username = optarg;
                 break;
-            case 'H':
-                options.updateHost = optarg;
+            case 'v':
+                options.printVersion = true;
                 break;
         }
     }
-- 
cgit v1.2.3-70-g09d2


From da6d1acf73e3de0558548cd73006aadda33994f5 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 25 Oct 2008 21:10:35 +0000
Subject: Changed NPC's to inherit from the player class. This should be
 helpful later, since they essentially are a beefed up player.

---
 src/npc.cpp | 7 ++++++-
 src/npc.h   | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/npc.cpp b/src/npc.cpp
index 5efee873..2eebed7b 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -40,7 +40,7 @@ static const int NAME_X_OFFSET = 15;
 static const int NAME_Y_OFFSET = 30;
 
 NPC::NPC(Uint32 id, Uint16 job, Map *map, Network *network):
-    Being(id, job, map), mNetwork(network)
+    Player(id, job, map), mNetwork(network)
 {
     NPCInfo info = NPCDB::get(job);
 
@@ -94,6 +94,11 @@ void NPC::setName(const std::string &name)
     Being::setName(displayName + " (NPC)");
 }
 
+void NPC::setGender(int gender)
+{
+    Being::setGender(gender);
+}
+
 Being::Type
 NPC::getType() const
 {
diff --git a/src/npc.h b/src/npc.h
index 432d26d1..0dff1dcb 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -24,13 +24,13 @@
 #ifndef _TMW_NPC_H
 #define _TMW_NPC_H
 
-#include "being.h"
+#include "player.h"
 
 class Network;
 class Graphics;
 class Text;
 
-class NPC : public Being
+class NPC : public Player
 {
     public:
         NPC(Uint32 id, Uint16 job, Map *map, Network *network);
@@ -38,6 +38,7 @@ class NPC : public Being
         ~NPC();
 
         void setName(const std::string &name);
+        void setGender(int gender);
 
         virtual Type
         getType() const;
-- 
cgit v1.2.3-70-g09d2


From 6429efce8c5b17caf492adeba7d37a71fa3c4776 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 25 Oct 2008 21:33:59 +0000
Subject: Fixed NPC's so that clothes would draw again. However, if in the
 future this isn't sufficient for attacking, movement, or other code, this
 will be changed to mimic the style used by the base class player.

---
 src/npc.cpp | 6 ++++++
 src/npc.h   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/npc.cpp b/src/npc.cpp
index 2eebed7b..82b68af4 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -99,6 +99,12 @@ void NPC::setGender(int gender)
     Being::setGender(gender);
 }
 
+void NPC::setSprite(int slot, int id, std::string color)
+{
+    // Fix this later should it not be adequate enough.
+    Being::setSprite(slot, id, color);
+}
+
 Being::Type
 NPC::getType() const
 {
diff --git a/src/npc.h b/src/npc.h
index 0dff1dcb..fa39e6c2 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -39,6 +39,7 @@ class NPC : public Player
 
         void setName(const std::string &name);
         void setGender(int gender);
+        void setSprite(int slot, int id, std::string color);
 
         virtual Type
         getType() const;
-- 
cgit v1.2.3-70-g09d2


From d9c8c729a1dc2f18c1a367eddfd2eb94b79ec190 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 26 Oct 2008 01:21:02 +0000
Subject: Fixed some compile errors that occured from restructuring.

---
 src/main.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index b57027d6..d41acba0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -156,6 +156,7 @@ struct Options
     std::string playername;
     std::string configPath;
     std::string updateHost;
+    std::string dataPath;
 };
 
 /**
@@ -442,14 +443,14 @@ void printHelp()
         << "  -C --configfile : Configuration file to use" << std::endl
         << "  -d --data       : Directory to load game data from" << std::endl
         << "  -D --default    : Bypass the login process with default "
-                                "settings" << std::endl
+                               "settings" << std::endl
         << "  -h --help       : Display this help" << std::endl
-        << "  -H --updatehost : Use this update host" << std::endl;
+        << "  -H --updatehost : Use this update host" << std::endl
         << "  -p --playername : Login with this player" << std::endl
         << "  -P --password   : Login with this password" << std::endl
         << "  -u --skipupdate : Skip the update downloads" << std::endl
         << "  -U --username   : Login with this username" << std::endl
-        << "  -v --version    : Display the version" << std::endl
+        << "  -v --version    : Display the version" << std::endl;
 }
 
 void printVersion()
-- 
cgit v1.2.3-70-g09d2


From fe76762f26180fdbbbac6e16bfa02c8bde3be78b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 26 Oct 2008 02:32:25 +0000
Subject: Added Crush's recent Particle engine modifications from TMW.

---
 AethyraLin2WinXcompile.cbp |   1 +
 src/CMakeLists.txt         |   2 +-
 src/Makefile.am            |   2 +-
 src/particle.cpp           |   2 +-
 src/particleemitter.cpp    | 100 +++++++++++++++++++++++-----------------
 src/particleemitter.h      |  37 +++++++--------
 src/particleemitterprop.h  | 112 +++++++++++++++++++++++++++++++++++++++++++++
 src/utils/minmax.h         |  50 --------------------
 8 files changed, 194 insertions(+), 112 deletions(-)
 create mode 100644 src/particleemitterprop.h
 delete mode 100644 src/utils/minmax.h

diff --git a/AethyraLin2WinXcompile.cbp b/AethyraLin2WinXcompile.cbp
index f2711040..2abfefb8 100644
--- a/AethyraLin2WinXcompile.cbp
+++ b/AethyraLin2WinXcompile.cbp
@@ -318,6 +318,7 @@
 		<Unit filename="src\particle.h" />
 		<Unit filename="src\particleemitter.cpp" />
 		<Unit filename="src\particleemitter.h" />
+		<Unit filename="src\particleemitterprop.h" />
 		<Unit filename="src\party.cpp" />
 		<Unit filename="src\party.h" />
 		<Unit filename="src\player.cpp" />
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d7ff67a8..d5021823 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -265,7 +265,6 @@ SET(SRCS
     utils/base64.h
     utils/dtor.h
     utils/fastsqrt.h
-    utils/minmax.h
     utils/strprintf.cpp
     utils/strprintf.h
     utils/tostring.h
@@ -328,6 +327,7 @@ SET(SRCS
     particle.h
     particleemitter.cpp
     particleemitter.h
+    particleemitterprop.h
     player.cpp
     player.h
     properties.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 0f12579f..17445ddf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -227,7 +227,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      utils/base64.h \
 	      utils/dtor.h \
 	      utils/fastsqrt.h \
-	      utils/minmax.h \
 	      utils/strprintf.cpp \
 	      utils/strprintf.h \
 	      utils/tostring.h \
@@ -290,6 +289,7 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      particle.h \
 	      particleemitter.cpp \
 	      particleemitter.h \
+	      particleemitterprop.h \
               party.cpp \
               party.h \
 	      player.cpp \
diff --git a/src/particle.cpp b/src/particle.cpp
index 703b34c3..b7071674 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -181,7 +181,7 @@ Particle::update()
                     e++
                 )
             {
-                Particles newParticles = (*e)->createParticles();
+                Particles newParticles = (*e)->createParticles(mLifetimePast);
                 for (   ParticleIterator p = newParticles.begin();
                         p != newParticles.end();
                         p++
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index 08944cdd..edd7bf4f 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -74,20 +74,22 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *
 
             if (name == "position-x")
             {
-                mParticlePosX = readMinMax(propertyNode, 0.0f);
+                mParticlePosX = readParticleEmitterProp(propertyNode, 0.0f);
             }
             else if (name == "position-y")
             {
 
-                mParticlePosY = readMinMax(propertyNode, 0.0f);
+                mParticlePosY = readParticleEmitterProp(propertyNode, 0.0f);
                 mParticlePosY.minVal *= SIN45;
                 mParticlePosY.maxVal *= SIN45;
+                mParticlePosY.changeAmplitude *= SIN45;
              }
             else if (name == "position-z")
             {
-                mParticlePosZ = readMinMax(propertyNode, 0.0f);
+                mParticlePosZ = readParticleEmitterProp(propertyNode, 0.0f);
                 mParticlePosZ.minVal *= SIN45;
                 mParticlePosZ.maxVal *= SIN45;
+                mParticlePosZ.changeAmplitude *= SIN45;
             }
             else if (name == "image")
             {
@@ -101,72 +103,74 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *
             }
             else if (name == "horizontal-angle")
             {
-                mParticleAngleHorizontal = readMinMax(propertyNode, 0.0f);
+                mParticleAngleHorizontal = readParticleEmitterProp(propertyNode, 0.0f);
                 mParticleAngleHorizontal.minVal += rotation;
                 mParticleAngleHorizontal.minVal *= DEG_RAD_FACTOR;
                 mParticleAngleHorizontal.maxVal += rotation;
                 mParticleAngleHorizontal.maxVal *= DEG_RAD_FACTOR;
+                mParticleAngleHorizontal.changeAmplitude *= DEG_RAD_FACTOR;
             }
             else if (name == "vertical-angle")
             {
-                mParticleAngleVertical = readMinMax(propertyNode, 0.0f);
+                mParticleAngleVertical = readParticleEmitterProp(propertyNode, 0.0f);
                 mParticleAngleVertical.minVal *= DEG_RAD_FACTOR;
                 mParticleAngleVertical.maxVal *= DEG_RAD_FACTOR;
+                mParticleAngleVertical.changeAmplitude *= DEG_RAD_FACTOR;
             }
             else if (name == "power")
             {
-                mParticlePower = readMinMax(propertyNode, 0.0f);
+                mParticlePower = readParticleEmitterProp(propertyNode, 0.0f);
             }
             else if (name == "gravity")
             {
-                mParticleGravity = readMinMax(propertyNode, 0.0f);
+                mParticleGravity = readParticleEmitterProp(propertyNode, 0.0f);
             }
             else if (name == "randomnes" || name == "randomness") // legacy bug
             {
-                mParticleRandomness = readMinMax(propertyNode, 0);
+                mParticleRandomness = readParticleEmitterProp(propertyNode, 0);
             }
             else if (name == "bounce")
             {
-                mParticleBounce = readMinMax(propertyNode, 0.0f);
+                mParticleBounce = readParticleEmitterProp(propertyNode, 0.0f);
             }
             else if (name == "lifetime")
             {
-                mParticleLifetime = readMinMax(propertyNode, 0);
+                mParticleLifetime = readParticleEmitterProp(propertyNode, 0);
                 mParticleLifetime.minVal += 1;
             }
             else if (name == "output")
             {
-                mOutput = readMinMax(propertyNode, 0);
+                mOutput = readParticleEmitterProp(propertyNode, 0);
                 mOutput.maxVal +=1;
             }
             else if (name == "output-pause")
             {
-                mOutputPause = readMinMax(propertyNode, 0);
-                mOutputPauseLeft = mOutputPause.value();
+                mOutputPause = readParticleEmitterProp(propertyNode, 0);
+                mOutputPauseLeft = mOutputPause.value(0);
             }
             else if (name == "acceleration")
             {
-                mParticleAcceleration = readMinMax(propertyNode, 0.0f);
+                mParticleAcceleration = readParticleEmitterProp(propertyNode, 0.0f);
             }
             else if (name == "die-distance")
             {
-                mParticleDieDistance = readMinMax(propertyNode, 0.0f);
+                mParticleDieDistance = readParticleEmitterProp(propertyNode, 0.0f);
             }
             else if (name == "momentum")
             {
-                mParticleMomentum = readMinMax(propertyNode, 1.0f);
+                mParticleMomentum = readParticleEmitterProp(propertyNode, 1.0f);
             }
             else if (name == "fade-out")
             {
-                mParticleFadeOut = readMinMax(propertyNode, 0);
+                mParticleFadeOut = readParticleEmitterProp(propertyNode, 0);
             }
             else if (name == "fade-in")
             {
-                mParticleFadeIn = readMinMax(propertyNode, 0);
+                mParticleFadeIn = readParticleEmitterProp(propertyNode, 0);
             }
             else if (name == "alpha")
             {
-                mParticleAlpha = readMinMax(propertyNode, 1.0f);
+                mParticleAlpha = readParticleEmitterProp(propertyNode, 1.0f);
             }
             else if (name == "follow-parent")
             {
@@ -301,21 +305,35 @@ ParticleEmitter::~ParticleEmitter()
 }
 
 
-template <typename T> MinMax<T>
-ParticleEmitter::readMinMax(xmlNodePtr propertyNode, T def)
+template <typename T> ParticleEmitterProp<T>
+ParticleEmitter::readParticleEmitterProp(xmlNodePtr propertyNode, T def)
 {
-    MinMax<T> retval;
+    ParticleEmitterProp<T> retval;
 
     def = (T) XML::getFloatProperty(propertyNode, "value", (double) def);
     retval.set((T) XML::getFloatProperty(propertyNode, "min", (double) def),
                (T) XML::getFloatProperty(propertyNode, "max", (double) def));
 
+     std::string change = XML::getProperty(propertyNode, "change-func", "none");
+     T amplitude = (T) XML::getFloatProperty(propertyNode, "change-amplitude", 0.0);
+     int period = XML::getProperty(propertyNode, "change-period", 0);
+     int phase = XML::getProperty(propertyNode, "change-phase", 0);
+     if (change == "saw" || change == "sawtooth") {
+         retval.setFunction(FUNC_SAW, amplitude, period, phase);
+     } else if (change == "sine" || change == "sinewave") {
+         retval.setFunction(FUNC_SINE, amplitude, period, phase);
+     } else if (change == "triangle") {
+         retval.setFunction(FUNC_TRIANGLE, amplitude, period, phase);
+     } else if (change == "square"){
+         retval.setFunction(FUNC_SQUARE, amplitude, period, phase);
+     }
+
     return retval;
 }
 
 
 std::list<Particle *>
-ParticleEmitter::createParticles()
+ParticleEmitter::createParticles(int tick)
 {
     std::list<Particle *> newParticles;
 
@@ -324,9 +342,9 @@ ParticleEmitter::createParticles()
         mOutputPauseLeft--;
         return newParticles;
     }
-    mOutputPauseLeft = mOutputPause.value();
+    mOutputPauseLeft = mOutputPause.value(tick);
 
-    for (int i = mOutput.value(); i > 0; i--)
+    for (int i = mOutput.value(tick); i > 0; i--)
     {
         // Limit maximum particles
         if (Particle::particleCount > Particle::maxCount) break;
@@ -348,33 +366,33 @@ ParticleEmitter::createParticles()
 
 
         newParticle->setPosition(
-                mParticlePosX.value(),
-                mParticlePosY.value(),
-                mParticlePosZ.value());
+                mParticlePosX.value(tick),
+                mParticlePosY.value(tick),
+                mParticlePosZ.value(tick));
 
-        float angleH = mParticleAngleHorizontal.value();
-        float angleV = mParticleAngleVertical.value();
-        float power = mParticlePower.value();
+        float angleH = mParticleAngleHorizontal.value(tick);
+        float angleV = mParticleAngleVertical.value(tick);
+        float power = mParticlePower.value(tick);
         newParticle->setVelocity(
                 cos(angleH) * cos(angleV) * power,
                 sin(angleH) * cos(angleV) * power,
                 sin(angleV) * power);
 
-        newParticle->setRandomness(mParticleRandomness.value());
-        newParticle->setGravity(mParticleGravity.value());
-        newParticle->setBounce(mParticleBounce.value());
+        newParticle->setRandomness(mParticleRandomness.value(tick));
+        newParticle->setGravity(mParticleGravity.value(tick));
+        newParticle->setBounce(mParticleBounce.value(tick));
         newParticle->setFollow(mParticleFollow);
 
         newParticle->setDestination(mParticleTarget,
-                                    mParticleAcceleration.value(),
-                                    mParticleMomentum.value()
+                                    mParticleAcceleration.value(tick),
+                                    mParticleMomentum.value(tick)
                                    );
-        newParticle->setDieDistance(mParticleDieDistance.value());
+        newParticle->setDieDistance(mParticleDieDistance.value(tick));
 
-        newParticle->setLifetime(mParticleLifetime.value());
-        newParticle->setFadeOut(mParticleFadeOut.value());
-        newParticle->setFadeIn(mParticleFadeIn.value());
-        newParticle->setAlpha(mParticleAlpha.value());
+        newParticle->setLifetime(mParticleLifetime.value(tick));
+        newParticle->setFadeOut(mParticleFadeOut.value(tick));
+        newParticle->setFadeIn(mParticleFadeIn.value(tick));
+        newParticle->setAlpha(mParticleAlpha.value(tick));
 
         for (std::list<ParticleEmitter>::iterator i = mParticleChildEmitters.begin();
              i != mParticleChildEmitters.end();
diff --git a/src/particleemitter.h b/src/particleemitter.h
index c237c1ba..31346401 100644
--- a/src/particleemitter.h
+++ b/src/particleemitter.h
@@ -27,10 +27,11 @@
 #include <list>
 
 #include "utils/xml.h"
-#include "utils/minmax.h"
 
 #include "resources/animation.h"
 
+#include "particleemitterprop.h"
+
 class Image;
 class Map;
 class Particle;
@@ -66,7 +67,7 @@ class ParticleEmitter
          * Spawns new particles
          * @return: a list of created particles
          */
-        std::list<Particle *> createParticles();
+        std::list<Particle *> createParticles(int tick);
 
         /**
          * Sets the target of the particles that are created
@@ -76,50 +77,50 @@ class ParticleEmitter
         { mParticleTarget = target; };
 
     private:
-        template <typename T> MinMax<T> readMinMax(xmlNodePtr propertyNode, T def);
+        template <typename T> ParticleEmitterProp<T> readParticleEmitterProp(xmlNodePtr propertyNode, T def);
 
         /**
          * initial position of particles:
          */
-        MinMax<float> mParticlePosX, mParticlePosY, mParticlePosZ;
+        ParticleEmitterProp<float> mParticlePosX, mParticlePosY, mParticlePosZ;
 
         /**
          * initial vector of particles:
          */
-        MinMax<float> mParticleAngleHorizontal, mParticleAngleVertical;
+        ParticleEmitterProp<float> mParticleAngleHorizontal, mParticleAngleVertical;
 
         /**
          * Initial velocity of particles
          */
-        MinMax<float> mParticlePower;
+        ParticleEmitterProp<float> mParticlePower;
 
         /*
          * Vector changing of particles:
          */
-        MinMax<float> mParticleGravity;
-        MinMax<int> mParticleRandomness;
-        MinMax<float> mParticleBounce;
+        ParticleEmitterProp<float> mParticleGravity;
+        ParticleEmitterProp<int> mParticleRandomness;
+        ParticleEmitterProp<float> mParticleBounce;
         bool mParticleFollow;
 
         /*
          * Properties of targeting particles:
          */
         Particle *mParticleTarget;
-        MinMax<float> mParticleAcceleration;
-        MinMax<float> mParticleDieDistance;
-        MinMax<float> mParticleMomentum;
+        ParticleEmitterProp<float> mParticleAcceleration;
+        ParticleEmitterProp<float> mParticleDieDistance;
+        ParticleEmitterProp<float> mParticleMomentum;
 
         /*
          * Behavior over time of the particles:
          */
-        MinMax<int> mParticleLifetime;
-        MinMax<int> mParticleFadeOut;
-        MinMax<int> mParticleFadeIn;
+        ParticleEmitterProp<int> mParticleLifetime;
+        ParticleEmitterProp<int> mParticleFadeOut;
+        ParticleEmitterProp<int> mParticleFadeIn;
 
         Map *mMap;             /**< Map the particles are spawned on */
 
-        MinMax<int> mOutput;   /**< Number of particles spawned per update */
-        MinMax<int> mOutputPause; /**< Pause in frames between two spawns */
+        ParticleEmitterProp<int> mOutput;   /**< Number of particles spawned per update */
+        ParticleEmitterProp<int> mOutputPause; /**< Pause in frames between two spawns */
         int mOutputPauseLeft;
 
         /*
@@ -127,7 +128,7 @@ class ParticleEmitter
          */
         Image *mParticleImage; /**< Particle image, if used */
         Animation mParticleAnimation; /**< Filename of particle animation file */
-        MinMax<float> mParticleAlpha; /**< Opacity of the graphical representation of the particles */
+        ParticleEmitterProp<float> mParticleAlpha; /**< Opacity of the graphical representation of the particles */
 
         /** List of emitters the spawned particles are equipped with */
         std::list<ParticleEmitter> mParticleChildEmitters;
diff --git a/src/particleemitterprop.h b/src/particleemitterprop.h
new file mode 100644
index 00000000..e645c169
--- /dev/null
+++ b/src/particleemitterprop.h
@@ -0,0 +1,112 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include <cstdlib>
+#include <cmath>
+
+/**
+ * Returns a random numeric value that is larger than or equal min and smaller
+ * than max
+ */
+
+enum ChangeFunc
+{
+    FUNC_NONE,
+    FUNC_SINE,
+    FUNC_SAW,
+    FUNC_TRIANGLE,
+    FUNC_SQUARE
+};
+
+template <typename T> struct ParticleEmitterProp
+{
+    ParticleEmitterProp():
+        changeFunc(FUNC_NONE)
+    {
+    }
+
+    void set(T min, T max)
+    {
+        minVal=min; maxVal=max;
+    }
+
+    void set(T val)
+    {
+        set(val, val);
+    }
+
+    void setFunction(ChangeFunc func, T amplitude, int period, int phase)
+    {
+        changeFunc = func;
+        changeAmplitude = amplitude;
+        changePeriod = period;
+        changePhase = phase;
+    }
+
+    T value(int tick)
+    {
+        tick += changePhase;
+        T val = (T) (minVal + (maxVal - minVal) * (rand() / ((double) RAND_MAX + 1)));
+
+        switch (changeFunc)
+        {
+            case FUNC_SINE:
+                val += (T) std::sin(M_PI * 2 * ((double)(tick%changePeriod) / (double)changePeriod)) * changeAmplitude;
+                break;
+            case FUNC_SAW:
+                val += (T) (changeAmplitude * ((double)(tick%changePeriod) / (double)changePeriod)) * 2 - changeAmplitude;
+                break;
+            case FUNC_TRIANGLE:
+                if ((tick%changePeriod) * 2 < changePeriod)
+                {
+                    val += changeAmplitude - (T)((tick%changePeriod) / (double)changePeriod) * changeAmplitude * 4;
+                } else {
+                    val += changeAmplitude * -3 + (T)((tick%changePeriod) / (double)changePeriod) * changeAmplitude * 4;
+                    // I have no idea why this works but it does
+                }
+                break;
+            case FUNC_SQUARE:
+                if ((tick%changePeriod) * 2 < changePeriod)
+                {
+                    val += changeAmplitude;
+                } else {
+                    val -= changeAmplitude;
+                }
+                break;
+            case FUNC_NONE:
+            default:
+                //nothing
+                break;
+        }
+
+        return val;
+    }
+
+    T minVal;
+    T maxVal;
+
+    ChangeFunc changeFunc;
+    T changeAmplitude;
+    int changePeriod;
+    int changePhase;
+};
diff --git a/src/utils/minmax.h b/src/utils/minmax.h
deleted file mode 100644
index daf18c68..00000000
--- a/src/utils/minmax.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2006 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: minmax.h 3628 2007-10-18 18:39:48Z b_lindeijer $
- */
-
-#include <cstdlib>
-
-/**
- * Returns a random numeric value that is larger than or equal min and smaller
- * than max
- */
-
-template <typename T> struct MinMax
-{
-    void set(T min, T max)
-    {
-        minVal=min; maxVal=max;
-    }
-
-    void set(T val)
-    {
-        set(val, val);
-    }
-
-    T value()
-    {
-        return (T)(minVal + (maxVal - minVal) * (rand() / ((double) RAND_MAX + 1)));
-    }
-
-    T minVal;
-    T maxVal;
-};
-- 
cgit v1.2.3-70-g09d2


From 8119f4ec53b64adc427f683077f65ce8aec85582 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 27 Oct 2008 01:32:22 +0000
Subject: Merged the Tametomo branch back into trunk. Targeting has been
 removed from the viewport, and is now located on the beings themselves.
 Eventually, this will be changed further so that the targets draw below the
 being, instead of maintaining the same logic, but baby steps first.

---
 src/being.cpp        |  4 +--
 src/being.h          | 10 +++---
 src/gui/viewport.cpp | 95 +------------------------------------------------
 src/gui/viewport.h   | 24 -------------
 src/localplayer.cpp  | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/localplayer.h    | 25 +++++++++++++
 6 files changed, 133 insertions(+), 124 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index 519be4cc..c4569d4e 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -26,15 +26,15 @@
 #include <cmath>
 
 #include "animatedsprite.h"
+#include "configuration.h"
 #include "equipment.h"
 #include "game.h"
 #include "graphics.h"
+#include "localplayer.h"
 #include "log.h"
 #include "map.h"
 #include "particle.h"
 #include "sound.h"
-#include "localplayer.h"
-#include "configuration.h"
 #include "text.h"
 
 #include "resources/resourcemanager.h"
diff --git a/src/being.h b/src/being.h
index cceebc3c..1eeeb9db 100644
--- a/src/being.h
+++ b/src/being.h
@@ -30,9 +30,9 @@
 #include <SDL_types.h>
 #include <vector>
 
-#include "sprite.h"
-#include "map.h"
 #include "animatedsprite.h"
+#include "map.h"
+#include "sprite.h"
 
 #include "gui/speechbubble.h"
 
@@ -48,7 +48,6 @@ class ItemInfo;
 class Item;
 class Map;
 class Graphics;
-class ImageSet;
 class Particle;
 class SpeechBubble;
 class Text;
@@ -362,8 +361,10 @@ class Being : public Sprite
          */
         virtual void triggerEffect(int effectId) { internalTriggerEffect(effectId, false, true); }
 
-        const std::auto_ptr<Equipment> mEquipment;
+        // Target cursor being used by the being
+        Image *mTargetCursor;
 
+        const std::auto_ptr<Equipment> mEquipment;
 
     protected:
         /**
@@ -392,6 +393,7 @@ class Being : public Sprite
         std::string mName;              /**< Name of character */
         SpriteIterator mSpriteIterator;
         bool mIsGM;
+        bool mTargeted;
         bool mParticleEffects;          /**< Whether to display particles or not */
 
         /** Engine-related infos about weapon. */
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index f6361ef7..7f420e0a 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -74,65 +74,11 @@ Viewport::Viewport():
     config.addListener("ScrollRadius", this);
 
     mPopupMenu = new PopupMenu();
-
-    // Load target cursors
-    loadTargetCursor("graphics/gui/target-cursor-blue-s.png", 44, 35,
-                     false, Being::TC_SMALL);
-    loadTargetCursor("graphics/gui/target-cursor-red-s.png", 44, 35,
-                     true, Being::TC_SMALL);
-    loadTargetCursor("graphics/gui/target-cursor-blue-m.png", 62, 44,
-                     false, Being::TC_MEDIUM);
-    loadTargetCursor("graphics/gui/target-cursor-red-m.png", 62, 44,
-                     true, Being::TC_MEDIUM);
-    loadTargetCursor("graphics/gui/target-cursor-blue-l.png", 82, 60,
-                     false, Being::TC_LARGE);
-    loadTargetCursor("graphics/gui/target-cursor-red-l.png", 82, 60,
-                     true, Being::TC_LARGE);
-}
-
-void
-Viewport::loadTargetCursor(std::string filename, int width, int height,
-                           bool outRange, Being::TargetCursorSize size)
-{
-    assert(size > -1);
-    assert(size < 3);
-
-    ImageSet* currentImageSet;
-    SimpleAnimation* currentCursor;
-
-    ResourceManager *resman = ResourceManager::getInstance();
-
-    currentImageSet = resman->getImageSet(filename, width, height);
-    Animation *anim = new Animation();
-    for (unsigned int i = 0; i < currentImageSet->size(); ++i)
-    {
-        anim->addFrame(currentImageSet->get(i), 75, 0, 0);
-    }
-    currentCursor = new SimpleAnimation(anim);
-
-    if (outRange)
-    {
-        mOutRangeImages[size] = currentImageSet;
-        mTargetCursorOutRange[size] = currentCursor;
-    }
-    else 
-    {
-        mInRangeImages[size] = currentImageSet;
-        mTargetCursorInRange[size] = currentCursor;
-    }
 }
 
 Viewport::~Viewport()
 {
     delete mPopupMenu;
-
-    for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
-    {
-        delete mTargetCursorInRange[i];
-        delete mTargetCursorOutRange[i];
-        mInRangeImages[i]->decRef();
-        mOutRangeImages[i]->decRef();
-    }
 }
 
 void
@@ -228,7 +174,7 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     if (mMap)
     {
         mMap->draw(graphics, (int) mPixelViewX, (int) mPixelViewY);
-        drawTargetCursor(graphics); // TODO: Draw the cursor with the sprite
+        player_node->drawTargetCursor(graphics, (int) mPixelViewX, (int) mPixelViewY);
 
 
         // Find a path from the player to the mouse, and draw it. This is for debug
@@ -291,45 +237,6 @@ void Viewport::logic()
                                     mouseY / 32 + mTileViewY);
         mWalkTime = player_node->mWalkTime;
     }
-
-    for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
-    {
-        mTargetCursorInRange[i]->update(10);
-        mTargetCursorOutRange[i]->update(10);
-    }
-}
-
-void Viewport::drawTargetCursor(Graphics *graphics)
-{
-    // Draw target marker if needed
-    Being *target = player_node->getTarget();
-    if (target)
-    {
-        // Calculate target circle position
-
-        // Find whether target is in range
-        int rangeX = abs(target->mX - player_node->mX);
-        int rangeY = abs(target->mY - player_node->mY);
-        int attackRange = player_node->getAttackRange();
-
-        // Get the correct target cursors graphic
-        Being::TargetCursorSize cursorSize = target->getTargetCursorSize();
-        Image* targetCursor;
-        if (rangeX > attackRange || rangeY > attackRange)
-        {
-            targetCursor = mTargetCursorOutRange[cursorSize]->getCurrentImage();
-        }
-        else 
-        {
-            targetCursor = mTargetCursorInRange[cursorSize]->getCurrentImage();
-        }
-
-        // Draw the target cursor at the correct position
-        int posX = target->getPixelX() + 16 - targetCursor->getWidth() / 2 - (int) mPixelViewX;
-        int posY = target->getPixelY() + 16 - targetCursor->getHeight() / 2 - (int) mPixelViewY;
-
-        graphics->drawImage(targetCursor, posX, posY);
-   }
 }
 
 void Viewport::mousePressed(gcn::MouseEvent &event)
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 70ac1bea..c7b3c0e7 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -38,7 +38,6 @@ class ImageSet;
 class Item;
 class PopupMenu;
 class Graphics;
-class SimpleAnimation;
 
 /**
  * The viewport on the map. Displays the current map and handles mouse input
@@ -136,17 +135,6 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         scrollBy(float x, float y) { mPixelViewX += x; mPixelViewY += y; }
 
     private:
-        /**
-         * Helper function for loading target cursors
-         */
-        void loadTargetCursor(std::string filename, int width, int height,
-                              bool outRange, Being::TargetCursorSize size);
-
-        /**
-         * Draws range based target cursor
-         */
-        void drawTargetCursor(Graphics *graphics);
-
         Map *mMap;                 /**< The current map. */
 
         int mScrollRadius;
@@ -159,18 +147,6 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         int mTileViewY;              /**< Current viewpoint in tiles. */
         bool mShowDebugPath;       /**< Show a path from player to pointer. */
 
-        /** Images of in range target cursor. */
-        ImageSet *mInRangeImages[Being::NUM_TC];
-
-        /** Images of out of range target cursor. */
-        ImageSet *mOutRangeImages[Being::NUM_TC];
-
-        /** Animated in range target cursor. */
-        SimpleAnimation *mTargetCursorInRange[Being::NUM_TC];
-
-        /** Animated out of range target cursor. */
-        SimpleAnimation *mTargetCursorOutRange[Being::NUM_TC];
-
         bool mPlayerFollowMouse;
         int mWalkTime;
 
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 66d37ddf..4cdaf03c 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -20,6 +20,7 @@
  *
  *  $Id$
  */
+#include <cassert>
 
 #include "localplayer.h"
 
@@ -38,6 +39,9 @@
 #include "net/messageout.h"
 #include "net/protocol.h"
 
+#include "resources/resourcemanager.h"
+#include "resources/imageset.h"
+
 #include "utils/tostring.h"
 
 LocalPlayer *player_node = NULL;
@@ -54,12 +58,21 @@ LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map):
     mInventory(new Inventory(INVENTORY_SIZE)),
     mStorage(new Inventory(STORAGE_SIZE))
 {
+    initTargetCursor();
 }
 
 LocalPlayer::~LocalPlayer()
 {
     delete mInventory;
     delete mStorage;
+
+    for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
+    {
+        delete mTargetCursorInRange[i];
+        delete mTargetCursorOutRange[i];
+        mInRangeImages[i]->decRef();
+        mOutRangeImages[i]->decRef();
+    }
 }
 
 void LocalPlayer::logic()
@@ -104,6 +117,12 @@ void LocalPlayer::logic()
         mLastAction = -1;
     }
 
+    for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
+    {
+        player_node->mTargetCursorInRange[i]->update(10);
+        player_node->mTargetCursorOutRange[i]->update(10);
+    }
+
     Being::logic();
 }
 
@@ -494,3 +513,83 @@ void LocalPlayer::setGotoTarget(Being *target)
     mGoingToTarget = true;
     setDestination(target->mX, target->mY);
 }
+
+void LocalPlayer::initTargetCursor()
+{
+    // Load target cursors
+    loadTargetCursor("graphics/gui/target-cursor-blue-s.png", 44, 35,
+                     false, TC_SMALL);
+    loadTargetCursor("graphics/gui/target-cursor-red-s.png", 44, 35,
+                     true, TC_SMALL);
+    loadTargetCursor("graphics/gui/target-cursor-blue-m.png", 62, 44,
+                     false, TC_MEDIUM);
+    loadTargetCursor("graphics/gui/target-cursor-red-m.png", 62, 44,
+                     true, TC_MEDIUM);
+    loadTargetCursor("graphics/gui/target-cursor-blue-l.png", 82, 60,
+                     false, TC_LARGE);
+    loadTargetCursor("graphics/gui/target-cursor-red-l.png", 82, 60,
+                     true, TC_LARGE);
+}
+
+void LocalPlayer::loadTargetCursor(std::string filename, int width, int height,
+                                   bool outRange, TargetCursorSize size)
+{
+    assert(size > -1);
+    assert(size < 3);
+
+    ImageSet* currentImageSet;
+    SimpleAnimation* currentCursor;
+
+    ResourceManager *resman = ResourceManager::getInstance();
+
+    currentImageSet = resman->getImageSet(filename, width, height);
+    Animation *anim = new Animation();
+    for (unsigned int i = 0; i < currentImageSet->size(); ++i)
+    {
+        anim->addFrame(currentImageSet->get(i), 75, 0, 0);
+    }
+    currentCursor = new SimpleAnimation(anim);
+
+    if (outRange)
+    {
+        mOutRangeImages[size] = currentImageSet;
+        mTargetCursorOutRange[size] = currentCursor;
+    }
+    else 
+    {
+        mInRangeImages[size] = currentImageSet;
+        mTargetCursorInRange[size] = currentCursor;
+    }
+}
+
+void LocalPlayer::drawTargetCursor(Graphics *graphics, int offsetX, int offsetY)
+{
+    // Draw target marker if needed
+    if (mTarget)
+    {
+        // Calculate target circle position
+
+        // Find whether target is in range
+        int rangeX = abs(mTarget->mX - mX);
+        int rangeY = abs(mTarget->mY - mY);
+        int attackRange = getAttackRange();
+
+        // Get the correct target cursors graphic
+        TargetCursorSize cursorSize = mTarget->getTargetCursorSize();
+
+        if (rangeX > attackRange || rangeY > attackRange)
+        {
+            mTarget->mTargetCursor = mTargetCursorOutRange[cursorSize]->getCurrentImage();
+        }
+        else 
+        {
+            mTarget->mTargetCursor = mTargetCursorInRange[cursorSize]->getCurrentImage();
+        }
+
+        // Draw the target cursor at the correct position
+        int posX = mTarget->getPixelX() + 16 - mTarget->mTargetCursor->getWidth() / 2 - offsetX;
+        int posY = mTarget->getPixelY() + 16 - mTarget->mTargetCursor->getHeight() / 2 - offsetY;
+
+        graphics->drawImage(mTarget->mTargetCursor, posX, posY);
+   }
+}
diff --git a/src/localplayer.h b/src/localplayer.h
index 757c70eb..c0627378 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -25,6 +25,7 @@
 #define _TMW_LOCALPLAYER_H
 
 #include "player.h"
+#include "simpleanimation.h"
 
 // TODO move into some sane place...
 #define MAX_SLOT 2
@@ -33,6 +34,7 @@
 #define STORAGE_SIZE 301
 
 class FloorItem;
+class ImageSet;
 class Inventory;
 class Item;
 class Network;
@@ -214,6 +216,14 @@ class LocalPlayer : public Player
 
         float mLastAttackTime; /**< Used to synchronize the charge dialog */
 
+        void drawTargetCursor(Graphics *graphics, int offsetX, int offsetY);
+
+        /** Animated in range target cursor. */
+        SimpleAnimation *mTargetCursorInRange[NUM_TC];
+
+        /** Animated out of range target cursor. */
+        SimpleAnimation *mTargetCursorOutRange[NUM_TC];
+
     protected:
         void walk(unsigned char dir);
 
@@ -233,6 +243,21 @@ class LocalPlayer : public Player
 
         Inventory *mInventory;
         Inventory *mStorage;
+
+        /**
+         * Helper function for loading target cursors
+         */
+        void loadTargetCursor(std::string filename, int width, int height,
+                              bool outRange, Being::TargetCursorSize size);
+
+        /** Images of in range target cursor. */
+        ImageSet *mInRangeImages[NUM_TC];
+
+        /** Images of out of range target cursor. */
+        ImageSet *mOutRangeImages[NUM_TC];
+
+        // Load the target cursors into memory
+        void initTargetCursor();
 };
 
 extern LocalPlayer *player_node;
-- 
cgit v1.2.3-70-g09d2


From 218ad29dc13b1b89da9804dec15f32692d8709d6 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 27 Oct 2008 04:23:43 +0000
Subject: Made targets draw on the fringe layer, as well as added t for talking
 to an NPC, n for targeting an NPC, and changed basic targeting code so that
 it'll time out after being on a target for longer than a minute.

---
 src/being.h            |  1 -
 src/game.cpp           | 29 ++++++++++++++++++++++++-----
 src/gui/viewport.cpp   |  3 ---
 src/keyboardconfig.cpp |  2 ++
 src/keyboardconfig.h   |  2 ++
 src/localplayer.cpp    | 23 ++++++++++++++++++++---
 src/localplayer.h      |  1 +
 src/map.cpp            |  2 ++
 src/particle.cpp       |  6 ++----
 9 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/src/being.h b/src/being.h
index 1eeeb9db..a2d5e5a7 100644
--- a/src/being.h
+++ b/src/being.h
@@ -393,7 +393,6 @@ class Being : public Sprite
         std::string mName;              /**< Name of character */
         SpriteIterator mSpriteIterator;
         bool mIsGM;
-        bool mTargeted;
         bool mParticleEffects;          /**< Whether to display particles or not */
 
         /** Engine-related infos about weapon. */
diff --git a/src/game.cpp b/src/game.cpp
index 5e7ee1e8..2fc23a53 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -830,10 +830,7 @@ void Game::handleInput()
         {
             Being *target = beingManager->findNearestLivingBeing(player_node, 20, Being::PLAYER);
 
-            if (target)
-            {
-                player_node->setTarget(target);
-            }
+            player_node->setTarget(target);
         }
 
         // Target the nearest monster if 'a' pressed
@@ -841,9 +838,31 @@ void Game::handleInput()
         {
             Being *target = beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER);
 
+            player_node->setTarget(target);
+        }
+
+        // Target the nearest npc if 'n' pressed
+        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_NPC) )
+        {
+            Being *target = beingManager->findNearestLivingBeing(x, y, 20, Being::NPC);
+
+            player_node->setTarget(target);
+        }
+
+        // Talk to the nearest NPC if 't' pressed
+        if ( keyboard.isKeyActive(keyboard.KEY_TALK) )
+        {
+            Being *target = player_node->getTarget();
+
+            if (!target)
+            {
+                target = beingManager->findNearestLivingBeing(x, y, 20, Being::NPC);
+            }
+
             if (target)
             {
-                player_node->setTarget(target);
+                if (target->getType() == Being::NPC)
+                    dynamic_cast<NPC*>(target)->talk();
             }
         }
 
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 7f420e0a..426906a0 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -28,7 +28,6 @@
 #include "gui.h"
 #include "popupmenu.h"
 
-#include "../simpleanimation.h"
 #include "../beingmanager.h"
 #include "../configuration.h"
 #include "../flooritemmanager.h"
@@ -174,8 +173,6 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     if (mMap)
     {
         mMap->draw(graphics, (int) mPixelViewX, (int) mPixelViewY);
-        player_node->drawTargetCursor(graphics, (int) mPixelViewX, (int) mPixelViewY);
-
 
         // Find a path from the player to the mouse, and draw it. This is for debug
         // purposes.
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 9f558883..6694e5e2 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -44,8 +44,10 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
     {"keyMoveRight", SDLK_RIGHT, "Move Right"},
     {"keyAttack", SDLK_LCTRL, "Attack"},
     {"keySmilie", SDLK_LALT, "Smilie"},
+    {"keyTalk", SDLK_t, "Talk"},
     {"keyTarget", SDLK_LSHIFT, "Target"},
     {"keyTargetClosest", SDLK_a, "Target Closest"},
+    {"keyTargetNPC", SDLK_n, "Target NPC"},
     {"keyTargetPlayer", SDLK_q, "Target Player"},
     {"keyPickup", SDLK_z, "Pickup"},
     {"keyHideWindows", SDLK_h, "Hide Windows"},
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index b57136dc..a4329b09 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -152,8 +152,10 @@ class KeyboardConfig
             KEY_MOVE_RIGHT,
             KEY_ATTACK,
             KEY_SMILIE,
+            KEY_TALK,
             KEY_TARGET,
             KEY_TARGET_CLOSEST,
+            KEY_TARGET_NPC,
             KEY_TARGET_PLAYER,
             KEY_PICKUP,
             KEY_HIDE_WINDOWS,
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 4cdaf03c..440ea636 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -117,6 +117,14 @@ void LocalPlayer::logic()
         mLastAction = -1;
     }
 
+    // Remove target if its been on a being for more than a minute
+    if (get_elapsed_time(mTargetTime) >= 60000)
+    {
+        mTargetTime = -1;
+        setTarget(mTarget);
+        mLastAction = -1;
+    }
+
     for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
     {
         player_node->mTargetCursorInRange[i]->update(10);
@@ -262,8 +270,16 @@ void LocalPlayer::walk(unsigned char dir)
 
 void LocalPlayer::setTarget(Being *target)
 {
+    if (mLastAction != -1)
+        return;
+    mLastAction = tick_time;
+
     if (target == mTarget)
     {
+        if (target != NULL)
+        {
+            target->mTargetCursor = NULL;
+        }
         return;
     }
     if (mTarget && mTarget->getType() == Being::MONSTER)
@@ -562,7 +578,7 @@ void LocalPlayer::loadTargetCursor(std::string filename, int width, int height,
     }
 }
 
-void LocalPlayer::drawTargetCursor(Graphics *graphics, int offsetX, int offsetY)
+void LocalPlayer::drawTargetCursor(Graphics *graphics, int scrollX, int scrollY)
 {
     // Draw target marker if needed
     if (mTarget)
@@ -587,9 +603,10 @@ void LocalPlayer::drawTargetCursor(Graphics *graphics, int offsetX, int offsetY)
         }
 
         // Draw the target cursor at the correct position
-        int posX = mTarget->getPixelX() + 16 - mTarget->mTargetCursor->getWidth() / 2 - offsetX;
-        int posY = mTarget->getPixelY() + 16 - mTarget->mTargetCursor->getHeight() / 2 - offsetY;
+        int posX = mTarget->getPixelX() + 16 - mTarget->mTargetCursor->getWidth() / 2 - scrollX;
+        int posY = mTarget->getPixelY() + 16 - mTarget->mTargetCursor->getHeight() / 2 - scrollY;
 
         graphics->drawImage(mTarget->mTargetCursor, posX, posY);
    }
+   return;
 }
diff --git a/src/localplayer.h b/src/localplayer.h
index c0627378..dcdcbeec 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -236,6 +236,7 @@ class LocalPlayer : public Player
         bool mTrading;
         bool mInStorage;    /**< Whether storage is currently accessible */
         bool mGoingToTarget;
+        int mTargetTime;    /** How long the being has been targeted **/
         int mLastAction;    /**< Time stamp of the last action, -1 if none. */
         int mWalkingDir;    /**< The direction the player is walking in. */
         int mDestX;         /**< X coordinate of destination. */
diff --git a/src/map.cpp b/src/map.cpp
index f9454187..15d5e5f3 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -29,6 +29,7 @@
 #include "configuration.h"
 #include "game.h"
 #include "graphics.h"
+#include "localplayer.h"
 #include "particle.h"
 #include "sprite.h"
 #include "tileset.h"
@@ -112,6 +113,7 @@ void MapLayer::draw(Graphics *graphics,
         // If drawing the fringe layer, make sure all sprites above this row of
         // tiles have been drawn
         if (mIsFringeLayer) {
+             player_node->drawTargetCursor(graphics, scrollX, scrollY);
              while (si != sprites.end() && (*si)->getPixelY() <= y * 32 - 32) {
                  (*si)->draw(graphics, -scrollX, -scrollY);
                  si++;
diff --git a/src/particle.cpp b/src/particle.cpp
index b7071674..af54a4b5 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -360,11 +360,9 @@ Particle::~Particle()
 void
 Particle::clear()
 {
-    std::for_each(mChildEmitters.begin(), mChildEmitters.end(),
-            make_dtor(mChildEmitters));
+    delete_all(mChildEmitters);
     mChildEmitters.clear();
 
-    std::for_each(mChildParticles.begin(), mChildParticles.end(),
-            make_dtor(mChildParticles));
+    delete_all(mChildParticles);
     mChildParticles.clear();
 }
-- 
cgit v1.2.3-70-g09d2


From d303b0164b62708b48b9f831ff0e37bddd8eb5e9 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 27 Oct 2008 05:20:45 +0000
Subject: Added the ability to turn off a target by targeting it again after
 being targeted.

---
 src/localplayer.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 440ea636..a16aa685 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -273,12 +273,18 @@ void LocalPlayer::setTarget(Being *target)
     if (mLastAction != -1)
         return;
     mLastAction = tick_time;
+    mTargetTime = tick_time;
 
     if (target == mTarget)
     {
-        if (target != NULL)
+        if (mTarget)
         {
-            target->mTargetCursor = NULL;
+            if (mTarget->getType() == Being::MONSTER)
+            {
+                static_cast<Monster *>(mTarget)->showName(false);
+            }
+            mTarget->mTargetCursor = NULL;
+            mTarget = NULL;
         }
         return;
     }
@@ -580,6 +586,7 @@ void LocalPlayer::loadTargetCursor(std::string filename, int width, int height,
 
 void LocalPlayer::drawTargetCursor(Graphics *graphics, int scrollX, int scrollY)
 {
+
     // Draw target marker if needed
     if (mTarget)
     {
-- 
cgit v1.2.3-70-g09d2


From dc4cfce2e367b93b9733869298a3459883df2e3d Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 27 Oct 2008 06:02:05 +0000
Subject: Fixed mouse attacks and targeting.

---
 src/gui/viewport.cpp | 6 ++----
 src/localplayer.cpp  | 6 +++++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 426906a0..b6c25dfb 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -300,16 +300,14 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
                     if (being->mAction == Being::DEAD)
                         break;
 
-                    if (keyboard.isKeyActive(keyboard.KEY_TARGET) || player_node->withinAttackRange(being))
+                    if (player_node->withinAttackRange(being))
                     {
-                        player_node->stopAttack();
                         player_node->setGotoTarget(being);
-                        player_node->attack(being, true);
+                        player_node->attack(being, keyboard.isKeyActive(keyboard.KEY_TARGET));
                     }
                     else
                     {
                         player_node->setDestination(tilex, tiley);
-                        player_node->stopAttack();
                     }
                     break;
 
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index a16aa685..34a99bc9 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -273,7 +273,11 @@ void LocalPlayer::setTarget(Being *target)
     if (mLastAction != -1)
         return;
     mLastAction = tick_time;
-    mTargetTime = tick_time;
+
+    if (target)
+    {
+        mTargetTime = tick_time;
+    }
 
     if (target == mTarget)
     {
-- 
cgit v1.2.3-70-g09d2


From 8057f36623788c1d675e0311d98362b7d1d9f892 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 27 Oct 2008 06:05:18 +0000
Subject: Changed mouse attack behavior so that if you click on a being that's
 too far away and are holding down the attack key, you will attack that being.

---
 src/gui/viewport.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index b6c25dfb..ad0c35e5 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -300,7 +300,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
                     if (being->mAction == Being::DEAD)
                         break;
 
-                    if (player_node->withinAttackRange(being))
+                    if (player_node->withinAttackRange(being) || keyboard.isKeyActive(keyboard.KEY_ATTACK))
                     {
                         player_node->setGotoTarget(being);
                         player_node->attack(being, keyboard.isKeyActive(keyboard.KEY_TARGET));
-- 
cgit v1.2.3-70-g09d2


From f3beda85b284e57caf6e5c685174bcb2e608d9ce Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 27 Oct 2008 07:19:11 +0000
Subject: Revised code so that dead sprites are de-targeted.

---
 src/being.cpp        |  1 +
 src/gui/viewport.cpp |  2 +-
 src/localplayer.cpp  | 21 ++++++++++++++-------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index c4569d4e..db8b18e6 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -238,6 +238,7 @@ void Being::controlParticle(Particle *particle)
 void Being::setAction(Action action)
 {
     SpriteAction currentAction = ACTION_INVALID;
+
     switch (action)
     {
         case WALK:
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index ad0c35e5..ef3f0dff 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -303,7 +303,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
                     if (player_node->withinAttackRange(being) || keyboard.isKeyActive(keyboard.KEY_ATTACK))
                     {
                         player_node->setGotoTarget(being);
-                        player_node->attack(being, keyboard.isKeyActive(keyboard.KEY_TARGET));
+                        player_node->attack(being, true);
                     }
                     else
                     {
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 34a99bc9..85030eb7 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -112,8 +112,8 @@ void LocalPlayer::logic()
             break;
     }
 
-    // Actions are allowed once per second
-    if (get_elapsed_time(mLastAction) >= 1000) {
+    // Actions are allowed twice per second
+    if (get_elapsed_time(mLastAction) >= 500) {
         mLastAction = -1;
     }
 
@@ -125,6 +125,15 @@ void LocalPlayer::logic()
         mLastAction = -1;
     }
 
+    if (mTarget)
+    {
+        if (mTarget->mAction == DEAD)
+        {
+            setTarget(mTarget);
+            mLastAction = -1;
+        }
+    }
+
     for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
     {
         player_node->mTargetCursorInRange[i]->update(10);
@@ -439,14 +448,11 @@ void LocalPlayer::attack(Being *target, bool keep)
     if (mAction != STAND)
         return;
 
-    if (keep && target)
+    if (keep && (mTarget != target))
     {
+        mLastAction = -1;
         setTarget(target);
     }
-    else if (mTarget)
-    {
-        target = mTarget;
-    }
 
     if (!target)
         return;
@@ -535,6 +541,7 @@ bool LocalPlayer::withinAttackRange(Being *target)
 
 void LocalPlayer::setGotoTarget(Being *target)
 {
+    mLastAction = -1;
     setTarget(target);
     mGoingToTarget = true;
     setDestination(target->mX, target->mY);
-- 
cgit v1.2.3-70-g09d2


From 0007b8e9497eacb506c8bfad34aad5adff10ba5a Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 27 Oct 2008 17:05:14 +0000
Subject: De-hardcoded the number of hair styles.

---
 src/being.cpp             | 15 ++++++++++++++-
 src/being.h               |  9 +++++++--
 src/gui/char_select.cpp   |  4 ++--
 src/player.cpp            |  2 +-
 src/resources/colordb.cpp |  2 +-
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index db8b18e6..7c884218 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -38,6 +38,7 @@
 #include "text.h"
 
 #include "resources/resourcemanager.h"
+#include "resources/itemdb.h"
 #include "resources/imageset.h"
 #include "resources/iteminfo.h"
 
@@ -52,6 +53,7 @@
 #define BEING_EFFECTS_FILE "effects.xml"
 
 int Being::instances = 0;
+int Being::mNumberOfHairstyles = 1;
 ImageSet *Being::emotionSet = NULL;
 
 static const int X_SPEECH_OFFSET = 18;
@@ -90,6 +92,17 @@ Being::Being(int id, int job, Map *map):
         ResourceManager *rm = ResourceManager::getInstance();
         emotionSet = rm->getImageSet("graphics/gui/emotions.png", 30, 32);
         if (!emotionSet) logger->error("Unable to load emotions!");
+
+        // Hairstyles are encoded as negative numbers.  Count how far negative we can go.
+        int hairstyles = 1;
+        while (ItemDB::get(-hairstyles).getSprite(0) != "error.xml")
+        {
+            hairstyles++;
+        }
+        mNumberOfHairstyles = hairstyles;
+        if (mNumberOfHairstyles == 0)
+            mNumberOfHairstyles = 1; // No hair style -> no hair
+
     }
 
     instances++;
@@ -149,7 +162,7 @@ void Being::setPath(const Path &path)
 
 void Being::setHairStyle(int style, int color)
 {
-    mHairStyle = style < 0 ? mHairStyle : style % NR_HAIR_STYLES;
+    mHairStyle = style < 0 ? mHairStyle : style % mNumberOfHairstyles;
     mHairColor = color;
 }
 
diff --git a/src/being.h b/src/being.h
index a2d5e5a7..b0c5b49e 100644
--- a/src/being.h
+++ b/src/being.h
@@ -38,8 +38,6 @@
 
 #include "resources/colordb.h"
 
-#define NR_HAIR_STYLES 10
-
 #define FIRST_IGNORE_EMOTE 14
 
 class AnimatedSprite;
@@ -199,6 +197,11 @@ class Being : public Sprite
         int getHairStyle() const
         { return mHairStyle; }
 
+        /**
+         * Get the number of hairstyles implemented
+         */
+        static int getNumOfHairstyles() { return mNumberOfHairstyles; }
+
         /**
          * Sets the hair style and color for this being.
          */
@@ -398,6 +401,8 @@ class Being : public Sprite
         /** Engine-related infos about weapon. */
         const ItemInfo* mEquippedWeapon;
 
+        static int mNumberOfHairstyles;          /** Number of hair styles in use */
+
         Path mPath;
         std::string mSpeech;
         Text *mText;
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index b83f98de..ca4d8608 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -261,7 +261,7 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network,
 
     printf("%d\n", numberOfHairColors);
 
-    mPlayer->setHairStyle(rand() % NR_HAIR_STYLES, rand() % numberOfHairColors);
+    mPlayer->setHairStyle(rand() % mPlayer->getNumOfHairstyles(), rand() % numberOfHairColors);
 
     mNameField = new TextField("");
     mNameLabel = new gcn::Label("Name:");
@@ -352,7 +352,7 @@ CharCreateDialog::action(const gcn::ActionEvent &event)
         mPlayer->setHairStyle(mPlayer->getHairStyle() + 1, mPlayer->getHairColor());
     }
     else if (event.getId() == "prevstyle") {
-        mPlayer->setHairStyle(mPlayer->getHairStyle() + NR_HAIR_STYLES - 1, mPlayer->getHairColor());
+        mPlayer->setHairStyle(mPlayer->getHairStyle() + mPlayer->getNumOfHairstyles() - 1, mPlayer->getHairColor());
     }
 }
 
diff --git a/src/player.cpp b/src/player.cpp
index 37badcdc..c9d1e683 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -159,7 +159,7 @@ void Player::setGender(int gender)
 
 void Player::setHairStyle(int style, int color)
 {
-    style = style < 0 ? mHairStyle : style % NR_HAIR_STYLES;
+    style = style < 0 ? mHairStyle : style % mNumberOfHairstyles;
     if (style == mHairStyle && color == mHairColor) return;
 
     Being::setHairStyle(style, color);
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index caa1fbda..26ba298d 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -35,7 +35,7 @@ namespace
 {
     ColorDB::Colors mColors;
     bool mLoaded = false;
-    std::string mFail = "";
+    std::string mFail = "#ffffff";
 }
 
 void ColorDB::load()
-- 
cgit v1.2.3-70-g09d2


From 9cd73fb8c9d4890336d0d0ccf290d45084155c2d Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 27 Oct 2008 17:09:55 +0000
Subject: Removed an unnecessary check.

---
 src/being.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index 7c884218..19c2224d 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -100,9 +100,6 @@ Being::Being(int id, int job, Map *map):
             hairstyles++;
         }
         mNumberOfHairstyles = hairstyles;
-        if (mNumberOfHairstyles == 0)
-            mNumberOfHairstyles = 1; // No hair style -> no hair
-
     }
 
     instances++;
-- 
cgit v1.2.3-70-g09d2


From 89d67a3c0f222529e61207891ae320a5a5babcdf Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 28 Oct 2008 01:27:57 +0000
Subject: Fixed attacking so that it will actually continue to attack in
 succession like it's intended to if it's given a true keep flag, or just do
 one attack if that flag isn't set. Since most people seem to prefer to
 continue to attack when attacking, shift will be used for when someone only
 wants to hit the target once.

---
 src/game.cpp         |  2 +-
 src/gui/viewport.cpp |  2 +-
 src/localplayer.cpp  | 72 +++++++++++++++++++++++++++++++---------------------
 src/localplayer.h    |  2 ++
 4 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 2fc23a53..86427a7a 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -801,7 +801,7 @@ void Game::handleInput()
         {
             Being *target = beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER);
 
-            bool newTarget = keyboard.isKeyActive(keyboard.KEY_TARGET);
+            bool newTarget = !keyboard.isKeyActive(keyboard.KEY_TARGET);
             // A set target has highest priority
             if (newTarget || !player_node->getTarget())
             {
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index ef3f0dff..6f89f639 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -303,7 +303,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
                     if (player_node->withinAttackRange(being) || keyboard.isKeyActive(keyboard.KEY_ATTACK))
                     {
                         player_node->setGotoTarget(being);
-                        player_node->attack(being, true);
+                        player_node->attack(being, !keyboard.isKeyActive(keyboard.KEY_TARGET));
                     }
                     else
                     {
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 85030eb7..a63ec18a 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -107,30 +107,37 @@ void LocalPlayer::logic()
             mFrame = (get_elapsed_time(mWalkTime) * frames) / mAttackSpeed;
             if (mFrame >= frames) {
                 nextStep();
-                attack();
             }
             break;
     }
 
-    // Actions are allowed twice per second
-    if (get_elapsed_time(mLastAction) >= 500) {
+    // Actions are allowed once per second
+    if (get_elapsed_time(mLastAction) >= 1000) {
         mLastAction = -1;
     }
 
+    // Targeting allowed 4 times a second
+    if (get_elapsed_time(mLastTarget) >= 250) {
+        mLastTarget = -1;
+    }
+
     // Remove target if its been on a being for more than a minute
     if (get_elapsed_time(mTargetTime) >= 60000)
     {
         mTargetTime = -1;
         setTarget(mTarget);
-        mLastAction = -1;
+        mLastTarget = -1;
     }
 
     if (mTarget)
     {
         if (mTarget->mAction == DEAD)
         {
-            setTarget(mTarget);
-            mLastAction = -1;
+            stopAttack();
+        }
+        if (mKeepAttacking && mTarget)
+        {
+            attack(mTarget, true);
         }
     }
 
@@ -279,27 +286,19 @@ void LocalPlayer::walk(unsigned char dir)
 
 void LocalPlayer::setTarget(Being *target)
 {
-    if (mLastAction != -1)
+    if (mLastTarget != -1 || target == this)
         return;
-    mLastAction = tick_time;
+    mLastTarget = tick_time;
 
     if (target)
     {
         mTargetTime = tick_time;
     }
 
-    if (target == mTarget)
+    if ((target == NULL) || target == mTarget)
     {
-        if (mTarget)
-        {
-            if (mTarget->getType() == Being::MONSTER)
-            {
-                static_cast<Monster *>(mTarget)->showName(false);
-            }
-            mTarget->mTargetCursor = NULL;
-            mTarget = NULL;
-        }
-        return;
+        target = NULL;
+        mKeepAttacking = false;
     }
     if (mTarget && mTarget->getType() == Being::MONSTER)
     {
@@ -444,22 +443,25 @@ bool LocalPlayer::tradeRequestOk() const
 
 void LocalPlayer::attack(Being *target, bool keep)
 {
-    // Can only attack when standing still
-    if (mAction != STAND)
+    mKeepAttacking = keep;
+
+    if (!target)
         return;
 
-    if (keep && (mTarget != target))
+    if ((mTarget != target) || !mTarget)
     {
-        mLastAction = -1;
+        mLastTarget = -1;
         setTarget(target);
     }
 
-    if (!target)
-        return;
-
     int dist_x = target->mX - mX;
     int dist_y = target->mY - mY;
 
+    // Must be standing and be within attack range to continue
+    if ((mAction != STAND) || (mAttackRange < abs(dist_x)) || 
+        (mAttackRange < abs(dist_y)))
+        return;
+
     if (abs(dist_y) >= abs(dist_x))
     {
         if (dist_y > 0)
@@ -478,9 +480,10 @@ void LocalPlayer::attack(Being *target, bool keep)
     // Implement charging attacks here
     mLastAttackTime = 0;
 
-    setAction(ATTACK);
     mWalkTime = tick_time;
 
+    setAction(ATTACK);
+
     if (mEquippedWeapon)
     {
         std::string soundFile = mEquippedWeapon->getSound(EQUIP_EVENT_STRIKE);
@@ -494,11 +497,22 @@ void LocalPlayer::attack(Being *target, bool keep)
     outMsg.writeInt16(0x0089);
     outMsg.writeInt32(target->getId());
     outMsg.writeInt8(0);
+
+    if (!keep)
+    {
+        stopAttack();
+    }
 }
 
 void LocalPlayer::stopAttack()
 {
-    setTarget(NULL);
+    if (mTarget)
+    {
+        setAction(STAND);
+        mLastTarget = -1;
+        setTarget(NULL);
+        mLastTarget = -1;
+    }
 }
 
 Being* LocalPlayer::getTarget() const
@@ -541,7 +555,7 @@ bool LocalPlayer::withinAttackRange(Being *target)
 
 void LocalPlayer::setGotoTarget(Being *target)
 {
-    mLastAction = -1;
+    mLastTarget = -1;
     setTarget(target);
     mGoingToTarget = true;
     setDestination(target->mX, target->mY);
diff --git a/src/localplayer.h b/src/localplayer.h
index dcdcbeec..1eebabb6 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -236,8 +236,10 @@ class LocalPlayer : public Player
         bool mTrading;
         bool mInStorage;    /**< Whether storage is currently accessible */
         bool mGoingToTarget;
+        bool mKeepAttacking;/** Whether or not to continue to attack */
         int mTargetTime;    /** How long the being has been targeted **/
         int mLastAction;    /**< Time stamp of the last action, -1 if none. */
+        int mLastTarget;    /** Time stamp of last targeting action, -1 if none. */
         int mWalkingDir;    /**< The direction the player is walking in. */
         int mDestX;         /**< X coordinate of destination. */
         int mDestY;         /**< Y coordinate of destination. */
-- 
cgit v1.2.3-70-g09d2


From 42a982115438f269f7b3877a759fa982ea1bffa7 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 28 Oct 2008 02:13:12 +0000
Subject: Changed the name of the old target key to stop attack, as well as
 making it do exactly that in the local player. Since it already was doing
 this behavior anyways, I just extended it out to stop attack at any point in
 the attack.

---
 src/keyboardconfig.cpp | 2 +-
 src/localplayer.cpp    | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 6694e5e2..46fea458 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -45,7 +45,7 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
     {"keyAttack", SDLK_LCTRL, "Attack"},
     {"keySmilie", SDLK_LALT, "Smilie"},
     {"keyTalk", SDLK_t, "Talk"},
-    {"keyTarget", SDLK_LSHIFT, "Target"},
+    {"keyTarget", SDLK_LSHIFT, "Stop Attack"},
     {"keyTargetClosest", SDLK_a, "Target Closest"},
     {"keyTargetNPC", SDLK_n, "Target NPC"},
     {"keyTargetPlayer", SDLK_q, "Target Player"},
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index a63ec18a..87a4f81b 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -29,10 +29,11 @@
 #include "game.h"
 #include "inventory.h"
 #include "item.h"
+#include "keyboardconfig.h"
 #include "main.h"
+#include "monster.h"
 #include "particle.h"
 #include "sound.h"
-#include "monster.h"
 
 #include "gui/gui.h"
 
@@ -129,6 +130,11 @@ void LocalPlayer::logic()
         mLastTarget = -1;
     }
 
+    if (keyboard.isKeyActive(keyboard.KEY_TARGET))
+    {
+        stopAttack();
+    }
+
     if (mTarget)
     {
         if (mTarget->mAction == DEAD)
-- 
cgit v1.2.3-70-g09d2


From b00a8da8f954cd8116bd7a5375f70550bdcb9009 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 28 Oct 2008 02:19:32 +0000
Subject: Fixed OK dialogue so that it draws correctly for multiple lines
 (forgot to do button padding before).

---
 src/gui/ok_dialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index 13124c3c..2c7661a1 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -50,7 +50,7 @@ OkDialog::OkDialog(const std::string &title, const std::string &msg,
     {
         // 15 == height of each line of text (based on font heights)
         // 14 == row top + bottom graphic pixel heights
-        setContentSize(mTextBox->getMinWidth() + 15, 15 + (numRows * 15));
+        setContentSize(mTextBox->getMinWidth() + 15, 15 + (numRows * 15) + okButton->getHeight());
         mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5, 
                                                3 + (numRows * 14)));
     }
-- 
cgit v1.2.3-70-g09d2


From a5c89d99f3a75bfa0d7a8605f310747772bb690b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 28 Oct 2008 14:31:05 +0000
Subject: Fixed up confirm dialogues so that they also can utilize the text
 wrapping code, like the ok dialogues.

---
 src/gui/confirm_dialog.cpp | 55 +++++++++++++++++++++++++++++++++-------------
 src/gui/confirm_dialog.h   | 10 +++++++++
 src/gui/ok_dialog.cpp      |  1 -
 3 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp
index 5b700831..848c4767 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirm_dialog.cpp
@@ -23,37 +23,57 @@
 
 #include "confirm_dialog.h"
 
-#include <guichan/widgets/label.hpp>
-
-#include "button.h"
-
+#include <guichan/font.hpp>
 
 ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg,
         Window *parent):
     Window(title, true, parent)
 {
-    gcn::Label *textLabel = new gcn::Label(msg);
+    mTextBox = new TextBox();
+    mTextBox->setEditable(false);
+    mTextBox->setOpaque(false);
+
+    mTextArea = new ScrollArea(mTextBox);
     gcn::Button *yesButton = new Button("Yes", "yes", this);
     gcn::Button *noButton = new Button("No", "no", this);
 
-    int w = textLabel->getWidth() + 20;
+    mTextArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mTextArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mTextArea->setOpaque(false);
+
+    mTextBox->setMinWidth(260);
+    mTextBox->setTextWrapped(msg);
+
+    int numRows = mTextBox->getNumberOfRows();
+    int width = getFont()->getWidth(title);
     int inWidth = yesButton->getWidth() + noButton->getWidth() + 5;
-    int h = textLabel->getHeight() + 25 + yesButton->getHeight();
 
-    if (w < inWidth + 10) {
-        w = inWidth + 10;
+    if (numRows > 1)
+    {
+        // 15 == height of each line of text (based on font heights)
+        // 14 == row top + bottom graphic pixel heights
+        setContentSize(mTextBox->getMinWidth() + 15, 15 + (numRows * 15) + noButton->getHeight());
+        mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5, 
+                                               3 + (numRows * 14)));
+    }
+    else
+    {
+        if (width < getFont()->getWidth(msg))
+            width = getFont()->getWidth(msg);
+        if (width < inWidth)
+            width = inWidth;
+        setContentSize(width + 15, 30 + noButton->getHeight());
+        mTextArea->setDimension(gcn::Rectangle(4, 5, width + 5, 17));
     }
 
-    setContentSize(w, h);
-    textLabel->setPosition(10, 10);
     yesButton->setPosition(
-            (w - inWidth) / 2,
-            h - 5 - noButton->getHeight());
+            (mTextBox->getMinWidth() - inWidth) / 2,
+            (numRows * 14) + noButton->getHeight() - 8);
     noButton->setPosition(
             yesButton->getX() + yesButton->getWidth() + 5,
-            h - 5 - noButton->getHeight());
+            (numRows * 14) + noButton->getHeight() - 8);
 
-    add(textLabel);
+    add(mTextArea);
     add(yesButton);
     add(noButton);
 
@@ -65,6 +85,11 @@ ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg,
     yesButton->requestFocus();
 }
 
+unsigned int ConfirmDialog::getNumRows()
+{
+    return mTextBox->getNumberOfRows();
+}
+
 void ConfirmDialog::action(const gcn::ActionEvent &event)
 {
     // Proxy button events to our listeners
diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h
index b8e385f6..65f33cac 100644
--- a/src/gui/confirm_dialog.h
+++ b/src/gui/confirm_dialog.h
@@ -26,6 +26,9 @@
 
 #include <guichan/actionlistener.hpp>
 
+#include "button.h"
+#include "scrollarea.h"
+#include "textbox.h"
 #include "window.h"
 
 #include "../guichanfwd.h"
@@ -45,10 +48,17 @@ class ConfirmDialog : public Window, public gcn::ActionListener {
         ConfirmDialog(const std::string &title, const std::string &msg,
                 Window *parent = NULL);
 
+        unsigned int getNumRows();
+
         /**
          * Called when receiving actions from the widgets.
          */
         void action(const gcn::ActionEvent &event);
+
+    private:
+        TextBox *mTextBox;
+        ScrollArea *mTextArea;
+        gcn::Button *okButton;
 };
 
 #endif
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index 2c7661a1..b8d3c7ba 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -25,7 +25,6 @@
 
 #include <guichan/font.hpp>
 
-
 OkDialog::OkDialog(const std::string &title, const std::string &msg,
         Window *parent):
     Window(title, true, parent)
-- 
cgit v1.2.3-70-g09d2


From bd15dca49554b66c2921f99bbc0a5e5494019898 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 28 Oct 2008 19:50:23 +0000
Subject: Fixed a fast walking bug that was caused by a state conflict where
 the keys would tell the client to attack and stop attacking all at the same
 time. Thanks to SoftLace for reporting it.

---
 src/game.cpp        | 12 +++++++++---
 src/localplayer.cpp |  6 ------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 86427a7a..58c85e42 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -826,7 +826,7 @@ void Game::handleInput()
         }
 
         // Target the nearest player if 'q' is pressed
-        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) )
+        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) && !keyboard.isKeyActive(keyboard.KEY_TARGET) )
         {
             Being *target = beingManager->findNearestLivingBeing(player_node, 20, Being::PLAYER);
 
@@ -834,7 +834,7 @@ void Game::handleInput()
         }
 
         // Target the nearest monster if 'a' pressed
-        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) )
+        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) && !keyboard.isKeyActive(keyboard.KEY_TARGET) )
         {
             Being *target = beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER);
 
@@ -842,7 +842,7 @@ void Game::handleInput()
         }
 
         // Target the nearest npc if 'n' pressed
-        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_NPC) )
+        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_NPC) && !keyboard.isKeyActive(keyboard.KEY_TARGET) )
         {
             Being *target = beingManager->findNearestLivingBeing(x, y, 20, Being::NPC);
 
@@ -866,6 +866,12 @@ void Game::handleInput()
             }
         }
 
+        // Stop attacking if shift is pressed
+        if (keyboard.isKeyActive(keyboard.KEY_TARGET))
+        {
+            player_node->stopAttack();
+        }
+
         if (joystick)
         {
             if (joystick->buttonPressed(1))
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 87a4f81b..ee73b673 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -29,7 +29,6 @@
 #include "game.h"
 #include "inventory.h"
 #include "item.h"
-#include "keyboardconfig.h"
 #include "main.h"
 #include "monster.h"
 #include "particle.h"
@@ -130,11 +129,6 @@ void LocalPlayer::logic()
         mLastTarget = -1;
     }
 
-    if (keyboard.isKeyActive(keyboard.KEY_TARGET))
-    {
-        stopAttack();
-    }
-
     if (mTarget)
     {
         if (mTarget->mAction == DEAD)
-- 
cgit v1.2.3-70-g09d2


From bf986b19a872b472d8593d14bb6f1d3bc6721e8d Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 28 Oct 2008 23:14:56 +0000
Subject: Added support for no dialogue NPC's. Patch by Peavey from TMW.

---
 src/net/npchandler.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 29855fc0..811372fa 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -70,9 +70,15 @@ void NPCHandler::handleMessage(MessageIn *msg)
             npcTextDialog->setVisible(true);
             break;
 
+         case SMSG_NPC_CLOSE:
+            id = msg->readInt32();
+            dynamic_cast<NPC*>(beingManager->findBeing(id));
+            if (current_npc == dynamic_cast<NPC*>(beingManager->findBeing(id)))
+            	current_npc = NULL;
+            break;
+
         case SMSG_NPC_NEXT:
-        case SMSG_NPC_CLOSE:
-            // Next/Close button in NPC dialog, currently unused
+            // Next button in NPC dialog, currently unused
             break;
     }
 }
-- 
cgit v1.2.3-70-g09d2


From d532bc32e16c906dc6a88b3e45200f09e5f666f7 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 28 Oct 2008 23:17:16 +0000
Subject: Made it so that the trade window doesn't stay visible when it was
 open before the client was closed. Patch by Trelos on TMW.

---
 src/game.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/game.cpp b/src/game.cpp
index 58c85e42..5299a1e5 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -224,6 +224,7 @@ void createGuiWindows(Network *network)
         miniStatusWindow->getWindowName() + "Visible", true));
     buyDialog->setVisible(false);
     sellDialog->setVisible(false);
+    tradeWindow->setVisible(false);
     menuWindow->setVisible((bool) config.getValue(
         menuWindow->getWindowName() + "Visible", true));
     itemShortcutWindow->setVisible((bool) config.getValue(
-- 
cgit v1.2.3-70-g09d2


From f50e0ea375bf9053b04a9b0349ca73caf7a08ba4 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 28 Oct 2008 23:22:51 +0000
Subject: Removed a redundant line that wasn't doing anything. Should have
 taken a minute more to check it over thouroughly first.

---
 src/net/npchandler.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 811372fa..70f04271 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -72,7 +72,6 @@ void NPCHandler::handleMessage(MessageIn *msg)
 
          case SMSG_NPC_CLOSE:
             id = msg->readInt32();
-            dynamic_cast<NPC*>(beingManager->findBeing(id));
             if (current_npc == dynamic_cast<NPC*>(beingManager->findBeing(id)))
             	current_npc = NULL;
             break;
-- 
cgit v1.2.3-70-g09d2


From 4d96a14a3922a21be3f93773c26a42a82c49b589 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 30 Oct 2008 03:11:07 +0000
Subject: Fixed a small targeting issue that arose from having uninitialized
 data at the start.

---
 src/localplayer.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index ee73b673..dccd3914 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -53,8 +53,9 @@ LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map):
     mXp(0), mNetwork(0),
     mTarget(NULL), mPickUpTarget(NULL),
     mTrading(false), mGoingToTarget(false),
-    mLastAction(-1),
-    mWalkingDir(0), mDestX(0), mDestY(0),
+    mTargetTime(-1), mLastAction(-1),
+    mLastTarget(-1), mWalkingDir(0), 
+    mDestX(0), mDestY(0),
     mInventory(new Inventory(INVENTORY_SIZE)),
     mStorage(new Inventory(STORAGE_SIZE))
 {
@@ -115,17 +116,15 @@ void LocalPlayer::logic()
     if (get_elapsed_time(mLastAction) >= 1000) {
         mLastAction = -1;
     }
-
     // Targeting allowed 4 times a second
     if (get_elapsed_time(mLastTarget) >= 250) {
         mLastTarget = -1;
     }
-
     // Remove target if its been on a being for more than a minute
     if (get_elapsed_time(mTargetTime) >= 60000)
     {
         mTargetTime = -1;
-        setTarget(mTarget);
+        setTarget(NULL);
         mLastTarget = -1;
     }
 
@@ -290,15 +289,15 @@ void LocalPlayer::setTarget(Being *target)
         return;
     mLastTarget = tick_time;
 
-    if (target)
-    {
-        mTargetTime = tick_time;
-    }
-
     if ((target == NULL) || target == mTarget)
     {
         target = NULL;
         mKeepAttacking = false;
+        mTargetTime = -1;
+    }
+    if (target)
+    {
+        mTargetTime = tick_time;
     }
     if (mTarget && mTarget->getType() == Being::MONSTER)
     {
-- 
cgit v1.2.3-70-g09d2


From c22fc71adacaf6222f7e6fb70f83758298f25904 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 31 Oct 2008 04:05:51 +0000
Subject: Added critical notifications to the client. While I had originally
 planned to do this (I still did it my way), TMW beat me to implementing, so
 I'll credit them with their commit reminding me to do it. This is not done
 the exact same way, as I prefer to see an actual "crit!" show above the
 being, instead of an ambiguous particle.

---
 data/graphics/gui/hits_blue.png   | Bin 589 -> 884 bytes
 data/graphics/gui/hits_red.png    | Bin 561 -> 813 bytes
 data/graphics/gui/hits_yellow.png | Bin 894 -> 907 bytes
 src/being.cpp                     |  24 ++++++++++++++++++++----
 src/being.h                       |   5 +++++
 src/gui/gui.cpp                   |   4 ++--
 src/net/beinghandler.cpp          |   5 ++++-
 7 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/data/graphics/gui/hits_blue.png b/data/graphics/gui/hits_blue.png
index 59458485..cfb04ab8 100644
Binary files a/data/graphics/gui/hits_blue.png and b/data/graphics/gui/hits_blue.png differ
diff --git a/data/graphics/gui/hits_red.png b/data/graphics/gui/hits_red.png
index da765dc4..150f1c1e 100644
Binary files a/data/graphics/gui/hits_red.png and b/data/graphics/gui/hits_red.png differ
diff --git a/data/graphics/gui/hits_yellow.png b/data/graphics/gui/hits_yellow.png
index d77b7c05..6975dfd5 100644
Binary files a/data/graphics/gui/hits_yellow.png and b/data/graphics/gui/hits_yellow.png differ
diff --git a/src/being.cpp b/src/being.cpp
index 19c2224d..3214b491 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -189,10 +189,6 @@ void Being::takeDamage(int amount)
     }
     else
     {
-        // Hit particle effect
-        controlParticle(particleEngine->addEffect(
-                    "graphics/particles/hit.particle.xml", 0, 0));
-
         if (getType() == MONSTER)
         {
             font = hitBlueFont;
@@ -208,6 +204,26 @@ void Being::takeDamage(int amount)
                                         mPx + 16, mPy + 16);
 }
 
+void Being::showCrit()
+{
+    gcn::Font *font;
+    std::string text = "crit!";
+
+    // Selecting the right color
+    if (getType() == MONSTER)
+    {
+        font = hitBlueFont;
+    }
+    else
+    {
+        font = hitRedFont;
+    }
+
+    // Show crit notice
+    particleEngine->addTextRiseFadeOutEffect(text, font,
+                                             mPx + 16, mPy - 16);
+}
+
 void Being::handleAttack(Being *victim, int damage)
 {
     setAction(Being::ATTACK);
diff --git a/src/being.h b/src/being.h
index b0c5b49e..62a1c937 100644
--- a/src/being.h
+++ b/src/being.h
@@ -165,6 +165,11 @@ class Being : public Sprite
          */
         virtual void takeDamage(int amount);
 
+        /**
+         * Puts a crit notification bubble above this being.
+         */
+        virtual void showCrit();
+
         /**
          * Handles an attack of another being by this being.
          *
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index edc25152..6d70d532 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -180,9 +180,9 @@ Gui::Gui(Graphics *graphics):
     // Load hits' colourful fonts
     try {
         hitRedFont = new gcn::ImageFont("graphics/gui/hits_red.png",
-                "0123456789");
+                "0123456789crit! ");
         hitBlueFont = new gcn::ImageFont("graphics/gui/hits_blue.png",
-                "0123456789");
+                "0123456789crit! ");
         hitYellowFont = new gcn::ImageFont("graphics/gui/hits_yellow.png",
                 "0123456789misxp ");
     }
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index baca0cfc..85e18e5a 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -237,8 +237,11 @@ void BeingHandler::handleMessage(MessageIn *msg)
 
             switch (type)
             {
-                case 0x00: // Damage
                 case 0x0a: // Critical Damage
+                    if (dstBeing) {
+                         dstBeing->showCrit();
+                    }
+               case 0x00: // Damage
                     if (dstBeing) {
                         dstBeing->takeDamage(param1);
                     }
-- 
cgit v1.2.3-70-g09d2


From b28c963a566f685f71c3c404099fe7c65bfa0a70 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 31 Oct 2008 21:12:38 +0000
Subject: Added a text patch done on TMW to increase the number of characters
 supported (done by vargavind), as well as changing the effect used for
 critical updates (change of opinion on what looks better).

---
 src/being.cpp   | 4 ++--
 src/gui/gui.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index 3214b491..245e023e 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -220,8 +220,8 @@ void Being::showCrit()
     }
 
     // Show crit notice
-    particleEngine->addTextRiseFadeOutEffect(text, font,
-                                             mPx + 16, mPy - 16);
+    particleEngine->addTextSplashEffect(text, 255, 255, 255, font,
+                                        mPx + 16, mPy + 16);
 }
 
 void Being::handleAttack(Being *victim, int damage)
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 6d70d532..e386a85c 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -114,7 +114,7 @@ Gui::Gui(Graphics *graphics):
     try {
         mGuiFont = new gcn::ImageFont("graphics/gui/sansserif8.png",
                 " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ["
-                "\\]^_`abcdefghijklmnopqrstuvwxyz{|}~|"
+                "\\]^_`abcdefghijklmnopqrstuvwxyz{|}~|��������"
                 );
     }
     catch (gcn::Exception e)
-- 
cgit v1.2.3-70-g09d2


From 6937d802ec6a1976959bcdffdb0df462bf0d38ac Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 31 Oct 2008 22:31:22 +0000
Subject: Improved keyboard support by putting the NPC ok button in focus, and
 making it so that hitting enter on opening the dialog will close it.

---
 src/game.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/game.cpp b/src/game.cpp
index 5299a1e5..18467b0b 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -635,6 +635,10 @@ void Game::handleInput()
                 {
                     setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
                 }
+                else if (npcTextDialog->isVisible())
+                {
+                    npcTextDialog->action(gcn::ActionEvent(NULL, "ok"));
+                }
                 // Else, open the chat edit box
                 else
                 {
-- 
cgit v1.2.3-70-g09d2


From 95b4c6fb0698aa7af06035495aca008bcf342fc3 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 31 Oct 2008 22:49:49 +0000
Subject: Last commit was a bit premature (was trying to cancel the commit).
 Anyways, this patch improves keyboard support for NPCs by allowing the user
 to hit enter to proceed through the dialogs. What it doesn't do at the moment
 is give users a way to scroll through the dialog choices... yet. But once one
 is selected, you can hit enter to continue.

---
 src/game.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/game.cpp b/src/game.cpp
index 18467b0b..d7ce4314 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -635,10 +635,16 @@ void Game::handleInput()
                 {
                     setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
                 }
+                // Proceed to the next dialog option, or close the window
                 else if (npcTextDialog->isVisible())
                 {
                     npcTextDialog->action(gcn::ActionEvent(NULL, "ok"));
                 }
+                // Choose the currently highlighted dialogue option
+                else if (npcListDialog->isVisible())
+                {
+                    npcListDialog->action(gcn::ActionEvent(NULL, "ok"));
+                }
                 // Else, open the chat edit box
                 else
                 {
-- 
cgit v1.2.3-70-g09d2


From d433f836a690199a89781a1c7f694620e7a1ad27 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 1 Nov 2008 02:28:05 +0000
Subject: Modified inventory window code to take advantage of the text wrapping
 code.

---
 src/gui/inventorywindow.cpp | 104 +++++++++++++++++++++++++++++---------------
 src/gui/inventorywindow.h   |  20 +++++++--
 2 files changed, 86 insertions(+), 38 deletions(-)

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 0f7b6792..5add1d4f 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -27,8 +27,6 @@
 
 #include <guichan/mouseinput.hpp>
 
-#include <guichan/widgets/label.hpp>
-
 #include "button.h"
 #include "gui.h"
 #include "item_amount.h"
@@ -63,13 +61,21 @@ InventoryWindow::InventoryWindow():
     mInvenScroll = new ScrollArea(mItems);
     mInvenScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
 
-    mItemNameLabel = new gcn::Label("Name:");
-    mItemDescriptionLabel = new gcn::Label("Description:");
-    mItemEffectLabel = new gcn::Label("Effect:");
-    mWeightLabel = new gcn::Label("Total Weight: - Maximum Weight: ");
+    mTotalWeight = toString(player_node->mTotalWeight);
+    mMaxWeight = toString(player_node->mMaxWeight);
+
+    mItemName = "Name:";
+    mItemNameLabel = new TextBox();
+    mItemDescription = "Description:";
+    mItemDescriptionLabel = new TextBox();
+    mItemEffect = "Effect:";
+    mItemEffectLabel = new TextBox();
+    mWeight = "Total Weight: " + mTotalWeight + " g - " +
+              "Maximum Weight: " + mMaxWeight + " g";
+    mWeightLabel = new TextBox();
     mWeightLabel->setPosition(8, 8);
-    mInvenScroll->setPosition(8,
-            mWeightLabel->getY() + mWeightLabel->getHeight() + 5);
+
+    draw();
 
     add(mUseButton);
     add(mDropButton);
@@ -92,10 +98,18 @@ void InventoryWindow::logic()
     // redesign of InventoryWindow and ItemContainer probably.
     updateButtons();
 
-    // Update weight information
-    mWeightLabel->setCaption(
-        "Total Weight: " + toString(player_node->mTotalWeight) + " g - " +
-        "Maximum Weight: " + toString(player_node->mMaxWeight) + " g");
+    if ((mMaxWeight != toString(player_node->mMaxWeight)) ||
+         mTotalWeight != toString(player_node->mTotalWeight))
+    {
+        mTotalWeight = toString(player_node->mTotalWeight);
+        mMaxWeight = toString(player_node->mMaxWeight);
+
+        // Adjust widgets
+        mWeight = "Total Weight: " + mTotalWeight + " g - " +
+                  "Maximum Weight: " + mMaxWeight + " g";
+
+        draw();
+    }
 }
 
 void InventoryWindow::action(const gcn::ActionEvent &event)
@@ -137,21 +151,25 @@ void InventoryWindow::valueChanged(const gcn::SelectionEvent &event)
     // Update name, effect and description
     if (!item)
     {
-        mItemNameLabel->setCaption("Name:");
-        mItemEffectLabel->setCaption("Effect:");
-        mItemDescriptionLabel->setCaption("Description:");
+        mItemName = "Name:";
+        mItemNameLabel->setTextWrapped(mItemName);
+        mItemEffect = "Effect:";
+        mItemEffectLabel->setTextWrapped(mItemEffect);
+        mItemDescription = "Description:";
+        mItemDescriptionLabel->setTextWrapped(mItemDescription);
     }
     else
     {
         const ItemInfo& itemInfo = item->getInfo();
-        std::string SomeText;
-        SomeText = "Name: " + itemInfo.getName();
-        mItemNameLabel->setCaption(SomeText);
-        SomeText = "Effect: " + itemInfo.getEffect();
-        mItemEffectLabel->setCaption(SomeText);
-        SomeText = "Description: " + itemInfo.getDescription();
-        mItemDescriptionLabel->setCaption(SomeText);
+        mItemName = "Name: " + itemInfo.getName();
+        mItemNameLabel->setTextWrapped(mItemName);
+        mItemEffect = "Effect: " + itemInfo.getEffect();
+        mItemEffectLabel->setTextWrapped(mItemEffect);
+        mItemDescription = "Description: " + itemInfo.getDescription();
+        mItemDescriptionLabel->setTextWrapped(mItemDescription);
     }
+
+    draw();
 }
 
 void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
@@ -173,36 +191,54 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
     }
 }
 
-void InventoryWindow::widgetResized(const gcn::Event &event)
+void InventoryWindow::draw()
 {
-    Window::widgetResized(event);
-
     const gcn::Rectangle &area = getChildrenArea();
     const int width = area.width;
     const int height = area.height;
 
-    // Adjust widgets
+    // Update weight information
+    mWeightLabel->setTextWrapped(mWeight);
+    mWeightLabel->setMinWidth(width - 16);
+    mWeightLabel->setWidth(width - 16);
+
     mUseButton->setPosition(8, height - 8 - mUseButton->getHeight());
     mDropButton->setPosition(8 + mUseButton->getWidth() + 5,
             mUseButton->getY());
 
+    mItemNameLabel->setMinWidth(width - 16);
+    mItemNameLabel->setTextWrapped(mItemName);
     mItemNameLabel->setDimension(gcn::Rectangle(8,
-            mUseButton->getY() - 5 - mItemNameLabel->getHeight(),
+            mUseButton->getY() - 5 - (mItemNameLabel->getNumberOfRows()*15),
             width - 16,
-            mItemNameLabel->getHeight()));
+            (mItemNameLabel->getNumberOfRows()*15)));
+    mItemEffectLabel->setMinWidth(width - 16);
+    mItemEffectLabel->setTextWrapped(mItemEffect);
     mItemEffectLabel->setDimension(gcn::Rectangle(8,
-            mItemNameLabel->getY() - 5 - mItemEffectLabel->getHeight(),
+            mItemNameLabel->getY() - 5 - (mItemEffectLabel->getNumberOfRows()*15),
             width - 16,
-            mItemEffectLabel->getHeight()));
+            (mItemEffectLabel->getNumberOfRows()*15)));
+    mItemDescriptionLabel->setMinWidth(width - 16);
+    mItemDescriptionLabel->setTextWrapped(mItemDescription);
     mItemDescriptionLabel->setDimension(gcn::Rectangle(8,
-            mItemEffectLabel->getY() - 5 - mItemDescriptionLabel->getHeight(),
+            mItemEffectLabel->getY() - 5 - (mItemDescriptionLabel->getNumberOfRows()*15),
             width - 16,
-            mItemDescriptionLabel->getHeight()));
+            (mItemDescriptionLabel->getNumberOfRows()*15)));
 
     mInvenScroll->setSize(width - 16,
-            mItemDescriptionLabel->getY() - mWeightLabel->getHeight() - 18);
+            mItemDescriptionLabel->getY() - (mWeightLabel->getNumberOfRows()*15) - 18);
+    mInvenScroll->setPosition(8, (mWeightLabel->getNumberOfRows()*15) + 10);
 
-    mWeightLabel->setWidth(width - 16);
+    setMinHeight(130 + (mWeightLabel->getNumberOfRows()*15) + 
+                       (mItemDescriptionLabel->getNumberOfRows()*15) +
+                       (mItemEffectLabel->getNumberOfRows()*15) +
+                       (mItemNameLabel->getNumberOfRows()*15));
+}
+
+void InventoryWindow::widgetResized(const gcn::Event &event)
+{
+    Window::widgetResized(event);
+    draw();
 }
 
 void InventoryWindow::updateButtons()
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 4793069c..e6170dac 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -27,6 +27,7 @@
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
 
+#include "textbox.h"
 #include "window.h"
 
 #include "../guichanfwd.h"
@@ -70,6 +71,11 @@ class InventoryWindow : public Window, gcn::ActionListener,
 
         void mouseClicked(gcn::MouseEvent &event);
 
+        /**
+         * Updates window drawing.
+         */
+        void draw();
+
         /**
          * Called whenever the widget changes size.
          */
@@ -80,12 +86,18 @@ class InventoryWindow : public Window, gcn::ActionListener,
 
         ItemContainer *mItems;
 
+        std::string mItemName;
+        std::string mItemDescription;
+        std::string mItemEffect;
+        std::string mWeight;
+        std::string mTotalWeight;
+        std::string mMaxWeight;
         gcn::Button *mUseButton, *mDropButton;
         gcn::ScrollArea *mInvenScroll;
-        gcn::Label *mItemNameLabel;
-        gcn::Label *mItemDescriptionLabel;
-        gcn::Label *mItemEffectLabel;
-        gcn::Label *mWeightLabel;
+        TextBox *mItemNameLabel;
+        TextBox *mItemDescriptionLabel;
+        TextBox *mItemEffectLabel;
+        TextBox *mWeightLabel;
 };
 
 extern InventoryWindow *inventoryWindow;
-- 
cgit v1.2.3-70-g09d2


From 81299ca9acc39dec62e1e504781721ad0db0d471 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 1 Nov 2008 03:36:47 +0000
Subject: Made NPC dialogues resizeable.

---
 src/gui/inventorywindow.cpp |  2 --
 src/gui/npc_text.cpp        | 41 +++++++++++++++++++++++++++++++++--------
 src/gui/npc_text.h          | 18 ++++++++++++++++++
 src/gui/npclistdialog.cpp   | 35 ++++++++++++++++++++++++++++++-----
 src/gui/npclistdialog.h     | 17 +++++++++++++++++
 5 files changed, 98 insertions(+), 15 deletions(-)

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 5add1d4f..936416d1 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -48,7 +48,6 @@ InventoryWindow::InventoryWindow():
     setResizable(true);
     setCloseButton(true);
     setMinWidth(240);
-    setMinHeight(172);
     // If you adjust these defaults, don't forget to adjust the trade window's.
     setDefaultSize(115, 25, 322, 172);
 
@@ -200,7 +199,6 @@ void InventoryWindow::draw()
     // Update weight information
     mWeightLabel->setTextWrapped(mWeight);
     mWeightLabel->setMinWidth(width - 16);
-    mWeightLabel->setWidth(width - 16);
 
     mUseButton->setPosition(8, height - 8 - mUseButton->getHeight());
     mDropButton->setPosition(8 + mUseButton->getWidth() + 5,
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 8324a196..d74b3ddd 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -25,8 +25,6 @@
 
 #include <string>
 
-#include "scrollarea.h"
-#include "button.h"
 #include "textbox.h"
 
 #include "../npc.h"
@@ -34,11 +32,16 @@
 NpcTextDialog::NpcTextDialog():
     Window("NPC")
 {
+    setResizable(true);
+
+    setMinWidth(200);
+    setMinHeight(150);
+
     mTextBox = new TextBox;
     mTextBox->setEditable(false);
 
-    gcn::ScrollArea *scrollArea = new ScrollArea(mTextBox);
-    gcn::Button *okButton = new Button("OK", "ok", this);
+    scrollArea = new ScrollArea(mTextBox);
+    okButton = new Button("OK", "ok", this);
 
     setContentSize(260, 175);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
@@ -58,15 +61,37 @@ NpcTextDialog::NpcTextDialog():
 void
 NpcTextDialog::setText(const std::string &text)
 {
-    mTextBox->setMinWidth(230);
-    mTextBox->setTextWrapped(text);
+    mText = text;
+    draw();
 }
 
 void
 NpcTextDialog::addText(const std::string &text)
 {
-    mTextBox->setMinWidth(230);
-    mTextBox->setTextWrapped(mTextBox->getText() + text + "\n");
+    mText = mTextBox->getText() + text + "\n";
+    draw();
+}
+
+void NpcTextDialog::widgetResized(const gcn::Event &event)
+{
+    Window::widgetResized(event);
+    draw();
+}
+
+void NpcTextDialog::draw()
+{
+    const gcn::Rectangle &area = getChildrenArea();
+    const int width = area.width;
+    const int height = area.height;
+
+    mTextBox->setMinWidth(width - 30);
+    mTextBox->setTextWrapped(mText);
+
+    scrollArea->setDimension(gcn::Rectangle(
+                5, 5, width - 10, height - 15 - okButton->getHeight()));
+    okButton->setPosition(
+            width - 5 - okButton->getWidth(),
+            height - 5 - okButton->getHeight());
 }
 
 void
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index c9f13454..3773950a 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -27,6 +27,8 @@
 #include <iosfwd>
 #include <guichan/actionlistener.hpp>
 
+#include "scrollarea.h"
+#include "button.h"
 #include "window.h"
 
 #include "../guichanfwd.h"
@@ -48,6 +50,18 @@ class NpcTextDialog : public Window, public gcn::ActionListener
          */
         NpcTextDialog();
 
+        /**
+         * Called when resizing the window
+         *
+         * @param event The calling event
+         */
+        void widgetResized(const gcn::Event &event);
+
+        /**
+         * Redraws the window
+         */
+        void draw();
+
         /**
          * Called when receiving actions from the widgets.
          */
@@ -72,7 +86,11 @@ class NpcTextDialog : public Window, public gcn::ActionListener
         addText(const std::string &string);
 
     private:
+        gcn::Button *okButton;
+        gcn::ScrollArea *scrollArea;
         TextBox *mTextBox;
+
+        std::string mText;
 };
 
 #endif
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index e6523583..3203ba84 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -25,8 +25,6 @@
 
 #include <sstream>
 
-#include "button.h"
-#include "scrollarea.h"
 #include "listbox.h"
 
 #include "../npc.h"
@@ -34,10 +32,15 @@
 NpcListDialog::NpcListDialog():
     Window("NPC")
 {
+    setResizable(true);
+
+    setMinWidth(200);
+    setMinHeight(150);
+
     mItemList = new ListBox(this);
-    ScrollArea *scrollArea = new ScrollArea(mItemList);
-    Button *okButton = new Button("OK", "ok", this);
-    Button *cancelButton = new Button("Cancel", "cancel", this);
+    scrollArea = new ScrollArea(mItemList);
+    okButton = new Button("OK", "ok", this);
+    cancelButton = new Button("Cancel", "cancel", this);
 
     setContentSize(260, 175);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
@@ -90,6 +93,28 @@ NpcListDialog::reset()
     mItems.clear();
 }
 
+void NpcListDialog::widgetResized(const gcn::Event &event)
+{
+    Window::widgetResized(event);
+    draw();
+}
+
+void NpcListDialog::draw()
+{
+    const gcn::Rectangle &area = getChildrenArea();
+    const int width = area.width;
+    const int height = area.height;
+
+    scrollArea->setDimension(gcn::Rectangle(
+                5, 5, width - 10, height - 15 - okButton->getHeight()));
+    cancelButton->setPosition(
+            width - 5 - cancelButton->getWidth(),
+            height - 5 - cancelButton->getHeight());
+    okButton->setPosition(
+            cancelButton->getX() - 5 - okButton->getWidth(),
+            cancelButton->getY());
+}
+
 void
 NpcListDialog::action(const gcn::ActionEvent &event)
 {
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index a96fd766..4e9d4b3b 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -30,6 +30,8 @@
 #include <guichan/actionlistener.hpp>
 #include <guichan/listmodel.hpp>
 
+#include "button.h"
+#include "scrollarea.h"
 #include "window.h"
 
 #include "../guichanfwd.h"
@@ -50,6 +52,18 @@ class NpcListDialog : public Window, public gcn::ActionListener,
          */
         NpcListDialog();
 
+        /**
+         * Called when resizing the window
+         *
+         * @param event The calling event
+         */
+        void widgetResized(const gcn::Event &event);
+
+        /**
+         * Redraws the window
+         */
+        void draw();
+
         /**
          * Called when receiving actions from the widgets.
          */
@@ -84,6 +98,9 @@ class NpcListDialog : public Window, public gcn::ActionListener,
 
     private:
         gcn::ListBox *mItemList;
+        ScrollArea *scrollArea;
+        Button *okButton;
+        Button *cancelButton;
 
         std::vector<std::string> mItems;
 };
-- 
cgit v1.2.3-70-g09d2


From 16fcbac4db7ab690f2a1e301f3987012c7ff162b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 1 Nov 2008 03:39:59 +0000
Subject: Made the status window a static size, since its contents don't lend
 themselves to being easily resizeable without revamping. This should keep
 people from assuming that they can resize this window and expect the same
 sorts of results as other windows that are designed for resizing.

---
 src/gui/status.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 995b0149..79b3aec7 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -38,7 +38,6 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     mPlayer(player)
 {
     setWindowName("Status");
-    setResizable(true);
     setCloseButton(true);
     setDefaultSize((windowContainer->getWidth() - 365) / 2,
                    (windowContainer->getHeight() - 255) / 2, 365, 275);
-- 
cgit v1.2.3-70-g09d2


From 494e35cda96863f676409d304a916d9308040eab Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 1 Nov 2008 03:42:31 +0000
Subject: Added a close button to the minimap so that it matches the other
 windows better.

---
 src/gui/minimap.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 8640fdb0..8404e52a 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -35,6 +35,7 @@ Minimap::Minimap():
     mMapImage(NULL),
     mProportion(0.5)
 {
+    setCloseButton(true);
     setWindowName("MiniMap");
 }
 
-- 
cgit v1.2.3-70-g09d2


From 5cf18a062ffca03196b83fe6fda8ea3e54079c57 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 2 Nov 2008 00:33:31 +0000
Subject: Ported a patch from TMW by fate which de-hardcodes skills, as well as
 removes the server sending out view id's for gloves and boots (which weren't
 needed.) Here's the full log:

* Updated GUI table and model to better handle NULL widgets during initialisation
* On SMSG_MOVE et al., ignore boots and glove information-- that information is incorrect and we're guaranteed to
already have the correct information anyway.
* Properly decode `is dead' information for PCs, so that dead players, when encountered, will be lying on the ground,
dead, rather than standing.
* Use `skills.xml' file from client data to determine skill names
* Report client version number (hereby bumped to 1) in unused charserver slot (ignored by vanilla eAthena)
---
 src/gui/skill.cpp        | 181 ++++++++++++++++++++++++++++++++++-------------
 src/gui/skill.h          |  18 +++--
 src/gui/table.cpp        |  12 +++-
 src/gui/table_model.cpp  |  10 ++-
 src/gui/table_model.h    |   5 ++
 src/main.cpp             |   3 +-
 src/net/beinghandler.cpp |  14 ++--
 src/net/network.h        |   4 ++
 src/net/skillhandler.cpp |   1 +
 9 files changed, 184 insertions(+), 64 deletions(-)

diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 8cf1e06d..32c961bd 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -18,63 +18,119 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: skill.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $
+ *  $Id$
  */
 
+#include <algorithm>
+
 #include <guichan/widgets/label.hpp>
 
 #include "skill.h"
 
 #include "button.h"
 #include "listbox.h"
-#include "scrollarea.h"
 #include "windowcontainer.h"
 
 #include "../localplayer.h"
 
 #include "../utils/dtor.h"
+#include "../utils/xml.h"
+#include "log.h"
+
+#define SKILLS_FILE "skills.xml"
 
-const char *skill_db[] = {
-    // 0-99
-    "", "Basic", "Sword", "Two hand", "HP regeneration", "Bash", "Provoke", "Magnum", "Endure", "MP regeneration",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "MAX weight", "Discount", "Overcharge", "",
-    "Identify", "", "", "", "", "", "", "", "Double", "Miss",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    // 100-199
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "First aid", "Play as dead", "Moving recovery", "Fatal blow", "Auto berserk", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
-    "", "", "", "", "", "", "", "", "", "",
+struct SkillInfo {
+    std::string name;
+    bool modifiable;
+};
+
+std::vector<SkillInfo> skill_db;
+
+static void initSkillinfo(void);
+
+class SkillGuiTableModel : public StaticTableModel
+{
+public:
+    SkillGuiTableModel(SkillDialog *dialog) :
+        StaticTableModel(0, 3)
+    {
+        mEntriesNr = 0;
+        mDialog = dialog;
+        update();
+    }
+
+    virtual int
+    getRows(void) { return mEntriesNr; }
+
+    virtual int
+    getColumnWidth(int index)
+    {
+        switch (index) {
+        case 0:  return 160;
+        default: return 35;
+        }
+    }
+
+    virtual int
+    getRowHeight(void)
+    {
+        return 12;
+    }
+
+    virtual void
+    update(void)
+    {
+        mEntriesNr = mDialog->getSkills().size();
+        resize();
+
+        for (int i = 0; i < mEntriesNr; i++) {
+            SKILL *skill = mDialog->getSkills()[i];
+            SkillInfo *info = &skill_db[skill->id];
+            char tmp[128];
+
+            sprintf(tmp, "%c%s", info->modifiable? ' ' : '*', info->name.c_str());
+            gcn::Label *name_label = new gcn::Label(std::string(tmp));
+
+            sprintf(tmp, "Lv:%i", skill->lv);
+            gcn::Label *lv_label = new gcn::Label(std::string(tmp));
+
+            sprintf(tmp, "Sp:%i", skill->sp);
+            gcn::Label *sp_label = new gcn::Label(std::string(tmp));
+
+            set(i, 0, name_label);
+            set(i, 1, lv_label);
+            set(i, 2, sp_label);
+        }
+    }
+
+
+private:
+    SkillDialog *mDialog;
+    int mEntriesNr;
 };
 
 
 SkillDialog::SkillDialog():
     Window("Skills")
 {
+    initSkillinfo();
+    mTableModel = new SkillGuiTableModel(this);
+    mTable.setModel(mTableModel);
+    mTable.setLinewiseSelection(true);
+
     setWindowName("Skills");
     setCloseButton(true);
     setDefaultSize(windowContainer->getWidth() - 255, 25, 240, 240);
 
-    mSkillListBox = new ListBox(this);
-    ScrollArea *skillScrollArea = new ScrollArea(mSkillListBox);
+//    mSkillListBox = new ListBox(this);
+    skillScrollArea = new ScrollArea(&mTable);
     mPointsLabel = new gcn::Label("Skill Points:");
     mIncButton = new Button("Up", "inc", this);
     mUseButton = new Button("Use", "use", this);
     mUseButton->setEnabled(false);
 
-    mSkillListBox->setActionEventId("skill");
+//    mSkillListBox->setActionEventId("skill");
+    mTable.setActionEventId("skill");
 
     skillScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     skillScrollArea->setDimension(gcn::Rectangle(5, 5, 230, 180));
@@ -88,7 +144,8 @@ SkillDialog::SkillDialog():
     add(mIncButton);
     add(mUseButton);
 
-    mSkillListBox->addActionListener(this);
+//    mSkillListBox->addActionListener(this);
+    mTable.addActionListener(this);
 
     setLocationRelativeTo(getParent());
     loadWindowState();
@@ -96,7 +153,6 @@ SkillDialog::SkillDialog():
 
 SkillDialog::~SkillDialog()
 {
-    cleanList();
 }
 
 void SkillDialog::action(const gcn::ActionEvent &event)
@@ -104,7 +160,7 @@ void SkillDialog::action(const gcn::ActionEvent &event)
     if (event.getId() == "inc")
     {
         // Increment skill
-        int selectedSkill = mSkillListBox->getSelected();
+        int selectedSkill = mTable.getSelectedRow();//mSkillListBox->getSelected();
         if (selectedSkill >= 0)
         {
             player_node->raiseSkill(mSkillList[selectedSkill]->id);
@@ -113,7 +169,7 @@ void SkillDialog::action(const gcn::ActionEvent &event)
     else if (event.getId() == "skill")
     {
         mIncButton->setEnabled(
-                mSkillListBox->getSelected() > -1 &&
+                mTable.getSelectedRow() > -1 &&
                 player_node->mSkillPoint > 0);
     }
     else if (event.getId() == "close")
@@ -130,8 +186,13 @@ void SkillDialog::update()
         mPointsLabel->setCaption(tmp);
     }
 
-    mIncButton->setEnabled(mSkillListBox->getSelected() > -1 &&
-            player_node->mSkillPoint > 0);
+    int selectedSkill = mTable.getSelectedRow();
+
+    mIncButton->setEnabled(selectedSkill > -1
+                           && skill_db[mSkillList[selectedSkill]->id].modifiable
+                           && player_node->mSkillPoint > 0);
+
+    mTableModel->update();
 }
 
 int SkillDialog::getNumberOfElements()
@@ -139,20 +200,6 @@ int SkillDialog::getNumberOfElements()
     return mSkillList.size();
 }
 
-std::string SkillDialog::getElementAt(int i)
-{
-    if (i >= 0 && i < (int)mSkillList.size())
-    {
-        char tmp[128];
-        sprintf(tmp, "%s    Lv: %i    Sp: %i",
-                skill_db[mSkillList[i]->id],
-                mSkillList[i]->lv,
-                mSkillList[i]->sp);
-        return tmp;
-    }
-    return "";
-}
-
 bool SkillDialog::hasSkill(int id)
 {
     for (unsigned int i = 0; i < mSkillList.size(); i++) {
@@ -184,6 +231,42 @@ void SkillDialog::setSkill(int id, int lvl, int mp)
 
 void SkillDialog::cleanList()
 {
-    delete_all(mSkillList);
+    for_each(mSkillList.begin(), mSkillList.end(), make_dtor(mSkillList));
     mSkillList.clear();
 }
+
+static void
+initSkillinfo(void)
+{
+    SkillInfo emptySkillInfo = { "", false };
+
+    XML::Document doc(SKILLS_FILE);
+    xmlNodePtr root = doc.rootNode();
+
+    if (!root || !xmlStrEqual(root->name, BAD_CAST "skills"))
+    {
+        logger->log("Error loading skills file: "
+                    SKILLS_FILE);
+        skill_db.resize(2, emptySkillInfo);
+        skill_db[1].name = "Basic";
+        skill_db[1].modifiable = true;
+        return;
+    }
+
+    for_each_xml_child_node(node, root)
+    {
+        if (xmlStrEqual(node->name, BAD_CAST "skill"))
+        {
+            int index = atoi(XML::getProperty(node, "id", "-1").c_str());
+            std::string name = XML::getProperty(node, "name", "");
+            bool modifiable = !atoi(XML::getProperty(node, "fixed", "0").c_str());
+
+            if (index >= 0) {
+                skill_db.resize(index + 1, emptySkillInfo);
+                skill_db[index].name = name;
+                skill_db[index].modifiable = modifiable;
+            }
+        }
+    }
+}
+
diff --git a/src/gui/skill.h b/src/gui/skill.h
index 6bd6c51b..92badc8a 100644
--- a/src/gui/skill.h
+++ b/src/gui/skill.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: skill.h 3494 2007-08-20 05:29:12Z joshlangley $
+ *  $Id$
  */
 
 #ifndef _TMW_SKILL_H
@@ -26,9 +26,11 @@
 
 #include <vector>
 
-#include <guichan/listmodel.hpp>
 #include <guichan/actionlistener.hpp>
+#include <guichan/listmodel.hpp>
 
+#include "scrollarea.h"
+#include "table.h"
 #include "window.h"
 
 #include "../guichanfwd.h"
@@ -38,13 +40,14 @@ struct SKILL {
     short lv, sp;
 };
 
+class SkillGuiTableModel;
+
 /**
  * The skill dialog.
  *
  * \ingroup Interface
  */
-class SkillDialog : public Window, public gcn::ActionListener,
-                    public gcn::ListModel
+class SkillDialog : public Window, public gcn::ActionListener
 {
     public:
         /**
@@ -62,15 +65,18 @@ class SkillDialog : public Window, public gcn::ActionListener,
         void update();
 
         int getNumberOfElements();
-        std::string getElementAt(int);
 
         bool hasSkill(int id);
         void addSkill(int id, int lv, int sp);
         void setSkill(int id, int lv, int sp);
         void cleanList();
 
+        const std::vector<SKILL*>& getSkills(void) const { return mSkillList; }
+
     private:
-        gcn::ListBox *mSkillListBox;
+        GuiTable mTable;//gcn::ListBox *mSkillListBox;
+        ScrollArea *skillScrollArea;
+        SkillGuiTableModel *mTableModel;
         gcn::Label *mPointsLabel;
         gcn::Button *mIncButton;
         gcn::Button *mUseButton;
diff --git a/src/gui/table.cpp b/src/gui/table.cpp
index 89a93825..8d2ab86a 100644
--- a/src/gui/table.cpp
+++ b/src/gui/table.cpp
@@ -102,11 +102,14 @@ GuiTable::setModel(TableModel *new_model)
         mModel->removeListener(this);
     }
 
+
     mModel = new_model;
     installActionListeners();
 
-    new_model->installListener(this);
-    recomputeDimensions();
+    if (new_model) {
+        new_model->installListener(this);
+        recomputeDimensions();
+    }
 }
 
 
@@ -187,6 +190,9 @@ GuiTable::uninstallActionListeners(void)
 void
 GuiTable::installActionListeners(void)
 {
+    if (!mModel)
+        return;
+
     int rows = mModel->getRows();
     int columns = mModel->getColumns();
 
@@ -367,7 +373,7 @@ GuiTable::getWidgetAt(int x, int y)
     if (row > -1
         && column > -1) {
         gcn::Widget *w = mModel->getElementAt(row, column);
-        if (w->isFocusable())
+        if (w && w->isFocusable())
             return w;
         else
             return NULL; // Grab the event locally
diff --git a/src/gui/table_model.cpp b/src/gui/table_model.cpp
index 78df0636..57da29d9 100644
--- a/src/gui/table_model.cpp
+++ b/src/gui/table_model.cpp
@@ -70,11 +70,19 @@ StaticTableModel::~StaticTableModel(void)
             delete *it;
 }
 
+void
+StaticTableModel::resize(void)
+{
+    mRows = getRows();
+    mColumns = getColumns();
+    mTableModel.resize(mRows * mColumns, NULL);
+}
+
 void
 StaticTableModel::set(int row, int column, gcn::Widget *widget)
 {
     if (row >= mRows || row < 0
-        || column >= mColumns || row > 0)
+        || column >= mColumns || column < 0)
         // raise exn?
         return;
 
diff --git a/src/gui/table_model.h b/src/gui/table_model.h
index 48ef1c0d..69e41cd3 100644
--- a/src/gui/table_model.h
+++ b/src/gui/table_model.h
@@ -120,6 +120,11 @@ public:
      */
     virtual void fixRowHeight(int height);
 
+    /**
+     * Resizes the table model
+     */
+    virtual void resize(void);
+
     virtual int getRows();
     virtual int getColumns();
     virtual int getRowHeight();
diff --git a/src/main.cpp b/src/main.cpp
index d41acba0..db7b16d4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -623,7 +623,8 @@ void charLogin(Network *network, LoginData *loginData)
     outMsg.writeInt32(loginData->account_ID);
     outMsg.writeInt32(loginData->session_ID1);
     outMsg.writeInt32(loginData->session_ID2);
-    outMsg.writeInt16(0); // unknown
+    // [Fate] The next word is unused by the old char server, so we squeeze in tmw client version information
+    outMsg.writeInt16(TMW_CLIENT_PROTOCOL_VERSION);
     outMsg.writeInt8(loginData->sex);
 
     // We get 4 useless bytes before the real answer comes in
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 85e18e5a..f19fd39c 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -406,8 +406,8 @@ void BeingHandler::handleMessage(MessageIn *msg)
             headTop = msg->readInt16();
             headMid = msg->readInt16();
             hairColor = msg->readInt16();
-            shoes = msg->readInt16();
-            gloves = msg->readInt16();
+            msg->readInt16();  // clothes color
+            msg->readInt16();  // head direction
             msg->readInt32();  // guild
             msg->readInt32();  // emblem
             msg->readInt16();  // manner
@@ -450,9 +450,15 @@ void BeingHandler::handleMessage(MessageIn *msg)
 
             if (msg->getId() == SMSG_PLAYER_UPDATE_1)
             {
-                if (msg->readInt8() == 2)
+                switch (msg->readInt8())
                 {
-                    dstBeing->setAction(Being::SIT);
+                    case 1:
+                        dstBeing->setAction(Being::DEAD);
+                        break;
+
+                    case 2:
+                        dstBeing->setAction(Being::SIT);
+                        break;
                 }
             }
             else if (msg->getId() == SMSG_PLAYER_MOVE)
diff --git a/src/net/network.h b/src/net/network.h
index 53800b1e..826e6776 100644
--- a/src/net/network.h
+++ b/src/net/network.h
@@ -29,6 +29,10 @@
 #include <SDL_thread.h>
 #include <string>
 
+#define TMW_CLIENT_PROTOCOL_VERSION     1
+     /***< Protocol version, reported to the eAthena char and mapserver who
+	   can adjust the protocol accordingly */
+
 class MessageHandler;
 class MessageIn;
 
diff --git a/src/net/skillhandler.cpp b/src/net/skillhandler.cpp
index 1f9403f4..3685d04b 100644
--- a/src/net/skillhandler.cpp
+++ b/src/net/skillhandler.cpp
@@ -73,6 +73,7 @@ void SkillHandler::handleMessage(MessageIn *msg)
                     }
                 }
             }
+            skillDialog->update();
             break;
 
         case SMSG_SKILL_FAILED:
-- 
cgit v1.2.3-70-g09d2


From 4ce57a9faccce077c21596f441a6683a832c0f04 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 2 Nov 2008 00:48:42 +0000
Subject: Reverted a TMW change that had a repercussion that I didn't think of.
 While TMW may think that it's unnecessary to use these view packets, what
 they fail to realize is that this is done so that you can see these viewed on
 OTHER players than yourself, otherwise there would never be a reason to use
 any of the clothing packets at all. So, my reccommendation, if any TMW person
 is reading these SVN logs at all, is to either add it back, or remove all
 clothing ID's in the SMSG_PLAYER_MOVE packet. This is yet again another
 reason why all TMW commits should not be treated as being good and should be
 tested first before committing to our own SVN.

---
 src/net/beinghandler.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index f19fd39c..951cb570 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -406,8 +406,8 @@ void BeingHandler::handleMessage(MessageIn *msg)
             headTop = msg->readInt16();
             headMid = msg->readInt16();
             hairColor = msg->readInt16();
-            msg->readInt16();  // clothes color
-            msg->readInt16();  // head direction
+            shoes = msg->readInt16();
+            gloves = msg->readInt16();
             msg->readInt32();  // guild
             msg->readInt32();  // emblem
             msg->readInt16();  // manner
-- 
cgit v1.2.3-70-g09d2


From d41605e5aff79d26075a7ddbc9e6c021b9a5c35b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 2 Nov 2008 01:23:14 +0000
Subject: Merged another fix from TMW for the new skill dialogue, which makes
 it so that if a skill is unknown, it doesn't crash the client (it doesn't
 print garbage, like fate claims).

---
 src/gui/skill.cpp | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 32c961bd..4296c506 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -80,14 +80,21 @@ public:
     virtual void
     update(void)
     {
+	static const SkillInfo fakeSkillInfo = { "???", false };
+
         mEntriesNr = mDialog->getSkills().size();
         resize();
 
         for (int i = 0; i < mEntriesNr; i++) {
             SKILL *skill = mDialog->getSkills()[i];
-            SkillInfo *info = &skill_db[skill->id];
+            SkillInfo const *info;
             char tmp[128];
 
+            if (skill->id >= 0 && (unsigned int) skill->id < skill_db.size())
+                info = &skill_db[skill->id];
+            else
+                info = &fakeSkillInfo;
+
             sprintf(tmp, "%c%s", info->modifiable? ' ' : '*', info->name.c_str());
             gcn::Label *name_label = new gcn::Label(std::string(tmp));
 
@@ -188,9 +195,18 @@ void SkillDialog::update()
 
     int selectedSkill = mTable.getSelectedRow();
 
-    mIncButton->setEnabled(selectedSkill > -1
-                           && skill_db[mSkillList[selectedSkill]->id].modifiable
-                           && player_node->mSkillPoint > 0);
+    if (selectedSkill >= 0) {
+        int skillId = mSkillList[selectedSkill]->id;
+        bool modifiable;
+ 	 
+        if (skillId >= 0 && (unsigned int) skillId < skill_db.size())
+            modifiable = skill_db[skillId].modifiable;
+        else
+            modifiable = false;
+
+        mIncButton->setEnabled(modifiable && player_node->mSkillPoint > 0);
+    } else
+        mIncButton->setEnabled(false);
 
     mTableModel->update();
 }
-- 
cgit v1.2.3-70-g09d2


From 842336f6d028dd8995b777439c9d1bf41f152d0f Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 2 Nov 2008 02:07:04 +0000
Subject: Fixed weapon attacks, which apparently has been broken since the
 mapping code was imported, due to me changing the actions to enumerations.

---
 src/being.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index 245e023e..b4e7847d 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -276,9 +276,6 @@ void Being::setAction(Action action)
         case ATTACK:
             if (mEquippedWeapon)
             {
-                currentAction = mEquippedWeapon->getAttackType();
-            }
-            else {
                 currentAction = ACTION_ATTACK;
             }
             for (int i = 0; i < VECTOREND_SPRITE; i++)
-- 
cgit v1.2.3-70-g09d2


From 168eba19e2b4712c8410bd940e3bd1fbba746d1f Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 2 Nov 2008 02:41:08 +0000
Subject: Fixed a hair color problem that Soft reported that I apparently broke
 when I de-hardcoded the hair colors.

---
 src/being.cpp  | 2 +-
 src/player.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/being.cpp b/src/being.cpp
index b4e7847d..5c09218c 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -160,7 +160,7 @@ void Being::setPath(const Path &path)
 void Being::setHairStyle(int style, int color)
 {
     mHairStyle = style < 0 ? mHairStyle : style % mNumberOfHairstyles;
-    mHairColor = color;
+    mHairColor = color < 0 ? mHairColor : color % ColorDB::size();
 }
 
 void Being::setSprite(int slot, int id, std::string color)
diff --git a/src/player.cpp b/src/player.cpp
index c9d1e683..5fb5ffe9 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -160,6 +160,7 @@ void Player::setGender(int gender)
 void Player::setHairStyle(int style, int color)
 {
     style = style < 0 ? mHairStyle : style % mNumberOfHairstyles;
+    color = color < 0 ? mHairColor : color % ColorDB::size();
     if (style == mHairStyle && color == mHairColor) return;
 
     Being::setHairStyle(style, color);
-- 
cgit v1.2.3-70-g09d2


From da8d03a095ff2ef34f688db8c602c974be956223 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 2 Nov 2008 03:06:25 +0000
Subject: This correctly fixes the attack problem. Apparently, I didn't realize
 a bit ago that the item type was being used to determine which attack
 animation to use, since a comment lied about it not being used.

---
 src/being.cpp            | 4 ++++
 src/resources/itemdb.cpp | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index 5c09218c..7ad83e5e 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -275,6 +275,10 @@ void Being::setAction(Action action)
             break;
         case ATTACK:
             if (mEquippedWeapon)
+            {
+                currentAction = mEquippedWeapon->getAttackType();
+            }
+            else 
             {
                 currentAction = ACTION_ATTACK;
             }
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index ad9eda01..8b73f646 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -91,7 +91,7 @@ void ItemDB::load()
         std::string image = XML::getProperty(node, "image", "");
         std::string description = XML::getProperty(node, "description", "");
         std::string effect = XML::getProperty(node, "effect", "");
-        //int weaponType = XML::getProperty(node, "weapon_type", 0);// Not used by Aethyra
+        int weaponType = XML::getProperty(node, "weapon_type", 0);// Not used by Aethyra
 
         if (id)
         {
@@ -103,7 +103,7 @@ void ItemDB::load()
             itemInfo->setType(type);
             itemInfo->setView(view);
             //itemInfo->setWeight(weight);
-            //itemInfo->setWeaponType(weaponType);
+            itemInfo->setWeaponType(weaponType);
 
             for_each_xml_child_node(itemChild, node)
             {
-- 
cgit v1.2.3-70-g09d2


From 247fd9993dd95f411eeaf2a1a98887684ab9cb6c Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 2 Nov 2008 04:42:27 +0000
Subject: Fixed a few windows compiler errors, as well as rolled out a new
 Windows build.

---
 AethyraLin2WinXcompile.cbp | 3 ---
 src/gui/skill.cpp          | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/AethyraLin2WinXcompile.cbp b/AethyraLin2WinXcompile.cbp
index 2abfefb8..50881830 100644
--- a/AethyraLin2WinXcompile.cbp
+++ b/AethyraLin2WinXcompile.cbp
@@ -240,9 +240,6 @@
 		<Unit filename="src\gui\viewport.h" />
 		<Unit filename="src\gui\widgets\dropdown.cpp" />
 		<Unit filename="src\gui\widgets\dropdown.h" />
-		<Unit filename="src\gui\widgets\gettext.h" />
-		<Unit filename="src\gui\widgets\layout.cpp" />
-		<Unit filename="src\gui\widgets\layout.h" />
 		<Unit filename="src\gui\widgets\resizegrip.cpp" />
 		<Unit filename="src\gui\widgets\resizegrip.h" />
 		<Unit filename="src\gui\window.cpp" />
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 4296c506..5a23e2a8 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -35,7 +35,7 @@
 
 #include "../utils/dtor.h"
 #include "../utils/xml.h"
-#include "log.h"
+#include "../log.h"
 
 #define SKILLS_FILE "skills.xml"
 
-- 
cgit v1.2.3-70-g09d2


From 85381cb0cfeac608af58883810ffff134ac60ed3 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 2 Nov 2008 15:29:13 +0000
Subject: Since TMW de-hardcoded their hair colors, I have since removed the
 hard coded fail colors from the color db.

---
 src/resources/colordb.cpp | 44 +++++++++++++++++---------------------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index 26ba298d..271becbf 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -30,6 +30,7 @@
 #include "../utils/xml.h"
 
 #define HAIR_COLOR_FILE "colors.xml"
+#define TMW_COLOR_FILE "hair.xml"
 
 namespace
 {
@@ -47,41 +48,30 @@ void ColorDB::load()
 
     XML::Document doc(HAIR_COLOR_FILE);
     xmlNodePtr root = doc.rootNode();
+    bool TMWHair = false;
 
     if (!root || !xmlStrEqual(root->name, BAD_CAST "colors"))
     {
-        logger->log("Error loading colors file: "
-                    HAIR_COLOR_FILE);
-
-        // Provide "legacy" support for the TMW server that
-        // doesn't seperate out hair colors from the actual
-        // code. Seriously, this is freaking annoying.
-        mColors[0] = "#8c4b41,da9041,ffffff"; // light brown
-        mColors[1] = "#06372b,489e25,fdedcc"; // green
-        mColors[2] = "#5f0b33,91191c,f9ad81"; // dark red
-        mColors[3] = "#602486,934cc3,fdc689"; // purple
-        mColors[4] = "#805e74,c6b09b,ffffff"; // white
-        mColors[5] = "#8c6625,dab425,ffffff"; // yellow
-        mColors[6] = "#1d2d6d,1594a3,fdedcc"; // blue
-        mColors[7] = "#831f2d,be4f2d,f8cc8b"; // brown
-        mColors[8] = "#432482,584bbc,dae8e5"; // light blue
-        mColors[9] = "#460850,611967,e7b4ae"; // dark purple
+        logger->log("Error loading Aethyra's color, %s, trying TMW's color file, %s.", 
+                    HAIR_COLOR_FILE, TMW_COLOR_FILE);
+
+        TMWHair = true;
+        XML::Document doc(TMW_COLOR_FILE);
+        root = doc.rootNode();
     }
-    else
+    for_each_xml_child_node(node, root)
     {
-        for_each_xml_child_node(node, root)
+        if (xmlStrEqual(node->name, BAD_CAST "color"))
         {
-            if (xmlStrEqual(node->name, BAD_CAST "color"))
-            {
-                int id = XML::getProperty(node, "id", 0);
+            int id = XML::getProperty(node, "id", 0);
 
-                if (mColors.find(id) != mColors.end())
-                {
-                    logger->log("ColorDB: Redefinition of dye ID %d", id);
-                }
-
-                mColors[id] = XML::getProperty(node, "dye", "");
+            if (mColors.find(id) != mColors.end())
+            {
+                logger->log("ColorDB: Redefinition of dye ID %d", id);
             }
+
+            TMWHair ? mColors[id] = XML::getProperty(node, "value", "") :
+                      mColors[id] = XML::getProperty(node, "dye", "");
         }
     }
 
-- 
cgit v1.2.3-70-g09d2


From 25cda302161fe6be6f70a6228b8f40467c77929e Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 2 Nov 2008 15:35:36 +0000
Subject: Fixed a potential crash.

---
 src/resources/colordb.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index 271becbf..d654762c 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -58,6 +58,11 @@ void ColorDB::load()
         TMWHair = true;
         XML::Document doc(TMW_COLOR_FILE);
         root = doc.rootNode();
+        if (!root || !xmlStrEqual(root->name, BAD_CAST "colors"))
+        {
+            mLoaded = true;
+            return;
+        }
     }
     for_each_xml_child_node(node, root)
     {
-- 
cgit v1.2.3-70-g09d2


From 6c6b8104326941c4bd6c1f1d542e8969d82e97d8 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 3 Nov 2008 02:20:25 +0000
Subject: Fixed talk being recalled while t is held down. Thanks doors for
 noticing this bug.

---
 src/game.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index d7ce4314..10a66ce1 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -863,17 +863,20 @@ void Game::handleInput()
         // Talk to the nearest NPC if 't' pressed
         if ( keyboard.isKeyActive(keyboard.KEY_TALK) )
         {
-            Being *target = player_node->getTarget();
-
-            if (!target)
+            if (!npcTextDialog->isVisible() && !npcListDialog->isVisible())
             {
-                target = beingManager->findNearestLivingBeing(x, y, 20, Being::NPC);
-            }
+                Being *target = player_node->getTarget();
 
-            if (target)
-            {
-                if (target->getType() == Being::NPC)
-                    dynamic_cast<NPC*>(target)->talk();
+                if (!target)
+                {
+                    target = beingManager->findNearestLivingBeing(x, y, 20, Being::NPC);
+                }
+
+                if (target)
+                {
+                    if (target->getType() == Being::NPC)
+                        dynamic_cast<NPC*>(target)->talk();
+                }
             }
         }
 
-- 
cgit v1.2.3-70-g09d2


From c10473eac230927f0c8af3b2d3a8a5dbf867bb8a Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 3 Nov 2008 18:52:59 +0000
Subject: Updated a few files that have been out of date for a while. This
 doesn't fix make dist yet, but at least these files aren't out of date any
 more.

---
 AUTHORS                     |   13 +-
 configure.ac                |    2 +-
 debian/aethyra-data.install |    1 +
 debian/aethyra.menu         |    8 +-
 debian/aethyra.xpm          | 1088 +++++++++++++------------------------------
 debian/control              |   36 +-
 src/winver.h                |    6 +-
 7 files changed, 349 insertions(+), 805 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a672e18f..a9d7cb5e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,29 +2,30 @@
 Aethyra Dev Team
 ---------------------------
 
- Blameu aka Kevin Day (blame@aethyra.com.com)
+ Tametomo         <irarice@gmail.com>
 
 == Programmers ==
 
- Sanga            <sanga@aethyra.com>
  Kraant           <kraant@gmail.com>
- Tametomo
+ Tametomo         <irarice@gmail.com>
 
 == Artists ==
  
  Frictor
  Angeliex
  
-
 == Map Designers ==
 
  Ichigo Black (aka Gonzo Dark)
  Arkyan 
 
-== Inactive ==
+== Inactive/Retired ==
 
- Sertraline
+ Blameu aka Kevin Day (blame@aethyra.com.com)
+ Sanga            <sanga@aethyra.com>
  Scraggy          <DougABoffey@netscape.net>
+ Sertraline
+
 -----------------------
 The Mana World Dev Team
 -----------------------
diff --git a/configure.ac b/configure.ac
index 92672b8b..d24b00be 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([Aethyra], [Aethyra SVN 0.0.25], [blame582@gmail.com], [aethyra])
+AC_INIT([Aethyra], [Aethyra SVN 0.0.27], [irarice@gmail.com], [aethyra])
 AC_CONFIG_HEADERS([config.h:config.h.in])
 AC_LANG_CPLUSPLUS
 
diff --git a/debian/aethyra-data.install b/debian/aethyra-data.install
index 007bcf7b..c652dff3 100644
--- a/debian/aethyra-data.install
+++ b/debian/aethyra-data.install
@@ -1,4 +1,5 @@
 data/graphics/gui/*.png usr/share/games/aethyra/data/graphics/gui
+data/graphics/gui/*.xml usr/share/games/aethyra/data/graphics/gui
 data/graphics/images/*.png usr/share/games/aethyra/data/graphics/images
 data/graphics/images/ambient/*.png usr/share/games/aethyra/data/graphics/images/ambient
 data/graphics/tiles/*.png usr/share/games/aethyra/data/graphics/tiles
diff --git a/debian/aethyra.menu b/debian/aethyra.menu
index 4af5ad0a..42035107 100644
--- a/debian/aethyra.menu
+++ b/debian/aethyra.menu
@@ -1,4 +1,4 @@
-?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"
+?package(aethyra):needs="X11" section="Games/Adventure"\
+ title="Aethyra"\
+ description="Aethyra is a 2D MMORPG using eAthena."\
+ command="/usr/games/aethyra" icon="/usr/share/pixmaps/aethyra.xpm"
diff --git a/debian/aethyra.xpm b/debian/aethyra.xpm
index a3ab9513..515be72e 100644
--- a/debian/aethyra.xpm
+++ b/debian/aethyra.xpm
@@ -1,776 +1,312 @@
-/* XPM */
-static char * aethyra_xpm[] = {
-"32 32 741 2",
-"	c None",
-".	c #E8ED72",
-"+	c #E7ED6A",
-"@	c #E1EB62",
-"#	c #D4E758",
-"$	c #D2E750",
-"%	c #CDE748",
-"&	c #F5F4A1",
-"*	c #F3F294",
-"=	c #EBEE81",
-"-	c #EAEE77",
-";	c #E6ED6F",
-">	c #E1EB68",
-",	c #D9E859",
-"'	c #D3E851",
-")	c #CCE549",
-"!	c #C7E643",
-"~	c #BEE239",
-"{	c #B3DF32",
-"]	c #F8F8C4",
-"^	c #F9F7B3",
-"/	c #F4F3A2",
-"(	c #F4F397",
-"_	c #F5F39A",
-":	c #F2F399",
-"<	c #E2EA6D",
-"[	c #DFEA66",
-"}	c #DAE95C",
-"|	c #D3E753",
-"1	c #CAE54B",
-"2	c #C7E545",
-"3	c #BFE23C",
-"4	c #B7E034",
-"5	c #B1E130",
-"6	c #A5DC28",
-"7	c #F9F9DA",
-"8	c #F9F8CA",
-"9	c #F8F7C9",
-"0	c #F8F7CD",
-"a	c #F9F7C7",
-"b	c #F9F7B8",
-"c	c #F7F5A8",
-"d	c #E6EC73",
-"e	c #E0EA68",
-"f	c #DBE95D",
-"g	c #D8E956",
-"h	c #D2E850",
-"i	c #C4E343",
-"j	c #BEE23D",
-"k	c #B2E036",
-"l	c #A9DE2E",
-"m	c #A0DC29",
-"n	c #91D823",
-"o	c #F9F9F5",
-"p	c #F9F9EA",
-"q	c #F9F9E2",
-"r	c #F9F8E9",
-"s	c #F9F8E1",
-"t	c #F9F7D3",
-"u	c #F9F7BC",
-"v	c #F9F7AF",
-"w	c #E8EE80",
-"x	c #E2EC6F",
-"y	c #DBEA61",
-"z	c #D3E755",
-"A	c #CAE44C",
-"B	c #C6E446",
-"C	c #BDE441",
-"D	c #B8E337",
-"E	c #AADE30",
-"F	c #9DDA2A",
-"G	c #91D722",
-"H	c #87D61F",
-"I	c #7FD61B",
-"J	c #F9F9F8",
-"K	c #F9F9F7",
-"L	c #F9F9F0",
-"M	c #F9F8EC",
-"N	c #F9F7E1",
-"O	c #F9F7D7",
-"P	c #F9F7C9",
-"Q	c #F9F7B4",
-"R	c #EBF092",
-"S	c #E1EB69",
-"T	c #DBE95F",
-"U	c #D3E654",
-"V	c #CCE44A",
-"W	c #C9E647",
-"X	c #BDE13D",
-"Y	c #B1DE35",
-"Z	c #A8DD30",
-"`	c #9BDA29",
-" .	c #94D823",
-"..	c #8CD921",
-"+.	c #82D71C",
-"@.	c #7CD716",
-"#.	c #F9F9F9",
-"$.	c #F9F8F5",
-"%.	c #F9F7EE",
-"&.	c #F9F7E4",
-"*.	c #F9F7D5",
-"=.	c #F9F7CB",
-"-.	c #F9F7BF",
-";.	c #F4F39E",
-">.	c #E1EA76",
-",.	c #E0EA69",
-"'.	c #D9E85D",
-").	c #D7E859",
-"!.	c #CCE64E",
-"~.	c #C1E343",
-"{.	c #BBE23C",
-"].	c #B0DF34",
-"^.	c #A9DD2F",
-"/.	c #9AD928",
-"(.	c #90D822",
-"_.	c #8AD81F",
-":.	c #81D81B",
-"<.	c #76D517",
-"[.	c #F9F7F6",
-"}.	c #F9F7F4",
-"|.	c #F9F5D3",
-"1.	c #F9F6C7",
-"2.	c #F9F6B9",
-"3.	c #E6EC86",
-"4.	c #E6ED72",
-"5.	c #E3ED6C",
-"6.	c #D6E75E",
-"7.	c #D1E655",
-"8.	c #C7E34A",
-"9.	c #C1E141",
-"0.	c #B2DD39",
-"a.	c #B3E135",
-"b.	c #A6DE30",
-"c.	c #9BDB29",
-"d.	c #97DA24",
-"e.	c #87D71E",
-"f.	c #82D71B",
-"g.	c #87DA1F",
-"h.	c #63CF12",
-"i.	c #F8F8F8",
-"j.	c #F9F7F5",
-"k.	c #F9F5E3",
-"l.	c #F9F5D4",
-"m.	c #F9F6B8",
-"n.	c #EDF198",
-"o.	c #E1EB6F",
-"p.	c #E1EC68",
-"q.	c #D8E95C",
-"r.	c #D3E752",
-"s.	c #C9E44A",
-"t.	c #C7E746",
-"u.	c #BEE43D",
-"v.	c #B0E138",
-"w.	c #A8E02D",
-"x.	c #A3DF29",
-"y.	c #B4E226",
-"z.	c #CDEB2C",
-"A.	c #B9E925",
-"B.	c #6DD213",
-"C.	c #56C90F",
-"D.	c #F9F8F4",
-"E.	c #F9F7EB",
-"F.	c #F9F7F2",
-"G.	c #F9F5EA",
-"H.	c #F9F3DE",
-"I.	c #F9F4CF",
-"J.	c #F9F5C5",
-"K.	c #F9F5B8",
-"L.	c #F8F7B2",
-"M.	c #F1F495",
-"N.	c #E3EC6B",
-"O.	c #D8E859",
-"P.	c #CEE650",
-"Q.	c #C8E449",
-"R.	c #C2E441",
-"S.	c #BAE139",
-"T.	c #E7F24F",
-"U.	c #E3F347",
-"V.	c #DCF13E",
-"W.	c #D9F137",
-"X.	c #CDEE30",
-"Y.	c #C3EB27",
-"Z.	c #85D919",
-"`.	c #4FC90E",
-" +	c #F7F7F2",
-".+	c #F9F9F2",
-"++	c #F9F8ED",
-"@+	c #F9F5EE",
-"#+	c #F9F4E4",
-"$+	c #F9F5DC",
-"%+	c #F9F6D1",
-"&+	c #F9F6C2",
-"*+	c #F9F6B7",
-"=+	c #F9F6A6",
-"-+	c #F8F599",
-";+	c #F7F591",
-">+	c #F4F584",
-",+	c #D7EB61",
-"'+	c #C5E447",
-")+	c #BAE13E",
-"!+	c #B8E23A",
-"~+	c #B8E132",
-"{+	c #E6F349",
-"]+	c #E1F343",
-"^+	c #DAF13B",
-"/+	c #D2EF33",
-"(+	c #CBEE2E",
-"_+	c #C1EA25",
-":+	c #A9E61F",
-"<+	c #55CE10",
-"[+	c #4FC60D",
-"}+	c #F8F8E9",
-"|+	c #F9F9E8",
-"1+	c #F9F9E7",
-"2+	c #F9F8E4",
-"3+	c #F9F7F0",
-"4+	c #F9F6EF",
-"5+	c #F9F5E7",
-"6+	c #F9F3DB",
-"7+	c #F9F5D6",
-"8+	c #F9F7CE",
-"9+	c #F9F7BE",
-"0+	c #F9F7B7",
-"a+	c #F9F7A5",
-"b+	c #F7F691",
-"c+	c #F6F588",
-"d+	c #F5F580",
-"e+	c #DBEE6B",
-"f+	c #BAE13D",
-"g+	c #B5E137",
-"h+	c #A5DB2E",
-"i+	c #E0F041",
-"j+	c #DBF140",
-"k+	c #DAF138",
-"l+	c #D1EE32",
-"m+	c #C6EB2B",
-"n+	c #C0EC27",
-"o+	c #BAEB22",
-"p+	c #65D517",
-"q+	c #4FCC0B",
-"r+	c #F9F9D7",
-"s+	c #F9F9D6",
-"t+	c #F9F8EA",
-"u+	c #F9F7E8",
-"v+	c #F9F5E5",
-"w+	c #F9F5DD",
-"x+	c #F9F2D2",
-"y+	c #F9F3CA",
-"z+	c #F9F6C3",
-"A+	c #F9F7BA",
-"B+	c #F9F8B2",
-"C+	c #F8F89E",
-"D+	c #F8F58E",
-"E+	c #F5F583",
-"F+	c #EFF479",
-"G+	c #C5E557",
-"H+	c #C5E543",
-"I+	c #B9E13B",
-"J+	c #9FDA2A",
-"K+	c #CEEC3B",
-"L+	c #D9EF38",
-"M+	c #D4EE32",
-"N+	c #D1EF30",
-"O+	c #C8ED2A",
-"P+	c #C2EB26",
-"Q+	c #B5E81E",
-"R+	c #80DC1C",
-"S+	c #46C80B",
-"T+	c #F0F1C0",
-"U+	c #F9F8C7",
-"V+	c #F9F9C6",
-"W+	c #F9F8D5",
-"X+	c #F9F7DF",
-"Y+	c #F9F6D6",
-"Z+	c #F9F5D0",
-"`+	c #F9F3C4",
-" @	c #F9F3BC",
-".@	c #F9F5B5",
-"+@	c #F9F7B0",
-"@@	c #F9F8A4",
-"#@	c #F7F796",
-"$@	c #EFF386",
-"%@	c #D3E865",
-"&@	c #C7E450",
-"*@	c #C0E242",
-"=@	c #BEE33F",
-"-@	c #B5E036",
-";@	c #A7DB2F",
-">@	c #A0DC2B",
-",@	c #C4E32F",
-"'@	c #DCF139",
-")@	c #D2ED2E",
-"!@	c #CAEC2A",
-"~@	c #CBEF2B",
-"{@	c #BEEA22",
-"]@	c #B2E81E",
-"^@	c #8FDD17",
-"/@	c #3DC209",
-"(@	c #33BC07",
-"_@	c #F5F5B4",
-":@	c #F6F6AE",
-"<@	c #F6F6B1",
-"[@	c #F7F7B3",
-"}@	c #F2F3AB",
-"|@	c #F3F198",
-"1@	c #F8F5BA",
-"2@	c #F9F4B6",
-"3@	c #F9F3AF",
-"4@	c #F9F4A4",
-"5@	c #F8F7A2",
-"6@	c #F7F799",
-"7@	c #F6F68A",
-"8@	c #DDEC69",
-"9@	c #CEE74F",
-"0@	c #C0E03C",
-"a@	c #D5EA4C",
-"b@	c #BEE23A",
-"c@	c #A9DF2F",
-"d@	c #9EDD2A",
-"e@	c #BEE22A",
-"f@	c #DCF23A",
-"g@	c #D4F033",
-"h@	c #CBED2A",
-"i@	c #C5ED29",
-"j@	c #BDEB22",
-"k@	c #B4E81E",
-"l@	c #A5E618",
-"m@	c #41C209",
-"n@	c #3ABF07",
-"o@	c #DCDC8A",
-"p@	c #F3F49B",
-"q@	c #F3F49D",
-"r@	c #F2F49D",
-"s@	c #F4F59F",
-"t@	c #F4F59D",
-"u@	c #F1F498",
-"v@	c #F8F7BF",
-"w@	c #F9F6AF",
-"x@	c #F8F39A",
-"y@	c #F8F594",
-"z@	c #F5F57D",
-"A@	c #DDEC66",
-"B@	c #C2E144",
-"C@	c #BDE13F",
-"D@	c #BFD82E",
-"E@	c #E6EF4E",
-"F@	c #E1F04A",
-"G@	c #C2E433",
-"H@	c #CDEA34",
-"I@	c #DDF03F",
-"J@	c #D4EF36",
-"K@	c #CFEF30",
-"L@	c #CBEE2A",
-"M@	c #C2EC26",
-"N@	c #B7E91F",
-"O@	c #ADE71C",
-"P@	c #A0E517",
-"Q@	c #3FC008",
-"R@	c #33BD06",
-"S@	c #DDD97B",
-"T@	c #F2F392",
-"U@	c #F0F28F",
-"V@	c #F1F38C",
-"W@	c #F6F7BE",
-"X@	c #F5F6B7",
-"Y@	c #F5F5B2",
-"Z@	c #F9F6A7",
-"`@	c #F9F6A3",
-" #	c #F8F59C",
-".#	c #F8F38D",
-"+#	c #F7F58C",
-"@#	c #F5F687",
-"##	c #F3F576",
-"$#	c #F0F575",
-"%#	c #DDEC57",
-"&#	c #D8EA49",
-"*#	c #DDE946",
-"=#	c #E8F14F",
-"-#	c #E3F148",
-";#	c #E2F346",
-">#	c #E1F345",
-",#	c #D8F039",
-"'#	c #D1EF31",
-")#	c #CAED2C",
-"!#	c #C4EC27",
-"~#	c #C1ED24",
-"{#	c #B6EA1F",
-"]#	c #AFEA1C",
-"^#	c #A4E717",
-"/#	c #3EBF08",
-"(#	c #37C206",
-"_#	c #E8EB6C",
-":#	c #E6ED76",
-"<#	c #E4EC73",
-"[#	c #ECEF86",
-"}#	c #F8F7A7",
-"|#	c #F9F7A7",
-"1#	c #F8F7A3",
-"2#	c #F8F69D",
-"3#	c #F8F69A",
-"4#	c #F7F48A",
-"5#	c #F6F27B",
-"6#	c #F6F482",
-"7#	c #F3F57B",
-"8#	c #F1F574",
-"9#	c #F0F46C",
-"0#	c #EBF25E",
-"a#	c #EBF259",
-"b#	c #E7F152",
-"c#	c #E1EF44",
-"d#	c #DFEF40",
-"e#	c #D7EE3B",
-"f#	c #DAF039",
-"g#	c #D7F137",
-"h#	c #D1F032",
-"i#	c #CCEF2C",
-"j#	c #C6EE26",
-"k#	c #B7EA1F",
-"l#	c #AAE81A",
-"m#	c #97E415",
-"n#	c #37BE07",
-"o#	c #2CAF05",
-"p#	c #D5DC5B",
-"q#	c #E4ED6F",
-"r#	c #E9F082",
-"s#	c #F8F7A1",
-"t#	c #F8F79D",
-"u#	c #F7F696",
-"v#	c #F6F68B",
-"w#	c #F5F37B",
-"x#	c #F5F378",
-"y#	c #F3F372",
-"z#	c #F1F36C",
-"A#	c #EEF468",
-"B#	c #ECF35D",
-"C#	c #EAF256",
-"D#	c #E7F151",
-"E#	c #E4F148",
-"F#	c #E0F043",
-"G#	c #E1F143",
-"H#	c #D9EF39",
-"I#	c #D2ED31",
-"J#	c #CEF030",
-"K#	c #C9EF2A",
-"L#	c #C0ED25",
-"M#	c #ADE61C",
-"N#	c #A7E619",
-"O#	c #A5E818",
-"P#	c #80D913",
-"Q#	c #34BE06",
-"R#	c #35BF05",
-"S#	c #E0EC61",
-"T#	c #E4ED72",
-"U#	c #F7F792",
-"V#	c #F7F791",
-"W#	c #F8F78F",
-"X#	c #F6F687",
-"Y#	c #F6F688",
-"Z#	c #F3F377",
-"`#	c #F4F474",
-" $	c #F1F472",
-".$	c #EEF46D",
-"+$	c #DEEB59",
-"@$	c #E7F059",
-"#$	c #E9F356",
-"$$	c #E9F255",
-"%$	c #E7F24D",
-"&$	c #E6F245",
-"*$	c #E4F243",
-"=$	c #DFF240",
-"-$	c #D7EF36",
-";$	c #CCEB2B",
-">$	c #CDEE2C",
-",$	c #C5ED2A",
-"'$	c #BDEB25",
-")$	c #ADE71E",
-"!$	c #A6E51A",
-"~$	c #9AE316",
-"{$	c #93E214",
-"]$	c #5CC30B",
-"^$	c #34BD05",
-"/$	c #DDEC59",
-"($	c #D6E858",
-"_$	c #F5F57C",
-":$	c #F5F680",
-"<$	c #F5F67E",
-"[$	c #F5F67C",
-"}$	c #F4F574",
-"|$	c #F1F26A",
-"1$	c #F2F46F",
-"2$	c #EFF468",
-"3$	c #BCE24A",
-"4$	c #BBDF38",
-"5$	c #B9DB30",
-"6$	c #C3DF33",
-"7$	c #DDED42",
-"8$	c #E5F249",
-"9$	c #DEF03D",
-"0$	c #D5EF35",
-"a$	c #CEEE2E",
-"b$	c #C1E925",
-"c$	c #B9E923",
-"d$	c #B1E71E",
-"e$	c #ABE619",
-"f$	c #A8E517",
-"g$	c #94E113",
-"h$	c #83DE11",
-"i$	c #35AD06",
-"j$	c #2FBB04",
-"k$	c #CEE249",
-"l$	c #CFE54B",
-"m$	c #E8F16F",
-"n$	c #F5F578",
-"o$	c #F4F674",
-"p$	c #F1F46D",
-"q$	c #F2F268",
-"r$	c #F1F366",
-"s$	c #EFF462",
-"t$	c #DEEF5B",
-"u$	c #B3E039",
-"v$	c #B4E037",
-"w$	c #AEDE31",
-"x$	c #A6DB2B",
-"y$	c #BBE331",
-"z$	c #E3F243",
-"A$	c #DFF141",
-"B$	c #D9F038",
-"C$	c #D9F136",
-"D$	c #CDEF2E",
-"E$	c #C7EE2A",
-"F$	c #BDEB24",
-"G$	c #B7EA1D",
-"H$	c #A0E316",
-"I$	c #96E214",
-"J$	c #93E212",
-"K$	c #6DD10D",
-"L$	c #2CAD04",
-"M$	c #2AB303",
-"N$	c #CDE746",
-"O$	c #CDE74B",
-"P$	c #F0F56D",
-"Q$	c #F2F46A",
-"R$	c #F0F264",
-"S$	c #ECF15A",
-"T$	c #EFF361",
-"U$	c #EDF45A",
-"V$	c #EBF45C",
-"W$	c #B9E239",
-"X$	c #B6E335",
-"Y$	c #ADE02E",
-"Z$	c #A9E02B",
-"`$	c #A4DE28",
-" %	c #DFF243",
-".%	c #D7EF35",
-"+%	c #D5EF31",
-"@%	c #D4F031",
-"#%	c #CDEF2C",
-"$%	c #C7ED28",
-"%%	c #C6EE27",
-"&%	c #C1EE23",
-"*%	c #B6EC1F",
-"=%	c #A7E818",
-"-%	c #67CC0E",
-";%	c #47C208",
-">%	c #34B906",
-",%	c #2DBD04",
-"'%	c #C1E23C",
-")%	c #C3E53E",
-"!%	c #D7EB4F",
-"~%	c #EEF257",
-"{%	c #ECF057",
-"]%	c #EAF051",
-"^%	c #EBF255",
-"/%	c #EBF452",
-"(%	c #E9F450",
-"_%	c #B8E137",
-":%	c #A3DB2A",
-"<%	c #A5DF2B",
-"[%	c #98DA26",
-"}%	c #8CD621",
-"|%	c #90D41D",
-"1%	c #BFE326",
-"2%	c #D0EE2D",
-"3%	c #CEEF2E",
-"4%	c #C8EE28",
-"5%	c #C1ED26",
-"6%	c #BCEC22",
-"7%	c #B9ED20",
-"8%	c #9FE419",
-"9%	c #70CD0F",
-"0%	c #35B906",
-"a%	c #34C005",
-"b%	c #30C005",
-"c%	c #26B503",
-"d%	c #B7E036",
-"e%	c #B7E239",
-"f%	c #E2EF4B",
-"g%	c #EBF451",
-"h%	c #E5F14B",
-"i%	c #E4F04B",
-"j%	c #E7F451",
-"k%	c #E6F44B",
-"l%	c #B6DD2C",
-"m%	c #ABDC25",
-"n%	c #B4DF23",
-"o%	c #A3D61D",
-"p%	c #96D91D",
-"q%	c #86D218",
-"r%	c #B3DE21",
-"s%	c #CAED2B",
-"t%	c #C6EC25",
-"u%	c #BEEB22",
-"v%	c #BDEC20",
-"w%	c #B3EA1D",
-"x%	c #9AE017",
-"y%	c #46BC07",
-"z%	c #40C107",
-"A%	c #35C206",
-"B%	c #2EBE05",
-"C%	c #2BBD04",
-"D%	c #B2E130",
-"E%	c #B5E334",
-"F%	c #DFF042",
-"G%	c #E4F147",
-"H%	c #E5F348",
-"I%	c #E2F246",
-"J%	c #E4F445",
-"K%	c #DFF33F",
-"L%	c #E0F33D",
-"M%	c #DCF238",
-"N%	c #D8F034",
-"O%	c #D2EF2E",
-"P%	c #CBEB29",
-"Q%	c #D1EF2D",
-"R%	c #C7ED26",
-"S%	c #C5EE26",
-"T%	c #B7EA20",
-"U%	c #B5EA1D",
-"V%	c #AEEA1B",
-"W%	c #85D813",
-"X%	c #3FC208",
-"Y%	c #3AC507",
-"Z%	c #33C005",
-"`%	c #2BBB04",
-" &	c #26A903",
-".&	c #A9E029",
-"+&	c #A5DF29",
-"@&	c #A5DE29",
-"#&	c #D8EE3D",
-"$&	c #E4F341",
-"%&	c #E2F340",
-"&&	c #E0F33C",
-"*&	c #DDF239",
-"=&	c #D9F236",
-"-&	c #D6F133",
-";&	c #D3F131",
-">&	c #CEEE2A",
-",&	c #CEEF28",
-"'&	c #CBEF29",
-")&	c #BFEB22",
-"!&	c #B2EB23",
-"~&	c #81DD1D",
-"{&	c #6DCF11",
-"]&	c #68D10F",
-"^&	c #4CCB0E",
-"/&	c #39C407",
-"(&	c #33C106",
-"_&	c #2ABB04",
-":&	c #27B803",
-"<&	c #97DA23",
-"[&	c #98DC24",
-"}&	c #95DC23",
-"|&	c #93DB25",
-"1&	c #99DF2A",
-"2&	c #C6EC31",
-"3&	c #C6EB2E",
-"4&	c #ADE026",
-"5&	c #C1E928",
-"6&	c #CCEE29",
-"7&	c #C9ED26",
-"8&	c #B9EA21",
-"9&	c #8FD718",
-"0&	c #4FC30C",
-"a&	c #4DCB0B",
-"b&	c #49CB0A",
-"c&	c #3DC508",
-"d&	c #3DC808",
-"e&	c #34C306",
-"f&	c #2DBC04",
-"g&	c #2CBF04",
-"h&	c #88D81D",
-"i&	c #87D81A",
-"j&	c #86D81A",
-"k&	c #7ED518",
-"l&	c #75D015",
-"m&	c #71D113",
-"n&	c #84DB1A",
-"o&	c #9DE524",
-"p&	c #7CD316",
-"q&	c #62CA0E",
-"r&	c #5AC80B",
-"s&	c #55C90B",
-"t&	c #46CA0A",
-"u&	c #41C708",
-"v&	c #3DC907",
-"w&	c #36C406",
-"x&	c #30C205",
-"y&	c #27AA04",
-"z&	c #75D016",
-"A&	c #79D516",
-"B&	c #73D515",
-"C&	c #6AD113",
-"D&	c #6CD413",
-"E&	c #65D211",
-"F&	c #5BCD0F",
-"G&	c #56CD0E",
-"H&	c #58D10E",
-"I&	c #50CC0C",
-"J&	c #48C809",
-"K&	c #40C708",
-"L&	c #3FC607",
-"M&	c #40C907",
-"N&	c #38C706",
-"O&	c #32C105",
-"P&	c #57BE0F",
-"Q&	c #61D111",
-"R&	c #66D411",
-"S&	c #62D20F",
-"T&	c #57CD0D",
-"U&	c #57D00C",
-"V&	c #4DCC0C",
-"W&	c #4BCD0A",
-"X&	c #40C608",
-"Y&	c #3DC807",
-"Z&	c #30B505",
-"`&	c #4BBC0B",
-" *	c #4CC20A",
-".*	c #48BF0A",
-"+*	c #45C109",
-"@*	c #38B507",
-"#*	c #31B506",
-"                          . + @ # $ %                           ",
-"                    & * = - ; > , ' ) ! ~ {                     ",
-"                ] ^ / ( _ : < [ } | 1 2 3 4 5 6                 ",
-"              7 8 9 0 a b c d e f g h i j k l m n               ",
-"          o p q r s t a u v w x y z A B C D E F G H I           ",
-"        J K L o M N O P u Q R S T U V W X Y Z `  ...+.@.        ",
-"        #.K J $.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.        ",
-"      #.#.J [.}.%.&.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.      ",
-"    i.#.K [.j.}.%.k.l.1.m.n.o.p.q.r.s.t.u.v.E w.x.y.z.A.B.C.    ",
-"    #.K D.E.}.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.D T.U.V.W.X.Y.Z.`.    ",
-"   +.+.+++&.F.@+#+$+%+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+  ",
-"  }+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+9.f+g+h+i+j+k+l+m+n+o+p+q+  ",
-"  r+r+s+t+u+v+w+x+y+z+A+B+C+D+E+F+G+H+I+].J+K+L+M+N+O+P+Q+R+S+  ",
-"T+U+V+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@",
-"_@:@<@[@[@}@|@1@2@3@4@5@6@7@8@9@W 0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@",
-"o@p@q@r@s@t@u@v@w@4@x@y@b+z@A@B@C@D@E@F@G@H@I@J@K@L@M@N@O@P@Q@R@",
-"S@T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#",
-"_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h#i#j#k#O@l#m#n#o#",
-"p#q#r#5@s#t#u#b+v#w#x#y#z#A#B#C#D#E#F#G#H#I#'#J#K#L#M#N#O#P#Q#R#",
-"  S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$;$>$,$'$)$!$~${$]$^$  ",
-"  /$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$G#9$k+0$a$b$c$d$e$f$g$h$i$j$  ",
-"  k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$'#D$E$F$G$H$I$J$K$L$M$  ",
-"    N$O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%>%,%    ",
-"    '%)%!%~%{%]%^%/%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8%9%0%a%b%c%    ",
-"      d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v%w%x%y%z%A%B%C%      ",
-"        D%E%F%G%H%I%J%K%L%M%N%O%P%Q%R%S%T%U%V%W%X%Y%Z%`% &      ",
-"        .&+&@&#&$&%&&&*&=&-&;&>&,&'&)&!&~&{&]&^&/&(&_&:&        ",
-"          <&[&}&|&1&2&3&4&5&6&7&{@8&9&0&a&b&c&d&e&f&g&          ",
-"              h&i&j&k&l&m&n&o&p&q&r&s&a&t&u&v&w&x&y&            ",
-"                z&A&B&C&D&E&F&G&H&I&J&K&L&M&N&O&                ",
-"                    P&Q&R&S&T&U&V&W&X&Y&v&Z&                    ",
-"                          `& *.*+*@*#*                          "};
+/* XPM */
+static char * Aethyra_xpm[] = {
+"32 32 277 2",
+"  	c None",
+". 	c #840000",
+"+ 	c #7E0000",
+"@ 	c #4F0000",
+"# 	c #810000",
+"$ 	c #830000",
+"% 	c #7B0000",
+"& 	c #460000",
+"* 	c #4C0000",
+"= 	c #4B0000",
+"- 	c #750000",
+"; 	c #860000",
+"> 	c #850000",
+", 	c #5D0000",
+"' 	c #490000",
+") 	c #450000",
+"! 	c #4A0000",
+"~ 	c #440000",
+"{ 	c #6A0000",
+"] 	c #7A0000",
+"^ 	c #8B0000",
+"/ 	c #990000",
+"( 	c #960000",
+"_ 	c #720000",
+": 	c #6E0000",
+"< 	c #740000",
+"[ 	c #6B0202",
+"} 	c #550505",
+"| 	c #420404",
+"1 	c #440101",
+"2 	c #4D0000",
+"3 	c #4E0000",
+"4 	c #480000",
+"5 	c #9D0000",
+"6 	c #9B0000",
+"7 	c #6F0000",
+"8 	c #710000",
+"9 	c #760000",
+"0 	c #680404",
+"a 	c #4B0C0C",
+"b 	c #3C0909",
+"c 	c #470202",
+"d 	c #450101",
+"e 	c #500000",
+"f 	c #510000",
+"g 	c #790000",
+"h 	c #890000",
+"i 	c #920000",
+"j 	c #710706",
+"k 	c #7D381F",
+"l 	c #934A1A",
+"m 	c #7B1A09",
+"n 	c #6B1609",
+"o 	c #521E13",
+"p 	c #4F2517",
+"q 	c #5D230F",
+"r 	c #4D0F04",
+"s 	c #350A0A",
+"t 	c #360909",
+"u 	c #470303",
+"v 	c #930000",
+"w 	c #840202",
+"x 	c #712C1C",
+"y 	c #A58248",
+"z 	c #866621",
+"A 	c #835819",
+"B 	c #98681F",
+"C 	c #845C1D",
+"D 	c #BB964A",
+"E 	c #856225",
+"F 	c #3D1B0B",
+"G 	c #241818",
+"H 	c #251717",
+"I 	c #360A0A",
+"J 	c #430000",
+"K 	c #6C0000",
+"L 	c #800000",
+"M 	c #730404",
+"N 	c #6A431E",
+"O 	c #473C1C",
+"P 	c #534420",
+"Q 	c #806125",
+"R 	c #53290B",
+"S 	c #461C09",
+"T 	c #BB9432",
+"U 	c #65490F",
+"V 	c #1F1110",
+"W 	c #1A2323",
+"X 	c #1A2222",
+"Y 	c #261212",
+"Z 	c #440202",
+"` 	c #7F0000",
+" .	c #870000",
+"..	c #6D0505",
+"+.	c #422522",
+"@.	c #454434",
+"#.	c #A18744",
+"$.	c #8F7237",
+"%.	c #A37F48",
+"&.	c #AD8847",
+"*.	c #C6A657",
+"=.	c #644C14",
+"-.	c #211615",
+";.	c #1C2626",
+">.	c #1B2323",
+",.	c #231313",
+"'.	c #420202",
+").	c #6C0404",
+"!.	c #532D23",
+"~.	c #A8915B",
+"{.	c #967C37",
+"].	c #6E5926",
+"^.	c #453512",
+"/.	c #473713",
+"(.	c #A4832A",
+"_.	c #594310",
+":.	c #241F1E",
+"<.	c #232828",
+"[.	c #1C2020",
+"}.	c #241111",
+"|.	c #430202",
+"1.	c #7C5030",
+"2.	c #967C3D",
+"3.	c #3E3318",
+"4.	c #3D3930",
+"5.	c #454442",
+"6.	c #524D44",
+"7.	c #C09E45",
+"8.	c #654F17",
+"9.	c #262524",
+"0.	c #252929",
+"a.	c #410202",
+"b.	c #6B0302",
+"c.	c #A78041",
+"d.	c #6A5621",
+"e.	c #414543",
+"f.	c #696B6B",
+"g.	c #747676",
+"h.	c #7B7566",
+"i.	c #C9A84F",
+"j.	c #665017",
+"k.	c #282725",
+"l.	c #252A2A",
+"m.	c #1B2222",
+"n.	c #3D0202",
+"o.	c #750802",
+"p.	c #B48E41",
+"q.	c #564418",
+"r.	c #4A4B4B",
+"s.	c #6D6F6F",
+"t.	c #797A7A",
+"u.	c #867C62",
+"v.	c #AE9040",
+"w.	c #664F12",
+"x.	c #2D2A25",
+"y.	c #242828",
+"z.	c #1E1E1E",
+"A.	c #291010",
+"B.	c #400202",
+"C.	c #860B02",
+"D.	c #B78C32",
+"E.	c #594013",
+"F.	c #433E3E",
+"G.	c #606464",
+"H.	c #74736C",
+"I.	c #7C6D44",
+"J.	c #433719",
+"K.	c #413311",
+"L.	c #322F1E",
+"M.	c #1C2121",
+"N.	c #271212",
+"O.	c #3C0606",
+"P.	c #8C0200",
+"Q.	c #B5771D",
+"R.	c #765513",
+"S.	c #3F3636",
+"T.	c #555B5B",
+"U.	c #686969",
+"V.	c #5A5957",
+"W.	c #3C3832",
+"X.	c #403826",
+"Y.	c #2F3023",
+"Z.	c #1C1F1D",
+"`.	c #2E0A0A",
+" +	c #460101",
+".+	c #8F0101",
+"++	c #A03F0C",
+"@+	c #AC7E19",
+"#+	c #4B3625",
+"$+	c #474747",
+"%+	c #5B5C5A",
+"&+	c #83775A",
+"*+	c #8C7539",
+"=+	c #67541F",
+"-+	c #6B551C",
+";+	c #8C6D24",
+">+	c #4E1C09",
+",+	c #4A0101",
+"'+	c #8A0606",
+")+	c #8D1203",
+"!+	c #A76713",
+"~+	c #87611B",
+"{+	c #453A32",
+"]+	c #52554E",
+"^+	c #A38A45",
+"/+	c #715818",
+"(+	c #7A6424",
+"_+	c #443212",
+":+	c #947026",
+"<+	c #7D4E11",
+"[+	c #490400",
+"}+	c #420000",
+"|+	c #7F0808",
+"1+	c #8B0101",
+"2+	c #800F01",
+"3+	c #915E11",
+"4+	c #504F40",
+"5+	c #4E4834",
+"6+	c #5A4715",
+"7+	c #5B4814",
+"8+	c #382813",
+"9+	c #917035",
+"0+	c #533209",
+"a+	c #3F0400",
+"b+	c #8E0101",
+"c+	c #8A0000",
+"d+	c #671104",
+"e+	c #663D12",
+"f+	c #786023",
+"g+	c #74612B",
+"h+	c #665320",
+"i+	c #675321",
+"j+	c #785C24",
+"k+	c #684718",
+"l+	c #380B00",
+"m+	c #400000",
+"n+	c #8C0303",
+"o+	c #8D0000",
+"p+	c #780101",
+"q+	c #510808",
+"r+	c #291A16",
+"s+	c #26291C",
+"t+	c #2D2B18",
+"u+	c #321F0E",
+"v+	c #370A02",
+"w+	c #3E0100",
+"x+	c #850202",
+"y+	c #600202",
+"z+	c #331313",
+"A+	c #1E2121",
+"B+	c #1A1E1E",
+"C+	c #270D0D",
+"D+	c #470000",
+"E+	c #7B0404",
+"F+	c #720101",
+"G+	c #4B0D0D",
+"H+	c #2D1717",
+"I+	c #261414",
+"J+	c #380808",
+"K+	c #7E0202",
+"L+	c #5D0606",
+"M+	c #3B0E0E",
+"N+	c #300C0C",
+"O+	c #430303",
+"P+	c #7A0505",
+"Q+	c #7C0000",
+"R+	c #640404",
+"S+	c #430D0D",
+"T+	c #460202",
+"U+	c #610505",
+"V+	c #440E0E",
+"W+	c #390B0B",
+"X+	c #560202",
+"Y+	c #480707",
+"Z+	c #410505",
+"`+	c #4B0101",
+" @	c #480101",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"          . +                                     @             ",
+"          # $ %                               & * @ =           ",
+"          - # ; > $           , '           ) ! @ * ~           ",
+"          { ] ^ / ( $ _ : < [ } | 1 ) ~ ' 2 2 3 3 4             ",
+"            ] ^ 5 6 . 7 8 9 0 a b c * d 4 e f @ 3 4             ",
+"            g h / i j k l m n o p q r s t u e 3 2 4             ",
+"            8 > v w x y z A B C D E F G H I = @ ' J             ",
+"            K L ^ M N O P Q R S T U V W X Y Z e )               ",
+"              `  ...+.@.#.$.%.&.*.=.-.;.>.,.'.e &               ",
+"              ` . ).!.~.{.].^./.(._.:.<.[.}.|.@ 4               ",
+"                # [ 1.2.3.4.5.6.7.8.9.0.[.}.a.=                 ",
+"                ` b.c.d.e.f.g.h.i.j.k.l.m.,.n.)                 ",
+"                L o.p.q.r.s.t.u.v.w.x.y.z.A.B.~                 ",
+"                ; C.D.E.F.G.H.I.J.K.L.M.N.O.4                   ",
+"                  P.Q.R.S.T.U.V.W.X.Y.Z.`. +2                   ",
+"                  .+++@+#+$+%+&+*+=+-+;+>+,+=                   ",
+"                  '+)+!+~+{+]+^+/+(+_+:+<+[+}+                  ",
+"                  |+1+2+3+z 4+5+6+7+8+9+0+a+                    ",
+"                    b+c+d+e+f+g+h+i+j+k+l+m+                    ",
+"                    n+o+p+q+r+s+t+u+v+w+) )                     ",
+"                      x+` y+z+A+B+C+1 e D+                      ",
+"                      E+# F+G+H+I+J+3 @ ~                       ",
+"                        K+% L+M+N+O+e '                         ",
+"                        P+Q+R+S+I T+@ )                         ",
+"                          9 U+V+W+u 2                           ",
+"                            X+Y+Z+ +                            ",
+"                            * `+ @                              ",
+"                                                                ",
+"                                                                "};
diff --git a/debian/control b/debian/control
index 4ada3be5..b845ba94 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: aethyra
 Section: games
 Priority: optional
-Homepage: http://www.aethyra.com/
-Maintainer: Patrick Matthäi <patrick.matthaei@web.de> (Patrick is TMW maintainer need to change this)
+Homepage: http://www.aethyra.org/
+Maintainer: Aethyra Project <www.aethyra.org>
 Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), dpatch, autotools-dev, libcurl4-gnutls-dev, libgl1-mesa-dev, libguichan2-dev (>= 0.7.1), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev, libphysfs-dev, libpng12-dev, libxml2-dev, zlib1g-dev
 Standards-Version: 3.7.3
 
@@ -10,28 +10,34 @@ Package: aethyra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, aethyra-data (= ${source:Version})
 Recommends: aethyra-music
-Description: Aethyra is a great Online Rolegame
- based upon The Mana World 0.0 codebase. It has its own universe, and its own
- character management system, which will give you the opportunity to play in a
- 2D heroic-fantasy world forever.
+Description:  Aethyra is a community driven experiment that utilizes eAthena at its core with the end goal of 
+ getting its players as involved in the process as much as possible. It's originally forked from 
+ The Mana World when its developers came up with the idea of "Why should we have to wait for an 
+ MMORPG game in development when we've already got a great server setup here that does everything 
+ we've been promised and more?" As such, we are trying to implement as many functions of eAthena 
+ as possible while creating our own in the process based on what our players want to see.
 
 Package: aethyra-dbg
 Architecture: any
 Priority: extra
 Depends: aethyra (= ${binary:Version})
-Description: Aethyra is a great Online Rolegame (debugging symbols)
- based upon the The Mana World 0.0 codebase. It has its own universe, and its own
- character management system, which will give you the opportunity to play in a
- 2D heroic-fantasy world forever.
+Description:  Aethyra is a community driven experiment that utilizes eAthena at its core with the end goal of 
+ getting its players as involved in the process as much as possible. It's originally forked from 
+ The Mana World when its developers came up with the idea of "Why should we have to wait for an 
+ MMORPG game in development when we've already got a great server setup here that does everything 
+ we've been promised and more?" As such, we are trying to implement as many functions of eAthena 
+ as possible while creating our own in the process based on what our players want to see.
  .
- This package provides debugging symbols for the tmw package.
+ This package provides debugging symbols for the aethyra package.
 
 Package: aethyra-data
 Architecture: all
 Recommends: aethyra, aethyra-music
-Description: Aethyra is a great Online Rolegame (data files)
- based upon The Mana World 0.0 codebase. It has its own universe, and its own
- character management system, which will give you the opportunity to play in a
- 2D heroic-fantasy world forever.
+Description:  Aethyra is a community driven experiment that utilizes eAthena at its core with the end goal of 
+ getting its players as involved in the process as much as possible. It's originally forked from 
+ The Mana World when its developers came up with the idea of "Why should we have to wait for an 
+ MMORPG game in development when we've already got a great server setup here that does everything 
+ we've been promised and more?" As such, we are trying to implement as many functions of eAthena 
+ as possible while creating our own in the process based on what our players want to see.
  .
  This package contains the data files.
diff --git a/src/winver.h b/src/winver.h
index 52d90315..3c6e7aed 100644
--- a/src/winver.h
+++ b/src/winver.h
@@ -1,6 +1,6 @@
 /* VERSION DEFINITIONS */
 #define VER_MAJOR 0
 #define VER_MINOR 0
-#define VER_RELEASE 24
-#define VER_BUILD 1
-#define PACKAGE_VERSION "0.0.24.1"
+#define VER_RELEASE 27
+#define VER_BUILD 0
+#define PACKAGE_VERSION "0.0.27"
-- 
cgit v1.2.3-70-g09d2


From 6ad0aaed79c4334c6c9c22ccc53dc463cc554bb3 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 3 Nov 2008 19:28:50 +0000
Subject: Added a /w alias for whispering. Suggested by Kyron.

---
 src/gui/chat.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 316669c2..6a74d19e 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -345,7 +345,7 @@ void ChatWindow::chatSend(const std::string & nick, std::string msg)
         mTextOutput->clearRows();
         return;
     }
-    if (command == "whisper" || command == "msg") {
+    if (command == "whisper" || command == "msg" || command == "w") {
         std::string recvnick = "";
 
         if (msg.substr(0, 1) == "\"") {
@@ -704,7 +704,7 @@ void ChatWindow::help(const std::string & msg1, const std::string & msg2)
                 BY_SERVER);
         return;
     }
-    if (msg1 == "whisper" || msg1 == "msg") {
+    if (msg1 == "whisper" || msg1 == "msg" || msg1 == "w") {
         chatLog("Command: /whisper <nick> <msg>", BY_SERVER);
         chatLog("This command sends the message <msg> to <nick.", BY_SERVER);
         chatLog("If the <nick> has spaces in it, enclose it in "
-- 
cgit v1.2.3-70-g09d2


From e7bec61d89e2fb60bd89a51e0475f16a0956945e Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 3 Nov 2008 19:50:46 +0000
Subject: Fixed login server order, so as to not confuse new people.

---
 src/gui/login.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index c553d56e..dd64cf1b 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -55,8 +55,8 @@ LoginDialog::LoginDialog(LoginData *loginData):
     dfltServer.push_back("www.aethyra.org"); 
     dfltServer.push_back("www.aethyra.org");
     std::vector<std::string> dfltPort;
-    dfltPort.push_back("22001");
     dfltPort.push_back("21001");
+    dfltPort.push_back("22001");
     mServerList = new DropDownList("MostRecent00", dfltServer, dfltPort,
                                    MAX_SERVER_LIST_SIZE);
     mServerListBox = new gcn::ListBox(mServerList);
-- 
cgit v1.2.3-70-g09d2


From 5c7340cf1e87745129e121309f0cdcb1f2e28b4b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 4 Nov 2008 21:50:00 +0000
Subject: Committed an extension to the San Serif font by Vargavind on TMW so
 that it contains the complete ISO-8859-15 character set, as well as made a
 few other smaller fixes towards fixing make dist.

---
 CMakeLists.txt                   |   2 +-
 configure.ac                     |   2 +-
 data/graphics/gui/sansserif8.png | Bin 1261 -> 2134 bytes
 src/gui/gui.cpp                  |  14 ++++++++++++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index df745a7c..7ac379de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 PROJECT(AETHYRA)
 
-SET(VERSION 0.0.24.1)
+SET(VERSION 0.0.27)
 
 # where to look for cmake modules
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)
diff --git a/configure.ac b/configure.ac
index d24b00be..ac227410 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([Aethyra], [Aethyra SVN 0.0.27], [irarice@gmail.com], [aethyra])
+AC_INIT([Aethyra], [SVN-0.0.27], [irarice@gmail.com], [aethyra])
 AC_CONFIG_HEADERS([config.h:config.h.in])
 AC_LANG_CPLUSPLUS
 
diff --git a/data/graphics/gui/sansserif8.png b/data/graphics/gui/sansserif8.png
index 7eae7a1b..a4738548 100644
Binary files a/data/graphics/gui/sansserif8.png and b/data/graphics/gui/sansserif8.png differ
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index e386a85c..f72f544c 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -113,8 +113,18 @@ Gui::Gui(Graphics *graphics):
     // Set global font
     try {
         mGuiFont = new gcn::ImageFont("graphics/gui/sansserif8.png",
-                " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ["
-                "\\]^_`abcdefghijklmnopqrstuvwxyz{|}~|��������"
+                " !\"#$%&'()*+,-./"
+                "0123456789:;<=>?"
+                "@ABCDEFGHIJKLMNO"
+                "PQRSTUVWXYZ[\\]^_"
+                "`abcdefghijklmno"
+                "pqrstuvwxyz{|}~|"
+                "����������������"
+                "����������������"
+                "����������������"
+                "����������������"
+                "����������������"
+                "����������������"
                 );
     }
     catch (gcn::Exception e)
-- 
cgit v1.2.3-70-g09d2


From 8828593b7976e48804c132bd249e15d096b3103f Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 5 Nov 2008 16:58:14 +0000
Subject: Found a way to remove the ugly hack that was done to ensure that
 stringstream would behave. Before, it set the string stream to a single
 space, while now it clears the stream and then sets it to null. So, should
 the string stream code ever be fixed in the future, this function won't
 break.

---
 src/gui/textbox.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp
index 3507273a..2a496a1f 100644
--- a/src/gui/textbox.cpp
+++ b/src/gui/textbox.cpp
@@ -97,13 +97,8 @@ void TextBox::setTextWrapped(const std::string &text)
                 if (minWidth > mMinWidth)
                 {
                     mMinWidth = minWidth;
-                    // This is a reaaaly ugly hack for getting the string stream
-                    // to clear itself. Don't mess with the spacer in the stream
-                    // reset, as well as removing the break. These are all there
-                    // because there are several compilers that I have tried 
-                    // that do not properly reset the string stream. 
-                    // You have been warned!
-                    wrappedStream.str(" ");
+                    wrappedStream.clear();
+                    wrappedStream.str("");
                     spacePos = 0;
                     lastNewlinePos = 0;
                     newlinePos = text.find("\n", lastNewlinePos);
-- 
cgit v1.2.3-70-g09d2


From 762c754670c1accb294a9d5c34dfbb32e9cfe960 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 5 Nov 2008 23:58:27 +0000
Subject: Minor targeting fix (don't count attacking against target timeouts),
 as well as only calling the target draw update code only when necessary.

---
 src/localplayer.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index dccd3914..129626f0 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -138,12 +138,12 @@ void LocalPlayer::logic()
         {
             attack(mTarget, true);
         }
-    }
 
-    for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
-    {
-        player_node->mTargetCursorInRange[i]->update(10);
-        player_node->mTargetCursorOutRange[i]->update(10);
+        for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
+        {
+            player_node->mTargetCursorInRange[i]->update(10);
+            player_node->mTargetCursorOutRange[i]->update(10);
+        }
     }
 
     Being::logic();
@@ -480,6 +480,7 @@ void LocalPlayer::attack(Being *target, bool keep)
     mLastAttackTime = 0;
 
     mWalkTime = tick_time;
+    mTargetTime = tick_time;
 
     setAction(ATTACK);
 
-- 
cgit v1.2.3-70-g09d2


From cb81caa6ddbe1861d7b276d48f337dd8841d68c1 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 6 Nov 2008 02:56:09 +0000
Subject: Don't allow players to use items through item shortcuts while
 trading. Patch done by Peavey on TMW.

---
 src/game.cpp | 152 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 78 insertions(+), 74 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 10a66ce1..eb200f4a 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -672,97 +672,101 @@ void Game::handleInput()
         if (keyboard.isEnabled() && !chatWindow->isInputFocused())
         {
             const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
-            // Checks if any item shortcut is pressed.
-            for (int i = KeyboardConfig::KEY_SHORTCUT_0;
-                i <= KeyboardConfig::KEY_SHORTCUT_9;
-                i++)
-            {
-                if (tKey == i && !used) {
-                    itemShortcut->useItem(i - KeyboardConfig::KEY_SHORTCUT_0);
-                    break;
-            }
-        }
-        switch (tKey) {
-            case KeyboardConfig::KEY_PICKUP:
+
+            // Do not activate shortcuts if tradewindow is visible
+            if (!tradeWindow->isVisible())
             {
-                FloorItem *item = floorItemManager->findByCoordinates(
-                                  player_node->mX, player_node->mY);
-
-                // If none below the player, try the tile in front
-                // of the player
-                if (!item) {
-                    Uint16 x = player_node->mX;
-                    Uint16 y = player_node->mY;
-                    switch (player_node->getSpriteDirection())
-                    {
-                        case DIRECTION_UP   : --y; break;
-                        case DIRECTION_DOWN : ++y; break;
-                        case DIRECTION_LEFT : --x; break;
-                        case DIRECTION_RIGHT: ++x; break;
-                        default: break;
+                // Checks if any item shortcut is pressed.
+                for (int i = KeyboardConfig::KEY_SHORTCUT_0;
+                    i <= KeyboardConfig::KEY_SHORTCUT_9;
+                    i++)
+                {
+                    if (tKey == i && !used) {
+                        itemShortcut->useItem(i - KeyboardConfig::KEY_SHORTCUT_0);
+                        break;
                     }
-                    item = floorItemManager->findByCoordinates(x, y);
                 }
-
-                if (item)
-                    player_node->pickUp(item);
-
-                used = true;
             }
-            break;
-            case KeyboardConfig::KEY_SIT:
-                // Player sit action
-                player_node->toggleSit();
-                used = true;
-                break;
-            case KeyboardConfig::KEY_HIDE_WINDOWS:
-                // Hide certain windows
-                if (!chatWindow->isInputFocused())
+            switch (tKey) {
+                case KeyboardConfig::KEY_PICKUP:
                 {
-                    statusWindow->setVisible(false);
-                    inventoryWindow->setVisible(false);
-                    skillDialog->setVisible(false);
-                    setupWindow->setVisible(false);
-                    equipmentWindow->setVisible(false);
-                    helpWindow->setVisible(false);
-                    debugWindow->setVisible(false);
+                    FloorItem *item = floorItemManager->findByCoordinates(
+                                      player_node->mX, player_node->mY);
+
+                    // If none below the player, try the tile in front
+                    // of the player
+                    if (!item) {
+                        Uint16 x = player_node->mX;
+                        Uint16 y = player_node->mY;
+                        switch (player_node->getSpriteDirection())
+                        {
+                            case DIRECTION_UP   : --y; break;
+                            case DIRECTION_DOWN : ++y; break;
+                            case DIRECTION_LEFT : --x; break;
+                            case DIRECTION_RIGHT: ++x; break;
+                            default: break;
+                        }
+                        item = floorItemManager->findByCoordinates(x, y);
+                    }
+
+                    if (item)
+                        player_node->pickUp(item);
+
+                    used = true;
                 }
                 break;
+                case KeyboardConfig::KEY_SIT:
+                   // Player sit action
+                    player_node->toggleSit();
+                    used = true;
+                    break;
+                case KeyboardConfig::KEY_HIDE_WINDOWS:
+                    // Hide certain windows
+                    if (!chatWindow->isInputFocused())
+                    {
+                        statusWindow->setVisible(false);
+                        inventoryWindow->setVisible(false);
+                        skillDialog->setVisible(false);
+                        setupWindow->setVisible(false);
+                        equipmentWindow->setVisible(false);
+                        helpWindow->setVisible(false);
+                        debugWindow->setVisible(false);
+                    }
+                    break;
+                }
             }
-        }
 
-        if (requestedWindow)
-        {
-            requestedWindow->setVisible(!requestedWindow->isVisible());
-            if (requestedWindow->isVisible())
+            if (requestedWindow)
             {
-                requestedWindow->requestMoveToTop();
+                requestedWindow->setVisible(!requestedWindow->isVisible());
+                if (requestedWindow->isVisible())
+                {
+                    requestedWindow->requestMoveToTop();
+                }
+                used = true;
             }
-            used = true;
-        }
-
-    }
 
-    // Quit event
-    else if (event.type == SDL_QUIT)
-    {
-        done = true;
-    }
+        }
 
-    // Push input to GUI when not used
-    if (!used)
-    {
-        try
+        // Quit event
+        else if (event.type == SDL_QUIT)
         {
-            guiInput->pushInput(event);
+            done = true;
         }
-        catch (gcn::Exception e)
+
+        // Push input to GUI when not used
+        if (!used)
         {
-            const char* err = e.getMessage().c_str();
-            logger->log("Warning: guichan input exception: %s", err);
+            try
+            {
+                guiInput->pushInput(event);
+            }
+            catch (gcn::Exception e)
+            {
+                const char* err = e.getMessage().c_str();
+                logger->log("Warning: guichan input exception: %s", err);
+            }
         }
-    }
-
     } // End while
     // If the user is configuring the keys then don't respond.
     if (!keyboard.isEnabled())
-- 
cgit v1.2.3-70-g09d2


From 0db6dce98d9c07b569dd29207979818f114f7a32 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 6 Nov 2008 17:44:35 +0000
Subject: Ported a patch by Peavey on TMW to keep all item pointers inside of
 inventory. For us, this should get rid of the arrow crashing bug, if it still
 exists (been a few weeks since I've heard of it happening now).

---
 src/equipment.cpp            | 29 +++++++++--------------------
 src/equipment.h              | 21 +++++++--------------
 src/gui/equipmentwindow.cpp  | 21 +++++++++++++++------
 src/gui/equipmentwindow.h    |  2 ++
 src/localplayer.cpp          |  2 +-
 src/net/equipmenthandler.cpp |  8 ++++----
 6 files changed, 38 insertions(+), 45 deletions(-)

diff --git a/src/equipment.cpp b/src/equipment.cpp
index b2d5e609..984df74d 100644
--- a/src/equipment.cpp
+++ b/src/equipment.cpp
@@ -21,36 +21,25 @@
  *  $Id: equipment.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
-#include "equipment.h"
-
 #include <algorithm>
 
+#include "equipment.h"
 #include "item.h"
-#include "item.h"
+#include "inventory.h"
+#include "localplayer.h"
 
 Equipment::Equipment():
     mArrows(0)
 {
-    std::fill_n(mEquipment, EQUIPMENT_SIZE, (Item*) 0);
+    std::fill_n(mEquipment, EQUIPMENT_SIZE, 0);
 }
 
 void
-Equipment::removeEquipment(Item *item)
+Equipment::setEquipment(int index, int inventoryIndex)
 {
-    Item **i = std::find(mEquipment, mEquipment + EQUIPMENT_SIZE, item);
-    if (i != mEquipment + EQUIPMENT_SIZE) {
-        *i = 0;
-    }
+    mEquipment[index] = inventoryIndex;
+    Item* item = player_node->getInventory()->getItem(inventoryIndex);
+    if (item)
+    	item->setEquipped(true);
 }
 
-void Equipment::removeEquipment(int index)
-{
-    if (index >= 0 && index < EQUIPMENT_SIZE)
-        mEquipment[index] = 0;
-}
-
-void Equipment::setEquipment(int index, Item *item)
-{
-    mEquipment[index] = item;
-    item->setEquipped(true);
-}
diff --git a/src/equipment.h b/src/equipment.h
index 7977894a..8b2ce127 100644
--- a/src/equipment.h
+++ b/src/equipment.h
@@ -24,8 +24,6 @@
 #ifndef _TMW_EQUIPMENT_H_
 #define _TMW_EQUIPMENT_H_
 
-#include <guichan/actionlistener.hpp>
-
 class Item;
 
 #define EQUIPMENT_SIZE 10
@@ -41,41 +39,36 @@ class Equipment
         /**
          * Get equipment at the given slot.
          */
-        Item* getEquipment(int index) const
+        int getEquipment(int index) const
         { return mEquipment[index]; }
 
         /**
          * Set equipment at the given slot.
          */
         void
-        setEquipment(int index, Item *item);
+        setEquipment(int index, int inventoryIndex);
 
         /**
          * Remove equipment from the given slot.
          */
         void
-        removeEquipment(int index);
-
-        /**
-         * Remove the given item from equipment.
-         */
-        void removeEquipment(Item *item);
+        removeEquipment(int index) { mEquipment[index] = 0; }
 
         /**
          * Get the item used in the arrow slot.
          */
-        Item*
+        int
         getArrows() { return mArrows; }
 
         /**
          * Set the item used in the arrow slot.
          */
         void
-        setArrows(Item *arrows) {mArrows = arrows;}
+        setArrows(int arrows) {mArrows = arrows;}
 
     private:
-        Item *mEquipment[EQUIPMENT_SIZE];
-        Item *mArrows;
+        int mEquipment[EQUIPMENT_SIZE];
+        int mArrows;
 };
 
 #endif
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 564486aa..727ac732 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -25,7 +25,9 @@
 
 #include "../equipment.h"
 #include "../graphics.h"
+#include "../inventory.h"
 #include "../item.h"
+#include "../localplayer.h"
 #include "../log.h"
 
 #include "../resources/iteminfo.h"
@@ -40,6 +42,7 @@ EquipmentWindow::EquipmentWindow(Equipment *equipment):
     setCloseButton(true);
     setDefaultSize(5, 230, 200, 120);
     loadWindowState();
+    inventory = player_node->getInventory();
 }
 
 EquipmentWindow::~EquipmentWindow()
@@ -61,22 +64,28 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
         graphics->drawRectangle(gcn::Rectangle(10 + 36 * (i % 4),
                 36 * (i / 4) + 25, 32, 32));
 
-        if (!(item = mEquipment->getEquipment(i)))
+        if (!(item = inventory->getItem(mEquipment->getEquipment(i))))
             continue;
 
         image = item->getImage();
-        static_cast<Graphics*>(graphics)->drawImage(
-                image, 36 * (i % 4) + 10, 36 * (i / 4) + 25);
+        if (image)
+        {
+            static_cast<Graphics*>(graphics)->drawImage(
+                    image, 36 * (i % 4) + 10, 36 * (i / 4) + 25);
+        }
     }
 
     graphics->drawRectangle(gcn::Rectangle(160, 25, 32, 32));
 
-    if (!(item = mEquipment->getArrows()))
+     if (!(item = inventory->getItem(mEquipment->getArrows())))
         return;
 
     image = item->getImage();
 
-    static_cast<Graphics*>(graphics)->drawImage(image, 160, 25);
+    if (image)
+    {
+        static_cast<Graphics*>(graphics)->drawImage(image, 160, 25);
+    }
     graphics->drawText(toString(item->getQuantity()), 170, 62,
-            gcn::Graphics::CENTER);
+            gcn::Graphics::CENTER);   
 }
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index bb8eb32f..6a7a4944 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -27,6 +27,7 @@
 #include "window.h"
 
 #include "../guichanfwd.h"
+#include "../inventory.h"
 
 class Equipment;
 
@@ -55,6 +56,7 @@ class EquipmentWindow : public Window
 
     private:
         Equipment *mEquipment;
+        Inventory *inventory;
 };
 
 extern EquipmentWindow *equipmentWindow;
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 129626f0..9475fcbb 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -200,7 +200,7 @@ void LocalPlayer::unequipItem(Item *item)
     outMsg.writeInt16(item->getInvIndex());
 
     // Tidy equipment directly to avoid weapon still shown bug, for instance
-    mEquipment->removeEquipment(item);
+    mEquipment->removeEquipment(item->getInvIndex());
 }
 
 void LocalPlayer::useItem(Item *item)
diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index b5c9fe2b..5464fa55 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.cpp
@@ -87,7 +87,7 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
                         position++;
                     }
                     item = inventory->getItem(index);
-                    player_node->mEquipment->setEquipment(position, item);
+                    player_node->mEquipment->setEquipment(position, index);
                 }
             }
             break;
@@ -120,7 +120,7 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
                 position++;
             }
             logger->log("Position %i", position);
-            item = player_node->mEquipment->getEquipment(position);
+            item = player_node->getInventory()->getItem(player_node->mEquipment->getEquipment(position));
 
             // Unequip any existing equipped item in this position
             if (item) {
@@ -128,7 +128,7 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
             }
 
             item = inventory->getItem(index);
-            player_node->mEquipment->setEquipment(position, item);
+            player_node->mEquipment->setEquipment(position, index);
             break;
 
         case SMSG_PLAYER_UNEQUIP:
@@ -181,7 +181,7 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
             item = inventory->getItem(index);
             if (item) {
                 item->setEquipped(true);
-                player_node->mEquipment->setArrows(item);
+                player_node->mEquipment->setArrows(index);
                 logger->log("Arrows equipped: %i", index);
             }
             break;
-- 
cgit v1.2.3-70-g09d2


From 38360d3cd26b61a5162b8ec5b526de19e39835f9 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 6 Nov 2008 19:12:24 +0000
Subject: Minor interface cleanup. Moved the login selection scrollbox so that
 it aligns up with the other fields.

---
 src/gui/login.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index dd64cf1b..0cdb4656 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -51,6 +51,7 @@ LoginDialog::LoginDialog(LoginData *loginData):
     gcn::Label *passLabel = new gcn::Label("Password:");
     gcn::Label *serverLabel = new gcn::Label("Server:");
     gcn::Label *portLabel = new gcn::Label("Port:");
+    gcn::Label *dropdownLabel = new gcn::Label("Recent:");
     std::vector<std::string> dfltServer;
     dfltServer.push_back("www.aethyra.org"); 
     dfltServer.push_back("www.aethyra.org");
@@ -98,7 +99,8 @@ LoginDialog::LoginDialog(LoginData *loginData):
     mPortField->setWidth(FIELD_WIDTH);
 
     const int DROP_DOWN_TOP = 9 + PORT_TOP + serverLabel->getHeight();
-    mServerDropDown->setPosition(5, DROP_DOWN_TOP);
+    dropdownLabel->setPosition(5, DROP_DOWN_TOP);
+    mServerDropDown->setPosition(65, DROP_DOWN_TOP);
     mServerDropDown->setWidth(FIELD_WIDTH);
 
     const int REST_TOP = LOGIN_DIALOG_HEIGHT - mCancelButton->getHeight() - 5;
@@ -132,6 +134,7 @@ LoginDialog::LoginDialog(LoginData *loginData):
     add(passLabel);
     add(serverLabel);
     add(portLabel);
+    add(dropdownLabel);
     add(mUserField);
     add(mPassField);
     add(mServerField);
-- 
cgit v1.2.3-70-g09d2


From b51c608c07a48a2c6d4fb6332a4ba436510e3273 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 8 Nov 2008 19:57:51 +0000
Subject: Ported a TMW compile error fix reported by Martin Michlmayr.

---
 src/utils/strprintf.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/utils/strprintf.cpp b/src/utils/strprintf.cpp
index 352696f1..48fc3814 100644
--- a/src/utils/strprintf.cpp
+++ b/src/utils/strprintf.cpp
@@ -21,10 +21,8 @@
  *  $Id: strprintf.cpp 3416 2007-08-06 06:20:14Z gmelquio $
  */
 
-#ifndef _TMW_UTILS_TOSTRING_H
-#define _TMW_UTILS_TOSTRING_H
-
 #include <cstdarg>
+#include <cstdio>
 
 #include "strprintf.h"
 
@@ -50,4 +48,3 @@ std::string strprintf(char const *format, ...)
     return res;
 }
 
-#endif
-- 
cgit v1.2.3-70-g09d2


From eceb7c70ac01166c32de7d1e88ef8e840ccdce7d Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 9 Nov 2008 06:45:42 +0000
Subject: Fixed NPC's reporting as dead on the new server.

---
 src/net/beinghandler.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 951cb570..b9686e39 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -453,7 +453,8 @@ void BeingHandler::handleMessage(MessageIn *msg)
                 switch (msg->readInt8())
                 {
                     case 1:
-                        dstBeing->setAction(Being::DEAD);
+			if (dstBeing->getType() != Being::NPC)
+                            dstBeing->setAction(Being::DEAD);
                         break;
 
                     case 2:
-- 
cgit v1.2.3-70-g09d2


From 32fa850b9c8ca03f666deeb42d1c74278ffd983a Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 9 Nov 2008 21:35:56 +0000
Subject: Fixed icns file to have our cleint logo, so that Mac OS X builds use
 the proper icon.

---
 data/icons/Aethyra.icns | Bin 65136 -> 31566 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/icons/Aethyra.icns b/data/icons/Aethyra.icns
index 7230a099..08909c0f 100644
Binary files a/data/icons/Aethyra.icns and b/data/icons/Aethyra.icns differ
-- 
cgit v1.2.3-70-g09d2


From 2f01bff208bec2c2d5ffdb98b35b9398b88092a3 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 11 Nov 2008 20:14:19 +0000
Subject: Fixed a text glitch reported by Jarvellis.

---
 src/being.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/being.cpp b/src/being.cpp
index 7ad83e5e..7fb63a7c 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -501,7 +501,7 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
                                         (mSpeechBubble->getNumRows()*14));
         mSpeechBubble->setVisible(true);
     }
-    else if (!config.getValue("speechbubble", 1))
+    else if (mSpeechTime > 0 && !config.getValue("speechbubble", 1))
     {
         mSpeechBubble->setVisible(false);
         // don't introduce a memory leak
-- 
cgit v1.2.3-70-g09d2


From 0436733dc9e412b12272fa7332831c9185c3d19b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 12 Nov 2008 18:52:35 +0000
Subject: Applied a fix that fixes TMW loading.

---
 src/resources/colordb.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index d654762c..2340a8f2 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -47,19 +47,20 @@ void ColorDB::load()
     }
 
     XML::Document doc(HAIR_COLOR_FILE);
+    XML::Document doc2(TMW_COLOR_FILE);
     xmlNodePtr root = doc.rootNode();
     bool TMWHair = false;
 
     if (!root || !xmlStrEqual(root->name, BAD_CAST "colors"))
     {
-        logger->log("Error loading Aethyra's color, %s, trying TMW's color file, %s.", 
-                    HAIR_COLOR_FILE, TMW_COLOR_FILE);
+        logger->log("Trying TMW's color file, %s.", TMW_COLOR_FILE);
 
         TMWHair = true;
-        XML::Document doc(TMW_COLOR_FILE);
-        root = doc.rootNode();
+        root = doc2.rootNode();
         if (!root || !xmlStrEqual(root->name, BAD_CAST "colors"))
         {
+            logger->log("ColorDB: Failed");
+            mColors[0] = mFail;
             mLoaded = true;
             return;
         }
@@ -75,8 +76,10 @@ void ColorDB::load()
                 logger->log("ColorDB: Redefinition of dye ID %d", id);
             }
 
-            TMWHair ? mColors[id] = XML::getProperty(node, "value", "") :
-                      mColors[id] = XML::getProperty(node, "dye", "");
+            TMWHair ? mColors[id] = XML::getProperty(node, "value", "#FFFFFF") :
+                      mColors[id] = XML::getProperty(node, "dye", "#FFFFFF");
+
+            logger->log("%d %s", id, mColors[id].c_str());
         }
     }
 
-- 
cgit v1.2.3-70-g09d2


From 717e8babd1124a4c6c685a6386a84f58148d4931 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 13 Nov 2008 22:13:02 +0000
Subject: Added a slot display so that players can track how much space they've
 used.

---
 src/gui/inventorywindow.cpp | 22 ++++++++++++++++++++--
 src/gui/inventorywindow.h   |  2 ++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 936416d1..1b2e5c63 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -34,6 +34,7 @@
 #include "scrollarea.h"
 #include "viewport.h"
 
+#include "../inventory.h"
 #include "../item.h"
 #include "../localplayer.h"
 
@@ -73,6 +74,11 @@ InventoryWindow::InventoryWindow():
               "Maximum Weight: " + mMaxWeight + " g";
     mWeightLabel = new TextBox();
     mWeightLabel->setPosition(8, 8);
+    mSlots = "Slots: " + 
+             toString(player_node->getInventory()->getNumberOfSlotsUsed()) + 
+             "/" + toString(player_node->getInventory()->getSize());
+    mSlotsLabel = new TextBox();
+    mItemEffectLabel = new TextBox();
 
     draw();
 
@@ -83,6 +89,7 @@ InventoryWindow::InventoryWindow():
     add(mItemDescriptionLabel);
     add(mItemEffectLabel);
     add(mWeightLabel);
+    add(mSlotsLabel);
 
     mUseButton->setSize(60, mUseButton->getHeight());
 
@@ -107,6 +114,10 @@ void InventoryWindow::logic()
         mWeight = "Total Weight: " + mTotalWeight + " g - " +
                   "Maximum Weight: " + mMaxWeight + " g";
 
+        mSlots = "Slots: " + 
+                 toString(player_node->getInventory()->getNumberOfSlotsUsed()) + 
+                 "/" + toString(player_node->getInventory()->getSize());
+
         draw();
     }
 }
@@ -222,12 +233,19 @@ void InventoryWindow::draw()
             mItemEffectLabel->getY() - 5 - (mItemDescriptionLabel->getNumberOfRows()*15),
             width - 16,
             (mItemDescriptionLabel->getNumberOfRows()*15)));
+    mSlotsLabel->setMinWidth(width - 16);
+    mSlotsLabel->setTextWrapped(mSlots);
+    mSlotsLabel->setDimension(gcn::Rectangle(8,
+            mItemDescriptionLabel->getY() - 5 - (mSlotsLabel->getNumberOfRows()*15),
+            width - 16,
+            (mSlotsLabel->getNumberOfRows()*15)));
 
     mInvenScroll->setSize(width - 16,
-            mItemDescriptionLabel->getY() - (mWeightLabel->getNumberOfRows()*15) - 18);
+            mSlotsLabel->getY() - (mWeightLabel->getNumberOfRows()*15) - 18);
     mInvenScroll->setPosition(8, (mWeightLabel->getNumberOfRows()*15) + 10);
 
-    setMinHeight(130 + (mWeightLabel->getNumberOfRows()*15) + 
+    setMinHeight(130 + (mSlotsLabel->getNumberOfRows()*15) + 
+                       (mWeightLabel->getNumberOfRows()*15) + 
                        (mItemDescriptionLabel->getNumberOfRows()*15) +
                        (mItemEffectLabel->getNumberOfRows()*15) +
                        (mItemNameLabel->getNumberOfRows()*15));
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index e6170dac..055bfad9 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -92,12 +92,14 @@ class InventoryWindow : public Window, gcn::ActionListener,
         std::string mWeight;
         std::string mTotalWeight;
         std::string mMaxWeight;
+        std::string mSlots;
         gcn::Button *mUseButton, *mDropButton;
         gcn::ScrollArea *mInvenScroll;
         TextBox *mItemNameLabel;
         TextBox *mItemDescriptionLabel;
         TextBox *mItemEffectLabel;
         TextBox *mWeightLabel;
+        TextBox *mSlotsLabel;
 };
 
 extern InventoryWindow *inventoryWindow;
-- 
cgit v1.2.3-70-g09d2


From 40f2ec0582932bb21952cb58c5e51ca508206cae Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 18 Nov 2008 06:45:46 +0000
Subject: Pedantic fixes to the client, where I alphabetized all of the include
 statements, as well as removing the new skill dialog, which we do not, nor
 will we use (if we do, it'd be a new one that we'd make).

WARNING!!! This, and all other previous builds have a linker error for
the Gnome libraries version 4.3.2 on my setup. It's assumed that this is
also the case for other users of this library as well. I'm currently
assuming that there's a bug in the compiler itself, and will look into
reporting this, but in the mean time, it doesn't build for these users,
unfortunately. Sorry about this.
---
 AethyraLin2WinXcompile.cbp        |   2 -
 debian/control                    |   2 +-
 debian/watch                      |   2 -
 src/CMakeLists.txt                |   3 +-
 src/Makefile.am                   |   3 +-
 src/animatedsprite.cpp            |   3 -
 src/animatedsprite.h              |   2 -
 src/animationparticle.cpp         |   2 -
 src/animationparticle.h           |   1 -
 src/being.cpp                     |   9 +-
 src/being.h                       |   4 +-
 src/beingmanager.cpp              |   3 -
 src/beingmanager.h                |   2 -
 src/configlistener.h              |   3 -
 src/configuration.cpp             |   6 +-
 src/configuration.h               |   8 +-
 src/engine.cpp                    |   6 +-
 src/engine.h                      |   2 -
 src/equipment.cpp                 |   2 -
 src/floor_item.cpp                |   3 -
 src/flooritemmanager.cpp          |   5 +-
 src/flooritemmanager.h            |   2 -
 src/game.cpp                      |  12 +--
 src/game.h                        |   2 -
 src/graphics.cpp                  |   2 -
 src/graphics.h                    |   2 -
 src/gui/box.cpp                   |   2 -
 src/gui/box.h                     |   2 -
 src/gui/browserbox.cpp            |   4 +-
 src/gui/browserbox.h              |   4 +-
 src/gui/button.cpp                |   2 -
 src/gui/button.h                  |   2 -
 src/gui/buttonbox.cpp             |   5 +-
 src/gui/buttonbox.h               |   6 +-
 src/gui/buy.cpp                   |   5 +-
 src/gui/buy.h                     |   2 -
 src/gui/buysell.cpp               |   5 +-
 src/gui/buysell.h                 |   6 +-
 src/gui/char_select.cpp           |   5 +-
 src/gui/char_select.h             |   8 +-
 src/gui/char_server.cpp           |   5 +-
 src/gui/char_server.h             |   2 -
 src/gui/chargedialog.cpp          |   2 -
 src/gui/chargedialog.h            |   1 -
 src/gui/chat.cpp                  |  12 +--
 src/gui/chat.h                    |   6 +-
 src/gui/chatinput.cpp             |   2 -
 src/gui/chatinput.h               |   6 +-
 src/gui/checkbox.cpp              |   2 -
 src/gui/checkbox.h                |   2 -
 src/gui/colour.cpp                |   4 +-
 src/gui/colour.h                  |   3 +-
 src/gui/confirm_dialog.cpp        |   6 +-
 src/gui/confirm_dialog.h          |   2 -
 src/gui/connection.cpp            |   5 +-
 src/gui/connection.h              |   2 -
 src/gui/debugwindow.cpp           |   7 +-
 src/gui/debugwindow.h             |   2 -
 src/gui/equipmentwindow.cpp       |   2 -
 src/gui/equipmentwindow.h         |   2 -
 src/gui/focushandler.cpp          |   3 -
 src/gui/focushandler.h            |   2 -
 src/gui/gccontainer.cpp           |   2 -
 src/gui/gccontainer.h             |   2 -
 src/gui/gui.cpp                   |   7 +-
 src/gui/gui.h                     |   4 +-
 src/gui/hbox.cpp                  |   2 -
 src/gui/hbox.h                    |   2 -
 src/gui/help.cpp                  |   5 +-
 src/gui/help.h                    |   4 +-
 src/gui/inttextbox.cpp            |   6 +-
 src/gui/inttextbox.h              |   2 -
 src/gui/inventorywindow.cpp       |   5 +-
 src/gui/inventorywindow.h         |   2 -
 src/gui/item_amount.cpp           |   5 +-
 src/gui/item_amount.h             |   2 -
 src/gui/itemcontainer.cpp         |   4 +-
 src/gui/itemcontainer.h           |   6 +-
 src/gui/itempopup.cpp             |  10 +-
 src/gui/itempopup.h               |   4 +-
 src/gui/itemshortcutcontainer.cpp |   4 +-
 src/gui/itemshortcutcontainer.h   |   2 -
 src/gui/itemshortcutwindow.cpp    |   5 +-
 src/gui/itemshortcutwindow.h      |   2 -
 src/gui/linkhandler.h             |   2 -
 src/gui/listbox.cpp               |   6 +-
 src/gui/listbox.h                 |   2 -
 src/gui/login.cpp                 |  14 ++-
 src/gui/login.h                   |  10 +-
 src/gui/menuwindow.cpp            |  13 +--
 src/gui/menuwindow.h              |   2 -
 src/gui/minimap.cpp               |   2 -
 src/gui/minimap.h                 |   2 -
 src/gui/ministatus.cpp            |   7 +-
 src/gui/ministatus.h              |   2 -
 src/gui/newskill.cpp              | 195 --------------------------------------
 src/gui/newskill.h                |  71 --------------
 src/gui/npc_text.cpp              |   5 +-
 src/gui/npc_text.h                |   5 +-
 src/gui/npclistdialog.cpp         |   5 +-
 src/gui/npclistdialog.h           |   2 -
 src/gui/ok_dialog.cpp             |   2 -
 src/gui/ok_dialog.h               |   2 -
 src/gui/passwordfield.cpp         |   2 -
 src/gui/passwordfield.h           |   2 -
 src/gui/playerbox.cpp             |   4 +-
 src/gui/playerbox.h               |   2 -
 src/gui/popupmenu.cpp             |   7 +-
 src/gui/popupmenu.h               |   5 +-
 src/gui/progressbar.cpp           |   2 -
 src/gui/progressbar.h             |   3 -
 src/gui/radiobutton.cpp           |   2 -
 src/gui/radiobutton.h             |   2 -
 src/gui/register.cpp              |   7 +-
 src/gui/register.h                |   4 +-
 src/gui/scrollarea.cpp            |   2 -
 src/gui/scrollarea.h              |   2 -
 src/gui/sell.cpp                  |   9 +-
 src/gui/sell.h                    |   2 -
 src/gui/setup.cpp                 |  17 ++--
 src/gui/setup.h                   |   2 -
 src/gui/setup_audio.cpp           |   5 +-
 src/gui/setup_audio.h             |   6 +-
 src/gui/setup_colours.cpp         |   3 +-
 src/gui/setup_colours.h           |   6 +-
 src/gui/setup_joystick.cpp        |   6 +-
 src/gui/setup_joystick.h          |   6 +-
 src/gui/setup_keyboard.cpp        |   7 +-
 src/gui/setup_keyboard.h          |  10 +-
 src/gui/setup_players.cpp         |   8 +-
 src/gui/setup_players.h           |   7 +-
 src/gui/setup_video.cpp           |   7 +-
 src/gui/setup_video.h             |   6 +-
 src/gui/setuptab.h                |   2 -
 src/gui/shop.cpp                  |   2 -
 src/gui/shop.h                    |   8 +-
 src/gui/shoplistbox.cpp           |  10 +-
 src/gui/shoplistbox.h             |   2 -
 src/gui/skill.cpp                 |   7 +-
 src/gui/skill.h                   |   2 -
 src/gui/slider.cpp                |   2 -
 src/gui/slider.h                  |   3 -
 src/gui/speechbubble.cpp          |   2 -
 src/gui/speechbubble.h            |   4 +-
 src/gui/status.cpp                |   5 +-
 src/gui/status.h                  |   2 -
 src/gui/tabbedcontainer.cpp       |   7 +-
 src/gui/tabbedcontainer.h         |   4 +-
 src/gui/table.cpp                 |   6 +-
 src/gui/table.h                   |   1 +
 src/gui/table_model.cpp           |   4 +-
 src/gui/table_model.h             |   4 +-
 src/gui/textbox.cpp               |   6 +-
 src/gui/textbox.h                 |   2 -
 src/gui/textfield.cpp             |   3 +-
 src/gui/textfield.h               |   2 -
 src/gui/trade.cpp                 |   5 +-
 src/gui/trade.h                   |   2 -
 src/gui/updatewindow.cpp          |   9 +-
 src/gui/updatewindow.h            |   3 +-
 src/gui/vbox.cpp                  |   2 -
 src/gui/vbox.h                    |   2 -
 src/gui/viewport.cpp              |  11 +--
 src/gui/viewport.h                |   4 +-
 src/gui/widgets/dropdown.cpp      |   2 -
 src/gui/widgets/dropdown.h        |   6 +-
 src/gui/widgets/resizegrip.cpp    |   6 +-
 src/gui/widgets/resizegrip.h      |   2 -
 src/gui/window.cpp                |   8 +-
 src/gui/window.h                  |   7 +-
 src/gui/windowcontainer.cpp       |   2 -
 src/gui/windowcontainer.h         |   2 -
 src/guichanfwd.h                  |   2 -
 src/imageparticle.cpp             |   5 +-
 src/imageparticle.h               |   2 -
 src/inventory.cpp                 |   5 +-
 src/inventory.h                   |   2 -
 src/item.cpp                      |   2 -
 src/item.h                        |   2 -
 src/itemshortcut.cpp              |   5 +-
 src/itemshortcut.h                |   2 -
 src/joystick.cpp                  |   5 +-
 src/joystick.h                    |   2 -
 src/keyboardconfig.cpp            |   8 +-
 src/keyboardconfig.h              |   6 +-
 src/localplayer.cpp               |   7 +-
 src/localplayer.h                 |   2 -
 src/lockedarray.h                 |   2 -
 src/main.cpp                      |  33 +++----
 src/main.h                        |   2 -
 src/map.cpp                       |   7 +-
 src/map.h                         |   2 -
 src/monster.cpp                   |   7 +-
 src/monster.h                     |   2 -
 src/net/beinghandler.cpp          |   9 +-
 src/net/beinghandler.h            |   2 -
 src/net/buysellhandler.cpp        |   7 +-
 src/net/buysellhandler.h          |   2 -
 src/net/charserverhandler.cpp     |   7 +-
 src/net/charserverhandler.h       |   2 -
 src/net/chathandler.cpp           |   5 +-
 src/net/chathandler.h             |   2 -
 src/net/equipmenthandler.cpp      |   3 -
 src/net/equipmenthandler.h        |   2 -
 src/net/inventoryhandler.cpp      |  10 +-
 src/net/inventoryhandler.h        |   2 -
 src/net/itemhandler.cpp           |   3 -
 src/net/itemhandler.h             |   2 -
 src/net/loginhandler.cpp          |   3 -
 src/net/loginhandler.h            |   5 +-
 src/net/maploginhandler.cpp       |   3 -
 src/net/maploginhandler.h         |   2 -
 src/net/messagehandler.cpp        |   5 +-
 src/net/messagehandler.h          |   2 -
 src/net/messagein.cpp             |   7 +-
 src/net/messagein.h               |   4 +-
 src/net/messageout.cpp            |   7 +-
 src/net/messageout.h              |   2 -
 src/net/network.cpp               |   7 +-
 src/net/network.h                 |   2 -
 src/net/npchandler.cpp            |   7 +-
 src/net/npchandler.h              |   2 -
 src/net/partyhandler.cpp          |   9 +-
 src/net/partyhandler.h            |   2 -
 src/net/playerhandler.cpp         |   8 +-
 src/net/playerhandler.h           |   2 -
 src/net/protocol.cpp              |   2 -
 src/net/protocol.h                |   2 -
 src/net/skillhandler.cpp          |   5 +-
 src/net/skillhandler.h            |   2 -
 src/net/tradehandler.cpp          |   5 +-
 src/net/tradehandler.h            |   2 -
 src/npc.cpp                       |   6 +-
 src/npc.h                         |   2 -
 src/openglgraphics.cpp            |   7 +-
 src/openglgraphics.h              |   2 -
 src/particle.cpp                  |   5 +-
 src/particle.h                    |   2 -
 src/particleemitter.cpp           |   7 +-
 src/particleemitter.h             |   2 -
 src/particleemitterprop.h         |   4 +-
 src/party.cpp                     |   7 +-
 src/party.h                       |   2 -
 src/player.cpp                    |  10 +-
 src/player.h                      |   2 -
 src/player_relations.cpp          |   7 +-
 src/player_relations.h            |  11 ++-
 src/properties.h                  |   4 +-
 src/recorder.cpp                  |   4 +-
 src/recorder.h                    |   4 +-
 src/resources/action.cpp          |   4 -
 src/resources/action.h            |   2 -
 src/resources/ambientoverlay.cpp  |   3 -
 src/resources/ambientoverlay.h    |   2 -
 src/resources/animation.cpp       |   6 +-
 src/resources/animation.h         |   2 -
 src/resources/buddylist.cpp       |   6 +-
 src/resources/buddylist.h         |   2 -
 src/resources/colordb.h           |   2 +-
 src/resources/dye.cpp             |   2 -
 src/resources/dye.h               |   7 +-
 src/resources/image.cpp           |   5 +-
 src/resources/image.h             |   5 +-
 src/resources/imageloader.cpp     |   6 +-
 src/resources/imageloader.h       |   2 -
 src/resources/imageset.cpp        |   5 +-
 src/resources/imageset.h          |   3 -
 src/resources/imagewriter.cpp     |   8 +-
 src/resources/imagewriter.h       |   2 -
 src/resources/itemdb.cpp          |   4 +-
 src/resources/itemdb.h            |   6 +-
 src/resources/iteminfo.cpp        |   5 +-
 src/resources/iteminfo.h          |   2 -
 src/resources/mapreader.cpp       |   7 +-
 src/resources/mapreader.h         |   4 +-
 src/resources/monsterdb.cpp       |   3 -
 src/resources/monsterdb.h         |   2 -
 src/resources/monsterinfo.cpp     |   2 -
 src/resources/monsterinfo.h       |   5 +-
 src/resources/music.cpp           |   2 -
 src/resources/music.h             |   2 -
 src/resources/npcdb.cpp           |   3 -
 src/resources/npcdb.h             |   4 +-
 src/resources/resource.cpp        |   3 -
 src/resources/resource.h          |   2 -
 src/resources/resourcemanager.cpp |  12 +--
 src/resources/resourcemanager.h   |   6 +-
 src/resources/soundeffect.cpp     |   2 -
 src/resources/soundeffect.h       |   2 -
 src/resources/spritedef.cpp       |   5 +-
 src/resources/spritedef.h         |   6 +-
 src/serverinfo.h                  |   2 -
 src/shopitem.cpp                  |   2 -
 src/shopitem.h                    |   2 -
 src/simpleanimation.cpp           |   8 +-
 src/simpleanimation.h             |   2 -
 src/sound.cpp                     |   6 +-
 src/sound.h                       |   3 -
 src/sprite.h                      |   2 -
 src/text.cpp                      |   3 +-
 src/textmanager.cpp               |   3 +-
 src/textparticle.cpp              |   5 +-
 src/textparticle.h                |   5 +-
 src/utils/base64.cpp              |   3 +-
 src/utils/base64.h                |   1 -
 src/utils/dtor.h                  |   2 -
 src/utils/fastsqrt.h              |   2 -
 src/utils/strprintf.cpp           |   2 -
 src/utils/strprintf.h             |   2 -
 src/utils/tostring.h              |   2 -
 src/utils/trim.h                  |   2 -
 src/utils/xml.cpp                 |   4 +-
 src/utils/xml.h                   |   6 +-
 src/vector.h                      |   2 -
 314 files changed, 320 insertions(+), 1252 deletions(-)
 delete mode 100644 debian/watch
 delete mode 100644 src/gui/newskill.cpp
 delete mode 100644 src/gui/newskill.h

diff --git a/AethyraLin2WinXcompile.cbp b/AethyraLin2WinXcompile.cbp
index 50881830..ec4940ac 100644
--- a/AethyraLin2WinXcompile.cbp
+++ b/AethyraLin2WinXcompile.cbp
@@ -168,8 +168,6 @@
 		<Unit filename="src\gui\minimap.h" />
 		<Unit filename="src\gui\ministatus.cpp" />
 		<Unit filename="src\gui\ministatus.h" />
-		<Unit filename="src\gui\newskill.cpp" />
-		<Unit filename="src\gui\newskill.h" />
 		<Unit filename="src\gui\npc_text.cpp" />
 		<Unit filename="src\gui\npc_text.h" />
 		<Unit filename="src\gui\npclistdialog.cpp" />
diff --git a/debian/control b/debian/control
index b845ba94..0d94b4fd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Homepage: http://www.aethyra.org/
 Maintainer: Aethyra Project <www.aethyra.org>
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), dpatch, autotools-dev, libcurl4-gnutls-dev, libgl1-mesa-dev, libguichan2-dev (>= 0.7.1), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev, libphysfs-dev, libpng12-dev, libxml2-dev, zlib1g-dev
+Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), dpatch, autotools-dev, libcurl4-gnutls-dev, libgl1-mesa-dev, libguichan-dev (>= 0.8.1-3), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev, libphysfs-dev, libpng12-dev, libxml2-dev, zlib1g-dev
 Standards-Version: 3.7.3
 
 Package: aethyra
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 01aa13f7..00000000
--- a/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/themanaworld/tmw-(.*)\.tar\.gz
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d5021823..e4803230 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -118,8 +118,6 @@ SET(SRCS
     gui/minimap.h
     gui/ministatus.cpp
     gui/ministatus.h
-    gui/newskill.cpp
-    gui/newskill.h
     gui/npclistdialog.cpp
     gui/npclistdialog.h
     gui/npc_text.cpp
@@ -286,6 +284,7 @@ SET(SRCS
     engine.h
     equipment.cpp
     equipment.h
+    extensions.h
     floor_item.cpp
     floor_item.h
     flooritemmanager.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 17445ddf..5c759135 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -70,8 +70,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/minimap.h \
 	      gui/ministatus.cpp \
 	      gui/ministatus.h \
-	      gui/newskill.cpp \
-	      gui/newskill.h \
 	      gui/npclistdialog.cpp \
 	      gui/npclistdialog.h \
 	      gui/npc_text.cpp \
@@ -248,6 +246,7 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      engine.h \
 	      equipment.cpp \
 	      equipment.h \
+              extensions.h \
 	      floor_item.cpp \
 	      floor_item.h \
 	      flooritemmanager.cpp \
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 92c4e3f3..c86c5392 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -17,12 +17,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: animatedsprite.cpp 3752 2007-11-20 10:50:00Z b_lindeijer $
  */
 
 #include "animatedsprite.h"
-
 #include "graphics.h"
 #include "log.h"
 
diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index 1fac5220..405bf42e 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: animatedsprite.h 3752 2007-11-20 10:50:00Z b_lindeijer $
  */
 
 #ifndef _TMW_ANIMATEDSPRITE_H
diff --git a/src/animationparticle.cpp b/src/animationparticle.cpp
index c79a5bc4..59eacb05 100644
--- a/src/animationparticle.cpp
+++ b/src/animationparticle.cpp
@@ -17,11 +17,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #include "animationparticle.h"
-
 #include "graphics.h"
 #include "simpleanimation.h"
 
diff --git a/src/animationparticle.h b/src/animationparticle.h
index 054b1b73..eabc2742 100644
--- a/src/animationparticle.h
+++ b/src/animationparticle.h
@@ -17,7 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #ifndef _ANIMATION_PARTICLE
diff --git a/src/being.cpp b/src/being.cpp
index 7fb63a7c..27bd0c57 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -17,15 +17,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: being.cpp 4301 2008-05-28 16:06:48Z peaveydk $
  */
-#include "being.h"
 
 #include <cassert>
 #include <cmath>
 
 #include "animatedsprite.h"
+#include "being.h"
 #include "configuration.h"
 #include "equipment.h"
 #include "game.h"
@@ -37,17 +35,16 @@
 #include "sound.h"
 #include "text.h"
 
-#include "resources/resourcemanager.h"
-#include "resources/itemdb.h"
 #include "resources/imageset.h"
+#include "resources/itemdb.h"
 #include "resources/iteminfo.h"
+#include "resources/resourcemanager.h"
 
 #include "gui/gui.h"
 #include "gui/speechbubble.h"
 
 #include "utils/dtor.h"
 #include "utils/tostring.h"
-
 #include "utils/xml.h"
 
 #define BEING_EFFECTS_FILE "effects.xml"
diff --git a/src/being.h b/src/being.h
index 62a1c937..325ec51a 100644
--- a/src/being.h
+++ b/src/being.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: being.h 4321 2008-06-02 11:42:26Z b_lindeijer $
  */
 
 #ifndef _TMW_BEING_H
@@ -26,8 +24,8 @@
 
 #include <list>
 #include <memory>
-#include <string>
 #include <SDL_types.h>
+#include <string>
 #include <vector>
 
 #include "animatedsprite.h"
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index f0ce9bd3..ada1ddfa 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -17,14 +17,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: beingmanager.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
 #include <cassert>
 
 #include "beingmanager.h"
-
 #include "localplayer.h"
 #include "monster.h"
 #include "npc.h"
diff --git a/src/beingmanager.h b/src/beingmanager.h
index 6942ff54..0179bed8 100644
--- a/src/beingmanager.h
+++ b/src/beingmanager.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: beingmanager.h 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
 #ifndef _TMW_BEINGMANAGER_H
diff --git a/src/configlistener.h b/src/configlistener.h
index bf00f3ef..9fbc4544 100644
--- a/src/configlistener.h
+++ b/src/configlistener.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: configlistener.h 1673 2005-08-29 22:00:35Z der_doener $
  */
 
 #ifndef _TMW_CONFIGLISTENER_H
@@ -26,7 +24,6 @@
 
 #include <iosfwd>
 
-
 /**
  * The listener interface for receiving notifications about changes to
  * configuration options.
diff --git a/src/configuration.cpp b/src/configuration.cpp
index e9c8db7a..8e80de18 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -17,16 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: configuration.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
-
-#include "configuration.h"
-
 #include <libxml/xmlwriter.h>
 
 #include "configlistener.h"
+#include "configuration.h"
 #include "log.h"
 
 #include "utils/tostring.h"
diff --git a/src/configuration.h b/src/configuration.h
index 7dadb083..197e1a41 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -17,18 +17,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: configuration.h 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
 #ifndef _TMW_CONFIGURATION_H
 #define _TMW_CONFIGURATION_H
 
-#include <map>
-#include <list>
-#include <string>
 #include <cassert>
 #include <libxml/xmlwriter.h>
+#include <list>
+#include <map>
+#include <string>
 
 class ConfigListener;
 class ConfigurationObject;
diff --git a/src/engine.cpp b/src/engine.cpp
index c8fee995..b51f4852 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -17,21 +17,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: engine.cpp 4000 2008-03-23 11:47:52Z b_lindeijer $
  */
 
-#include "engine.h"
-
 #include <list>
 
 #include "being.h"
 #include "beingmanager.h"
 #include "configuration.h"
+#include "engine.h"
 #include "flooritemmanager.h"
 #include "game.h"
 #include "graphics.h"
-#include "main.h"
 #include "localplayer.h"
 #include "log.h"
 #include "main.h"
diff --git a/src/engine.h b/src/engine.h
index 52f1e63a..8d387f80 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _ENGINE_H
diff --git a/src/equipment.cpp b/src/equipment.cpp
index 984df74d..f1d1d4f2 100644
--- a/src/equipment.cpp
+++ b/src/equipment.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: equipment.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include <algorithm>
diff --git a/src/floor_item.cpp b/src/floor_item.cpp
index 399a4149..0b114e14 100644
--- a/src/floor_item.cpp
+++ b/src/floor_item.cpp
@@ -17,12 +17,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: floor_item.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "floor_item.h"
-
 #include "map.h"
 
 FloorItem::FloorItem(unsigned int id,
diff --git a/src/flooritemmanager.cpp b/src/flooritemmanager.cpp
index fe64779b..7445b1e9 100644
--- a/src/flooritemmanager.cpp
+++ b/src/flooritemmanager.cpp
@@ -17,13 +17,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: flooritemmanager.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $
  */
 
-#include "flooritemmanager.h"
-
 #include "floor_item.h"
+#include "flooritemmanager.h"
 
 #include "utils/dtor.h"
 
diff --git a/src/flooritemmanager.h b/src/flooritemmanager.h
index a6bfbdc3..3dbaf988 100644
--- a/src/flooritemmanager.h
+++ b/src/flooritemmanager.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: flooritemmanager.h 2150 2006-02-06 02:56:48Z der_doener $
  */
 
 #ifndef _TMW_FLOORITEMMANAGER_H
diff --git a/src/game.cpp b/src/game.cpp
index eb200f4a..34fb4622 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: game.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
 #include "game.h"
@@ -28,8 +26,8 @@
 #include <sstream>
 #include <string>
 
-#include <guichan/sdl/sdlinput.hpp>
 #include <guichan/exception.hpp>
+#include <guichan/sdl/sdlinput.hpp>
 
 #include "beingmanager.h"
 #include "configuration.h"
@@ -69,19 +67,19 @@
 #include "gui/trade.h"
 #include "gui/viewport.h"
 
-#include "net/protocol.h"
 #include "net/beinghandler.h"
 #include "net/buysellhandler.h"
 #include "net/chathandler.h"
 #include "net/equipmenthandler.h"
 #include "net/inventoryhandler.h"
 #include "net/itemhandler.h"
+#include "net/messageout.h"
 #include "net/network.h"
 #include "net/npchandler.h"
 #include "net/playerhandler.h"
+#include "net/protocol.h"
 #include "net/skillhandler.h"
 #include "net/tradehandler.h"
-#include "net/messageout.h"
 
 #include "resources/imagewriter.h"
 
@@ -115,7 +113,6 @@ InventoryWindow *inventoryWindow;
 NpcListDialog *npcListDialog;
 NpcTextDialog *npcTextDialog;
 SkillDialog *skillDialog;
-//NewSkillDialog *newSkillWindow;
 Setup* setupWindow;
 Minimap *minimap;
 EquipmentWindow *equipmentWindow;
@@ -199,7 +196,6 @@ void createGuiWindows(Network *network)
     npcTextDialog = new NpcTextDialog();
     npcListDialog = new NpcListDialog();
     skillDialog = new SkillDialog();
-    //newSkillWindow = new NewSkillDialog();
     setupWindow = new Setup();
     minimap = new Minimap();
     equipmentWindow = new EquipmentWindow(player_node->mEquipment.get());
@@ -256,7 +252,6 @@ void destroyGuiWindows()
     delete minimap;
     delete equipmentWindow;
     //delete chargeDialog;
-    //delete newSkillWindow;
     delete tradeWindow;
     //delete buddyWindow;
     delete helpWindow;
@@ -609,7 +604,6 @@ void Game::handleInput()
             case SDLK_F8: requestedWindow = itemShortcutWindow; break;
             case SDLK_F9: requestedWindow = setupWindow; break;
             case SDLK_F10: requestedWindow = debugWindow; break;
-            //case SDLK_F11: requestedWindow = newSkillWindow; break;
 
             case SDLK_RETURN:
                 // Input chat window
diff --git a/src/game.h b/src/game.h
index 583aea70..1cc18cae 100644
--- a/src/game.h
+++ b/src/game.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: game.h 3859 2008-01-26 19:38:43Z b_lindeijer $
  */
 
 #ifndef _TMW_GAME_
diff --git a/src/graphics.cpp b/src/graphics.cpp
index 0433678f..6920bcb0 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: graphics.cpp 3628 2007-10-18 18:39:48Z b_lindeijer $
  */
 
 #include <cassert>
diff --git a/src/graphics.h b/src/graphics.h
index 0cf58141..efdd1ac1 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: graphics.h 3628 2007-10-18 18:39:48Z b_lindeijer $
  */
 
 #ifndef _GRAPHICS_H
diff --git a/src/gui/box.cpp b/src/gui/box.cpp
index f53bc18e..59d8c135 100644
--- a/src/gui/box.cpp
+++ b/src/gui/box.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: box.cpp 1456 2005-07-15 23:17:00Z b_lindeijer $
  */
 
 #include "box.h"
diff --git a/src/gui/box.h b/src/gui/box.h
index 280fd3e2..46654b48 100644
--- a/src/gui/box.h
+++ b/src/gui/box.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: box.h 2529 2006-08-13 10:20:19Z b_lindeijer $
  */
 
 
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index b7d08cab..430a2aa2 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: browserbox.cpp 4348 2008-06-14 12:42:49Z the_enemy $
  */
 
 #include <algorithm>
@@ -28,8 +26,8 @@
 #include <guichan/mouseinput.hpp>
 
 #include "browserbox.h"
-#include "linkhandler.h"
 #include "colour.h"
+#include "linkhandler.h"
 
 #ifdef USE_OPENGL
 #include "../configuration.h"
diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h
index c671d835..267e0fea 100644
--- a/src/gui/browserbox.h
+++ b/src/gui/browserbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: browserbox.h 3687 2007-10-26 00:22:12Z crush_tmw $
  */
 
 #ifndef __TMW_BROWSERBOX_H__
@@ -27,8 +25,8 @@
 #include <iosfwd>
 #include <vector>
 
-#include <guichan/widget.hpp>
 #include <guichan/mouselistener.hpp>
+#include <guichan/widget.hpp>
 
 #include "../guichanfwd.h"
 #include "../main.h"
diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index 1243d798..40ecd1b7 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: button.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include <algorithm>
diff --git a/src/gui/button.h b/src/gui/button.h
index bbd26010..eecd0dc0 100644
--- a/src/gui/button.h
+++ b/src/gui/button.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: button.h 3606 2007-09-27 14:54:09Z b_lindeijer $
  */
 
 #ifndef _TMW_BUTTON_H
diff --git a/src/gui/buttonbox.cpp b/src/gui/buttonbox.cpp
index 592cb92a..903d971d 100644
--- a/src/gui/buttonbox.cpp
+++ b/src/gui/buttonbox.cpp
@@ -17,13 +17,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: buttonbox.cpp
  */
 
-#include "buttonbox.h"
-
 #include "button.h"
+#include "buttonbox.h"
 
 ButtonBox::ButtonBox(const std::string &title, const std::string &buttonTxt,
 		     ButtonBoxListener *listener) :
diff --git a/src/gui/buttonbox.h b/src/gui/buttonbox.h
index 5fc9f88d..edde4aa4 100644
--- a/src/gui/buttonbox.h
+++ b/src/gui/buttonbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: buttonbox.h
  */
 
 #ifndef _TMW_BUTTONBOX_H
@@ -28,10 +26,10 @@
 
 #include <guichan/actionlistener.hpp>
 
-#include "../guichanfwd.h"
-
 #include "window.h"
 
+#include "../guichanfwd.h"
+
 class ButtonBoxListener
 {
     public:
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 8e2a7a7a..a4574eb7 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -17,15 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: buy.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
-#include "buy.h"
-
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
+#include "buy.h"
 #include "scrollarea.h"
 #include "shop.h"
 #include "shoplistbox.h"
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 6f75cab5..0915385a 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: buy.h 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #ifndef _TMW_BUY_H
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index 9cc3b297..57c95841 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -17,13 +17,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: buysell.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
-#include "buysell.h"
-
 #include "button.h"
+#include "buysell.h"
 
 #include "../npc.h"
 
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index 0966ec03..d73205b6 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: buysell.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _TMW_BUYSELL_H
@@ -26,10 +24,10 @@
 
 #include <guichan/actionlistener.hpp>
 
-#include "../guichanfwd.h"
-
 #include "window.h"
 
+#include "../guichanfwd.h"
+
 /**
  * A dialog to choose between buying or selling at a shop.
  *
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index ca4d8608..93783ded 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -17,17 +17,14 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: char_select.cpp 3760 2007-11-21 19:43:11Z b_lindeijer $
  */
 
-#include "char_select.h"
-
 #include <string>
 
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
+#include "char_select.h"
 #include "confirm_dialog.h"
 #include "ok_dialog.h"
 #include "playerbox.h"
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index 182600d1..63630736 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -17,23 +17,21 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: char_select.h 3752 2007-11-20 10:50:00Z b_lindeijer $
  */
 
 #ifndef _CHAR_SELECT_H
 #define _CHAR_SELECT_H
 
+#include <guichan/actionlistener.hpp>
+
 #include "window.h"
 
 #include "../guichanfwd.h"
 #include "../lockedarray.h"
 
-#include <guichan/actionlistener.hpp>
-
-class Player;
 class LocalPlayer;
 class Network;
+class Player;
 class PlayerBox;
 
 /**
diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp
index 3465fb69..8f68e6e1 100644
--- a/src/gui/char_server.cpp
+++ b/src/gui/char_server.cpp
@@ -17,13 +17,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: char_server.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
-#include "char_server.h"
-
 #include "button.h"
+#include "char_server.h"
 #include "listbox.h"
 #include "scrollarea.h"
 
diff --git a/src/gui/char_server.h b/src/gui/char_server.h
index 32a0645f..bb81d3a5 100644
--- a/src/gui/char_server.h
+++ b/src/gui/char_server.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: char_server.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _CHAR_SEL_SERVER_H
diff --git a/src/gui/chargedialog.cpp b/src/gui/chargedialog.cpp
index 862378ae..1733c7eb 100644
--- a/src/gui/chargedialog.cpp
+++ b/src/gui/chargedialog.cpp
@@ -17,7 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
  /* The window supported by this class shows player stats and keeps a charging
@@ -25,7 +24,6 @@
   */
 
 #include "chargedialog.h"
-
 #include "progressbar.h"
 
 #include "../localplayer.h"
diff --git a/src/gui/chargedialog.h b/src/gui/chargedialog.h
index 222fb3b5..53998ab8 100644
--- a/src/gui/chargedialog.h
+++ b/src/gui/chargedialog.h
@@ -17,7 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #ifndef _TMW_CHARGE_H
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 6a74d19e..dd11cebb 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -17,29 +17,27 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: chat.cpp 4227 2008-05-08 00:39:29Z peaveydk $
  */
 
 #include <algorithm>
 #include <fstream>
+
 #include <guichan/focushandler.hpp>
 #include <guichan/key.hpp>
 
-#include "chat.h"
-
 #include "browserbox.h"
+#include "chat.h"
 #include "chatinput.h"
 #include "scrollarea.h"
 #include "windowcontainer.h"
 
+#include "../beingmanager.h"
 #include "../configuration.h"
+#include "../extensions.h"
 #include "../game.h"
 #include "../localplayer.h"
-#include "../beingmanager.h"
-#include "../recorder.h"
 #include "../party.h"
-#include "../extensions.h"
+#include "../recorder.h"
 
 #include "../net/messageout.h"
 #include "../net/protocol.h"
diff --git a/src/gui/chat.h b/src/gui/chat.h
index 5e5ca110..437dc115 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -17,16 +17,14 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: chat.h 4227 2008-05-08 00:39:29Z peaveydk $
  */
 
 #ifndef _TMW_CHAT_H
 #define _TMW_CHAT_H
 
+#include <fstream>
 #include <list>
 #include <string>
-#include <fstream>
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
@@ -37,9 +35,9 @@
 
 class BrowserBox;
 class Network;
-class ScrollArea;
 class Recorder;
 class Party;
+class ScrollArea;
 
 #define BY_GM         0   // those should be self-explanatory =)
 #define BY_PLAYER     1
diff --git a/src/gui/chatinput.cpp b/src/gui/chatinput.cpp
index b403a03e..afe7f037 100644
--- a/src/gui/chatinput.cpp
+++ b/src/gui/chatinput.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: chatinput.cpp 3361 2007-07-07 20:12:58Z b_lindeijer $
  */
 
 #include "chatinput.h"
diff --git a/src/gui/chatinput.h b/src/gui/chatinput.h
index 043244b9..44e22956 100644
--- a/src/gui/chatinput.h
+++ b/src/gui/chatinput.h
@@ -17,19 +17,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: chatinput.h 3361 2007-07-07 20:12:58Z b_lindeijer $
  */
 
 #ifndef _TMW_CHATINPUT_H
 #define _TMW_CHATINPUT_H
 
+#include <guichan/focuslistener.hpp>
+
 #include "textfield.h"
 
 #include "../guichanfwd.h"
 
-#include <guichan/focuslistener.hpp>
-
 /**
  * The chat input hides when it loses focus. It is also invisible by default.
  */
diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp
index b530bbea..20e24dee 100644
--- a/src/gui/checkbox.cpp
+++ b/src/gui/checkbox.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: checkbox.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include "checkbox.h"
diff --git a/src/gui/checkbox.h b/src/gui/checkbox.h
index 160a2bf4..f6d8f2e5 100644
--- a/src/gui/checkbox.h
+++ b/src/gui/checkbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: checkbox.h 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #ifndef _TMW_CHECKBOX_H
diff --git a/src/gui/colour.cpp b/src/gui/colour.cpp
index d1782e1c..4c3782a4 100644
--- a/src/gui/colour.cpp
+++ b/src/gui/colour.cpp
@@ -19,10 +19,10 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "colour.h"
-
 #include <cstdio>
 
+#include "colour.h"
+
 #include "../configuration.h"
 
 Colour::Colour()
diff --git a/src/gui/colour.h b/src/gui/colour.h
index ac75f08b..1e8ba3db 100644
--- a/src/gui/colour.h
+++ b/src/gui/colour.h
@@ -21,9 +21,10 @@
 
 #ifndef _COLOUR_H
 #define _COLOUR_H
+
 #include <cstdio>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <guichan/listmodel.hpp>
 
diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp
index 848c4767..732f5769 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirm_dialog.cpp
@@ -17,14 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: confirm_dialog.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
-#include "confirm_dialog.h"
-
 #include <guichan/font.hpp>
 
+#include "confirm_dialog.h"
+
 ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg,
         Window *parent):
     Window(title, true, parent)
diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h
index 65f33cac..109dcea0 100644
--- a/src/gui/confirm_dialog.h
+++ b/src/gui/confirm_dialog.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: confirm_dialog.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _TMW_OPTION_DIALOG_H
diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index 0b62ca3c..1204b203 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.cpp
@@ -17,17 +17,14 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: connection.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
-#include "connection.h"
-
 #include <guichan/actionlistener.hpp>
 
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
+#include "connection.h"
 #include "progressbar.h"
 
 #include "../main.h"
diff --git a/src/gui/connection.h b/src/gui/connection.h
index 86b688a3..c3a6208f 100644
--- a/src/gui/connection.h
+++ b/src/gui/connection.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: connection.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_CONNECTION_H
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 1e7d5b35..7fc63096 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -17,22 +17,19 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: debugwindow.cpp 3509 2007-08-23 13:43:17Z b_lindeijer $
  */
 
-#include "debugwindow.h"
-
 #include <SDL_mouse.h>
 
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
+#include "debugwindow.h"
 #include "gui.h"
 #include "viewport.h"
 
-#include "../game.h"
 #include "../engine.h"
+#include "../game.h"
 #include "../particle.h"
 #include "../map.h"
 
diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h
index 59ae765c..ae1d8b14 100644
--- a/src/gui/debugwindow.h
+++ b/src/gui/debugwindow.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: debugwindow.h 3509 2007-08-23 13:43:17Z b_lindeijer $
  */
 
 #ifndef _TMW_DEBUGWINDOW_H
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 727ac732..bf85f033 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: equipmentwindow.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "equipmentwindow.h"
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 6a7a4944..7aacfc1e 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: equipmentwindow.h 2545 2006-08-17 19:11:28Z crush_tmw $
  */
 
 #ifndef _TMW_EQUIPMENT_H
diff --git a/src/gui/focushandler.cpp b/src/gui/focushandler.cpp
index 966d2013..f9ea8b7d 100644
--- a/src/gui/focushandler.cpp
+++ b/src/gui/focushandler.cpp
@@ -17,13 +17,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: focushandler.cpp 2239 2006-03-09 05:16:27Z der_doener $
  */
 
 #include "focushandler.h"
 
-
 void FocusHandler::requestModalFocus(gcn::Widget *widget)
 {
     /* If there is another widget with modal focus, remove its modal focus
diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h
index 5fde09f1..a5218485 100644
--- a/src/gui/focushandler.h
+++ b/src/gui/focushandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: focushandler.h 2239 2006-03-09 05:16:27Z der_doener $
  */
 
 #ifndef _TMW_FOCUSHANDLER_H
diff --git a/src/gui/gccontainer.cpp b/src/gui/gccontainer.cpp
index 8095be61..ec3c8a5c 100644
--- a/src/gui/gccontainer.cpp
+++ b/src/gui/gccontainer.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: gccontainer.cpp 4208 2008-04-29 11:25:26Z b_lindeijer $
  */
 
 #include "gccontainer.h"
diff --git a/src/gui/gccontainer.h b/src/gui/gccontainer.h
index 660111fc..2af7f6ad 100644
--- a/src/gui/gccontainer.h
+++ b/src/gui/gccontainer.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: gccontainer.h 4208 2008-04-29 11:25:26Z b_lindeijer $
  */
 
 #ifndef _TMW_GUI_GCCONTAINER_H
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index f72f544c..fcc7ed77 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -17,12 +17,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: gui.cpp 3628 2007-10-18 18:39:48Z b_lindeijer $
  */
 
-#include "gui.h"
-
 #include <guichan/exception.hpp>
 #include <guichan/image.hpp>
 #include <guichan/imagefont.hpp>
@@ -31,6 +27,7 @@
 #include <guichan/sdl/sdlinput.hpp>
 
 #include "focushandler.h"
+#include "gui.h"
 #include "viewport.h"
 #include "window.h"
 #include "windowcontainer.h"
@@ -41,8 +38,8 @@
 #include "../log.h"
 
 #include "../resources/imageset.h"
-#include "../resources/resourcemanager.h"
 #include "../resources/imageloader.h"
+#include "../resources/resourcemanager.h"
 
 // Guichan stuff
 Gui *gui;
diff --git a/src/gui/gui.h b/src/gui/gui.h
index f250a8e3..8cf91915 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: gui.h 3628 2007-10-18 18:39:48Z b_lindeijer $
  */
 
 #ifndef _TMW_GUI
@@ -28,8 +26,8 @@
 
 #include "../guichanfwd.h"
 
-class GuiConfigListener;
 class Graphics;
+class GuiConfigListener;
 class ImageSet;
 class Viewport;
 
diff --git a/src/gui/hbox.cpp b/src/gui/hbox.cpp
index dc909195..020e85c6 100644
--- a/src/gui/hbox.cpp
+++ b/src/gui/hbox.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: hbox.cpp 1881 2005-10-18 21:40:25Z der_doener $
  */
 
 #include "hbox.h"
diff --git a/src/gui/hbox.h b/src/gui/hbox.h
index 93ac270d..da70a53c 100644
--- a/src/gui/hbox.h
+++ b/src/gui/hbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: hbox.h 1881 2005-10-18 21:40:25Z der_doener $
  */
 
 #ifndef HBOX_H
diff --git a/src/gui/help.cpp b/src/gui/help.cpp
index 56a5e70e..19413a08 100644
--- a/src/gui/help.cpp
+++ b/src/gui/help.cpp
@@ -17,14 +17,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: help.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
-#include "help.h"
-
 #include "button.h"
 #include "browserbox.h"
+#include "help.h"
 #include "scrollarea.h"
 
 #include "../resources/resourcemanager.h"
diff --git a/src/gui/help.h b/src/gui/help.h
index 3b45283c..bd200ccf 100644
--- a/src/gui/help.h
+++ b/src/gui/help.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: help.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _TMW_HELP_H
@@ -26,8 +24,8 @@
 
 #include <guichan/actionlistener.hpp>
 
-#include "window.h"
 #include "linkhandler.h"
+#include "window.h"
 
 #include "../guichanfwd.h"
 
diff --git a/src/gui/inttextbox.cpp b/src/gui/inttextbox.cpp
index 7a39c2df..858a3fcb 100644
--- a/src/gui/inttextbox.cpp
+++ b/src/gui/inttextbox.cpp
@@ -17,14 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: inttextbox.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
-#include "inttextbox.h"
-
 #include <guichan/key.hpp>
 
+#include "inttextbox.h"
+
 #include "../utils/tostring.h"
 
 IntTextBox::IntTextBox(int i):
diff --git a/src/gui/inttextbox.h b/src/gui/inttextbox.h
index 6ade7e71..922ef4c5 100644
--- a/src/gui/inttextbox.h
+++ b/src/gui/inttextbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: inttextbox.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef INTTEXTBOX_H
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 1b2e5c63..cbce0ee3 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -17,18 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: inventorywindow.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
-#include "inventorywindow.h"
-
 #include <string>
 
 #include <guichan/mouseinput.hpp>
 
 #include "button.h"
 #include "gui.h"
+#include "inventorywindow.h"
 #include "item_amount.h"
 #include "itemcontainer.h"
 #include "scrollarea.h"
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 055bfad9..2e589471 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: inventorywindow.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _TMW_INVENTORYWINDOW_H
diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp
index 40e2e121..4ce8ac6c 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.cpp
@@ -17,14 +17,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: item_amount.cpp 3718 2007-11-11 14:46:33Z b_lindeijer $
  */
 
-#include "item_amount.h"
-
 #include "button.h"
 #include "inttextbox.h"
+#include "item_amount.h"
 #include "slider.h"
 #include "trade.h"
 
diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h
index 668dfe3b..2005094d 100644
--- a/src/gui/item_amount.h
+++ b/src/gui/item_amount.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: item_amount.h 3718 2007-11-11 14:46:33Z b_lindeijer $
  */
 
 #ifndef _TMW_ITEM_AMOUNT_WINDOW_H
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 186a2da6..30cb1d6d 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: itemcontainer.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "itemcontainer.h"
@@ -30,8 +28,8 @@
 #include "../inventory.h"
 #include "../item.h"
 #include "../itemshortcut.h"
-#include "../log.h"
 #include "../localplayer.h"
+#include "../log.h"
 
 #include "../resources/image.h"
 #include "../resources/iteminfo.h"
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index 5562023f..54e0c1ca 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -17,19 +17,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: itemcontainer.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _TMW_ITEMCONTAINER_H__
 #define _TMW_ITEMCONTAINER_H__
 
+#include <list>
+
 #include <guichan/mouselistener.hpp>
 #include <guichan/widget.hpp>
 #include <guichan/widgetlistener.hpp>
 
-#include <list>
-
 #include "../guichanfwd.h"
 
 class Image;
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index aab9fd9d..055cbe44 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -18,23 +18,21 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Legend of Mazzeroth; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
-#include "itempopup.h"
 #include <guichan/widgets/label.hpp>
-#include "widgets/layout.h"
 
 #include "gui.h"
+#include "itempopup.h"
+
+#include "widgets/layout.h"
 
 #include "../resources/image.h"
-#include "../resources/resourcemanager.h"
 #include "../resources/iteminfo.h"
+#include "../resources/resourcemanager.h"
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
 
-
 ItemPopup::ItemPopup()
 {
 
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index 499b2e0a..0082ec2c 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -19,15 +19,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Legend of Mazzeroth; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _LOM_ITEMPOPUP_H__
 #define _LOM_ITEMPOPUP_H__
 
-#include "textbox.h"
 #include "scrollarea.h"
+#include "textbox.h"
 #include "window.h"
 
 #include "../item.h"
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index 5899abd1..86a53aca 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -17,18 +17,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: itemshortcutcontainer.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "itemshortcutcontainer.h"
 
-#include "../localplayer.h"
 #include "../graphics.h"
 #include "../inventory.h"
 #include "../item.h"
 #include "../itemshortcut.h"
 #include "../keyboardconfig.h"
+#include "../localplayer.h"
 
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h
index cc4e830a..a8daca0b 100644
--- a/src/gui/itemshortcutcontainer.h
+++ b/src/gui/itemshortcutcontainer.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: itemshortcutcontainer.h 4076 2008-04-12 18:36:15Z b_lindeijer $
  */
 
 #ifndef _TMW_ITEMSHORTCUTCONTAINER_H__
diff --git a/src/gui/itemshortcutwindow.cpp b/src/gui/itemshortcutwindow.cpp
index 394fcbb7..5a4dfacd 100644
--- a/src/gui/itemshortcutwindow.cpp
+++ b/src/gui/itemshortcutwindow.cpp
@@ -17,13 +17,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: itemshortcutwindow.cpp 4076 2008-04-12 18:36:15Z b_lindeijer $
  */
 
-#include "itemshortcutwindow.h"
-
 #include "itemshortcutcontainer.h"
+#include "itemshortcutwindow.h"
 #include "scrollarea.h"
 
 static const int SCROLL_PADDING = 0;
diff --git a/src/gui/itemshortcutwindow.h b/src/gui/itemshortcutwindow.h
index 112c39d9..587f15c8 100644
--- a/src/gui/itemshortcutwindow.h
+++ b/src/gui/itemshortcutwindow.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: itemshortcutwindow.h 4076 2008-04-12 18:36:15Z b_lindeijer $
  */
 
 #ifndef _TMW_ITEMSHORTCUTWINDOW_H
diff --git a/src/gui/linkhandler.h b/src/gui/linkhandler.h
index 93a8c000..44f906db 100644
--- a/src/gui/linkhandler.h
+++ b/src/gui/linkhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: linkhandler.h 3606 2007-09-27 14:54:09Z b_lindeijer $
  */
 
 #ifndef _TMW_LINK_HANDLER_H_
diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp
index cf941be1..4dca66a0 100644
--- a/src/gui/listbox.cpp
+++ b/src/gui/listbox.cpp
@@ -17,17 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: listbox.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
-#include "listbox.h"
-
 #include <guichan/font.hpp>
 #include <guichan/graphics.hpp>
 #include <guichan/listmodel.hpp>
 #include <guichan/mouseinput.hpp>
 
+#include "listbox.h"
+
 ListBox::ListBox(gcn::ListModel *listModel):
     gcn::ListBox(listModel)
 {
diff --git a/src/gui/listbox.h b/src/gui/listbox.h
index 2f501a6c..30eb4c79 100644
--- a/src/gui/listbox.h
+++ b/src/gui/listbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: listbox.h 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #ifndef _TMW_LISTBOX_H
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 0cdb4656..fa47af32 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -17,26 +17,24 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: login.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
-#include "login.h"
-
 #include <string>
 #include <vector>
 
 #include <guichan/widgets/label.hpp>
 
-#include "../main.h"
-#include "../logindata.h"
-#include "../configuration.h"
-
 #include "button.h"
 #include "checkbox.h"
+#include "login.h"
 #include "ok_dialog.h"
 #include "passwordfield.h"
 #include "textfield.h"
+
+#include "../main.h"
+#include "../logindata.h"
+#include "../configuration.h"
+
 #include "../utils/tostring.h"
 
 static const int MAX_SERVER_LIST_SIZE = 5;
diff --git a/src/gui/login.h b/src/gui/login.h
index 3550d82b..3b911424 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -17,24 +17,24 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: login.h 3234 2007-03-24 13:05:27Z b_lindeijer $
  */
 
 #ifndef _TMW_LOGIN_H
 #define _TMW_LOGIN_H
 
 #include <iosfwd>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
 
+#include "scrollarea.h"
 #include "window.h"
-#include "../guichanfwd.h"
+
 #include "widgets/dropdown.h"
-#include "scrollarea.h"
+
+#include "../guichanfwd.h"
 
 class LoginData;
 
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index 2d07e632..79281631 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -17,26 +17,23 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: menuwindow.cpp 4060 2008-04-09 14:49:07Z b_lindeijer $
  */
 
-#include "menuwindow.h"
-
 #include <string>
 
 #include <guichan/actionlistener.hpp>
 
 #include "button.h"
+#include "menuwindow.h"
 #include "windowcontainer.h"
 
-extern Window *setupWindow;
-extern Window *inventoryWindow;
+extern Window *chatWindow;
 extern Window *equipmentWindow;
+extern Window *inventoryWindow;
+extern Window *itemShortcutWindow;
+extern Window *setupWindow;
 extern Window *skillDialog;
 extern Window *statusWindow;
-extern Window *itemShortcutWindow;
-extern Window *chatWindow;
 
 namespace {
     struct MenuWindowListener : public gcn::ActionListener
diff --git a/src/gui/menuwindow.h b/src/gui/menuwindow.h
index add04095..03ec3380 100644
--- a/src/gui/menuwindow.h
+++ b/src/gui/menuwindow.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: menuwindow.h 2417 2006-07-19 15:12:06Z umperio $
  */
 
 #ifndef _TMW_MENU_H
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 8404e52a..728f61e4 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: minimap.cpp 4116 2008-04-17 12:48:43Z peaveydk $
  */
 
 #include "minimap.h"
diff --git a/src/gui/minimap.h b/src/gui/minimap.h
index a3b14729..7897ebdb 100644
--- a/src/gui/minimap.h
+++ b/src/gui/minimap.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: minimap.h 2417 2006-07-19 15:12:06Z umperio $
  */
 
 #ifndef _TMW_MINIMAP_H
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 1bdabbfe..59dca0e1 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -17,20 +17,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: ministatus.cpp 3753 2007-11-20 12:27:56Z b_lindeijer $
  */
 
-#include "ministatus.h"
-
 #include <guichan/widgets/label.hpp>
 
 #include "gui.h"
+#include "ministatus.h"
 #include "progressbar.h"
 
-#include "../localplayer.h"
 #include "../configuration.h"
 #include "../graphics.h"
+#include "../localplayer.h"
 
 #include "../utils/tostring.h"
 
diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h
index d4002d93..d7f6f68c 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatus.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: ministatus.h 2581 2006-08-25 22:04:17Z b_lindeijer $
  */
 
 #ifndef _TMW_MINISTATUS_H
diff --git a/src/gui/newskill.cpp b/src/gui/newskill.cpp
deleted file mode 100644
index c2088e75..00000000
--- a/src/gui/newskill.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: newskill.cpp 3587 2007-09-20 13:24:20Z b_lindeijer $
- */
-
- /* This file implements the new skill dialog for use under the latest
-  * version of the skill system as of 2005/02/20
-  */
-
-#include "newskill.h"
-
-#include <guichan/widgets/label.hpp>
-
-#include "button.h"
-#include "progressbar.h"
-
-#include "../graphics.h"
-
-const char *skill_name[] = {
-    // 0-99
-    // weapon skills 0-9
-    "Short Blades", "Long Blades", "Hammers", "Archery", "Whip",
-    "Staves", "Throwing", "Piercing", "Hand to Hand", NULL,
-    // magic skills 10-19
-    "Epyri (Fire)", "Merene (Water)", "Geon (Earth)", "Izurial (Air)",
-    "Lumine (Light)", "Tenebrae (Dark)", "Chronos (Time)", "Teless (Space)",
-    "Gen (Mana)", NULL,
-    // craft skills 20-29
-    "Metalworking", "Woodworking", "Jeweler", "Cook", "Tailor",
-    "Alchemist", "Artisan", "Synthesis", NULL, NULL,
-    // general skills 30-39
-    "Running", "Searching", "Sneak", "Trading", "Intimidate",
-    "Athletics", NULL, NULL, NULL,NULL,
-    // combat skills 40-49
-    "Dodge", "Accuracy", "Critical", "Block", "Parry", "Diehard", "Magic Aura",
-    "Counter", NULL, NULL,
-    // resistance skills 50-59
-    "Poison", "Silence", "Petrify", "Paralyze", "Blind", "Slow", "Zombie",
-    "Critical", NULL, NULL,
-    // element reistance 60-69
-    "Heat (Fire)", "Chill (Water)", "Stone (Earth)", "Wind (Air)",
-    "Shine (Light)", "Shadow (Dark)", "Decay (Time)", "Chaos (Space)", NULL,
-    NULL,
-    // hunting skills 70-79
-    "Insects", "Birds", "Lizards", "Amorphs", "Undead", "Machines", "Arcana",
-    "Humanoids", "Plantoids", NULL,
-    // stats 80-89
-    "Strength", "Fortitude", "Vitality", "Menality", "Awareness", "Mana",
-    "Dexterity", NULL, NULL, NULL,
-    // unused (reserved) 90-99
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
-};
-
-
-NewSkillDialog::NewSkillDialog():
-    Window("Skills")
-{
-    startPoint = 0;
-    for (int i = 0; i < N_SKILL_CAT_SIZE; i++)
-    {
-        mSkillLabel[i] = new gcn::Label("Empty               ");
-        mSkillLevel[i] = new gcn::Label("00000");
-        mSkillbar[i] = new ProgressBar(0.0f,100,15,0,0,255);
-        mSkillLevel[i]->setAlignment(Graphics::RIGHT);
-        add(mSkillLabel[i],40,5+i*25);
-        add(mSkillLevel[i],150,5+i*25);
-        add(mSkillbar[i],180,5+i*25);
-    }
-    // initialize the skills
-    for (int i = 0; i < N_SKILL; i++)
-    {
-        mPlayerSkill[i].level = 0;
-        mPlayerSkill[i].exp = 0;
-    }
-    resetNSD();
-
-    // create controls
-    Button *catButton[N_SKILL_CAT];
-    catButton[0] = new Button("Weapons", "g1", this);
-    catButton[1] = new Button("Magic", "g2", this);
-    catButton[2] = new Button("Craft", "g3", this);
-    catButton[3] = new Button("General", "g4", this);
-    catButton[4] = new Button("Combat", "g5", this);
-    catButton[5] = new Button("E. Resist", "g6", this);
-    catButton[6] = new Button("S. Resist", "g7", this);
-    catButton[7] = new Button("Hunting", "g8", this);
-    catButton[8] = new Button("Stat", "g9", this);
-
-    setContentSize(350, 250);
-
-    for (int i = 0; i < 9; ++i) {
-        catButton[i]->setDimension(gcn::Rectangle(0, 0, 60, 20));
-        catButton[i]->setPosition(290, 20 * i);
-        add(catButton[i]);
-    }
-
-    Button *closeButton = new Button("Close", "close", this);
-    closeButton->setDimension(gcn::Rectangle(0,0,60,20));
-    closeButton->setPosition(290, 230);
-    add(closeButton);
-
-    // finsihing touches
-    setLocationRelativeTo(getParent());
-}
-
-void NewSkillDialog::action(const gcn::ActionEvent &event)
-{
-    int osp = startPoint;
-    if (event.getId() == "close")
-    {
-        setVisible(false);
-    }
-    else if (event.getId() == "g1") // weapons group 0-9
-    {
-        startPoint =0;
-    }
-    else if (event.getId() == "g2") // magic group 10-19
-    {
-        startPoint =10;
-    }
-    else if (event.getId() == "g3") // craft group 20-29
-    {
-        startPoint =20;
-    }
-    else if (event.getId() == "g4") // general group 30-39
-    {
-        startPoint =30;
-    }
-    else if (event.getId() == "g5") // combat group 40-49
-    {
-        startPoint =40;
-    }
-    else if (event.getId() == "g6") // e. resist group 50-59
-    {
-        startPoint =50;
-    }
-    else if (event.getId() == "g7") // s resist group 60-69
-    {
-        startPoint =60;
-    }
-    else if (event.getId() == "g8") // hunting group 70-79
-    {
-        startPoint =70;
-    }
-    else if (event.getId() == "g9") // stats group 80-89
-    {
-        startPoint =80;
-    }
-    if (osp != startPoint)
-    {
-        resetNSD();
-    }
-}
-
-void NewSkillDialog::resetNSD()
-{
-     for (int a = 0; a < N_SKILL_CAT_SIZE; a++)
-     {
-         if (skill_name[a + startPoint])
-         {
-             mSkillLabel[a]->setCaption(skill_name[a + startPoint]);
-             mSkillLabel[a]->setVisible(true);
-             char tmp[5];
-             sprintf(tmp, "%d", mPlayerSkill[a+startPoint].level);
-             mSkillLevel[a]->setCaption(tmp);
-             mSkillLevel[a]->setVisible(true);
-             mSkillbar[a]->setProgress(0.0f);
-             mSkillbar[a]->setVisible(true);
-         }
-         else
-         {
-             mSkillLevel[a]->setVisible(false);
-             mSkillLabel[a]->setVisible(false);
-             mSkillbar[a]->setVisible(false);
-         }
-     }
-}
diff --git a/src/gui/newskill.h b/src/gui/newskill.h
deleted file mode 100644
index c553ab1d..00000000
--- a/src/gui/newskill.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: newskill.h 3035 2007-01-14 14:54:39Z b_lindeijer $
- */
-
-#ifndef _TMW_NSKILL_H
-#define _TMW_NSKILL_H
-
-#include <guichan/actionlistener.hpp>
-
-#include "window.h"
-
-#include "../guichanfwd.h"
-
-class ProgressBar;
-
-#define N_SKILL 100 // skill count constant
-#define N_SKILL_CAT 9 // skill category count
-#define N_SKILL_CAT_SIZE 10 // skill category maximum size
-
-struct nSkill {
-    short level;
-    short exp;
-};
-
-/**
- * Dialog showing the skills in the planned skill model.
- *
- * \ingroup Interface
- */
-class NewSkillDialog : public Window, public gcn::ActionListener
-{
-    public:
-        /**
-         * Constructor.
-         */
-        NewSkillDialog();
-
-        // action listener
-        void action(const gcn::ActionEvent &event);
-
-    private:
-        void resetNSD(); // updates the values in the dialog box
-
-        // members
-        int startPoint; // starting point of skill listing
-        ProgressBar *mSkillbar[N_SKILL_CAT_SIZE];
-        gcn::Label *mSkillLabel[N_SKILL_CAT_SIZE];
-        gcn::Label *mSkillLevel[N_SKILL_CAT_SIZE];
-        nSkill mPlayerSkill[N_SKILL]; // pointer to an array of skill values
-};
-
-#endif
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index d74b3ddd..052b5f33 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -17,14 +17,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: npc_text.cpp 4096 2008-04-16 08:39:59Z b_lindeijer $
  */
 
-#include "npc_text.h"
-
 #include <string>
 
+#include "npc_text.h"
 #include "textbox.h"
 
 #include "../npc.h"
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 3773950a..e26dd870 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -17,18 +17,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: npc_text.h 4096 2008-04-16 08:39:59Z b_lindeijer $
  */
 
 #ifndef _TMW_NPC_TEXT_H
 #define _TMW_NPC_TEXT_H
 
 #include <iosfwd>
+
 #include <guichan/actionlistener.hpp>
 
-#include "scrollarea.h"
 #include "button.h"
+#include "scrollarea.h"
 #include "window.h"
 
 #include "../guichanfwd.h"
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 3203ba84..ba9e3d58 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -17,15 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: npclistdialog.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
-#include "npclistdialog.h"
-
 #include <sstream>
 
 #include "listbox.h"
+#include "npclistdialog.h"
 
 #include "../npc.h"
 
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index 4e9d4b3b..77f0c177 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: npclistdialog.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _TMW_GUI_NPCLISTDIALOG_H
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index b8d3c7ba..421c873e 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: ok_dialog.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #include "ok_dialog.h"
diff --git a/src/gui/ok_dialog.h b/src/gui/ok_dialog.h
index 426da538..a06ddd7c 100644
--- a/src/gui/ok_dialog.h
+++ b/src/gui/ok_dialog.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: ok_dialog.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _OK_DIALOG_H
diff --git a/src/gui/passwordfield.cpp b/src/gui/passwordfield.cpp
index 710eb767..01c7e15d 100644
--- a/src/gui/passwordfield.cpp
+++ b/src/gui/passwordfield.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: passwordfield.cpp 2132 2006-02-01 14:53:10Z der_doener $
  */
 
 #include "passwordfield.h"
diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h
index 8228bfe2..9aa6ab49 100644
--- a/src/gui/passwordfield.h
+++ b/src/gui/passwordfield.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: passwordfield.h 2895 2006-12-09 01:44:18Z b_lindeijer $
  */
 
 #ifndef _TMW_PASSWORDFIELD_H_
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index 6d39ce05..79c5676f 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -17,16 +17,14 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: playerbox.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include <algorithm>
 
 #include "playerbox.h"
 
-#include "../player.h"
 #include "../graphics.h"
+#include "../player.h"
 
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
diff --git a/src/gui/playerbox.h b/src/gui/playerbox.h
index 86cdf064..7aec87bf 100644
--- a/src/gui/playerbox.h
+++ b/src/gui/playerbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: playerbox.h 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #ifndef __TMW_PLAYERBOX_H__
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 7e40abed..c0feb68d 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -17,12 +17,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: popupmenu.cpp 4243 2008-05-16 15:48:52Z the_enemy $
  */
 
-#include "popupmenu.h"
-
 #include <cassert>
 #include <iostream>
 
@@ -31,6 +27,7 @@
 #include "browserbox.h"
 #include "inventorywindow.h"
 #include "item_amount.h"
+#include "popupmenu.h"
 #include "windowcontainer.h"
 
 #include "../being.h"
@@ -43,8 +40,8 @@
 #include "../net/messageout.h"
 #include "../net/protocol.h"
 
-#include "../resources/iteminfo.h"
 #include "../resources/itemdb.h"
+#include "../resources/iteminfo.h"
 
 extern std::string tradePartnerName;
 
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index 601fa2ae..3cf949b3 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -17,22 +17,19 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: popupmenu.h 2239 2006-03-09 05:16:27Z der_doener $
  */
 
 #ifndef _TMW_POPUP_MENU_H
 #define _TMW_POPUP_MENU_H
 
-#include "window.h"
 #include "linkhandler.h"
+#include "window.h"
 
 class Being;
 class BrowserBox;
 class FloorItem;
 class Item;
 
-
 /**
  * Window showing popup menu.
  */
diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index 6dbc3b85..708a2991 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: progressbar.cpp 4008 2008-03-27 14:51:10Z b_lindeijer $
  */
 
 #include "progressbar.h"
diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h
index df825a5d..a20c901f 100644
--- a/src/gui/progressbar.h
+++ b/src/gui/progressbar.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: progressbar.h 2240 2006-03-09 12:24:36Z der_doener $
  */
 
 #ifndef _TMW_PROGRESSBAR_H
@@ -32,7 +30,6 @@
 
 class ImageRect;
 
-
 /**
  * A progress bar.
  *
diff --git a/src/gui/radiobutton.cpp b/src/gui/radiobutton.cpp
index cbab4d2d..5f929e62 100644
--- a/src/gui/radiobutton.cpp
+++ b/src/gui/radiobutton.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: radiobutton.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include "radiobutton.h"
diff --git a/src/gui/radiobutton.h b/src/gui/radiobutton.h
index ef87dccd..8fb6d832 100644
--- a/src/gui/radiobutton.h
+++ b/src/gui/radiobutton.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: radiobutton.h 1584 2005-08-13 12:49:52Z der_doener $
  */
 
 #ifndef _TMW_RADIOBUTTON_H
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index e0b663b8..ec6a9756 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -17,12 +17,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: register.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
-#include "register.h"
-
 #include <string>
 #include <sstream>
 
@@ -36,10 +32,11 @@
 #include "button.h"
 #include "checkbox.h"
 #include "login.h"
+#include "ok_dialog.h"
 #include "passwordfield.h"
 #include "radiobutton.h"
+#include "register.h"
 #include "textfield.h"
-#include "ok_dialog.h"
 
 #include "../utils/tostring.h"
 
diff --git a/src/gui/register.h b/src/gui/register.h
index 6f997b75..87a11bb9 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -17,18 +17,18 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: register.h 3234 2007-03-24 13:05:27Z b_lindeijer $
  */
 
 #ifndef _TMW_REGISTER_H
 #define _TMW_REGISTER_H
 
 #include <iosfwd>
+
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
 
 #include "window.h"
+
 #include "../guichanfwd.h"
 
 class LoginData;
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index a3aef702..032e3f78 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: scrollarea.cpp 4204 2008-04-28 18:29:04Z b_lindeijer $
  */
 
 #include <algorithm>
diff --git a/src/gui/scrollarea.h b/src/gui/scrollarea.h
index 32a192fc..ebe2c77b 100644
--- a/src/gui/scrollarea.h
+++ b/src/gui/scrollarea.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: scrollarea.h 4204 2008-04-28 18:29:04Z b_lindeijer $
  */
 
 #ifndef __TMW_SCROLLAREA_H__
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 9fed52f3..63af1aaa 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -17,12 +17,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: sell.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
-#include "sell.h"
-
 #include <cassert>
 
 #include <guichan/widgets/label.hpp>
@@ -30,17 +26,18 @@
 #include "button.h"
 #include "shoplistbox.h"
 #include "scrollarea.h"
+#include "sell.h"
 #include "shop.h"
 #include "slider.h"
 
 #include "../item.h"
 #include "../npc.h"
 
-#include "../resources/iteminfo.h"
-
 #include "../net/messageout.h"
 #include "../net/protocol.h"
 
+#include "../resources/iteminfo.h"
+
 #include "../utils/tostring.h"
 
 SellDialog::SellDialog(Network *network):
diff --git a/src/gui/sell.h b/src/gui/sell.h
index 11528f89..48961efc 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: sell.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _TMW_SELL_H
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 4faa8a86..b8fdb7de 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -17,33 +17,30 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup.cpp 4306 2008-05-28 20:22:37Z crush_tmw $
  */
 
 #include <algorithm>
-
-#include "setup.h"
+#include <iostream>
 
 #include "button.h"
+#include "setup.h"
 #include "setup_audio.h"
+#include "setup_colours.h"
 #include "setup_joystick.h"
-#include "setup_video.h"
 #include "setup_keyboard.h"
 #include "setup_players.h"
-#include "setup_colours.h"
+#include "setup_video.h"
 #include "tabbedcontainer.h"
 
 #include "../utils/dtor.h"
-#include <iostream>
 
-extern Window *statusWindow;
-extern Window *minimap;
 extern Window *chatWindow;
-extern Window *inventoryWindow;
 extern Window *equipmentWindow;
 extern Window *helpWindow;
+extern Window *inventoryWindow;
+extern Window *minimap;
 extern Window *skillDialog;
+extern Window *statusWindow;
 
 Setup::Setup():
     Window("Setup")
diff --git a/src/gui/setup.h b/src/gui/setup.h
index c24b8cb9..fd200f4c 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup.h 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
 #ifndef _TMW_SETUP_H
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 09357cce..70b34a31 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -17,16 +17,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup_audio.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
-#include "setup_audio.h"
-
 #include <guichan/widgets/label.hpp>
 
 #include "checkbox.h"
 #include "ok_dialog.h"
+#include "setup_audio.h"
 #include "slider.h"
 
 #include "../configuration.h"
diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h
index 76420101..9835a8fb 100644
--- a/src/gui/setup_audio.h
+++ b/src/gui/setup_audio.h
@@ -17,17 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup_audio.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _TMW_GUI_SETUP_AUDIO_H
 #define _TMW_GUI_SETUP_AUDIO_H
 
-#include "setuptab.h"
-
 #include <guichan/actionlistener.hpp>
 
+#include "setuptab.h"
+
 #include "../guichanfwd.h"
 
 class Setup_Audio : public SetupTab, public gcn::ActionListener
diff --git a/src/gui/setup_colours.cpp b/src/gui/setup_colours.cpp
index 2c6d7aa9..0becd48f 100644
--- a/src/gui/setup_colours.cpp
+++ b/src/gui/setup_colours.cpp
@@ -19,8 +19,6 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "setup_colours.h"
-
 #include <vector>
 
 #include <guichan/listmodel.hpp>
@@ -29,6 +27,7 @@
 
 #include "colour.h"
 #include "scrollarea.h"
+#include "setup_colours.h"
 #include "slider.h"
 
 #include "../configuration.h"
diff --git a/src/gui/setup_colours.h b/src/gui/setup_colours.h
index 566bed37..3bd87848 100644
--- a/src/gui/setup_colours.h
+++ b/src/gui/setup_colours.h
@@ -22,17 +22,17 @@
 #ifndef _SETUP_COLOURS_H
 #define _SETUP_COLOURS_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <guichan/actionlistener.hpp>
-#include <guichan/widgets/listbox.hpp>
 #include <guichan/widgets/label.hpp>
+#include <guichan/widgets/listbox.hpp>
 
+#include "scrollarea.h"
 #include "setuptab.h"
 #include "slider.h"
 #include "textfield.h"
-#include "scrollarea.h"
 
 #include "../guichanfwd.h"
 
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 41e91595..723d0597 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -17,16 +17,14 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup_joystick.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
-#include "setup_joystick.h"
-
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
 #include "checkbox.h"
+#include "setup_joystick.h"
+
 #include "../configuration.h"
 #include "../joystick.h"
 
diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h
index 399156d8..d2973a89 100644
--- a/src/gui/setup_joystick.h
+++ b/src/gui/setup_joystick.h
@@ -17,17 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup_joystick.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _TMW_GUI_SETUP_JOYSTICK_H
 #define _TMW_GUI_SETUP_JOYSTICK_H
 
-#include "setuptab.h"
-
 #include <guichan/actionlistener.hpp>
 
+#include "setuptab.h"
+
 #include "../guichanfwd.h"
 
 class Setup_Joystick : public SetupTab, public gcn::ActionListener
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 704fc691..007fcb52 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -17,11 +17,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup_keyboard.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
-#include "setup_keyboard.h"
+#include <SDL_keyboard.h>
 
 #include <guichan/widgets/label.hpp>
 #include <guichan/listmodel.hpp>
@@ -30,14 +28,13 @@
 #include "listbox.h"
 #include "ok_dialog.h"
 #include "scrollarea.h"
+#include "setup_keyboard.h"
 
 #include "../configuration.h"
 #include "../keyboardconfig.h"
 
 #include "../utils/tostring.h"
 
-#include <SDL_keyboard.h>
-
 /**
  * The list model for key function list.
  *
diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h
index 7f945181..937790af 100644
--- a/src/gui/setup_keyboard.h
+++ b/src/gui/setup_keyboard.h
@@ -17,21 +17,19 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup_keyboard.h 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #ifndef _TMW_GUI_SETUP_KEYBOARD_H
 #define _TMW_GUI_SETUP_KEYBOARD_H
 
-#include "setuptab.h"
-#include "button.h"
-#include "../guichanfwd.h"
+#include <string>
 
 #include <guichan/actionlistener.hpp>
 
+#include "button.h"
+#include "setuptab.h"
 
-#include <string>
+#include "../guichanfwd.h"
 
 class Setup_Keyboard : public SetupTab, public gcn::ActionListener
 {
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index ed1facc7..d07a9685 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -17,23 +17,21 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup_players.cpp 4353 2008-06-16 07:04:46Z b_lindeijer $
  */
 
-#include "setup_players.h"
-
 #include <vector>
+
 #include <guichan/widgets/dropdown.hpp>
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
 #include "checkbox.h"
 #include "ok_dialog.h"
+#include "setup_players.h"
 
-#include "../player_relations.h"
 #include "../configuration.h"
 #include "../log.h"
+#include "../player_relations.h"
 #include "../sound.h"
 
 #define COLUMNS_NR 2 // name plus listbox
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index b04023ab..b693a952 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -22,15 +22,14 @@
 #ifndef _TMW_GUI_SETUP_PLAYERS_H
 #define _TMW_GUI_SETUP_PLAYERS_H
 
-#include "setuptab.h"
+#include <guichan/actionlistener.hpp>
 
-#include "scrollarea.h"
 #include "button.h"
+#include "scrollarea.h"
+#include "setuptab.h"
 #include "table.h"
-#include <guichan/actionlistener.hpp>
 
 #include "../guichanfwd.h"
-
 #include "../player_relations.h"
 
 class PlayerTableModel;
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 879a3066..ec5b1d0a 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -17,15 +17,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup_video.cpp 4338 2008-06-05 18:41:39Z crush_tmw $
  */
 
-#include "setup_video.h"
-
+#include <SDL.h>
 #include <string>
 #include <vector>
-#include <SDL.h>
 
 #include <guichan/key.hpp>
 #include <guichan/listmodel.hpp>
@@ -36,6 +32,7 @@
 #include "listbox.h"
 #include "ok_dialog.h"
 #include "scrollarea.h"
+#include "setup_video.h"
 #include "slider.h"
 #include "textfield.h"
 
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index d0a19cb6..4103c5ef 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -17,18 +17,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup_video.h 4306 2008-05-28 20:22:37Z crush_tmw $
  */
 
 #ifndef _TMW_GUI_SETUP_VIDEO_H
 #define _TMW_GUI_SETUP_VIDEO_H
 
-#include "setuptab.h"
-
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
 
+#include "setuptab.h"
+
 #include "../guichanfwd.h"
 
 class Setup_Video : public SetupTab, public gcn::ActionListener,
diff --git a/src/gui/setuptab.h b/src/gui/setuptab.h
index bbfe4fac..6c276c35 100644
--- a/src/gui/setuptab.h
+++ b/src/gui/setuptab.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setuptab.h 2273 2006-03-19 00:48:10Z der_doener $
  */
 
 #ifndef _TMW_GUI_SETUPTAB_H
diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp
index e7619547..a4478a62 100644
--- a/src/gui/shop.cpp
+++ b/src/gui/shop.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: shop.cpp 4348 2008-06-14 12:42:49Z the_enemy $
  */
 
 #include "shop.h"
diff --git a/src/gui/shop.h b/src/gui/shop.h
index 8dfda67e..97b8d173 100644
--- a/src/gui/shop.h
+++ b/src/gui/shop.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: shop.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _SHOP_H
@@ -29,10 +27,10 @@
 
 #include <guichan/listmodel.hpp>
 
-#include "../resources/image.h"
-
-#include "../shopitem.h"
 #include "../guichanfwd.h"
+#include "../shopitem.h"
+
+#include "../resources/image.h"
 
 class ShopItems : public gcn::ListModel
 {
diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp
index 7a8b52ed..e31eee58 100644
--- a/src/gui/shoplistbox.cpp
+++ b/src/gui/shoplistbox.cpp
@@ -17,18 +17,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: listbox.cpp 2655 2006-09-03 21:25:02Z b_lindeijer $
  */
 
-#include "shoplistbox.h"
-
+#include <guichan/basiccontainer.hpp>
 #include <guichan/font.hpp>
 #include <guichan/graphics.hpp>
+#include <guichan/imagefont.hpp>
 #include <guichan/listmodel.hpp>
 #include <guichan/mouseinput.hpp>
-#include <guichan/imagefont.hpp>
-#include <guichan/basiccontainer.hpp>
+
+#include "shoplistbox.h"
 
 #include "../graphics.h"
 
diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h
index 5840e47f..e856c076 100644
--- a/src/gui/shoplistbox.h
+++ b/src/gui/shoplistbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: listbox.h 2655 2006-09-03 21:25:02Z b_lindeijer $
  */
 
 #ifndef _TMW_SHOPLISTBOX_H
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 5a23e2a8..36c3a305 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -17,25 +17,22 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
 
 #include <guichan/widgets/label.hpp>
 
-#include "skill.h"
-
 #include "button.h"
 #include "listbox.h"
+#include "skill.h"
 #include "windowcontainer.h"
 
 #include "../localplayer.h"
+#include "../log.h"
 
 #include "../utils/dtor.h"
 #include "../utils/xml.h"
-#include "../log.h"
 
 #define SKILLS_FILE "skills.xml"
 
diff --git a/src/gui/skill.h b/src/gui/skill.h
index 92badc8a..ee579dd5 100644
--- a/src/gui/skill.h
+++ b/src/gui/skill.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_SKILL_H
diff --git a/src/gui/slider.cpp b/src/gui/slider.cpp
index a1ae6acc..afeecf17 100644
--- a/src/gui/slider.cpp
+++ b/src/gui/slider.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: slider.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include "slider.h"
diff --git a/src/gui/slider.h b/src/gui/slider.h
index 5700d64d..36bfe698 100644
--- a/src/gui/slider.h
+++ b/src/gui/slider.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: slider.h 1584 2005-08-13 12:49:52Z der_doener $
  */
 
 #ifndef _TMW_SLIDER_H
@@ -30,7 +28,6 @@
 
 class Image;
 
-
 /**
  * Slider widget. Same as the Guichan slider but with custom look.
  *
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 0ccbebc0..2ab80bd9 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -18,8 +18,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Legend of Mazzeroth; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <guichan/font.hpp>
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
index 7a2a73b8..9b8eab70 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -18,15 +18,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Legend of Mazzeroth; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _LOM_SPEECHBUBBLE_H__
 #define _LOM_SPEECHBUBBLE_H__
 
-#include "textbox.h"
 #include "scrollarea.h"
+#include "textbox.h"
 #include "window.h"
 
 class SpeechBubble : public Window
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 79b3aec7..9d6760d0 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -17,16 +17,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: status.cpp 3510 2007-08-23 14:14:51Z b_lindeijer $
  */
 
-#include "status.h"
-
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
 #include "progressbar.h"
+#include "status.h"
 #include "windowcontainer.h"
 
 #include "../localplayer.h"
diff --git a/src/gui/status.h b/src/gui/status.h
index 4d082148..55ed393e 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: status.h 3538 2007-08-28 00:01:38Z b_lindeijer $
  */
 
 #ifndef _TMW_STATUS_H
diff --git a/src/gui/tabbedcontainer.cpp b/src/gui/tabbedcontainer.cpp
index fc3efbd5..8e95aa7c 100644
--- a/src/gui/tabbedcontainer.cpp
+++ b/src/gui/tabbedcontainer.cpp
@@ -17,18 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: tabbedcontainer.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include <algorithm>
 
-#include "tabbedcontainer.h"
-
 #include "button.h"
+#include "tabbedcontainer.h"
 
-#include "../utils/tostring.h"
 #include "../utils/dtor.h"
+#include "../utils/tostring.h"
 
 TabbedContainer::TabbedContainer(int width, int padX, int buttonHeight,
                                  int height, int padY, int buttonsPerRow):
diff --git a/src/gui/tabbedcontainer.h b/src/gui/tabbedcontainer.h
index b004edc2..2fc41247 100644
--- a/src/gui/tabbedcontainer.h
+++ b/src/gui/tabbedcontainer.h
@@ -17,16 +17,14 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: tabbedcontainer.h 3152 2007-02-27 16:31:34Z crush_tmw $
  */
 
 #ifndef _TMW_TABPANE_H
 #define _TMW_TABPANE_H
 
 #include <iosfwd>
-#include <vector>
 #include <map>
+#include <vector>
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/table.cpp b/src/gui/table.cpp
index 8d2ab86a..e4d7812e 100644
--- a/src/gui/table.cpp
+++ b/src/gui/table.cpp
@@ -19,12 +19,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/graphics.hpp>
-#include <guichan/actionlistener.hpp>
-#include "table.h"
 #include <cassert>
 
+#include <guichan/graphics.hpp>
+#include <guichan/actionlistener.hpp>
 
+#include "table.h"
 
 class GuiTableActionListener : public gcn::ActionListener
 {
diff --git a/src/gui/table.h b/src/gui/table.h
index cef82d5d..b4c607ae 100644
--- a/src/gui/table.h
+++ b/src/gui/table.h
@@ -31,6 +31,7 @@
 #include <guichan/widget.hpp>
 
 #include "table_model.h"
+
 #include "../guichanfwd.h"
 
 class GuiTableActionListener;
diff --git a/src/gui/table_model.cpp b/src/gui/table_model.cpp
index 57da29d9..e1afef96 100644
--- a/src/gui/table_model.cpp
+++ b/src/gui/table_model.cpp
@@ -19,8 +19,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/widget.hpp>
 #include <cstdlib>
+
+#include <guichan/widget.hpp>
+
 #include "table_model.h"
 
 void
diff --git a/src/gui/table_model.h b/src/gui/table_model.h
index 69e41cd3..4022e369 100644
--- a/src/gui/table_model.h
+++ b/src/gui/table_model.h
@@ -22,9 +22,11 @@
 #ifndef TMW_TABLE_MODEL_H_
 #define TMW_TABLE_MODEL_H_
 
-#include <guichan/gui.hpp>
 #include <set>
 #include <vector>
+
+#include <guichan/gui.hpp>
+
 #include "../guichanfwd.h"
 
 class TableModelListener
diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp
index 2a496a1f..d7b589fa 100644
--- a/src/gui/textbox.cpp
+++ b/src/gui/textbox.cpp
@@ -17,17 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: textbox.cpp 4096 2008-04-16 08:39:59Z b_lindeijer $
  */
 
-#include "textbox.h"
-
 #include <sstream>
 
 #include <guichan/basiccontainer.hpp>
 #include <guichan/font.hpp>
 
+#include "textbox.h"
+
 TextBox::TextBox():
     gcn::TextBox()
 {
diff --git a/src/gui/textbox.h b/src/gui/textbox.h
index 6f4db7dd..a0f0f947 100644
--- a/src/gui/textbox.h
+++ b/src/gui/textbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: textbox.h 4096 2008-04-16 08:39:59Z b_lindeijer $
  */
 
 #ifndef __TMW_TEXTBOX_H__
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index b128701b..bd016a8d 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -17,13 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: textfield.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include <algorithm>
 
 #include <guichan/font.hpp>
+
 #include <guichan/sdl/sdlinput.hpp>
 
 #include "textfield.h"
diff --git a/src/gui/textfield.h b/src/gui/textfield.h
index 60766676..6def784d 100644
--- a/src/gui/textfield.h
+++ b/src/gui/textfield.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: textfield.h 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #ifndef __TMW_TEXTFIELD_H__
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 2831fc46..8c02ab01 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -17,12 +17,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id $
  */
 
-#include "trade.h"
-
 #include <sstream>
 
 #include <guichan/widgets/label.hpp>
@@ -34,6 +30,7 @@
 #include "itemcontainer.h"
 #include "scrollarea.h"
 #include "textfield.h"
+#include "trade.h"
 
 #include "../inventory.h"
 #include "../item.h"
diff --git a/src/gui/trade.h b/src/gui/trade.h
index 7adf9575..5d587991 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id $
  */
 
 #ifndef _TMW_TRADE_H
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 5e9baa32..64f02f54 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -17,12 +17,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: updatewindow.cpp 4332 2008-06-05 07:33:12Z b_lindeijer $
  */
 
-#include "updatewindow.h"
-
 #include <iostream>
 #include <SDL.h>
 #include <SDL_thread.h>
@@ -34,6 +30,7 @@
 #include "button.h"
 #include "progressbar.h"
 #include "scrollarea.h"
+#include "updatewindow.h"
 
 // Curl should be included after Guichan to avoid Windows redefinitions
 #include <curl/curl.h>
@@ -42,10 +39,10 @@
 #include "../log.h"
 #include "../main.h"
 
-#include "../utils/tostring.h"
-
 #include "../resources/resourcemanager.h"
 
+#include "../utils/tostring.h"
+
 /**
  * Calculates the Alder-32 checksum for the given file.
  */
diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index b669f829..4c302e85 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.h
@@ -17,14 +17,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: updatewindow.h 4332 2008-06-05 07:33:12Z b_lindeijer $
  */
 
 #ifndef _UPDATERWINDOW_H
 #define _UPDATERWINDOW_H
 
 #include <guichan/actionlistener.hpp>
+
 #include <string>
 #include <vector>
 
diff --git a/src/gui/vbox.cpp b/src/gui/vbox.cpp
index 6f36dc9c..2ec1112d 100644
--- a/src/gui/vbox.cpp
+++ b/src/gui/vbox.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: vbox.cpp 3587 2007-09-20 13:24:20Z b_lindeijer $
  */
 
 #include "vbox.h"
diff --git a/src/gui/vbox.h b/src/gui/vbox.h
index fd029143..4538338f 100644
--- a/src/gui/vbox.h
+++ b/src/gui/vbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: vbox.h 1881 2005-10-18 21:40:25Z der_doener $
  */
 
 #ifndef VBOX_H
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 6f89f639..3f0f546e 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -17,16 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: viewport.cpp 4098 2008-04-16 11:36:41Z b_lindeijer $
  */
 
-#include "viewport.h"
+#include <cassert>
 
 #include <guichan/sdl/sdlinput.hpp>
 
 #include "gui.h"
 #include "popupmenu.h"
+#include "viewport.h"
 
 #include "../beingmanager.h"
 #include "../configuration.h"
@@ -40,15 +39,13 @@
 #include "../textmanager.h"
 
 #include "../resources/animation.h"
-#include "../resources/monsterinfo.h"
-#include "../resources/resourcemanager.h"
 #include "../resources/image.h"
 #include "../resources/imageset.h"
+#include "../resources/monsterinfo.h"
+#include "../resources/resourcemanager.h"
 
 #include "../utils/tostring.h"
 
-#include <cassert>
-
 extern volatile int tick_time;
 
 Viewport::Viewport():
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index c7b3c0e7..3120de91 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_VIEWPORT_H_
@@ -28,8 +26,8 @@
 
 #include "windowcontainer.h"
 
-#include "../configlistener.h"
 #include "../being.h"
+#include "../configlistener.h"
 #include "../guichanfwd.h"
 
 class Map;
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 9bf7452d..88a12d68 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index 9f6491b7..25ae05f8 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef DROPDOWN_H
@@ -27,8 +25,10 @@
 #include <iosfwd>
 
 #include <guichan/widgets/dropdown.hpp>
-#include "../scrollarea.h"
+
 #include "../listbox.h"
+#include "../scrollarea.h"
+
 #include "../../guichanfwd.h"
 
 class Image;
diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp
index e13493bb..e8b50dc9 100644
--- a/src/gui/widgets/resizegrip.cpp
+++ b/src/gui/widgets/resizegrip.cpp
@@ -17,14 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: resizegrip.cpp 3587 2007-09-20 13:24:20Z b_lindeijer $
  */
 
-#include "resizegrip.h"
-
 #include <guichan/graphics.hpp>
 
+#include "resizegrip.h"
+
 #include "../../graphics.h"
 
 #include "../../resources/image.h"
diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h
index 03a9228f..5f3a09a4 100644
--- a/src/gui/widgets/resizegrip.h
+++ b/src/gui/widgets/resizegrip.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: resizegrip.h 3270 2007-04-15 01:22:17Z b_lindeijer $
  */
 
 #ifndef _TMW_RESIZEGRIP_H
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 1a6f1ac6..4ace032b 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -17,21 +17,19 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
-#include <climits>
 #include <cassert>
+#include <climits>
 
 #include <guichan/exception.hpp>
-#include <guichan/widgets/icon.hpp>
 
-#include "window.h"
+#include <guichan/widgets/icon.hpp>
 
 #include "gui.h"
 #include "gccontainer.h"
+#include "window.h"
 #include "windowcontainer.h"
 
 #include "widgets/resizegrip.h"
diff --git a/src/gui/window.h b/src/gui/window.h
index 228cc37b..3bb41a95 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -17,24 +17,23 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_WINDOW_H__
 #define _TMW_WINDOW_H__
 
-#include <guichan/widgets/window.hpp>
 #include <guichan/widgetlistener.hpp>
 
+#include <guichan/widgets/window.hpp>
+
 #include "../guichanfwd.h"
 
 class ConfigListener;
 class GCContainer;
+class Image;
 class ImageRect;
 class ResizeGrip;
 class WindowContainer;
-class Image;
 
 /**
  * A window. This window can be dragged around and has a title bar. Windows are
diff --git a/src/gui/windowcontainer.cpp b/src/gui/windowcontainer.cpp
index 05c2b5e9..d8535f73 100644
--- a/src/gui/windowcontainer.cpp
+++ b/src/gui/windowcontainer.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: windowcontainer.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $
  */
 
 #include "windowcontainer.h"
diff --git a/src/gui/windowcontainer.h b/src/gui/windowcontainer.h
index c9728230..d783fefd 100644
--- a/src/gui/windowcontainer.h
+++ b/src/gui/windowcontainer.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: windowcontainer.h 2884 2006-12-04 11:20:54Z b_lindeijer $
  */
 
 #ifndef _TMW_WINDOWCONTAINER_H_
diff --git a/src/guichanfwd.h b/src/guichanfwd.h
index 0a2560bf..4fb7ea3e 100644
--- a/src/guichanfwd.h
+++ b/src/guichanfwd.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: guichanfwd.h 2907 2006-12-12 15:33:46Z b_lindeijer $
  */
 
 #ifndef _TMW_GUICHANFWD_H
diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp
index 965434b0..6d74801e 100644
--- a/src/imageparticle.cpp
+++ b/src/imageparticle.cpp
@@ -17,13 +17,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
-#include "imageparticle.h"
-
 #include "graphics.h"
+#include "imageparticle.h"
 
 #include "resources/image.h"
 
diff --git a/src/imageparticle.h b/src/imageparticle.h
index ef663473..91c5426c 100644
--- a/src/imageparticle.h
+++ b/src/imageparticle.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: imageparticle.h 3567 2007-09-07 09:13:17Z b_lindeijer $
  */
 
 #ifndef _IMAGEPARTICLE_H
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 0b1b9613..764d7fee 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -17,15 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: inventory.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
-#include "inventory.h"
-
 #include <algorithm>
 #include <cassert>
 
+#include "inventory.h"
 #include "item.h"
 #include "log.h"
 
diff --git a/src/inventory.h b/src/inventory.h
index 42b0d86a..87d09567 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: inventory.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _INVENTORY_H
diff --git a/src/item.cpp b/src/item.cpp
index 2e33a9de..bc6b7cc7 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: item.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "item.h"
diff --git a/src/item.h b/src/item.h
index 449b388c..eb6fed77 100644
--- a/src/item.h
+++ b/src/item.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: item.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _ITEM_H_
diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp
index 5379f0eb..a3812042 100644
--- a/src/itemshortcut.cpp
+++ b/src/itemshortcut.cpp
@@ -17,15 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: itemshortcut.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
-#include "itemshortcut.h"
-
 #include "configuration.h"
 #include "inventory.h"
 #include "item.h"
+#include "itemshortcut.h"
 #include "localplayer.h"
 
 #include "utils/tostring.h"
diff --git a/src/itemshortcut.h b/src/itemshortcut.h
index bbf21332..a0c52468 100644
--- a/src/itemshortcut.h
+++ b/src/itemshortcut.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: itemshortcut.h 4180 2008-04-24 20:49:30Z peaveydk $
  */
 
 #ifndef _TMW_ITEMSHORTCUT_H__
diff --git a/src/joystick.cpp b/src/joystick.cpp
index ebae5c3a..f009ebc4 100644
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -17,13 +17,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: joystick.cpp 2595 2006-08-26 20:19:39Z b_lindeijer $
  */
 
-#include "joystick.h"
-
 #include "configuration.h"
+#include "joystick.h"
 #include "log.h"
 
 int Joystick::joystickCount = 0;
diff --git a/src/joystick.h b/src/joystick.h
index 5c6f7c86..4cc1babd 100644
--- a/src/joystick.h
+++ b/src/joystick.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: joystick.h 3587 2007-09-20 13:24:20Z b_lindeijer $
  */
 
 #ifndef _TMW_JOYSTICK_H
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 46fea458..f67c9534 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -17,16 +17,14 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
-#include "keyboardconfig.h"
+#include <guichan/sdl/sdlinput.hpp>
+
 #include "configuration.h"
+#include "keyboardconfig.h"
 #include "log.h"
 
-#include <guichan/sdl/sdlinput.hpp>
-
 #include "gui/setup_keyboard.h"
 
 struct KeyData
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index a4329b09..158252d4 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_KEYBOARDCONFIG_H
@@ -26,10 +24,10 @@
 
 #include <string>
 
-#include "gui/setup_keyboard.h"
-
 #include <guichan/sdl/sdlinput.hpp>
 
+#include "gui/setup_keyboard.h"
+
 /**
  * Each key represents a key function. Such as 'Move up', 'Attack' etc.
  */
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 9475fcbb..68999787 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -17,18 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 #include <cassert>
 
-#include "localplayer.h"
-
 #include "equipment.h"
 #include "floor_item.h"
 #include "game.h"
 #include "inventory.h"
 #include "item.h"
+#include "localplayer.h"
 #include "main.h"
 #include "monster.h"
 #include "particle.h"
@@ -39,8 +36,8 @@
 #include "net/messageout.h"
 #include "net/protocol.h"
 
-#include "resources/resourcemanager.h"
 #include "resources/imageset.h"
+#include "resources/resourcemanager.h"
 
 #include "utils/tostring.h"
 
diff --git a/src/localplayer.h b/src/localplayer.h
index 1eebabb6..ad59d138 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_LOCALPLAYER_H
diff --git a/src/lockedarray.h b/src/lockedarray.h
index bbb72520..a3e5dc0a 100644
--- a/src/lockedarray.h
+++ b/src/lockedarray.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: lockedarray.h 2277 2006-03-19 21:40:21Z der_doener $
  */
 
 #ifndef _TMW_LOCKEDARRAY_H
diff --git a/src/main.cpp b/src/main.cpp
index db7b16d4..42a504fe 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,50 +17,51 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: main.cpp 4332 2008-06-05 07:33:12Z b_lindeijer $
  */
 
-#include "main.h"
-
 #include <getopt.h>
 #include <iostream>
 #include <physfs.h>
+#include <SDL_image.h>
 #include <unistd.h>
 #include <vector>
-#include <SDL_image.h>
 
 #include <guichan/actionlistener.hpp>
+
 #include <guichan/sdl/sdlinput.hpp>
+
 #include <guichan/widgets/label.hpp>
 
 #include <libxml/parser.h>
 
-#ifndef WIN32
-#include <cerrno>
-#include <sys/stat.h>
+#ifdef __APPLE__
+#include <CoreFoundation/CFBundle.h>
 #endif
 #ifdef __MINGW32__
 #include <windows.h>
 #define usleep(usec) (Sleep ((usec) / 1000), 0)
 #endif
-#if defined __APPLE__
-#include <CoreFoundation/CFBundle.h>
+#ifdef WIN32
+#include <SDL_syswm.h>
+#else
+#include <cerrno>
+#include <sys/stat.h>
 #endif
 
 #include "configuration.h"
-#include "keyboardconfig.h"
-#include "player_relations.h"
 #include "game.h"
 #include "graphics.h"
 #include "itemshortcut.h"
-#include "lockedarray.h"
+#include "keyboardconfig.h"
 #include "localplayer.h"
+#include "lockedarray.h"
 #include "log.h"
 #include "logindata.h"
+#include "main.h"
 #ifdef USE_OPENGL
 #include "openglgraphics.h"
 #endif
+#include "player_relations.h"
 #include "serverinfo.h"
 #include "sound.h"
 
@@ -72,8 +73,8 @@
 #include "gui/ok_dialog.h"
 #include "gui/progressbar.h"
 #include "gui/register.h"
-#include "gui/updatewindow.h"
 #include "gui/textfield.h"
+#include "gui/updatewindow.h"
 
 #include "net/charserverhandler.h"
 #include "net/loginhandler.h"
@@ -91,10 +92,6 @@
 #include "utils/dtor.h"
 #include "utils/tostring.h"
 
-#ifdef WIN32
-#include <SDL_syswm.h>
-#endif
-
 // Account infos
 char n_server, n_character;
 
diff --git a/src/main.h b/src/main.h
index 8dfc51cf..a0fe65cb 100644
--- a/src/main.h
+++ b/src/main.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: main.h 3628 2007-10-18 18:39:48Z b_lindeijer $
  */
 
 #ifndef _TMW_MAIN_H
diff --git a/src/map.cpp b/src/map.cpp
index 15d5e5f3..612d9020 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -17,12 +17,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: map.cpp 4171 2008-04-22 18:42:21Z b_lindeijer $
  */
 
-#include "map.h"
-
 #include <queue>
 
 #include "beingmanager.h"
@@ -30,13 +26,14 @@
 #include "game.h"
 #include "graphics.h"
 #include "localplayer.h"
+#include "map.h"
 #include "particle.h"
 #include "sprite.h"
 #include "tileset.h"
 
-#include "resources/resourcemanager.h"
 #include "resources/ambientoverlay.h"
 #include "resources/image.h"
+#include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
 #include "utils/tostring.h"
diff --git a/src/map.h b/src/map.h
index 95532eb3..6eaf9e43 100644
--- a/src/map.h
+++ b/src/map.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_MAP_H_
diff --git a/src/monster.cpp b/src/monster.cpp
index be22bed3..62be513d 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -17,16 +17,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: monster.cpp 3823 2007-12-28 18:36:58Z crush_tmw $
  */
 
-#include "monster.h"
-
 #include "animatedsprite.h"
 #include "game.h"
-#include "sound.h"
+#include "monster.h"
 #include "particle.h"
+#include "sound.h"
 #include "text.h"
 
 #include "gui/gui.h"
diff --git a/src/monster.h b/src/monster.h
index 4839966a..0906dff3 100644
--- a/src/monster.h
+++ b/src/monster.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: monster.h 3690 2007-10-26 12:50:49Z crush_tmw $
  */
 
 #ifndef _TMW_MONSTER_H
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index b9686e39..8a7e61a1 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -17,15 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: beinghandler.cpp 4321 2008-06-02 11:42:26Z b_lindeijer $
  */
 
-#include "beinghandler.h"
-
 #include <iostream>
 #include <SDL_types.h>
 
+#include "beinghandler.h"
 #include "messagein.h"
 #include "protocol.h"
 
@@ -35,10 +32,10 @@
 #include "../localplayer.h"
 #include "../log.h"
 #include "../main.h"
+#include "../npc.h"
 #include "../particle.h"
-#include "../sound.h"
 #include "../player_relations.h"
-#include "../npc.h"
+#include "../sound.h"
 
 const int EMOTION_TIME = 150;    /**< Duration of emotion icon */
 
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index 8f58a397..9e736751 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: beinghandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_BEINGHANDLER_H
diff --git a/src/net/buysellhandler.cpp b/src/net/buysellhandler.cpp
index b4e2cf30..b464e69f 100644
--- a/src/net/buysellhandler.cpp
+++ b/src/net/buysellhandler.cpp
@@ -17,14 +17,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: buysellhandler.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
-#include "buysellhandler.h"
-
 #include <SDL_types.h>
 
+#include "buysellhandler.h"
 #include "messagein.h"
 #include "protocol.h"
 
@@ -39,8 +36,8 @@
 #include "../gui/sell.h"
 
 extern BuyDialog *buyDialog;
-extern SellDialog *sellDialog;
 extern Window *buySellDialog;
+extern SellDialog *sellDialog;
 
 BuySellHandler::BuySellHandler()
 {
diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h
index 4da52c95..49984840 100644
--- a/src/net/buysellhandler.h
+++ b/src/net/buysellhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: buysellhandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_BUYSELLHANDLER_H
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 2af3fe07..833732db 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -17,25 +17,22 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: charserverhandler.cpp 4330 2008-06-04 08:53:01Z b_lindeijer $
  */
 
 #include "charserverhandler.h"
-
 #include "messagein.h"
 #include "network.h"
 #include "protocol.h"
 
+#include "../extensions.h"
 #include "../game.h"
 #include "../localplayer.h"
 #include "../log.h"
 #include "../logindata.h"
 #include "../main.h"
-#include "../extensions.h"
 
-#include "../gui/ok_dialog.h"
 #include "../gui/char_select.h"
+#include "../gui/ok_dialog.h"
 
 /*
  * Yeah, this is a global.  Get over it.
diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h
index 663de94d..05f547d0 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: charserverhandler.h 3228 2007-03-22 23:53:13Z b_lindeijer $
  */
 
 #ifndef _TMW_NET_CHARSERVERHANDLER_H
diff --git a/src/net/chathandler.cpp b/src/net/chathandler.cpp
index bee19112..b73b86b4 100644
--- a/src/net/chathandler.cpp
+++ b/src/net/chathandler.cpp
@@ -17,15 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: chathandler.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
-#include "chathandler.h"
-
 #include <SDL_types.h>
 #include <string>
 
+#include "chathandler.h"
 #include "messagein.h"
 #include "protocol.h"
 
diff --git a/src/net/chathandler.h b/src/net/chathandler.h
index 08a560f3..53ea61d8 100644
--- a/src/net/chathandler.h
+++ b/src/net/chathandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: chathandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_CHATHANDLER_H
diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index 5464fa55..4775371a 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.cpp
@@ -17,12 +17,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: equipmenthandler.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "equipmenthandler.h"
-
 #include "messagein.h"
 #include "protocol.h"
 
diff --git a/src/net/equipmenthandler.h b/src/net/equipmenthandler.h
index 0121e6ad..31a747c3 100644
--- a/src/net/equipmenthandler.h
+++ b/src/net/equipmenthandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: equipmenthandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_EQUIPMENTHANDLER_H
diff --git a/src/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp
index 44a3256e..12b7d5ef 100644
--- a/src/net/inventoryhandler.cpp
+++ b/src/net/inventoryhandler.cpp
@@ -17,26 +17,24 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: inventoryhandler.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
-#include "inventoryhandler.h"
-
 #include <SDL_types.h>
 
+#include "inventoryhandler.h"
 #include "messagein.h"
 #include "protocol.h"
 
-#include "../resources/iteminfo.h"
+#include "../inventory.h"
 #include "../item.h"
 #include "../itemshortcut.h"
 #include "../localplayer.h"
 #include "../log.h"
-#include "../inventory.h"
 
 #include "../gui/chat.h"
 
+#include "../resources/iteminfo.h"
+
 #include "../utils/tostring.h"
 
 InventoryHandler::InventoryHandler()
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index 64ef8464..002fa938 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: inventoryhandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_INVENTORYHANDLER_H
diff --git a/src/net/itemhandler.cpp b/src/net/itemhandler.cpp
index 9af2be10..9cf85ce7 100644
--- a/src/net/itemhandler.cpp
+++ b/src/net/itemhandler.cpp
@@ -17,12 +17,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: itemhandler.cpp 2150 2006-02-06 02:56:48Z der_doener $
  */
 
 #include "itemhandler.h"
-
 #include "messagein.h"
 #include "protocol.h"
 
diff --git a/src/net/itemhandler.h b/src/net/itemhandler.h
index 702e193a..99fc6b62 100644
--- a/src/net/itemhandler.h
+++ b/src/net/itemhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: itemhandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_ITEMHANDLER_H
diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp
index 946f4a21..9a7aaabd 100644
--- a/src/net/loginhandler.cpp
+++ b/src/net/loginhandler.cpp
@@ -17,12 +17,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: loginhandler.cpp 3233 2007-03-24 01:57:39Z b_lindeijer $
  */
 
 #include "loginhandler.h"
-
 #include "messagein.h"
 #include "network.h"
 #include "protocol.h"
diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h
index 797655c3..1e087619 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.h
@@ -17,16 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: loginhandler.h 2137 2006-02-04 16:54:35Z der_doener $
  */
 
 #ifndef _TMW_NET_LOGINHANDLER_H
 #define _TMW_NET_LOGINHANDLER_H
 
-#include "messagehandler.h"
 #include <string>
 
+#include "messagehandler.h"
+
 struct LoginData;
 
 class LoginHandler : public MessageHandler
diff --git a/src/net/maploginhandler.cpp b/src/net/maploginhandler.cpp
index 15f70baf..bc08d5d6 100644
--- a/src/net/maploginhandler.cpp
+++ b/src/net/maploginhandler.cpp
@@ -17,12 +17,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: maploginhandler.cpp 2239 2006-03-09 05:16:27Z der_doener $
  */
 
 #include "maploginhandler.h"
-
 #include "messagein.h"
 #include "protocol.h"
 
diff --git a/src/net/maploginhandler.h b/src/net/maploginhandler.h
index 6ff6bc00..4d9fa75b 100644
--- a/src/net/maploginhandler.h
+++ b/src/net/maploginhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: maploginhandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_MAPLOGINHANDLER_H
diff --git a/src/net/messagehandler.cpp b/src/net/messagehandler.cpp
index 370a01ab..7a41e1ad 100644
--- a/src/net/messagehandler.cpp
+++ b/src/net/messagehandler.cpp
@@ -17,14 +17,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: messagehandler.cpp 2112 2006-01-22 13:31:13Z der_doener $
  */
 
-#include "messagehandler.h"
-
 #include <cassert>
 
+#include "messagehandler.h"
 #include "network.h"
 
 MessageHandler::MessageHandler():
diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h
index 90ffa489..952e76a9 100644
--- a/src/net/messagehandler.h
+++ b/src/net/messagehandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: messagehandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_MESSAGEHANDLER_H
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index bec47a5a..345e02fc 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -17,21 +17,18 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: messagein.cpp 2369 2006-06-26 21:32:52Z b_lindeijer $
  */
 
-#include "messagein.h"
-
 #include <cassert>
 #include <SDL.h>
 #include <SDL_endian.h>
 
+#include "messagein.h"
+
 #define MAKEWORD(low,high) \
     ((unsigned short)(((unsigned char)(low)) | \
     ((unsigned short)((unsigned char)(high))) << 8))
 
-
 MessageIn::MessageIn(const char *data, unsigned int length):
     mData(data),
     mLength(length),
diff --git a/src/net/messagein.h b/src/net/messagein.h
index 0a6b8b8b..81db6cdc 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.h
@@ -17,15 +17,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: messagein.h 1879 2005-10-16 21:18:11Z der_doener $
  */
 
 #ifndef _TMW_MESSAGEIN_
 #define _TMW_MESSAGEIN_
 
-#include <string>
 #include <SDL_types.h>
+#include <string>
 
 /**
  * Used for parsing an incoming message.
diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp
index f5f3dad9..6aa25411 100644
--- a/src/net/messageout.cpp
+++ b/src/net/messageout.cpp
@@ -17,18 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: messageout.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $
  */
 
 #include <cstring>
-#include <string>
 #include <SDL.h>
 #include <SDL_endian.h>
-
-#include "network.h"
+#include <string>
 
 #include "messageout.h"
+#include "network.h"
 
 MessageOut::MessageOut(Network *network):
     mNetwork(network),
diff --git a/src/net/messageout.h b/src/net/messageout.h
index 33deb1bb..3c4cc241 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: messageout.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_MESSAGEOUT_
diff --git a/src/net/network.cpp b/src/net/network.cpp
index efb11708..c9f8d1bd 100644
--- a/src/net/network.cpp
+++ b/src/net/network.cpp
@@ -17,19 +17,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: network.cpp 3550 2007-08-30 16:46:21Z b_lindeijer $
  */
 
-#include "network.h"
+#include <sstream>
 
 #include "messagehandler.h"
 #include "messagein.h"
+#include "network.h"
 
 #include "../log.h"
 
-#include <sstream>
-
 /** Warning: buffers and other variables are shared,
     so there can be only one connection active at a time */
 
diff --git a/src/net/network.h b/src/net/network.h
index 826e6776..856808a2 100644
--- a/src/net/network.h
+++ b/src/net/network.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: network.h 3234 2007-03-24 13:05:27Z b_lindeijer $
  */
 
 #ifndef _TMW_NETWORK_
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 70f04271..65259959 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -17,20 +17,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: npchandler.cpp 2883 2006-12-03 17:00:07Z b_lindeijer $
  */
 
-#include "npchandler.h"
-
 #include "messagein.h"
+#include "npchandler.h"
 #include "protocol.h"
 
 #include "../beingmanager.h"
 #include "../npc.h"
 
-#include "../gui/npclistdialog.h"
 #include "../gui/npc_text.h"
+#include "../gui/npclistdialog.h"
 
 extern NpcListDialog *npcListDialog;
 extern NpcTextDialog *npcTextDialog;
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index 7abd7495..abb16b7a 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: npchandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_NPCHANDLER_H
diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp
index c1f2ba2e..9b5f3080 100644
--- a/src/net/partyhandler.cpp
+++ b/src/net/partyhandler.cpp
@@ -17,23 +17,20 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: partyhandler.cpp
  */
 
-#include "partyhandler.h"
+#include <guichan/actionlistener.hpp>
 
+#include "partyhandler.h"
 #include "protocol.h"
 #include "messagein.h"
 
 #include "../gui/chat.h"
 #include "../gui/confirm_dialog.h"
 
+#include "../beingmanager.h"
 #include "../game.h"
 #include "../party.h"
-#include "../beingmanager.h"
-
-#include <guichan/actionlistener.hpp>
 
 PartyHandler::PartyHandler(Party *party) : mParty(party)
 {
diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h
index de97d084..daabc52f 100644
--- a/src/net/partyhandler.h
+++ b/src/net/partyhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: partyhandler.h
  */
 
 #ifndef _TMW_NET_PARTYHANDLER_H
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index ea561a81..c8442a89 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -17,20 +17,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: playerhandler.cpp 4190 2008-04-26 17:37:03Z peaveydk $
  */
 
-#include "playerhandler.h"
-
 #include "messagein.h"
+#include "playerhandler.h"
 #include "protocol.h"
 
 #include "../engine.h"
 #include "../localplayer.h"
 #include "../log.h"
 #include "../npc.h"
-#include "../utils/tostring.h"
 
 #include "../gui/buy.h"
 #include "../gui/chat.h"
@@ -42,6 +38,8 @@
 #include "../gui/skill.h"
 #include "../gui/viewport.h"
 
+#include "../utils/tostring.h"
+
 // TODO Move somewhere else
 OkDialog *weightNotice = NULL;
 OkDialog *deathNotice = NULL;
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index f7c0672d..ec22e704 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: playerhandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_PLAYERHANDLER_H
diff --git a/src/net/protocol.cpp b/src/net/protocol.cpp
index 791b7fe5..a0e21d2e 100644
--- a/src/net/protocol.cpp
+++ b/src/net/protocol.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: protocol.cpp 2158 2006-02-07 10:37:54Z der_doener $
  */
 
 #include "protocol.h"
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 5e1d3c62..fabe6911 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: protocol.h 4321 2008-06-02 11:42:26Z b_lindeijer $
  */
 
 #ifndef _TMW_PROTOCOL_
diff --git a/src/net/skillhandler.cpp b/src/net/skillhandler.cpp
index 3685d04b..b9a232fb 100644
--- a/src/net/skillhandler.cpp
+++ b/src/net/skillhandler.cpp
@@ -17,14 +17,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: skillhandler.cpp 2832 2006-11-05 20:57:59Z b_lindeijer $
  */
 
-#include "skillhandler.h"
-
 #include "messagein.h"
 #include "protocol.h"
+#include "skillhandler.h"
 
 #include "../log.h"
 
diff --git a/src/net/skillhandler.h b/src/net/skillhandler.h
index 734772b4..80095bd3 100644
--- a/src/net/skillhandler.h
+++ b/src/net/skillhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: skillhandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_SKILLHANDLER_H
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index 9174d846..11fe2c19 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -17,14 +17,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: tradehandler.cpp 4354 2008-06-17 16:52:44Z the_enemy $
  */
 
-#include "tradehandler.h"
-
 #include "messagein.h"
 #include "protocol.h"
+#include "tradehandler.h"
 
 #include "../inventory.h"
 #include "../item.h"
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index 22e01f48..37ec5024 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: tradehandler.h 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
 #ifndef _TMW_NET_TRADEHANDLER_H
diff --git a/src/npc.cpp b/src/npc.cpp
index 82b68af4..78670581 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -17,19 +17,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: npc.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
-#include "npc.h"
-
 #include "animatedsprite.h"
 #include "graphics.h"
+#include "npc.h"
 #include "particle.h"
 #include "text.h"
 
 #include "net/messageout.h"
 #include "net/protocol.h"
+
 #include "resources/npcdb.h"
 
 #include "gui/gui.h"
diff --git a/src/npc.h b/src/npc.h
index fa39e6c2..a37e8c66 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: npc.h 2883 2006-12-03 17:00:07Z b_lindeijer $
  */
 
 #ifndef _TMW_NPC_H
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index 6ffc5668..8f47bc1f 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -17,12 +17,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: openglgraphics.cpp 4130 2008-04-18 20:39:29Z the_enemy $
  */
 
-#include "main.h"
-
 #ifdef USE_OPENGL
 
 #ifndef GL_TEXTURE_RECTANGLE_ARB
@@ -30,8 +26,6 @@
 #define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
 #endif
 
-#include "openglgraphics.h"
-
 #include <cstring>
 #include <SDL.h>
 
@@ -43,6 +37,7 @@
 #include <guichan/image.hpp>
 
 #include "log.h"
+#include "openglgraphics.h"
 
 #include "resources/image.h"
 
diff --git a/src/openglgraphics.h b/src/openglgraphics.h
index c3dc794c..7d39e306 100644
--- a/src/openglgraphics.h
+++ b/src/openglgraphics.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: openglgraphics.h 3628 2007-10-18 18:39:48Z b_lindeijer $
  */
 
 #ifndef _TMW_OPENGLGRAPHICS_H
diff --git a/src/particle.cpp b/src/particle.cpp
index af54a4b5..f1896ae2 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -17,20 +17,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
 #include <cmath>
 
-#include "particle.h"
-
 #include "animationparticle.h"
 #include "configuration.h"
 #include "imageparticle.h"
 #include "log.h"
 #include "map.h"
+#include "particle.h"
 #include "particleemitter.h"
 #include "textparticle.h"
 
diff --git a/src/particle.h b/src/particle.h
index a21fe88b..0a53f5af 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _PARTICLE_H
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index edd7bf4f..03fe4672 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -17,21 +17,18 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
-#include "particleemitter.h"
-
 #include "animationparticle.h"
 #include "imageparticle.h"
 #include "log.h"
 #include "particle.h"
+#include "particleemitter.h"
 
 #include "resources/animation.h"
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 #include "resources/imageset.h"
+#include "resources/resourcemanager.h"
 
 #include <cmath>
 
diff --git a/src/particleemitter.h b/src/particleemitter.h
index 31346401..809a6ded 100644
--- a/src/particleemitter.h
+++ b/src/particleemitter.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _PARTICLEEMITTER_H
diff --git a/src/particleemitterprop.h b/src/particleemitterprop.h
index e645c169..f9c329a9 100644
--- a/src/particleemitterprop.h
+++ b/src/particleemitterprop.h
@@ -17,12 +17,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
-#include <cstdlib>
 #include <cmath>
+#include <cstdlib>
 
 /**
  * Returns a random numeric value that is larger than or equal min and smaller
diff --git a/src/party.cpp b/src/party.cpp
index 39c39352..3df2eedc 100644
--- a/src/party.cpp
+++ b/src/party.cpp
@@ -17,15 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: party.cpp
  */
 
-#include "party.h"
-
 #include "beingmanager.h"
-#include "localplayer.h"
 #include "game.h"
+#include "localplayer.h"
+#include "party.h"
 
 #include "gui/chat.h"
 #include "gui/confirm_dialog.h"
diff --git a/src/party.h b/src/party.h
index d4f51b5a..0e1afc3c 100644
--- a/src/party.h
+++ b/src/party.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: party.h
  */
 
 #ifndef _TMW_PARTY_H
diff --git a/src/player.cpp b/src/player.cpp
index 5fb5ffe9..1a7480db 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -17,25 +17,23 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: player.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
-#include "player.h"
+#include <iostream>
 
 #include "animatedsprite.h"
 #include "game.h"
 #include "graphics.h"
 #include "log.h"
+#include "player.h"
+
+#include "gui/gui.h"
 
 #include "resources/itemdb.h"
 #include "resources/iteminfo.h"
 
 #include "utils/strprintf.h"
 
-#include "gui/gui.h"
-#include <iostream>
-
 static const int NAME_X_OFFSET = 15;
 static const int NAME_Y_OFFSET = 30;
 
diff --git a/src/player.h b/src/player.h
index 6def34a5..8b1c8dcb 100644
--- a/src/player.h
+++ b/src/player.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: player.h 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
 #ifndef _TMW_PLAYER_H
diff --git a/src/player_relations.cpp b/src/player_relations.cpp
index 8abc9848..157cc09b 100644
--- a/src/player_relations.cpp
+++ b/src/player_relations.cpp
@@ -19,12 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <algorithm>
+
 #include "beingmanager.h"
-#include "player_relations.h"
 #include "graphics.h"
-#include "gui/gui.h"
+#include "player_relations.h"
 
-#include <algorithm>
+#include "gui/gui.h"
 
 #define PLAYER_IGNORE_STRATEGY_NOP "nop"
 #define PLAYER_IGNORE_STRATEGY_EMOTE0 "emote0"
diff --git a/src/player_relations.h b/src/player_relations.h
index ec93b4dc..56f3d5a4 100644
--- a/src/player_relations.h
+++ b/src/player_relations.h
@@ -22,13 +22,14 @@
 #ifndef TMW_PLAYER_RELATIONS_H_
 #define TMW_PLAYER_RELATIONS_H_
 
-#include "being.h"
-#include "player.h"
-#include "configuration.h"
-#include <string>
+#include <list>
 #include <map>
+#include <string>
 #include <vector>
-#include <list>
+
+#include "being.h"
+#include "configuration.h"
+#include "player.h"
 
 struct PlayerRelation
 {
diff --git a/src/properties.h b/src/properties.h
index 9ebead66..86fffea3 100644
--- a/src/properties.h
+++ b/src/properties.h
@@ -17,16 +17,14 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: properties.h 3754 2007-11-20 15:19:50Z b_lindeijer $
  */
 
 #ifndef _TMW_PROPERTIES_H_
 #define _TMW_PROPERTIES_H_
 
 #include <map>
-#include <string>
 #include <sstream>
+#include <string>
 
 /**
  * A class holding a set of properties.
diff --git a/src/recorder.cpp b/src/recorder.cpp
index 48ecb837..7bf618c5 100644
--- a/src/recorder.cpp
+++ b/src/recorder.cpp
@@ -17,14 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: record.cpp
  */
 
 #include "recorder.h"
 
-#include "gui/chat.h"
 #include "gui/buttonbox.h"
+#include "gui/chat.h"
 
 #include "utils/trim.h"
 
diff --git a/src/recorder.h b/src/recorder.h
index 75d86f88..9f30184f 100644
--- a/src/recorder.h
+++ b/src/recorder.h
@@ -17,15 +17,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: record.h
  */
 
 #ifndef _TMW_RECORD_H
 #define _TMW_RECORD_H
 
-#include <string>
 #include <fstream>
+#include <string>
 
 #include "gui/buttonbox.h"
 
diff --git a/src/resources/action.cpp b/src/resources/action.cpp
index 8ed099ea..f40d3109 100644
--- a/src/resources/action.cpp
+++ b/src/resources/action.cpp
@@ -17,17 +17,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: action.cpp 3676 2007-10-23 08:02:22Z b_lindeijer $
  */
 
 #include "action.h"
-
 #include "animation.h"
 
 #include "../utils/dtor.h"
 
-
 Action::Action()
 {
 }
diff --git a/src/resources/action.h b/src/resources/action.h
index 61307652..09eb066e 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: action.h 2905 2006-12-12 15:06:06Z b_lindeijer $
  */
 
 #ifndef _TMW_ACTION_H
diff --git a/src/resources/ambientoverlay.cpp b/src/resources/ambientoverlay.cpp
index 654cbb32..38d8fc46 100644
--- a/src/resources/ambientoverlay.cpp
+++ b/src/resources/ambientoverlay.cpp
@@ -17,12 +17,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: ambientoverlay.cpp 2727 2006-10-07 20:01:34Z b_lindeijer $
  */
 
 #include "ambientoverlay.h"
-
 #include "image.h"
 
 #include "../graphics.h"
diff --git a/src/resources/ambientoverlay.h b/src/resources/ambientoverlay.h
index c0b18600..56c70066 100644
--- a/src/resources/ambientoverlay.h
+++ b/src/resources/ambientoverlay.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: ambientoverlay.h 2727 2006-10-07 20:01:34Z b_lindeijer $
  */
 
 #ifndef _TMW_RESOURCES_AMBIENTOVERLAY_H_
diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp
index b740b9b5..596c5fac 100644
--- a/src/resources/animation.cpp
+++ b/src/resources/animation.cpp
@@ -17,14 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: animation.cpp 2905 2006-12-12 15:06:06Z b_lindeijer $
  */
 
-#include "animation.h"
-
 #include <algorithm>
 
+#include "animation.h"
+
 #include "../utils/dtor.h"
 
 Animation::Animation():
diff --git a/src/resources/animation.h b/src/resources/animation.h
index 53420ecd..8dfe8614 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: animation.h 3301 2007-05-23 21:35:01Z b_lindeijer $
  */
 
 #ifndef _TMW_ANIMATION_H
diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp
index c917a45e..1bd98680 100644
--- a/src/resources/buddylist.cpp
+++ b/src/resources/buddylist.cpp
@@ -17,19 +17,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: buddylist.cpp 4332 2008-06-05 07:33:12Z b_lindeijer $
  */
 
 #include <algorithm>
 #include <cstring>
-#include <iostream>
 #include <fstream>
+#include <iostream>
 
 #include "buddylist.h"
 
-#include "../main.h"
 #include "../configuration.h"
+#include "../main.h"
 
 BuddyList::BuddyList()
 {
diff --git a/src/resources/buddylist.h b/src/resources/buddylist.h
index 5a8f2324..6a3de8c4 100644
--- a/src/resources/buddylist.h
+++ b/src/resources/buddylist.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: buddylist.h 2239 2006-03-09 05:16:27Z der_doener $
  */
 
 #ifndef _TMW_BUDDYLIST_H
diff --git a/src/resources/colordb.h b/src/resources/colordb.h
index 1f8b191c..2b750fa3 100644
--- a/src/resources/colordb.h
+++ b/src/resources/colordb.h
@@ -22,8 +22,8 @@
 #ifndef _AETHYRA_COLOR_MANAGER_H
 #define _AETHYRA_COLOR_MANAGER_H
 
-#include <string>
 #include <map>
+#include <string>
 
 /**
  * The class that holds the color information.
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index 195d5dd1..3be105d8 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: dye.cpp 3708 2007-11-04 11:52:44Z gmelquio $
  */
 
 #include <algorithm>
diff --git a/src/resources/dye.h b/src/resources/dye.h
index fe8669bb..4fb8fd40 100644
--- a/src/resources/dye.h
+++ b/src/resources/dye.h
@@ -17,13 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: dye.h 3706 2007-11-03 21:04:51Z gmelquio $
  */
 
 #ifndef _TMW_DYE_H
 #define _TMW_DYE_H
 
+#include <string>
 #include <vector>
 
 /**
@@ -38,7 +37,7 @@ class Palette
          * The string is either a file name or a sequence of hexadecimal RGB
          * values separated by ',' and starting with '#'.
          */
-        Palette(std::string const &);
+        Palette(std::string const &pallete);
 
         /**
          * Gets a pixel color depending on its intensity.
@@ -65,7 +64,7 @@ class Dye
          * The parts of string are separated by semi-colons. Each part starts
          * by an uppercase letter, followed by a colon and then a palette name.
          */
-        Dye(std::string const &);
+        Dye(std::string const &dye);
 
         /**
          * Destroys the associated palettes.
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index dc22a69b..35b9c254 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -17,15 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: image.cpp 3760 2007-11-21 19:43:11Z b_lindeijer $
  */
 
 #include <SDL_image.h>
 
-#include "image.h"
-
 #include "dye.h"
+#include "image.h"
 
 #include "../log.h"
 
diff --git a/src/resources/image.h b/src/resources/image.h
index 6f10f858..6eb33ed9 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -17,16 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: image.h 3760 2007-11-21 19:43:11Z b_lindeijer $
  */
 
 #ifndef _TMW_IMAGE_H
 #define _TMW_IMAGE_H
 
+#include <SDL.h>
+
 #include "../main.h"
 
-#include <SDL.h>
 #ifdef USE_OPENGL
 
 /* The definition of OpenGL extensions by SDL is giving problems with recent
diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp
index d6539b05..a7e813d7 100644
--- a/src/resources/imageloader.cpp
+++ b/src/resources/imageloader.cpp
@@ -17,18 +17,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: imageloader.cpp 3515 2007-08-25 16:56:52Z gmelquio $
  */
 
 #include <cassert>
 #include <string>
+
 #include <guichan/color.hpp>
 #include <guichan/sdl/sdlpixel.hpp>
 
-#include "imageloader.h"
-
 #include "image.h"
+#include "imageloader.h"
 #include "resourcemanager.h"
 
 ProxyImage::ProxyImage(SDL_Surface *s):
diff --git a/src/resources/imageloader.h b/src/resources/imageloader.h
index 89f38eda..7979fd2f 100644
--- a/src/resources/imageloader.h
+++ b/src/resources/imageloader.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: imageloader.h 3515 2007-08-25 16:56:52Z gmelquio $
  */
 
 #ifndef _TMW_IMAGELOADER_H
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index b7263ec3..b321439a 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.cpp
@@ -17,16 +17,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: imageset.cpp 4209 2008-04-29 12:58:21Z b_lindeijer $
  */
 
+#include "image.h"
 #include "imageset.h"
 
 #include "../log.h"
 
-#include "image.h"
-
 #include "../utils/dtor.h"
 
 ImageSet::ImageSet(Image *img, int width, int height)
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index e276dd06..c7915212 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: imageset.h 3753 2007-11-20 12:27:56Z b_lindeijer $
  */
 
 #ifndef _TMW_IMAGESET_H
@@ -30,7 +28,6 @@
 
 class Image;
 
-
 /**
  * Stores a set of subimages originating from a single image.
  */
diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp
index f11cad24..36805646 100644
--- a/src/resources/imagewriter.cpp
+++ b/src/resources/imagewriter.cpp
@@ -17,15 +17,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: imagewriter.cpp 2417 2006-07-19 15:12:06Z umperio $
  */
 
-#include "imagewriter.h"
-
 #include <png.h>
-#include <string>
 #include <SDL.h>
+#include <string>
+
+#include "imagewriter.h"
 
 #include "../log.h"
 
diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h
index c7968d30..632e2ae4 100644
--- a/src/resources/imagewriter.h
+++ b/src/resources/imagewriter.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: imagewriter.h 1766 2005-09-18 01:31:33Z bertram25 $
  */
 
 #include <iosfwd>
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 8b73f646..3f8dadce 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -17,15 +17,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: itemdb.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include <cassert>
+
 #include <libxml/tree.h>
 
 #include "itemdb.h"
-
 #include "iteminfo.h"
 #include "resourcemanager.h"
 
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 1ee1b5f0..9b661a60 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -17,17 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: itemdb.h 3587 2007-09-20 13:24:20Z b_lindeijer $
  */
 
 #ifndef _TMW_ITEM_MANAGER_H
 #define _TMW_ITEM_MANAGER_H
 
-#include "iteminfo.h"
-
 #include <map>
 
+#include "iteminfo.h"
+
 /**
  * The namespace that holds the item information.
  */
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 64f5c37e..5daeafe6 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -17,13 +17,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: iteminfo.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
-#include "iteminfo.h"
-
 #include "itemdb.h"
+#include "iteminfo.h"
 
 const std::string&
 ItemInfo::getSprite(int gender) const
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 85f79263..4678bc08 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: iteminfo.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _TMW_ITEMINFO_H_
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index f3d78ae9..d6154ee0 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -17,18 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: mapreader.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
-#include "mapreader.h"
-
 #include <cassert>
 #include <iostream>
 #include <zlib.h>
 
-#include "resourcemanager.h"
 #include "image.h"
+#include "mapreader.h"
+#include "resourcemanager.h"
 
 #include "../log.h"
 #include "../map.h"
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index eb0d4873..ef52564e 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: mapreader.h 3587 2007-09-20 13:24:20Z b_lindeijer $
  */
 
 #ifndef _TMW_MAPREADER_H_
@@ -28,8 +26,8 @@
 
 #include <libxml/tree.h>
 
-class Properties;
 class Map;
+class Properties;
 class Tileset;
 
 /**
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 8d8dd133..4d52b8ad 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -17,12 +17,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: monsterdb.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #include "monsterdb.h"
-
 #include "resourcemanager.h"
 
 #include "../log.h"
diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h
index 43865bb3..f1d69e72 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/monsterdb.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: monsterdb.h 3606 2007-09-27 14:54:09Z b_lindeijer $
  */
 
 #ifndef _TMW_MONSTER_DB_H
diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp
index 19f2990b..4a71a122 100644
--- a/src/resources/monsterinfo.cpp
+++ b/src/resources/monsterinfo.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: monsterinfo.cpp 2650 2006-09-03 15:00:47Z b_lindeijer $
  */
 
 #include "monsterinfo.h"
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index c5345bd8..05a78c5a 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -17,21 +17,18 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: monsterinfo.h 2650 2006-09-03 15:00:47Z b_lindeijer $
  */
 
 #ifndef _TMW_MONSTERINFO_H_
 #define _TMW_MONSTERINFO_H_
 
+#include <list>
 #include <map>
 #include <string>
 #include <vector>
-#include <list>
 
 #include "../being.h"
 
-
 enum MonsterSoundEvent
 {
     MONSTER_EVENT_HIT,
diff --git a/src/resources/music.cpp b/src/resources/music.cpp
index 0e327218..2386aa43 100644
--- a/src/resources/music.cpp
+++ b/src/resources/music.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: music.cpp 3753 2007-11-20 12:27:56Z b_lindeijer $
  */
 
 #include "music.h"
diff --git a/src/resources/music.h b/src/resources/music.h
index a15d22c1..d50150b8 100644
--- a/src/resources/music.h
+++ b/src/resources/music.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: music.h 3753 2007-11-20 12:27:56Z b_lindeijer $
  */
 
 #ifndef _TMW_MUSIC_H
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index c310d6e3..3ae58067 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -17,12 +17,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: npcdb.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #include "npcdb.h"
-
 #include "resourcemanager.h"
 
 #include "../log.h"
diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h
index e1240c5e..b4539866 100644
--- a/src/resources/npcdb.h
+++ b/src/resources/npcdb.h
@@ -17,15 +17,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: npcdb.h 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #ifndef _TMW_NPC_DB_H
 #define _TMW_NPC_DB_H
 
-#include <map>
 #include <list>
+#include <map>
 #include <string>
 
 struct NPCsprite
diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp
index 2bb60e56..e9310905 100644
--- a/src/resources/resource.cpp
+++ b/src/resources/resource.cpp
@@ -17,14 +17,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: resource.cpp 3808 2007-12-22 21:33:47Z b_lindeijer $
  */
 
 #include <cassert>
 
 #include "resource.h"
-
 #include "resourcemanager.h"
 
 Resource::~Resource()
diff --git a/src/resources/resource.h b/src/resources/resource.h
index 9c70f6c0..e85e3147 100644
--- a/src/resources/resource.h
+++ b/src/resources/resource.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: resource.h 3808 2007-12-22 21:33:47Z b_lindeijer $
  */
 
 #ifndef _TMW_RESOURCE_H
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 16a2c470..310982af 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -17,29 +17,25 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: resourcemanager.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include <cassert>
-#include <sstream>
-#include <sys/time.h>
-
 #include <physfs.h>
 #include <SDL_image.h>
+#include <sstream>
 
-#include "resourcemanager.h"
+#include <sys/time.h>
 
 #include "dye.h"
 #include "image.h"
+#include "imageset.h"
 #include "music.h"
+#include "resourcemanager.h"
 #include "soundeffect.h"
-#include "imageset.h"
 #include "spritedef.h"
 
 #include "../log.h"
 
-
 ResourceManager *ResourceManager::instance = NULL;
 
 ResourceManager::ResourceManager()
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index 3f0f1704..c814d752 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: resourcemanager.h 3839 2008-01-13 16:28:50Z the_enemy $
  */
 
 #ifndef _TMW_RESOURCE_MANAGER_H
@@ -29,11 +27,11 @@
 #include <string>
 #include <vector>
 
-class Resource;
 class Image;
+class ImageSet;
 class Music;
+class Resource;
 class SoundEffect;
-class ImageSet;
 class SpriteDef;
 struct SDL_Surface;
 
diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp
index 03fa337e..e21fd2b0 100644
--- a/src/resources/soundeffect.cpp
+++ b/src/resources/soundeffect.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: soundeffect.cpp 3753 2007-11-20 12:27:56Z b_lindeijer $
  */
 
 #include "soundeffect.h"
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index 0a574e7d..c3ff6668 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: soundeffect.h 3753 2007-11-20 12:27:56Z b_lindeijer $
  */
 
 #ifndef _TMW_SOUND_EFFECT_H
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index a6d8891e..b4193fd3 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -17,20 +17,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <set>
 
-#include "spritedef.h"
-
 #include "action.h"
 #include "animation.h"
 #include "dye.h"
 #include "image.h"
 #include "imageset.h"
 #include "resourcemanager.h"
+#include "spritedef.h"
 
 #include "../log.h"
 #include "../utils/xml.h"
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 72c2566f..4b712340 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_SPRITEDEF_H
@@ -27,10 +25,10 @@
 #include <map>
 #include <string>
 
-#include "resource.h"
-
 #include <libxml/tree.h>
 
+#include "resource.h"
+
 class Action;
 class ImageSet;
 
diff --git a/src/serverinfo.h b/src/serverinfo.h
index 9a9eef1d..4d2bb525 100644
--- a/src/serverinfo.h
+++ b/src/serverinfo.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: serverinfo.h 1735 2005-09-13 22:56:29Z der_doener $
  */
 
 #ifndef _TMW_SERVERINFO_
diff --git a/src/shopitem.cpp b/src/shopitem.cpp
index 8bd79cc1..9888f829 100644
--- a/src/shopitem.cpp
+++ b/src/shopitem.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: shopitem.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "shopitem.h"
diff --git a/src/shopitem.h b/src/shopitem.h
index 4e6fd3a3..f0c00ef0 100644
--- a/src/shopitem.h
+++ b/src/shopitem.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: shopitem.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _SHOPITEM_H_
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index a75a3392..544d02b5 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -17,19 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: simpleanimation.cpp 3587 2007-09-20 13:24:20Z b_lindeijer $
  */
 
-#include "simpleanimation.h"
-
 #include "graphics.h"
 #include "log.h"
+#include "simpleanimation.h"
 
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 #include "resources/imageset.h"
-
+#include "resources/resourcemanager.h"
 
 SimpleAnimation::SimpleAnimation(xmlNodePtr animationNode):
     mAnimationTime(0),
diff --git a/src/simpleanimation.h b/src/simpleanimation.h
index dfca33e2..577268a8 100644
--- a/src/simpleanimation.h
+++ b/src/simpleanimation.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: simpleanimation.h 3301 2007-05-23 21:35:01Z b_lindeijer $
  */
 
 #ifndef _TMW_SIMPLEANIMAION_H
diff --git a/src/sound.cpp b/src/sound.cpp
index f0101442..6d440134 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -17,15 +17,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: sound.cpp 3892 2008-02-18 10:00:45Z umperio $
  */
 
-#include "sound.h"
-
 #include <SDL.h>
 
 #include "log.h"
+#include "sound.h"
+
 #include "resources/resourcemanager.h"
 #include "resources/soundeffect.h"
 
diff --git a/src/sound.h b/src/sound.h
index ebcd6442..72180607 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -17,15 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_SOUND_H
 #define _TMW_SOUND_H
 
 #include <SDL_mixer.h>
-
 #include <string>
 
 /** Sound engine
diff --git a/src/sprite.h b/src/sprite.h
index cbe32186..0e0a95db 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: sprite.h 3292 2007-05-07 16:22:54Z crush_tmw $
  */
 
 #ifndef _TMW_SPRITE_H_
diff --git a/src/text.cpp b/src/text.cpp
index 545c1c0e..4d36b8fc 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -19,12 +19,11 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "text.h"
-
 #include <cstring>
 
 #include <guichan/font.hpp>
 
+#include "text.h"
 #include "textmanager.h"
 
 int Text::mInstances = 0;
diff --git a/src/textmanager.cpp b/src/textmanager.cpp
index 54d44c2a..cb5d0bf2 100644
--- a/src/textmanager.cpp
+++ b/src/textmanager.cpp
@@ -19,11 +19,10 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "textmanager.h"
-
 #include <cstring>
 
 #include "text.h"
+#include "textmanager.h"
 
 TextManager *textManager = 0;
 
diff --git a/src/textparticle.cpp b/src/textparticle.cpp
index 89466006..ed9d5717 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.cpp
@@ -17,13 +17,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
-#include "textparticle.h"
-
 #include "graphics.h"
+#include "textparticle.h"
 
 TextParticle::TextParticle(Map *map, const std::string &text,
                            int colorR, int colorG, int colorB,
diff --git a/src/textparticle.h b/src/textparticle.h
index 5f81abff..f662621f 100644
--- a/src/textparticle.h
+++ b/src/textparticle.h
@@ -17,18 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: textparticle.h 3539 2007-08-28 16:42:47Z b_lindeijer $
  */
 
 #ifndef _TEXTPARTICLE_H
 #define _TEXTPARTICLE_H
 
-#include "particle.h"
-
 #include <guichan/color.hpp>
 
 #include "guichanfwd.h"
+#include "particle.h"
 
 class TextParticle : public Particle
 {
diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp
index e98216d4..9d8ba836 100644
--- a/src/utils/base64.cpp
+++ b/src/utils/base64.cpp
@@ -26,10 +26,9 @@
    | Author: Jim Winstead (jimw@php.net)                                  |
    +----------------------------------------------------------------------+
    */
-/* $Id: base64.cpp 2906 2006-12-12 15:18:30Z b_lindeijer $ */
 
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "base64.h"
 
diff --git a/src/utils/base64.h b/src/utils/base64.h
index 3356debf..c802207b 100644
--- a/src/utils/base64.h
+++ b/src/utils/base64.h
@@ -26,7 +26,6 @@
    | Author: Jim Winstead (jimw@php.net)                                  |
    +----------------------------------------------------------------------+
  */
-/* $Id: base64.h 2906 2006-12-12 15:18:30Z b_lindeijer $ */
 
 #ifndef _TMW_BASE64_H
 #define _TMW_BASE64_H
diff --git a/src/utils/dtor.h b/src/utils/dtor.h
index 29cde178..514ea9e7 100644
--- a/src/utils/dtor.h
+++ b/src/utils/dtor.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: dtor.h 2271 2006-03-18 15:15:33Z der_doener $
  */
 
 #ifndef _TMW_UTILS_DTOR_H
diff --git a/src/utils/fastsqrt.h b/src/utils/fastsqrt.h
index 4513a79d..8da1d354 100644
--- a/src/utils/fastsqrt.h
+++ b/src/utils/fastsqrt.h
@@ -5,8 +5,6 @@
  * http://www.math.purdue.edu/~clomont/Math/Papers/2003/InvSqrt.pdf
  *
  * Unfortunately the original creator of this function seems to be unknown.
- *
- * $Id: fastsqrt.h 3508 2007-08-22 16:32:52Z b_lindeijer $
  */
 
 float fastInvSqrt(float x)
diff --git a/src/utils/strprintf.cpp b/src/utils/strprintf.cpp
index 48fc3814..c532dd0d 100644
--- a/src/utils/strprintf.cpp
+++ b/src/utils/strprintf.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: strprintf.cpp 3416 2007-08-06 06:20:14Z gmelquio $
  */
 
 #include <cstdarg>
diff --git a/src/utils/strprintf.h b/src/utils/strprintf.h
index 66d753fa..382ab6e0 100644
--- a/src/utils/strprintf.h
+++ b/src/utils/strprintf.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: strprintf.h 3417 2007-08-06 11:14:45Z gmelquio $
  */
 
 #ifndef _TMW_UTILS_STRPRINTF_H
diff --git a/src/utils/tostring.h b/src/utils/tostring.h
index 3cbeef27..d2dd941a 100644
--- a/src/utils/tostring.h
+++ b/src/utils/tostring.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: tostring.h 3500 2007-08-21 15:11:19Z joshlangley $
  */
 
 #ifndef _TMW_UTILS_TOSTRING_H
diff --git a/src/utils/trim.h b/src/utils/trim.h
index 7b236730..a7c40ca2 100644
--- a/src/utils/trim.h
+++ b/src/utils/trim.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: trim.h 3606 2007-09-27 14:54:09Z b_lindeijer $
  */
 
 #ifndef _TMW_UTILS_TRIM_H_
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index c0b921b8..e511ced3 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -17,12 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: xml.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #include "xml.h"
+
 #include "../log.h"
+
 #include "../resources/resourcemanager.h"
 
 namespace XML
diff --git a/src/utils/xml.h b/src/utils/xml.h
index c64c1204..9e691963 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -17,17 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: xml.h 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #ifndef _TMW_XML_H
 #define _TMW_XML_H
 
-#include <libxml/tree.h>
-
 #include <string>
 
+#include <libxml/tree.h>
+
 /**
  * XML helper functions.
  */
diff --git a/src/vector.h b/src/vector.h
index 379c50e1..b19f6c64 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: vector.h 3541 2007-08-29 00:31:59Z b_lindeijer $
  */
 
 #ifndef _TMW_VECTOR_H_
-- 
cgit v1.2.3-70-g09d2


From 22aa43fac05d9a7f61f776bd03230b36ed853ad5 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 21 Nov 2008 02:54:04 +0000
Subject: Fixed the linker error that we've been having. Apparently, it was
 caused by me accidently removing the include for main.h in openglgraphics.

---
 src/main.cpp           | 30 ++++++++++++++++--------------
 src/openglgraphics.cpp | 23 ++++++++++++-----------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 42a504fe..bebf4591 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -34,20 +34,6 @@
 
 #include <libxml/parser.h>
 
-#ifdef __APPLE__
-#include <CoreFoundation/CFBundle.h>
-#endif
-#ifdef __MINGW32__
-#include <windows.h>
-#define usleep(usec) (Sleep ((usec) / 1000), 0)
-#endif
-#ifdef WIN32
-#include <SDL_syswm.h>
-#else
-#include <cerrno>
-#include <sys/stat.h>
-#endif
-
 #include "configuration.h"
 #include "game.h"
 #include "graphics.h"
@@ -92,6 +78,22 @@
 #include "utils/dtor.h"
 #include "utils/tostring.h"
 
+#ifdef __APPLE__
+#include <CoreFoundation/CFBundle.h>
+#endif
+
+#ifdef __MINGW32__
+#include <windows.h>
+#define usleep(usec) (Sleep ((usec) / 1000), 0)
+#endif
+
+#ifdef WIN32
+#include <SDL_syswm.h>
+#else
+#include <cerrno>
+#include <sys/stat.h>
+#endif
+
 // Account infos
 char n_server, n_character;
 
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index 8f47bc1f..eeedcdf1 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -19,28 +19,29 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifdef USE_OPENGL
-
-#ifndef GL_TEXTURE_RECTANGLE_ARB
-#define GL_TEXTURE_RECTANGLE_ARB 0x84F5
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
-#endif
-
 #include <cstring>
 #include <SDL.h>
 
-#ifdef __APPLE__
-#include <OpenGL/OpenGL.h>
-#endif
-
 #include <guichan/exception.hpp>
 #include <guichan/image.hpp>
 
 #include "log.h"
+#include "main.h"
 #include "openglgraphics.h"
 
 #include "resources/image.h"
 
+#ifdef __APPLE__
+#include <OpenGL/OpenGL.h>
+#endif
+
+#ifdef USE_OPENGL
+
+#ifndef GL_TEXTURE_RECTANGLE_ARB
+#define GL_TEXTURE_RECTANGLE_ARB 0x84F5
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
+#endif
+
 OpenGLGraphics::OpenGLGraphics():
     mAlpha(false), mTexture(false), mColorAlpha(false)
 {
-- 
cgit v1.2.3-70-g09d2


From be621542a7330c43c6d586286c4ef7411f83b6ea Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 21 Nov 2008 03:38:52 +0000
Subject: Added the setup button to show when the client is loaded, since all
 of the settings in it can be changed on client startup and aren't game
 specific.

---
 src/main.cpp | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index bebf4591..b1bfa4c1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -59,6 +59,7 @@
 #include "gui/ok_dialog.h"
 #include "gui/progressbar.h"
 #include "gui/register.h"
+#include "gui/setup.h"
 #include "gui/textfield.h"
 #include "gui/updatewindow.h"
 
@@ -94,6 +95,16 @@
 #include <sys/stat.h>
 #endif
 
+namespace {
+    struct SetupListener : public gcn::ActionListener
+    {
+        /**
+         * Called when receiving actions from widget.
+         */
+        void action(const gcn::ActionEvent &event);
+    } listener;
+}
+
 // Account infos
 char n_server, n_character;
 
@@ -120,6 +131,8 @@ LockedArray<LocalPlayer*> charInfo(MAX_SLOT + 1);
 
 Colour *textColour;
 
+extern Window *setupWindow;
+
 // This anonymous namespace hides whatever is inside from other modules.
 namespace {
 
@@ -417,6 +430,7 @@ void exit_engine()
 
     delete gui;
     delete graphics;
+    delete setupWindow;
 
     // Shutdown libxml
     xmlCleanupParser();
@@ -699,6 +713,7 @@ int main(int argc, char *argv[])
     Game *game = NULL;
     Window *currentDialog = NULL;
     Image *login_wallpaper = NULL;
+    setupWindow = new Setup();
 
     gcn::Container *top = static_cast<gcn::Container*>(gui->getTop());
 #ifdef PACKAGE_VERSION
@@ -711,6 +726,9 @@ int main(int argc, char *argv[])
     top->add(progressLabel, 15 + progressBar->getWidth(),
                             progressBar->getY() + 4);
     progressBar->setVisible(false);
+    gcn::Button *setup = new Button("Setup", "Setup", &listener);
+    setup->setPosition(top->getWidth() - setup->getWidth() - 3, 3);
+    top->add(setup);
 
     sound.playMusic("Magick - Real.ogg");
 
@@ -1018,3 +1036,22 @@ int main(int argc, char *argv[])
     PHYSFS_deinit();
     return 0;
 }
+
+void SetupListener::action(const gcn::ActionEvent &event)
+{
+    Window *window = NULL;
+
+    if (event.getId() == "Setup")
+    {
+        window = setupWindow;
+    }
+
+    if (window)
+    {
+        window->setVisible(!window->isVisible());
+        if (window->isVisible())
+        {
+            window->requestMoveToTop();
+        }
+    }
+}
-- 
cgit v1.2.3-70-g09d2


From f5c0ed3ec4216219494121721a4cce0c7ec4fb34 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 21 Nov 2008 06:24:50 +0000
Subject: Changed windowing code to allow for multiple skins. This will be
 modified in a bit so that there are no redundant skin loads, but for now, it
 doesn't leak any more as well.

---
 src/gui/speechbubble.cpp |  4 ++--
 src/gui/window.cpp       | 21 +++++++++++----------
 src/gui/window.h         |  5 ++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 2ab80bd9..6af16496 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -29,8 +29,8 @@
 
 // TODO: Fix windows so that they can each load their own skins without the
 // other windows overriding another window's skin.
-SpeechBubble::SpeechBubble()//:
-//    Window("Message", false, NULL, "graphics/gui/speechbubble.xml")
+SpeechBubble::SpeechBubble():
+    Window("Message", false, NULL, "graphics/gui/speechbubble.xml")
 {
     mSpeechBox = new TextBox();
     mSpeechBox->setEditable(false);
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 4ace032b..48964121 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -48,7 +48,7 @@ ConfigListener *Window::windowConfigListener = 0;
 WindowContainer *Window::windowContainer = 0;
 int Window::instances = 0;
 int Window::mouseResize = 0;
-ImageRect Window::border;
+//ImageRect Window::border;
 Image *Window::closeImage = NULL;
 bool Window::mAlphaChanged = false;
 
@@ -57,9 +57,9 @@ class WindowConfigListener : public ConfigListener
     void optionChanged(const std::string &)
     {
         Window::mAlphaChanged = true;
-        for_each(Window::border.grid, Window::border.grid + 9,
-                std::bind2nd(std::mem_fun(&Image::setAlpha),
-                    config.getValue("guialpha", 0.8)));
+//        for_each(Window::border.grid, Window::border.grid + 9,
+//                 std::bind2nd(std::mem_fun(&Image::setAlpha),
+//                 config.getValue("guialpha", 0.8)));
     }
 };
 
@@ -142,18 +142,19 @@ Window::~Window()
 
     instances--;
 
+    // Clean up static resources
+    for( int i = 0; i < 9; i++ )
+    {
+        delete border.grid[i];
+        border.grid[i] = NULL;
+    }
+
     if (instances == 0)
     {
         config.removeListener("guialpha", windowConfigListener);
         delete windowConfigListener;
         windowConfigListener = NULL;
 
-        // Clean up static resources
-        for( int i = 0; i < 9; i++ )
-        {
-            delete border.grid[i];
-            border.grid[i] = NULL;
-        }
         closeImage->decRef();
     }
 
diff --git a/src/gui/window.h b/src/gui/window.h
index 3bb41a95..9380fc88 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -26,12 +26,11 @@
 
 #include <guichan/widgets/window.hpp>
 
+#include "../graphics.h"
 #include "../guichanfwd.h"
 
 class ConfigListener;
 class GCContainer;
-class Image;
-class ImageRect;
 class ResizeGrip;
 class WindowContainer;
 
@@ -291,7 +290,7 @@ class Window : public gcn::Window, gcn::WidgetListener
 
         static int mouseResize;    /**< Active resize handles */
         static int instances;      /**< Number of Window instances */
-        static ImageRect border;   /**< The window border and background */
+        ImageRect border;   /**< The window border and background */
         static Image *closeImage;  /**< Close Button Image */
 
         /**
-- 
cgit v1.2.3-70-g09d2


From 73ccb1a8eacd7cb339eca67d7312107739f03605 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 22 Nov 2008 01:56:05 +0000
Subject: While there is still a small visual artifact, this patch fixes the
 buy window so that it properly reports how much money you have.

---
 src/gui/buy.cpp            | 3 ---
 src/gui/buy.h              | 6 +++---
 src/net/buysellhandler.cpp | 1 +
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index a4574eb7..597a7cad 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -156,9 +156,6 @@ void BuyDialog::action(const gcn::ActionEvent &event)
         mSlider->setValue(mAmountItems);
         updateButtonsAndLabels();
     }
-    // TODO: Actually we'd have a bug elsewhere if this check for the number
-    // of items to be bought ever fails, Bertram removed the assertions, is
-    // there a better way to ensure this fails in an _obivous_ way in C++?
     else if (event.getId() == "buy" && mAmountItems > 0 &&
                 mAmountItems <= mMaxItems)
     {
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 0915385a..3b94bbaa 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -117,9 +117,9 @@ class BuyDialog : public Window, public gcn::ActionListener,
 
         ShopItems *mShopItems;
 
-        int mMoney;
-        int mAmountItems;
-        int mMaxItems;
+        Uint32 mMoney;
+        Uint32 mAmountItems;
+        Uint32 mMaxItems;
 };
 
 #endif
diff --git a/src/net/buysellhandler.cpp b/src/net/buysellhandler.cpp
index b464e69f..ad613889 100644
--- a/src/net/buysellhandler.cpp
+++ b/src/net/buysellhandler.cpp
@@ -113,6 +113,7 @@ void BuySellHandler::handleMessage(MessageIn *msg)
             if (msg->readInt8() == 0) {
                 chatWindow->chatLog("Thanks for buying", BY_SERVER);
             } else {
+                buyDialog->setMoney(player_node->mGp);
                 chatWindow->chatLog("Unable to buy", BY_SERVER);
             }
             break;
-- 
cgit v1.2.3-70-g09d2


From d5e30d8f72184241034aa797471c31a5bcbaa095 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 23 Nov 2008 18:25:07 +0000
Subject: Corrected a misreporting of the number of available slots. In the
 future, this should be de-hardcoded and obtained from the server instead.

---
 src/localplayer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/localplayer.h b/src/localplayer.h
index ad59d138..bb37274d 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -28,7 +28,7 @@
 // TODO move into some sane place...
 #define MAX_SLOT 2
 
-#define INVENTORY_SIZE 102
+#define INVENTORY_SIZE 100
 #define STORAGE_SIZE 301
 
 class FloorItem;
-- 
cgit v1.2.3-70-g09d2


From 886a5d4803e277b053014ae6b5c1c347f7756d48 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 25 Nov 2008 18:43:28 +0000
Subject: Miscellaneous TMW change commits. Missed these changes before because
 of a confusion on git.

---
 src/gui/itemcontainer.cpp         |  2 +-
 src/gui/itemshortcutcontainer.cpp |  4 +++-
 src/gui/minimap.cpp               | 27 +++++++++++++++++++--------
 src/gui/widgets/resizegrip.cpp    |  4 ++--
 src/gui/widgets/resizegrip.h      |  2 +-
 src/inventory.cpp                 |  6 +++---
 src/inventory.h                   |  6 +++---
 src/itemshortcut.cpp              | 22 +++++++++++++---------
 src/net/equipmenthandler.cpp      |  2 +-
 src/resources/itemdb.cpp          |  2 +-
 10 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 30cb1d6d..5069e102 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -206,7 +206,7 @@ ItemContainer::mousePressed(gcn::MouseEvent &event)
         }
         Item *item = mInventory->getItem(index);
         setSelectedItem(item);
-        if (item && !item->isEquipment())
+        if (item)
         {
             itemShortcut->setItemSelected(item->getId());
         }
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index 86a53aca..f8a0959a 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -96,11 +96,13 @@ ItemShortcutContainer::draw(gcn::Graphics *graphics)
             player_node->getInventory()->findItem(itemShortcut->getItem(i));
         if (item) {
             // Draw item icon.
+            const std::string label =
+                item->isEquipped() ? "Eq." : toString(item->getQuantity());
             Image* image = item->getImage();
             if (image) {
                 g->drawImage(image, itemX, itemY);
                 g->drawText(
-                        toString(item->getQuantity()),
+                        label,
                         itemX + mBoxWidth / 2,
                         itemY + mBoxHeight - 14,
                         gcn::Graphics::CENTER);
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 728f61e4..bd79ec87 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -70,18 +70,29 @@ void Minimap::draw(gcn::Graphics *graphics)
 {
     Window::draw(graphics);
 
-    if (mMapImage != NULL)
+    const gcn::Rectangle a = getChildrenArea();
+
+    int mapOriginX = a.x;
+    int mapOriginY = a.y;
+
+    if (mMapImage)
     {
+        if (mMapImage->getWidth() > a.width ||
+            mMapImage->getHeight() > a.height)
+        {
+            mapOriginX += (a.width - player_node->mX) / 2;
+            mapOriginY += (a.height - player_node->mY) / 2;
+        }
         static_cast<Graphics*>(graphics)->
-            drawImage(mMapImage, getPadding(), getTitleBarHeight());
+            drawImage(mMapImage, mapOriginX, mapOriginY);
     }
 
-    Beings &beings = beingManager->getAll();
-    BeingIterator bi;
+    const Beings &beings = beingManager->getAll();
+    Beings::const_iterator bi;
 
     for (bi = beings.begin(); bi != beings.end(); bi++)
     {
-        Being *being = (*bi);
+        const Being *being = (*bi);
         int dotSize = 2;
 
         switch (being->getType()) {
@@ -107,11 +118,11 @@ void Minimap::draw(gcn::Graphics *graphics)
                 continue;
         }
 
-        int offset = (dotSize - 1) * (int) mProportion;
+        const int offset = (dotSize - 1) * (int) mProportion;
 
         graphics->fillRectangle(gcn::Rectangle(
-                    (being->mX * (int) mProportion) + getPadding() - offset,
-                    (being->mY * (int) mProportion) + getTitleBarHeight() - offset,
+                    (being->mX * (int) mProportion) + mapOriginX - offset,
+                    (being->mY * (int) mProportion) + mapOriginY - offset,
                     dotSize, dotSize));
     }
 }
diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp
index e8b50dc9..87527f0a 100644
--- a/src/gui/widgets/resizegrip.cpp
+++ b/src/gui/widgets/resizegrip.cpp
@@ -31,13 +31,13 @@
 Image *ResizeGrip::gripImage = 0;
 int ResizeGrip::mInstances = 0;
 
-ResizeGrip::ResizeGrip()
+ResizeGrip::ResizeGrip(std::string image)
 {
     if (mInstances == 0)
     {
         // Load the grip image
         ResourceManager *resman = ResourceManager::getInstance();
-        gripImage = resman->getImage("graphics/gui/resize.png");
+        gripImage = resman->getImage(image);
     }
 
     mInstances++;
diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h
index 5f3a09a4..acb934d2 100644
--- a/src/gui/widgets/resizegrip.h
+++ b/src/gui/widgets/resizegrip.h
@@ -41,7 +41,7 @@ class ResizeGrip : public gcn::Widget
         /**
          * Constructor.
          */
-        ResizeGrip();
+        ResizeGrip(std::string image = "graphics/gui/resize.png");
 
         /**
          * Destructor.
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 764d7fee..d346a50b 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -124,19 +124,19 @@ bool Inventory::contains(Item *item) const
     return false;
 }
 
-int Inventory::getFreeSlot()
+int Inventory::getFreeSlot() const
 {
     Item **i = std::find_if(mItems + 2, mItems + mSize,
             std::not1(SlotUsed()));
     return (i == mItems + mSize) ? -1 : (i - mItems);
 }
 
-int Inventory::getNumberOfSlotsUsed()
+int Inventory::getNumberOfSlotsUsed() const
 {
     return count_if(mItems, mItems + mSize, SlotUsed());
 }
 
-int Inventory::getLastUsedSlot()
+int Inventory::getLastUsedSlot() const
 {
     for (int i = mSize - 1; i >= 0; i--) {
         if (SlotUsed()(mItems[i])) {
diff --git a/src/inventory.h b/src/inventory.h
index 87d09567..566ca17c 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -83,7 +83,7 @@ class Inventory
         /**
          * Returns id of next free slot or -1 if all occupied.
          */
-        int getFreeSlot();
+        int getFreeSlot() const;
 
         /**
          * Reset all item slots.
@@ -93,12 +93,12 @@ class Inventory
         /**
          * Get the number of slots filled with an item
          */
-        int getNumberOfSlotsUsed();
+        int getNumberOfSlotsUsed() const;
 
         /**
          * Returns the index of the last occupied slot or 0 if none occupied.
          */
-        int getLastUsedSlot();
+        int getLastUsedSlot() const;
 
     protected:
         Item **mItems;  /**< The holder of items */
diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp
index a3812042..cfe46238 100644
--- a/src/itemshortcut.cpp
+++ b/src/itemshortcut.cpp
@@ -61,14 +61,8 @@ void ItemShortcut::save()
 {
     for (int i = 0; i < SHORTCUT_ITEMS; i++)
     {
-        if (mItems[i])
-        {
-            config.setValue("shortcut" + toString(i), mItems[i]);
-        }
-        else
-        {
-            config.setValue("shortcut" + toString(i), -1);
-        }
+        const int itemId = mItems[i] ? mItems[i] : -1;
+        config.setValue("shortcut" + toString(i), itemId);
     }
 }
 
@@ -78,6 +72,16 @@ void ItemShortcut::useItem(int index)
     {
         Item *item = player_node->getInventory()->findItem(mItems[index]);
         if (item && item->getQuantity())
-            player_node->useItem(item);
+        {
+            if (item->isEquipment()) {
+                if (item->isEquipped()) {
+                    player_node->unequipItem(item);
+                } else {
+                    player_node->equipItem(item);
+                }
+            } else {
+                player_node->useItem(item);
+            }
+        }
     }
 }
diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index 4775371a..23a8063f 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.cpp
@@ -156,7 +156,7 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
 
             item->setEquipped(false);
             if (equipPoint & 0x8000) {    // Arrows
-                player_node->mEquipment->setArrows(NULL);
+                player_node->mEquipment->setArrows(0);
             }
             else {
                 player_node->mEquipment->removeEquipment(position);
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 3f8dadce..f4ccc511 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -89,7 +89,7 @@ void ItemDB::load()
         std::string image = XML::getProperty(node, "image", "");
         std::string description = XML::getProperty(node, "description", "");
         std::string effect = XML::getProperty(node, "effect", "");
-        int weaponType = XML::getProperty(node, "weapon_type", 0);// Not used by Aethyra
+        int weaponType = XML::getProperty(node, "weapon_type", 0);
 
         if (id)
         {
-- 
cgit v1.2.3-70-g09d2


From c6adb930edd2d0a88d7c5ca4edd58d95382a5abf Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 27 Nov 2008 22:24:48 +0000
Subject: Merged a patch by Bjorn to fix allowing the joystick to be used
 without being enabled first. A similar patch was asked for by Doorsman here,
 so this combined with the setup button on client startup, should be enough to
 fulfill that request from Doors.

---
 src/game.cpp     |  4 +---
 src/joystick.cpp | 42 ++++++++++++++----------------------------
 src/joystick.h   | 39 ++++++++++++++++++++-------------------
 3 files changed, 35 insertions(+), 50 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 34fb4622..16bc082b 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -297,9 +297,7 @@ Game::Game(Network *network):
     // TODO: The user should be able to choose which one to use
     // Open the first device
     if (Joystick::getNumberOfJoysticks() > 0)
-    {
-    joystick = new Joystick(0);
-    }
+        joystick = new Joystick(0);
 
     network->registerHandler(mBeingHandler.get());
     network->registerHandler(mBuySellHandler.get());
diff --git a/src/joystick.cpp b/src/joystick.cpp
index f009ebc4..b3aba4fc 100644
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -19,6 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <cassert>
+
 #include "configuration.h"
 #include "joystick.h"
 #include "log.h"
@@ -28,7 +30,10 @@ int Joystick::joystickCount = 0;
 void Joystick::init()
 {
     SDL_InitSubSystem(SDL_INIT_JOYSTICK);
-    //SDL_JoystickEventState(SDL_ENABLE);
+
+    // Have SDL call SDL_JoystickUpdate() automatically
+    SDL_JoystickEventState(SDL_ENABLE);
+
     joystickCount = SDL_NumJoysticks();
     logger->log("%i joysticks/gamepads found", joystickCount);
     for (int i = 0; i < joystickCount; i++)
@@ -36,11 +41,11 @@ void Joystick::init()
 }
 
 Joystick::Joystick(int no):
-    mDirection(0), mCalibrating(false)
+    mDirection(0),
+    mCalibrating(false),
+    mEnabled(false)
 {
-    // TODO Bail out here?
-    if (no > joystickCount)
-        return;
+    assert(no < joystickCount);
 
     mJoystick = SDL_JoystickOpen(no);
 
@@ -65,50 +70,39 @@ Joystick::Joystick(int no):
 
 Joystick::~Joystick()
 {
-        SDL_JoystickClose(mJoystick);
+    SDL_JoystickClose(mJoystick);
 }
 
 void Joystick::update()
 {
     mDirection = 0;
 
-    SDL_JoystickUpdate();
-
     // When calibrating, don't bother the outside with our state
     if (mCalibrating) {
         doCalibration();
         return;
     };
 
-    if (!mEnabled) return;
+    if (!mEnabled)
+        return;
 
     // X-Axis
     int position = SDL_JoystickGetAxis(mJoystick, 0);
     if (position >= mRightTolerance)
-    {
         mDirection |= RIGHT;
-    }
     else if (position <= mLeftTolerance)
-    {
         mDirection |= LEFT;
-    }
 
     // Y-Axis
     position = SDL_JoystickGetAxis(mJoystick, 1);
     if (position <= mUpTolerance)
-    {
         mDirection |= UP;
-    }
     else if (position >= mDownTolerance)
-    {
         mDirection |= DOWN;
-    }
 
     // Buttons
     for (int i = 0; i < MAX_BUTTONS; i++)
-    {
         mButtons[i] = (SDL_JoystickGetButton(mJoystick, i) == 1);
-    }
 }
 
 void Joystick::startCalibration()
@@ -125,24 +119,16 @@ void Joystick::doCalibration()
     // X-Axis
     int position = SDL_JoystickGetAxis(mJoystick, 0);
     if (position > mRightTolerance)
-    {
         mRightTolerance = position;
-    }
     else if (position < mLeftTolerance)
-    {
         mLeftTolerance = position;
-    }
 
     // Y-Axis
     position = SDL_JoystickGetAxis(mJoystick, 1);
     if (position > mDownTolerance)
-    {
         mDownTolerance = position;
-    }
     else if (position < mUpTolerance)
-    {
         mUpTolerance = position;
-    }
 }
 
 void Joystick::finishCalibration()
@@ -156,5 +142,5 @@ void Joystick::finishCalibration()
 
 bool Joystick::buttonPressed(unsigned char no) const
 {
-    return (no < MAX_BUTTONS) ? mButtons[no] : false;
+    return (mEnabled && no < MAX_BUTTONS) ? mButtons[no] : false;
 }
diff --git a/src/joystick.h b/src/joystick.h
index 4cc1babd..2baf3e61 100644
--- a/src/joystick.h
+++ b/src/joystick.h
@@ -30,12 +30,19 @@ class Joystick
         /**
          * Number of buttons we can handle.
          */
-        enum { MAX_BUTTONS = 6 };
+        enum { 
+            MAX_BUTTONS = 6
+        };
 
         /**
          * Directions, to be used as bitmask values.
          */
-        enum { UP = 1, DOWN = 2, LEFT = 4, RIGHT = 8 };
+        enum {
+            UP    = 1,
+            DOWN  = 2,
+            LEFT  = 4,
+            RIGHT = 8
+        };
 
         /**
          * Initializes the joystick subsystem.
@@ -55,33 +62,27 @@ class Joystick
 
         ~Joystick();
 
-        bool
-        isEnabled() const { return mEnabled; }
+        bool isEnabled() const { return mEnabled; }
 
-        void
-        setEnabled(bool enabled) { mEnabled = enabled; }
+        void setEnabled(bool enabled) { mEnabled = enabled; }
 
         /**
          * Updates the direction and button information.
          */
-        void
-        update();
+        void update();
 
-        void
-        startCalibration();
+        void startCalibration();
 
-        void
-        finishCalibration();
+        void finishCalibration();
 
-        bool
-        isCalibrating() const { return mCalibrating; }
+        bool isCalibrating() const { return mCalibrating; }
 
         bool buttonPressed(unsigned char no) const;
 
-        bool isUp() const { return mDirection & UP; };
-        bool isDown() const { return mDirection & DOWN; };
-        bool isLeft() const { return mDirection & LEFT; };
-        bool isRight() const { return mDirection & RIGHT; };
+        bool isUp() const { return mEnabled && (mDirection & UP); };
+        bool isDown() const { return mEnabled && (mDirection & DOWN); };
+        bool isLeft() const { return mEnabled && (mDirection & LEFT); };
+        bool isRight() const { return mEnabled && (mDirection & RIGHT); };
 
     protected:
         unsigned char mDirection;
@@ -97,4 +98,4 @@ class Joystick
         void doCalibration();
 };
 
-#endif
+#endif // _TMW_JOYSTICK_H
-- 
cgit v1.2.3-70-g09d2


From d628724789db142c529af8c25e115dd7ea0626a7 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 29 Nov 2008 19:58:41 +0000
Subject: Imported patch that Fate made on TMW which which changes the item
 container to guarantee that the inventory window always reports what the
 player has correctly, getting rid of the stale item references that could
 occur from time to time.

---
 src/equipment.h             |  2 +-
 src/gui/inventorywindow.cpp |  4 +--
 src/gui/itemcontainer.cpp   | 82 ++++++++++++++++++++++++++++++++-------------
 src/gui/itemcontainer.h     | 19 +++++++----
 src/localplayer.cpp         |  1 +
 src/localplayer.h           |  2 +-
 6 files changed, 77 insertions(+), 33 deletions(-)

diff --git a/src/equipment.h b/src/equipment.h
index 8b2ce127..2427539c 100644
--- a/src/equipment.h
+++ b/src/equipment.h
@@ -52,7 +52,7 @@ class Equipment
          * Remove equipment from the given slot.
          */
         void
-        removeEquipment(int index) { mEquipment[index] = 0; }
+        removeEquipment(int index) { if (index >= 0 && index < EQUIPMENT_SIZE) mEquipment[index] = 0; }
 
         /**
          * Get the item used in the arrow slot.
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index cbce0ee3..a8b20d40 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -73,7 +73,7 @@ InventoryWindow::InventoryWindow():
     mWeightLabel->setPosition(8, 8);
     mSlots = "Slots: " + 
              toString(player_node->getInventory()->getNumberOfSlotsUsed()) + 
-             "/" + toString(player_node->getInventory()->getSize());
+             "/" + toString(player_node->getInventory()->getSize() - 2);
     mSlotsLabel = new TextBox();
     mItemEffectLabel = new TextBox();
 
@@ -113,7 +113,7 @@ void InventoryWindow::logic()
 
         mSlots = "Slots: " + 
                  toString(player_node->getInventory()->getNumberOfSlotsUsed()) + 
-                 "/" + toString(player_node->getInventory()->getSize());
+                 "/" + toString(player_node->getInventory()->getSize() - 2);
 
         draw();
     }
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 5069e102..fca0c72d 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -40,9 +40,12 @@
 const int ItemContainer::gridWidth = 36;  // item icon width + 4
 const int ItemContainer::gridHeight = 42; // item icon height + 10
 
+static const int NO_ITEM = -1;
+
 ItemContainer::ItemContainer(Inventory *inventory, int offset):
     mInventory(inventory),
-    mSelectedItem(NULL),
+    mSelectedItemIndex(NO_ITEM),
+    mLastSelectedItemId(NO_ITEM),
     mOffset(offset)
 {
     ResourceManager *resman = ResourceManager::getInstance();
@@ -86,13 +89,6 @@ ItemContainer::draw(gcn::Graphics *graphics)
         columns = 1;
     }
 
-    // Reset selected item when quantity not above 0 (should probably be made
-    // sure somewhere else)
-    if (mSelectedItem && mSelectedItem->getQuantity() <= 0)
-    {
-        selectNone();
-    }
-
     /*
      * mOffset is used to compensate for some weirdness that eAthena inherited from
      * Ragnarok Online.  Inventory slots and cart slots are +2 from their actual index,
@@ -109,7 +105,7 @@ ItemContainer::draw(gcn::Graphics *graphics)
         int itemY = ((i - 2) / columns) * gridHeight;
 
         // Draw selection image below selected item
-        if (mSelectedItem == item)
+        if (mSelectedItemIndex == i)
         {
             static_cast<Graphics*>(graphics)->drawImage(
                     mSelImg, itemX, itemY);
@@ -151,23 +147,67 @@ void ItemContainer::recalculateHeight()
 }
 
 Item*
-ItemContainer::getSelectedItem() const
+ItemContainer::getSelectedItem()
 {
-    return mSelectedItem;
+    refindSelectedItem(); // Make sure that we're still current
+
+    if (mSelectedItemIndex == NO_ITEM)
+        return NULL;
+
+    return mInventory->getItem(mSelectedItemIndex);
 }
 
 void
 ItemContainer::selectNone()
 {
-    setSelectedItem(NULL);
+    setSelectedItemIndex(NO_ITEM);
 }
 
-void
-ItemContainer::setSelectedItem(Item *item)
+void ItemContainer::refindSelectedItem()
+{
+    if (mSelectedItemIndex != NO_ITEM) {
+	
+        if (mInventory->getItem(mSelectedItemIndex) &&
+            mInventory->getItem(mSelectedItemIndex)->getId() == mLastSelectedItemId)
+            return; // we're already fine
+	
+        // Otherwise ensure the invariant: we must point to an item of the specified last ID,
+        // or nowhere at all.
+
+        for (int i = 0; i <= mMaxItems + mOffset; i++)
+            if (mInventory->getItem(i) &&
+                mInventory->getItem(i)->getId() == mLastSelectedItemId) {
+                mSelectedItemIndex = i;
+                return;
+            }
+    }
+
+    mLastSelectedItemId = mSelectedItemIndex = NO_ITEM;
+}
+
+void ItemContainer::setSelectedItemIndex(int index)
 {
-    if (mSelectedItem != item)
+    int newSelectedItemIndex;
+
+    /*
+     * mOffset is used to compensate for some weirdness that eAthena inherited from
+     * Ragnarok Online.  Inventory slots and cart slots are +2 from their actual index,
+     * while storage slots are +1.
+     */
+    if (index < 0 || index > mMaxItems + mOffset || mInventory->getItem(index) == NULL)
+        newSelectedItemIndex = NO_ITEM;
+    else
+        newSelectedItemIndex = index;
+	
+    if (mSelectedItemIndex != newSelectedItemIndex)
     {
-        mSelectedItem = item;
+        mSelectedItemIndex = newSelectedItemIndex;
+
+        if (mSelectedItemIndex == NO_ITEM)
+            mLastSelectedItemId = NO_ITEM;
+        else
+            mLastSelectedItemId = mInventory->getItem(index)->getId();
+
         distributeValueChangedEvent();
     }
 }
@@ -198,14 +238,10 @@ ItemContainer::mousePressed(gcn::MouseEvent &event)
         int index = mx / gridWidth + ((my / gridHeight) * columns) + mOffset;
 
         itemShortcut->setItemSelected(-1);
-        // Fix for old server, it should be: if (index >= mMaxItems)
-        if (index > mMaxItems + 1)
-        {
-            setSelectedItem(NULL);
-            return;
-        }
+        setSelectedItemIndex(index);
+
         Item *item = mInventory->getItem(index);
-        setSelectedItem(item);
+
         if (item)
         {
             itemShortcut->setItemSelected(item->getId());
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index 54e0c1ca..5d22b658 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -43,8 +43,9 @@ namespace gcn {
  *
  * \ingroup GUI
  */
-class ItemContainer : public gcn::Widget, public gcn::MouseListener,
-    public gcn::WidgetListener
+class ItemContainer : public gcn::Widget, 
+                      public gcn::MouseListener,
+                      public gcn::WidgetListener
 {
     public:
         /**
@@ -80,7 +81,7 @@ class ItemContainer : public gcn::Widget, public gcn::MouseListener,
         /**
          * Returns the selected item.
          */
-        Item* getSelectedItem() const;
+        Item* getSelectedItem();
 
         /**
          * Sets selected item to NULL.
@@ -107,9 +108,14 @@ class ItemContainer : public gcn::Widget, public gcn::MouseListener,
 
     private:
         /**
-         * Sets the currently selected item.
+         * Find the current item index by the most recently used item ID
          */
-        void setSelectedItem(Item *item);
+        void refindSelectedItem(void);
+
+        /**
+         * Sets the currently selected item. Invalid (e.g., negative) indices set `no item'.
+         */
+        void setSelectedItemIndex(int index);
 
         /**
          * Determine and set the height of the container.
@@ -123,7 +129,8 @@ class ItemContainer : public gcn::Widget, public gcn::MouseListener,
 
         Inventory *mInventory;
         Image *mSelImg;
-        Item *mSelectedItem;
+        int mSelectedItemIndex;
+        int mLastSelectedItemId; // last selected item ID. If we lose the item, find again by ID.
 
         int mMaxItems;
         int mOffset;
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 68999787..7fdbc09b 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -47,6 +47,7 @@ LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map):
     Player(id, job, map),
     mXpForNextLevel(0),
     mAttackRange(0),
+    mSkillPoint(0),
     mXp(0), mNetwork(0),
     mTarget(NULL), mPickUpTarget(NULL),
     mTrading(false), mGoingToTarget(false),
diff --git a/src/localplayer.h b/src/localplayer.h
index bb37274d..ad59d138 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -28,7 +28,7 @@
 // TODO move into some sane place...
 #define MAX_SLOT 2
 
-#define INVENTORY_SIZE 100
+#define INVENTORY_SIZE 102
 #define STORAGE_SIZE 301
 
 class FloorItem;
-- 
cgit v1.2.3-70-g09d2


From eac7d68a6b1a61528a8e2ef435f108a709618b88 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 29 Nov 2008 18:35:26 -0700
Subject: Deleted the unnecessary .deps directory.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/.deps/tmw-action.Po                | 1 -
 src/.deps/tmw-ambientoverlay.Po        | 1 -
 src/.deps/tmw-animatedsprite.Po        | 1 -
 src/.deps/tmw-animation.Po             | 1 -
 src/.deps/tmw-animationparticle.Po     | 1 -
 src/.deps/tmw-base64.Po                | 1 -
 src/.deps/tmw-being.Po                 | 1 -
 src/.deps/tmw-beinghandler.Po          | 1 -
 src/.deps/tmw-beingmanager.Po          | 1 -
 src/.deps/tmw-box.Po                   | 1 -
 src/.deps/tmw-browserbox.Po            | 1 -
 src/.deps/tmw-buddylist.Po             | 1 -
 src/.deps/tmw-buddywindow.Po           | 1 -
 src/.deps/tmw-button.Po                | 1 -
 src/.deps/tmw-buy.Po                   | 1 -
 src/.deps/tmw-buysell.Po               | 1 -
 src/.deps/tmw-buysellhandler.Po        | 1 -
 src/.deps/tmw-char_select.Po           | 1 -
 src/.deps/tmw-char_server.Po           | 1 -
 src/.deps/tmw-chargedialog.Po          | 1 -
 src/.deps/tmw-charserverhandler.Po     | 1 -
 src/.deps/tmw-chat.Po                  | 1 -
 src/.deps/tmw-chathandler.Po           | 1 -
 src/.deps/tmw-chatinput.Po             | 1 -
 src/.deps/tmw-checkbox.Po              | 1 -
 src/.deps/tmw-configuration.Po         | 1 -
 src/.deps/tmw-confirm_dialog.Po        | 1 -
 src/.deps/tmw-connection.Po            | 1 -
 src/.deps/tmw-debugwindow.Po           | 1 -
 src/.deps/tmw-dropdown.Po              | 1 -
 src/.deps/tmw-dye.Po                   | 1 -
 src/.deps/tmw-engine.Po                | 1 -
 src/.deps/tmw-equipment.Po             | 1 -
 src/.deps/tmw-equipmenthandler.Po      | 1 -
 src/.deps/tmw-equipmentwindow.Po       | 1 -
 src/.deps/tmw-floor_item.Po            | 1 -
 src/.deps/tmw-flooritemmanager.Po      | 1 -
 src/.deps/tmw-focushandler.Po          | 1 -
 src/.deps/tmw-game.Po                  | 1 -
 src/.deps/tmw-gccontainer.Po           | 1 -
 src/.deps/tmw-graphics.Po              | 1 -
 src/.deps/tmw-gui.Po                   | 1 -
 src/.deps/tmw-hbox.Po                  | 1 -
 src/.deps/tmw-help.Po                  | 1 -
 src/.deps/tmw-image.Po                 | 1 -
 src/.deps/tmw-imageloader.Po           | 1 -
 src/.deps/tmw-imageparticle.Po         | 1 -
 src/.deps/tmw-imageset.Po              | 1 -
 src/.deps/tmw-imagewriter.Po           | 1 -
 src/.deps/tmw-inttextbox.Po            | 1 -
 src/.deps/tmw-inventory.Po             | 1 -
 src/.deps/tmw-inventoryhandler.Po      | 1 -
 src/.deps/tmw-inventorywindow.Po       | 1 -
 src/.deps/tmw-item.Po                  | 1 -
 src/.deps/tmw-item_amount.Po           | 1 -
 src/.deps/tmw-itemcontainer.Po         | 1 -
 src/.deps/tmw-itemdb.Po                | 1 -
 src/.deps/tmw-itemhandler.Po           | 1 -
 src/.deps/tmw-iteminfo.Po              | 1 -
 src/.deps/tmw-itemshortcut.Po          | 1 -
 src/.deps/tmw-itemshortcutcontainer.Po | 1 -
 src/.deps/tmw-itemshortcutwindow.Po    | 1 -
 src/.deps/tmw-joystick.Po              | 1 -
 src/.deps/tmw-keyboardconfig.Po        | 1 -
 src/.deps/tmw-listbox.Po               | 1 -
 src/.deps/tmw-localplayer.Po           | 1 -
 src/.deps/tmw-log.Po                   | 1 -
 src/.deps/tmw-login.Po                 | 1 -
 src/.deps/tmw-loginhandler.Po          | 1 -
 src/.deps/tmw-main.Po                  | 1 -
 src/.deps/tmw-map.Po                   | 1 -
 src/.deps/tmw-maploginhandler.Po       | 1 -
 src/.deps/tmw-mapreader.Po             | 1 -
 src/.deps/tmw-menuwindow.Po            | 1 -
 src/.deps/tmw-messagehandler.Po        | 1 -
 src/.deps/tmw-messagein.Po             | 1 -
 src/.deps/tmw-messageout.Po            | 1 -
 src/.deps/tmw-minimap.Po               | 1 -
 src/.deps/tmw-ministatus.Po            | 1 -
 src/.deps/tmw-monster.Po               | 1 -
 src/.deps/tmw-monsterdb.Po             | 1 -
 src/.deps/tmw-monsterinfo.Po           | 1 -
 src/.deps/tmw-music.Po                 | 1 -
 src/.deps/tmw-network.Po               | 1 -
 src/.deps/tmw-newskill.Po              | 1 -
 src/.deps/tmw-npc.Po                   | 1 -
 src/.deps/tmw-npc_text.Po              | 1 -
 src/.deps/tmw-npcdb.Po                 | 1 -
 src/.deps/tmw-npchandler.Po            | 1 -
 src/.deps/tmw-npclistdialog.Po         | 1 -
 src/.deps/tmw-ok_dialog.Po             | 1 -
 src/.deps/tmw-openglgraphics.Po        | 1 -
 src/.deps/tmw-particle.Po              | 1 -
 src/.deps/tmw-particleemitter.Po       | 1 -
 src/.deps/tmw-passwordfield.Po         | 1 -
 src/.deps/tmw-player.Po                | 1 -
 src/.deps/tmw-player_relations.Po      | 1 -
 src/.deps/tmw-playerbox.Po             | 1 -
 src/.deps/tmw-playerhandler.Po         | 1 -
 src/.deps/tmw-popupmenu.Po             | 1 -
 src/.deps/tmw-progressbar.Po           | 1 -
 src/.deps/tmw-protocol.Po              | 1 -
 src/.deps/tmw-radiobutton.Po           | 1 -
 src/.deps/tmw-register.Po              | 1 -
 src/.deps/tmw-resizegrip.Po            | 1 -
 src/.deps/tmw-resource.Po              | 1 -
 src/.deps/tmw-resourcemanager.Po       | 1 -
 src/.deps/tmw-scrollarea.Po            | 1 -
 src/.deps/tmw-sell.Po                  | 1 -
 src/.deps/tmw-setup.Po                 | 1 -
 src/.deps/tmw-setup_audio.Po           | 1 -
 src/.deps/tmw-setup_joystick.Po        | 1 -
 src/.deps/tmw-setup_keyboard.Po        | 1 -
 src/.deps/tmw-setup_players.Po         | 1 -
 src/.deps/tmw-setup_video.Po           | 1 -
 src/.deps/tmw-shop.Po                  | 1 -
 src/.deps/tmw-shoplistbox.Po           | 1 -
 src/.deps/tmw-simpleanimation.Po       | 1 -
 src/.deps/tmw-skill.Po                 | 1 -
 src/.deps/tmw-skillhandler.Po          | 1 -
 src/.deps/tmw-slider.Po                | 1 -
 src/.deps/tmw-sound.Po                 | 1 -
 src/.deps/tmw-soundeffect.Po           | 1 -
 src/.deps/tmw-spritedef.Po             | 1 -
 src/.deps/tmw-status.Po                | 1 -
 src/.deps/tmw-strprintf.Po             | 1 -
 src/.deps/tmw-tabbedcontainer.Po       | 1 -
 src/.deps/tmw-table.Po                 | 1 -
 src/.deps/tmw-table_model.Po           | 1 -
 src/.deps/tmw-textbox.Po               | 1 -
 src/.deps/tmw-textfield.Po             | 1 -
 src/.deps/tmw-textparticle.Po          | 1 -
 src/.deps/tmw-trade.Po                 | 1 -
 src/.deps/tmw-tradehandler.Po          | 1 -
 src/.deps/tmw-updatewindow.Po          | 1 -
 src/.deps/tmw-vbox.Po                  | 1 -
 src/.deps/tmw-viewport.Po              | 1 -
 src/.deps/tmw-window.Po                | 1 -
 src/.deps/tmw-windowcontainer.Po       | 1 -
 src/.deps/tmw-xml.Po                   | 1 -
 140 files changed, 140 deletions(-)
 delete mode 100644 src/.deps/tmw-action.Po
 delete mode 100644 src/.deps/tmw-ambientoverlay.Po
 delete mode 100644 src/.deps/tmw-animatedsprite.Po
 delete mode 100644 src/.deps/tmw-animation.Po
 delete mode 100644 src/.deps/tmw-animationparticle.Po
 delete mode 100644 src/.deps/tmw-base64.Po
 delete mode 100644 src/.deps/tmw-being.Po
 delete mode 100644 src/.deps/tmw-beinghandler.Po
 delete mode 100644 src/.deps/tmw-beingmanager.Po
 delete mode 100644 src/.deps/tmw-box.Po
 delete mode 100644 src/.deps/tmw-browserbox.Po
 delete mode 100644 src/.deps/tmw-buddylist.Po
 delete mode 100644 src/.deps/tmw-buddywindow.Po
 delete mode 100644 src/.deps/tmw-button.Po
 delete mode 100644 src/.deps/tmw-buy.Po
 delete mode 100644 src/.deps/tmw-buysell.Po
 delete mode 100644 src/.deps/tmw-buysellhandler.Po
 delete mode 100644 src/.deps/tmw-char_select.Po
 delete mode 100644 src/.deps/tmw-char_server.Po
 delete mode 100644 src/.deps/tmw-chargedialog.Po
 delete mode 100644 src/.deps/tmw-charserverhandler.Po
 delete mode 100644 src/.deps/tmw-chat.Po
 delete mode 100644 src/.deps/tmw-chathandler.Po
 delete mode 100644 src/.deps/tmw-chatinput.Po
 delete mode 100644 src/.deps/tmw-checkbox.Po
 delete mode 100644 src/.deps/tmw-configuration.Po
 delete mode 100644 src/.deps/tmw-confirm_dialog.Po
 delete mode 100644 src/.deps/tmw-connection.Po
 delete mode 100644 src/.deps/tmw-debugwindow.Po
 delete mode 100644 src/.deps/tmw-dropdown.Po
 delete mode 100644 src/.deps/tmw-dye.Po
 delete mode 100644 src/.deps/tmw-engine.Po
 delete mode 100644 src/.deps/tmw-equipment.Po
 delete mode 100644 src/.deps/tmw-equipmenthandler.Po
 delete mode 100644 src/.deps/tmw-equipmentwindow.Po
 delete mode 100644 src/.deps/tmw-floor_item.Po
 delete mode 100644 src/.deps/tmw-flooritemmanager.Po
 delete mode 100644 src/.deps/tmw-focushandler.Po
 delete mode 100644 src/.deps/tmw-game.Po
 delete mode 100644 src/.deps/tmw-gccontainer.Po
 delete mode 100644 src/.deps/tmw-graphics.Po
 delete mode 100644 src/.deps/tmw-gui.Po
 delete mode 100644 src/.deps/tmw-hbox.Po
 delete mode 100644 src/.deps/tmw-help.Po
 delete mode 100644 src/.deps/tmw-image.Po
 delete mode 100644 src/.deps/tmw-imageloader.Po
 delete mode 100644 src/.deps/tmw-imageparticle.Po
 delete mode 100644 src/.deps/tmw-imageset.Po
 delete mode 100644 src/.deps/tmw-imagewriter.Po
 delete mode 100644 src/.deps/tmw-inttextbox.Po
 delete mode 100644 src/.deps/tmw-inventory.Po
 delete mode 100644 src/.deps/tmw-inventoryhandler.Po
 delete mode 100644 src/.deps/tmw-inventorywindow.Po
 delete mode 100644 src/.deps/tmw-item.Po
 delete mode 100644 src/.deps/tmw-item_amount.Po
 delete mode 100644 src/.deps/tmw-itemcontainer.Po
 delete mode 100644 src/.deps/tmw-itemdb.Po
 delete mode 100644 src/.deps/tmw-itemhandler.Po
 delete mode 100644 src/.deps/tmw-iteminfo.Po
 delete mode 100644 src/.deps/tmw-itemshortcut.Po
 delete mode 100644 src/.deps/tmw-itemshortcutcontainer.Po
 delete mode 100644 src/.deps/tmw-itemshortcutwindow.Po
 delete mode 100644 src/.deps/tmw-joystick.Po
 delete mode 100644 src/.deps/tmw-keyboardconfig.Po
 delete mode 100644 src/.deps/tmw-listbox.Po
 delete mode 100644 src/.deps/tmw-localplayer.Po
 delete mode 100644 src/.deps/tmw-log.Po
 delete mode 100644 src/.deps/tmw-login.Po
 delete mode 100644 src/.deps/tmw-loginhandler.Po
 delete mode 100644 src/.deps/tmw-main.Po
 delete mode 100644 src/.deps/tmw-map.Po
 delete mode 100644 src/.deps/tmw-maploginhandler.Po
 delete mode 100644 src/.deps/tmw-mapreader.Po
 delete mode 100644 src/.deps/tmw-menuwindow.Po
 delete mode 100644 src/.deps/tmw-messagehandler.Po
 delete mode 100644 src/.deps/tmw-messagein.Po
 delete mode 100644 src/.deps/tmw-messageout.Po
 delete mode 100644 src/.deps/tmw-minimap.Po
 delete mode 100644 src/.deps/tmw-ministatus.Po
 delete mode 100644 src/.deps/tmw-monster.Po
 delete mode 100644 src/.deps/tmw-monsterdb.Po
 delete mode 100644 src/.deps/tmw-monsterinfo.Po
 delete mode 100644 src/.deps/tmw-music.Po
 delete mode 100644 src/.deps/tmw-network.Po
 delete mode 100644 src/.deps/tmw-newskill.Po
 delete mode 100644 src/.deps/tmw-npc.Po
 delete mode 100644 src/.deps/tmw-npc_text.Po
 delete mode 100644 src/.deps/tmw-npcdb.Po
 delete mode 100644 src/.deps/tmw-npchandler.Po
 delete mode 100644 src/.deps/tmw-npclistdialog.Po
 delete mode 100644 src/.deps/tmw-ok_dialog.Po
 delete mode 100644 src/.deps/tmw-openglgraphics.Po
 delete mode 100644 src/.deps/tmw-particle.Po
 delete mode 100644 src/.deps/tmw-particleemitter.Po
 delete mode 100644 src/.deps/tmw-passwordfield.Po
 delete mode 100644 src/.deps/tmw-player.Po
 delete mode 100644 src/.deps/tmw-player_relations.Po
 delete mode 100644 src/.deps/tmw-playerbox.Po
 delete mode 100644 src/.deps/tmw-playerhandler.Po
 delete mode 100644 src/.deps/tmw-popupmenu.Po
 delete mode 100644 src/.deps/tmw-progressbar.Po
 delete mode 100644 src/.deps/tmw-protocol.Po
 delete mode 100644 src/.deps/tmw-radiobutton.Po
 delete mode 100644 src/.deps/tmw-register.Po
 delete mode 100644 src/.deps/tmw-resizegrip.Po
 delete mode 100644 src/.deps/tmw-resource.Po
 delete mode 100644 src/.deps/tmw-resourcemanager.Po
 delete mode 100644 src/.deps/tmw-scrollarea.Po
 delete mode 100644 src/.deps/tmw-sell.Po
 delete mode 100644 src/.deps/tmw-setup.Po
 delete mode 100644 src/.deps/tmw-setup_audio.Po
 delete mode 100644 src/.deps/tmw-setup_joystick.Po
 delete mode 100644 src/.deps/tmw-setup_keyboard.Po
 delete mode 100644 src/.deps/tmw-setup_players.Po
 delete mode 100644 src/.deps/tmw-setup_video.Po
 delete mode 100644 src/.deps/tmw-shop.Po
 delete mode 100644 src/.deps/tmw-shoplistbox.Po
 delete mode 100644 src/.deps/tmw-simpleanimation.Po
 delete mode 100644 src/.deps/tmw-skill.Po
 delete mode 100644 src/.deps/tmw-skillhandler.Po
 delete mode 100644 src/.deps/tmw-slider.Po
 delete mode 100644 src/.deps/tmw-sound.Po
 delete mode 100644 src/.deps/tmw-soundeffect.Po
 delete mode 100644 src/.deps/tmw-spritedef.Po
 delete mode 100644 src/.deps/tmw-status.Po
 delete mode 100644 src/.deps/tmw-strprintf.Po
 delete mode 100644 src/.deps/tmw-tabbedcontainer.Po
 delete mode 100644 src/.deps/tmw-table.Po
 delete mode 100644 src/.deps/tmw-table_model.Po
 delete mode 100644 src/.deps/tmw-textbox.Po
 delete mode 100644 src/.deps/tmw-textfield.Po
 delete mode 100644 src/.deps/tmw-textparticle.Po
 delete mode 100644 src/.deps/tmw-trade.Po
 delete mode 100644 src/.deps/tmw-tradehandler.Po
 delete mode 100644 src/.deps/tmw-updatewindow.Po
 delete mode 100644 src/.deps/tmw-vbox.Po
 delete mode 100644 src/.deps/tmw-viewport.Po
 delete mode 100644 src/.deps/tmw-window.Po
 delete mode 100644 src/.deps/tmw-windowcontainer.Po
 delete mode 100644 src/.deps/tmw-xml.Po

diff --git a/src/.deps/tmw-action.Po b/src/.deps/tmw-action.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-action.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-ambientoverlay.Po b/src/.deps/tmw-ambientoverlay.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-ambientoverlay.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-animatedsprite.Po b/src/.deps/tmw-animatedsprite.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-animatedsprite.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-animation.Po b/src/.deps/tmw-animation.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-animation.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-animationparticle.Po b/src/.deps/tmw-animationparticle.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-animationparticle.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-base64.Po b/src/.deps/tmw-base64.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-base64.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-being.Po b/src/.deps/tmw-being.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-being.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-beinghandler.Po b/src/.deps/tmw-beinghandler.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-beinghandler.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-beingmanager.Po b/src/.deps/tmw-beingmanager.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-beingmanager.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-box.Po b/src/.deps/tmw-box.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-box.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-browserbox.Po b/src/.deps/tmw-browserbox.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-browserbox.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-buddylist.Po b/src/.deps/tmw-buddylist.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-buddylist.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-buddywindow.Po b/src/.deps/tmw-buddywindow.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-buddywindow.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-button.Po b/src/.deps/tmw-button.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-button.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-buy.Po b/src/.deps/tmw-buy.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-buy.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-buysell.Po b/src/.deps/tmw-buysell.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-buysell.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-buysellhandler.Po b/src/.deps/tmw-buysellhandler.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-buysellhandler.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-char_select.Po b/src/.deps/tmw-char_select.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-char_select.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-char_server.Po b/src/.deps/tmw-char_server.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-char_server.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-chargedialog.Po b/src/.deps/tmw-chargedialog.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-chargedialog.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-charserverhandler.Po b/src/.deps/tmw-charserverhandler.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-charserverhandler.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-chat.Po b/src/.deps/tmw-chat.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-chat.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-chathandler.Po b/src/.deps/tmw-chathandler.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-chathandler.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-chatinput.Po b/src/.deps/tmw-chatinput.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-chatinput.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-checkbox.Po b/src/.deps/tmw-checkbox.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-checkbox.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-configuration.Po b/src/.deps/tmw-configuration.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-configuration.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-confirm_dialog.Po b/src/.deps/tmw-confirm_dialog.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-confirm_dialog.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-connection.Po b/src/.deps/tmw-connection.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-connection.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-debugwindow.Po b/src/.deps/tmw-debugwindow.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-debugwindow.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-dropdown.Po b/src/.deps/tmw-dropdown.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-dropdown.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-dye.Po b/src/.deps/tmw-dye.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-dye.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-engine.Po b/src/.deps/tmw-engine.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-engine.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-equipment.Po b/src/.deps/tmw-equipment.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-equipment.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-equipmenthandler.Po b/src/.deps/tmw-equipmenthandler.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-equipmenthandler.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-equipmentwindow.Po b/src/.deps/tmw-equipmentwindow.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-equipmentwindow.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-floor_item.Po b/src/.deps/tmw-floor_item.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-floor_item.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-flooritemmanager.Po b/src/.deps/tmw-flooritemmanager.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-flooritemmanager.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-focushandler.Po b/src/.deps/tmw-focushandler.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-focushandler.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-game.Po b/src/.deps/tmw-game.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-game.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-gccontainer.Po b/src/.deps/tmw-gccontainer.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-gccontainer.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-graphics.Po b/src/.deps/tmw-graphics.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-graphics.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-gui.Po b/src/.deps/tmw-gui.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-gui.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-hbox.Po b/src/.deps/tmw-hbox.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-hbox.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-help.Po b/src/.deps/tmw-help.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-help.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-image.Po b/src/.deps/tmw-image.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-image.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-imageloader.Po b/src/.deps/tmw-imageloader.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-imageloader.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-imageparticle.Po b/src/.deps/tmw-imageparticle.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-imageparticle.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-imageset.Po b/src/.deps/tmw-imageset.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-imageset.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-imagewriter.Po b/src/.deps/tmw-imagewriter.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-imagewriter.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-inttextbox.Po b/src/.deps/tmw-inttextbox.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-inttextbox.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-inventory.Po b/src/.deps/tmw-inventory.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-inventory.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-inventoryhandler.Po b/src/.deps/tmw-inventoryhandler.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-inventoryhandler.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-inventorywindow.Po b/src/.deps/tmw-inventorywindow.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-inventorywindow.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-item.Po b/src/.deps/tmw-item.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-item.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-item_amount.Po b/src/.deps/tmw-item_amount.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-item_amount.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-itemcontainer.Po b/src/.deps/tmw-itemcontainer.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-itemcontainer.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-itemdb.Po b/src/.deps/tmw-itemdb.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-itemdb.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-itemhandler.Po b/src/.deps/tmw-itemhandler.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-itemhandler.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-iteminfo.Po b/src/.deps/tmw-iteminfo.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-iteminfo.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-itemshortcut.Po b/src/.deps/tmw-itemshortcut.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-itemshortcut.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-itemshortcutcontainer.Po b/src/.deps/tmw-itemshortcutcontainer.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-itemshortcutcontainer.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-itemshortcutwindow.Po b/src/.deps/tmw-itemshortcutwindow.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-itemshortcutwindow.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-joystick.Po b/src/.deps/tmw-joystick.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-joystick.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-keyboardconfig.Po b/src/.deps/tmw-keyboardconfig.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-keyboardconfig.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-listbox.Po b/src/.deps/tmw-listbox.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-listbox.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-localplayer.Po b/src/.deps/tmw-localplayer.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-localplayer.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-log.Po b/src/.deps/tmw-log.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-log.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-login.Po b/src/.deps/tmw-login.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-login.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-loginhandler.Po b/src/.deps/tmw-loginhandler.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-loginhandler.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-main.Po b/src/.deps/tmw-main.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-main.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-map.Po b/src/.deps/tmw-map.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-map.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-maploginhandler.Po b/src/.deps/tmw-maploginhandler.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-maploginhandler.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-mapreader.Po b/src/.deps/tmw-mapreader.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-mapreader.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-menuwindow.Po b/src/.deps/tmw-menuwindow.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-menuwindow.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-messagehandler.Po b/src/.deps/tmw-messagehandler.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-messagehandler.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-messagein.Po b/src/.deps/tmw-messagein.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-messagein.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-messageout.Po b/src/.deps/tmw-messageout.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-messageout.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-minimap.Po b/src/.deps/tmw-minimap.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-minimap.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-ministatus.Po b/src/.deps/tmw-ministatus.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-ministatus.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-monster.Po b/src/.deps/tmw-monster.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-monster.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-monsterdb.Po b/src/.deps/tmw-monsterdb.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-monsterdb.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-monsterinfo.Po b/src/.deps/tmw-monsterinfo.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-monsterinfo.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-music.Po b/src/.deps/tmw-music.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-music.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-network.Po b/src/.deps/tmw-network.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-network.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-newskill.Po b/src/.deps/tmw-newskill.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-newskill.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-npc.Po b/src/.deps/tmw-npc.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-npc.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-npc_text.Po b/src/.deps/tmw-npc_text.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-npc_text.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-npcdb.Po b/src/.deps/tmw-npcdb.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-npcdb.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-npchandler.Po b/src/.deps/tmw-npchandler.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-npchandler.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-npclistdialog.Po b/src/.deps/tmw-npclistdialog.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-npclistdialog.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-ok_dialog.Po b/src/.deps/tmw-ok_dialog.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-ok_dialog.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-openglgraphics.Po b/src/.deps/tmw-openglgraphics.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-openglgraphics.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-particle.Po b/src/.deps/tmw-particle.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-particle.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-particleemitter.Po b/src/.deps/tmw-particleemitter.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-particleemitter.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-passwordfield.Po b/src/.deps/tmw-passwordfield.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-passwordfield.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-player.Po b/src/.deps/tmw-player.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-player.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-player_relations.Po b/src/.deps/tmw-player_relations.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-player_relations.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-playerbox.Po b/src/.deps/tmw-playerbox.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-playerbox.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-playerhandler.Po b/src/.deps/tmw-playerhandler.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-playerhandler.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-popupmenu.Po b/src/.deps/tmw-popupmenu.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-popupmenu.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-progressbar.Po b/src/.deps/tmw-progressbar.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-progressbar.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-protocol.Po b/src/.deps/tmw-protocol.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-protocol.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-radiobutton.Po b/src/.deps/tmw-radiobutton.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-radiobutton.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-register.Po b/src/.deps/tmw-register.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-register.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-resizegrip.Po b/src/.deps/tmw-resizegrip.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-resizegrip.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-resource.Po b/src/.deps/tmw-resource.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-resource.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-resourcemanager.Po b/src/.deps/tmw-resourcemanager.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-resourcemanager.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-scrollarea.Po b/src/.deps/tmw-scrollarea.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-scrollarea.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-sell.Po b/src/.deps/tmw-sell.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-sell.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-setup.Po b/src/.deps/tmw-setup.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-setup.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-setup_audio.Po b/src/.deps/tmw-setup_audio.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-setup_audio.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-setup_joystick.Po b/src/.deps/tmw-setup_joystick.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-setup_joystick.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-setup_keyboard.Po b/src/.deps/tmw-setup_keyboard.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-setup_keyboard.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-setup_players.Po b/src/.deps/tmw-setup_players.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-setup_players.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-setup_video.Po b/src/.deps/tmw-setup_video.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-setup_video.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-shop.Po b/src/.deps/tmw-shop.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-shop.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-shoplistbox.Po b/src/.deps/tmw-shoplistbox.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-shoplistbox.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-simpleanimation.Po b/src/.deps/tmw-simpleanimation.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-simpleanimation.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-skill.Po b/src/.deps/tmw-skill.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-skill.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-skillhandler.Po b/src/.deps/tmw-skillhandler.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-skillhandler.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-slider.Po b/src/.deps/tmw-slider.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-slider.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-sound.Po b/src/.deps/tmw-sound.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-sound.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-soundeffect.Po b/src/.deps/tmw-soundeffect.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-soundeffect.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-spritedef.Po b/src/.deps/tmw-spritedef.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-spritedef.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-status.Po b/src/.deps/tmw-status.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-status.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-strprintf.Po b/src/.deps/tmw-strprintf.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-strprintf.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-tabbedcontainer.Po b/src/.deps/tmw-tabbedcontainer.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-tabbedcontainer.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-table.Po b/src/.deps/tmw-table.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-table.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-table_model.Po b/src/.deps/tmw-table_model.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-table_model.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-textbox.Po b/src/.deps/tmw-textbox.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-textbox.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-textfield.Po b/src/.deps/tmw-textfield.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-textfield.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-textparticle.Po b/src/.deps/tmw-textparticle.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-textparticle.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-trade.Po b/src/.deps/tmw-trade.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-trade.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-tradehandler.Po b/src/.deps/tmw-tradehandler.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-tradehandler.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-updatewindow.Po b/src/.deps/tmw-updatewindow.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-updatewindow.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-vbox.Po b/src/.deps/tmw-vbox.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-vbox.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-viewport.Po b/src/.deps/tmw-viewport.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-viewport.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-window.Po b/src/.deps/tmw-window.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-window.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-windowcontainer.Po b/src/.deps/tmw-windowcontainer.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-windowcontainer.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/src/.deps/tmw-xml.Po b/src/.deps/tmw-xml.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/src/.deps/tmw-xml.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
-- 
cgit v1.2.3-70-g09d2


From 362271dae180acda703b84834006bbc46a21e02e Mon Sep 17 00:00:00 2001
From: Fate <fate-tmw@googlemail.com>
Date: Sun, 23 Nov 2008 18:47:38 -0700
Subject: Delete resources after removing from the orphan list, to avoid double
 frees during recursion

---
 src/resources/resourcemanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 310982af..510a16bd 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -128,10 +128,10 @@ void ResourceManager::cleanOrphans()
         else
         {
             logger->log("ResourceManager::release(%s)", res->mIdPath.c_str());
-            delete res;
             ResourceIterator toErase = iter;
             ++iter;
             mOrphanedResources.erase(toErase);
+            delete res; // delete only after removal from list, to avoid issues in recursion
         }
     }
 
-- 
cgit v1.2.3-70-g09d2


From 5345796e2e8263c50a5b29d539a55f34467d61d2 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 30 Nov 2008 16:13:59 -0700
Subject: Fixed up a few help files, as well as updated their contents to be
 more current. This has been neglected for a bit longer than it should have
 been. Signed-off-by: Ira Rice <irarice@gmail.com>

---
 data/help/changes.txt  |  3 ++-
 data/help/commands.txt |  2 +-
 data/help/team.txt     | 58 +++++++++++++++++++++++++++++++++++---------------
 3 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/data/help/changes.txt b/data/help/changes.txt
index eb25c86d..869a29ff 100644
--- a/data/help/changes.txt
+++ b/data/help/changes.txt
@@ -3,5 +3,6 @@
  
 ##3                         === RECENT CHANGES ===
  
-check out  www.aethyra.com for our changes in progress
+Go to http://gitorious.org/projects/tmw/repos/aethyra for a detailed
+list of changes.
  
diff --git a/data/help/commands.txt b/data/help/commands.txt
index 3019ebfc..eaacdf02 100644
--- a/data/help/commands.txt
+++ b/data/help/commands.txt
@@ -26,7 +26,7 @@
      ##2Alt + T##P            toggle ignore of incoming trades
      ##2A##P                  target nearest monster
      ##2H##P                  hide all non-sticky windows
-     ##2G or Z##P             pick up item
+     ##2Z##P                  pick up item
      ##2Enter##P              focus chat window / send message
 
 
diff --git a/data/help/team.txt b/data/help/team.txt
index bdd0c8c9..dfd00d4b 100644
--- a/data/help/team.txt
+++ b/data/help/team.txt
@@ -3,40 +3,64 @@
  
 ##3                        === DEVELOPMENT TEAM ===
 
-##2 Programmers:
- 
-  ##9Sanga Head Developer/GM ("Sanga")
-            <sanga@aethyra.com>
+##2 Administration:
 
-  ##9Scraggy Client Developer 
-            <DougABoffey@netscape.net>
+  ##9Blua Server Administrator/Content Development
+
+  ##9MrDan Forum Administrator/GM
+
+  ##9Slinker Game Server Host
+
+  ##9Tametomo Project Head/Artist/Client Developer/Ubuntu Package Maintainer/Misc.
+
+##2 Programmers:
 
   ##9Kraant Developer
             <kraant@gmail.com>
-
-  ##9Tametomo Developer/Artist
- 
  
 ##2 Artists:
+
+  ##9Angeliex Artist
  
+  ##9Bawabawa/Kyron/Pyrestriker Artist/SuSe Package Contributor 
+
   ##9Frictor Head Artist 
 
-  ##9Angeliex Artist
+##2 Mappers:
+
+  ##9Arkyan Mapper
 
   ##9GonzoDark Mapper
 
-  ##9Arkyan Mapper
- 
+##2 Content Development: 
+
+  ##9Moose
+
+##2 GMs
+
+  ##9Grimmjow
+
+  ##9SoftLace1
+
+  ##9Srauls
  
 ##2 Misc. thanks:
 
-  ##9MrDan Forum Admin/GM 
+  ##9doorsman Testing
 
-  ##9Slinker Game Server Host
+  ##9Snoopy Testing
 
-##2 Leave of Absence
+  ##9Tarax Testing
 
-  ##9Sert Head Artist/GM
+##2 Leave of Absence
 
   ##9Blame Developer/GM
-            <blame@aethyra.com>
\ No newline at end of file
+            <blame@aethyra.com>
+
+  ##9Sanga Head Developer/GM ("Sanga")
+            <sanga@aethyra.com>
+
+  ##9Scraggy Client Developer 
+            <DougABoffey@netscape.net>
+
+  ##9Sert Head Artist/GM
-- 
cgit v1.2.3-70-g09d2


From 124968ec059f75b47b605ab1218e984e8cb15f48 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 30 Nov 2008 17:33:18 -0700
Subject: Fixed up Minimap scrolling so that it actually scrolls (I forgot that
 we resized the minimap width by the map's actual width) as well as fixed the
 centering code so that it works.

TODO: Determine a decent way to have the map scroll, but not draw the
map below the map area's name.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/minimap.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index bd79ec87..8b4dd9c3 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -56,8 +56,14 @@ void Minimap::setMapImage(Image *img)
 
     if (mMapImage)
     {
+        int offsetX = getPadding();
+        int offsetY = getTitleBarHeight();
         mMapImage->setAlpha(0.7);
-        setDefaultSize(5, 25, mMapImage->getWidth(), mMapImage->getHeight());
+        setDefaultSize(offsetX, offsetY, 
+                       mMapImage->getWidth() < (100 + offsetX) ? 
+                           mMapImage->getWidth() : (100 + offsetX), 
+                       mMapImage->getHeight() < (100 + offsetY) ? 
+                           mMapImage->getHeight() : (100 + offsetY));
         loadWindowState();
     }
     else
@@ -80,9 +86,10 @@ void Minimap::draw(gcn::Graphics *graphics)
         if (mMapImage->getWidth() > a.width ||
             mMapImage->getHeight() > a.height)
         {
-            mapOriginX += (a.width - player_node->mX) / 2;
-            mapOriginY += (a.height - player_node->mY) / 2;
+            mapOriginX += ((a.width) / 2) - player_node->mX;
+            mapOriginY += ((a.height) / 2) - player_node->mY;
         }
+
         static_cast<Graphics*>(graphics)->
             drawImage(mMapImage, mapOriginX, mapOriginY);
     }
-- 
cgit v1.2.3-70-g09d2


From 76ec01b8d071fb2ecdb943bd74156e0bd92e1b09 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 30 Nov 2008 17:47:10 -0700
Subject: Fixed a problem noticed by Jarvellis. Apparently a while ago, to
 suppress a compiler warning, I added in some typecasts, but did them in the
 wrong spot, so it broke TMW's minimaps, but still worked on whole number
 proportions. This fixes that.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/minimap.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 8b4dd9c3..ec4675f5 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -125,11 +125,11 @@ void Minimap::draw(gcn::Graphics *graphics)
                 continue;
         }
 
-        const int offset = (dotSize - 1) * (int) mProportion;
+        const int offset = (int) ((dotSize - 1) * mProportion);
 
         graphics->fillRectangle(gcn::Rectangle(
-                    (being->mX * (int) mProportion) + mapOriginX - offset,
-                    (being->mY * (int) mProportion) + mapOriginY - offset,
+                    (int) (being->mX * mProportion) + mapOriginX - offset,
+                    (int) (being->mY * mProportion) + mapOriginY - offset,
                     dotSize, dotSize));
     }
 }
-- 
cgit v1.2.3-70-g09d2


From 52401fd3ce7f9ce94069ecc71412466af4e893a0 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 30 Nov 2008 23:33:35 -0700
Subject: Fixed map origin formula so that it will work on any map proportion.
 I accidently screwed this up earlier to make it work on our minimaps that I
 forgot to check it on a different sized map.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/minimap.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index ec4675f5..3a2e483d 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -86,8 +86,8 @@ void Minimap::draw(gcn::Graphics *graphics)
         if (mMapImage->getWidth() > a.width ||
             mMapImage->getHeight() > a.height)
         {
-            mapOriginX += ((a.width) / 2) - player_node->mX;
-            mapOriginY += ((a.height) / 2) - player_node->mY;
+            mapOriginX += ((a.width) / 2) - (player_node->mX * mProportion);
+            mapOriginY += ((a.height) / 2) - (player_node->mY * mProportion);
         }
 
         static_cast<Graphics*>(graphics)->
-- 
cgit v1.2.3-70-g09d2


From fdc24c062eb4a73aa81b941b67d277691d6dd5a1 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 2 Dec 2008 11:19:57 -0700
Subject: Changed colordb to only use one XML::Document pointer, instead of
 instantiating two XML::Document variables. Probably was a bit tired the day I
 made that fix, so I missed the obvious solution.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/resources/colordb.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index 2340a8f2..bb5bd0d1 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -46,9 +46,8 @@ void ColorDB::load()
         return;
     }
 
-    XML::Document doc(HAIR_COLOR_FILE);
-    XML::Document doc2(TMW_COLOR_FILE);
-    xmlNodePtr root = doc.rootNode();
+    XML::Document *doc = new XML::Document(HAIR_COLOR_FILE);
+    xmlNodePtr root = doc->rootNode();
     bool TMWHair = false;
 
     if (!root || !xmlStrEqual(root->name, BAD_CAST "colors"))
@@ -56,7 +55,8 @@ void ColorDB::load()
         logger->log("Trying TMW's color file, %s.", TMW_COLOR_FILE);
 
         TMWHair = true;
-        root = doc2.rootNode();
+        doc = new XML::Document(TMW_COLOR_FILE);
+        root = doc->rootNode();
         if (!root || !xmlStrEqual(root->name, BAD_CAST "colors"))
         {
             logger->log("ColorDB: Failed");
-- 
cgit v1.2.3-70-g09d2


From e228c6d5d499f8a59d215a0c3e6122b8800214fc Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 2 Dec 2008 14:35:08 -0700
Subject: Didn't clean up after myself in the last commit.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/resources/colordb.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index bb5bd0d1..d9c76f18 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -55,6 +55,7 @@ void ColorDB::load()
         logger->log("Trying TMW's color file, %s.", TMW_COLOR_FILE);
 
         TMWHair = true;
+        delete doc;
         doc = new XML::Document(TMW_COLOR_FILE);
         root = doc->rootNode();
         if (!root || !xmlStrEqual(root->name, BAD_CAST "colors"))
@@ -83,6 +84,7 @@ void ColorDB::load()
         }
     }
 
+    delete doc;
     mLoaded = true;
 }
 
-- 
cgit v1.2.3-70-g09d2


From d9f02ef550e80b596e951fc21e63f814df47914d Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 2 Dec 2008 14:56:08 -0700
Subject: Fixed MP bar updating in Status window. Thanks Scraggy for catching
 this.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/status.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 9d6760d0..d254f910 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -261,7 +261,7 @@ void StatusWindow::update()
     }
 
     mHpBar->setProgress((float) mPlayer->mHp / (float) mPlayer->mMaxHp);
-    // mMpBar->setProgress((float)mPlayer->mp / (float)mPlayer->maxMp);
+    mMpBar->setProgress((float) mPlayer->mMp / (float) mPlayer->mMaxMp);
 
     mXpBar->setProgress(
             (float) mPlayer->getXp() / (float) mPlayer->mXpForNextLevel);
-- 
cgit v1.2.3-70-g09d2


From 84164bd6cb597fe45f54e97cf9c8991e93e9a803 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 2 Dec 2008 16:17:42 -0700
Subject: Fixed status window so that the job level is displayed next to the
 level, as well as making the job level bar more consistent.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/status.cpp | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index d254f910..fbcc01d6 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -46,6 +46,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
 
     mLvlLabel = new gcn::Label("Level:");
     mGpLabel = new gcn::Label("Money:");
+    mJobLvlLabel = new gcn::Label("Job:");
 
     mHpLabel = new gcn::Label("HP:");
     mHpBar = new ProgressBar(1.0f, 80, 15, 0, 171, 34);
@@ -60,7 +61,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     mMpValueLabel = new gcn::Label("");
 
     mJobXpLabel = new gcn::Label("Job:");
-    mJobXpBar = new ProgressBar(1.0f, 60, 15, 220, 135, 203);
+    mJobXpBar = new ProgressBar(1.0f, 80, 15, 220, 135, 203);
     mJobValueLabel = new gcn::Label("");
 
     int y = 3;
@@ -68,6 +69,8 @@ StatusWindow::StatusWindow(LocalPlayer *player):
 
     mLvlLabel->setPosition(x, y);
     x += mLvlLabel->getWidth() + 40;
+    mJobLvlLabel->setPosition(x, y);
+    x += mJobLvlLabel->getWidth() + 40;
     mGpLabel->setPosition(x, y);
 
     y += mLvlLabel->getHeight() + 5; // Next Row
@@ -93,10 +96,11 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     mMpValueLabel->setPosition(x, y);
 
     mJobXpLabel->setPosition(175, y);
-    mJobXpBar->setPosition(225, y);
+    mJobXpBar->setPosition(205, y);
     mJobValueLabel->setPosition(290, y);
 
     add(mLvlLabel);
+    add(mJobLvlLabel);
     add(mGpLabel);
     add(mHpLabel);
     add(mHpValueLabel);
@@ -224,12 +228,12 @@ void StatusWindow::update()
     mLvlLabel->setCaption("Level: " + toString(mPlayer->mLevel));
     mLvlLabel->adjustSize();
 
+    mJobLvlLabel->setCaption("Job: " + toString(mPlayer->mJobLevel));
+    mJobLvlLabel->adjustSize();
+
     mGpLabel->setCaption("Money: " + toString(mPlayer->mGp) + " GP");
     mGpLabel->adjustSize();
 
-    mJobXpLabel->setCaption("Job: " + toString(mPlayer->mJobLevel));
-    mJobXpLabel->adjustSize();
-
     mHpValueLabel->setCaption(toString(mPlayer->mHp) +
             "/" + toString(mPlayer->mMaxHp));
     mHpValueLabel->adjustSize();
@@ -332,8 +336,10 @@ void StatusWindow::update()
     mStatsReflexPoints->adjustSize();
 
     // Update Second column widgets position
-    mGpLabel->setPosition(mLvlLabel->getX() + mLvlLabel->getWidth() + 20,
-                         mLvlLabel->getY());
+    mJobLvlLabel->setPosition(mLvlLabel->getX() + mLvlLabel->getWidth() + 20,
+                              mLvlLabel->getY());
+    mGpLabel->setPosition(mJobLvlLabel->getX() + mJobLvlLabel->getWidth() + 20,
+                          mJobLvlLabel->getY());
 
     mXpLabel->setPosition(
             mHpValueLabel->getX() + mHpValueLabel->getWidth() + 10,
@@ -345,11 +351,13 @@ void StatusWindow::update()
             mXpBar->getX() + mXpBar->getWidth() + 5,
             mXpLabel->getY());
 
-    mJobXpLabel->setPosition(mXpLabel->getX(), mMpLabel->getY());
+    mJobXpLabel->setPosition(mXpBar->getX() - mJobXpLabel->getWidth() - 5, 
+                             mMpLabel->getY());
     mJobXpBar->setPosition(
-            mXpBar->getX() + mXpBar->getWidth() - mJobXpBar->getWidth(),
+            mJobXpLabel->getX() + mJobXpLabel->getWidth() + 5,
             mJobXpLabel->getY());
-    mJobValueLabel->setPosition(290, mJobXpLabel->getY());
+    mJobValueLabel->setPosition(mJobXpBar->getX() + mJobXpBar->getWidth() + 5, 
+                                mJobXpLabel->getY());
 }
 
 void StatusWindow::draw(gcn::Graphics *g)
-- 
cgit v1.2.3-70-g09d2


From 7882d3dfcac6b2894d33947d4dca5df375712646 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 2 Dec 2008 18:08:12 -0700
Subject: Added the ability to use external tilesets in the client.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/status.h            |  2 +-
 src/resources/mapreader.cpp | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/gui/status.h b/src/gui/status.h
index 55ed393e..4fbce445 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -68,7 +68,7 @@ class StatusWindow : public Window, public gcn::ActionListener
         /**
          * Status Part
          */
-        gcn::Label *mLvlLabel, *mGpLabel, *mHpLabel, *mHpValueLabel;
+        gcn::Label *mLvlLabel, *mJobLvlLabel, *mGpLabel, *mHpLabel, *mHpValueLabel;
         gcn::Label *mMpLabel, *mMpValueLabel;
         gcn::Label *mXpLabel, *mXpValueLabel, *mJobXpLabel, *mJobValueLabel;
         ProgressBar *mHpBar, *mMpBar;
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index d6154ee0..b1068510 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -446,13 +446,17 @@ MapReader::readTileset(xmlNodePtr node,
                        const std::string &path,
                        Map *map)
 {
+    int firstGid = XML::getProperty(node, "firstgid", 0);
+    XML::Document* doc = NULL;
+
     if (xmlHasProp(node, BAD_CAST "source"))
     {
-        logger->log("Warning: External tilesets not supported yet.");
-        return NULL;
+        std::string filename = XML::getProperty(node, "source", "");
+        doc = new XML::Document(filename);
+        node = doc->rootNode();
+        firstGid += XML::getProperty(node, "firstgid", 0);
     }
 
-    const int firstGid = XML::getProperty(node, "firstgid", 0);
     const int tw = XML::getProperty(node, "tilewidth", map->getTileWidth());
     const int th = XML::getProperty(node, "tileheight", map->getTileHeight());
 
@@ -475,6 +479,8 @@ MapReader::readTileset(xmlNodePtr node,
             {
                 Tileset *set = new Tileset(tilebmp, tw, th, firstGid);
                 tilebmp->decRef();
+                if (doc)
+                    delete doc;
                 return set;
             }
             else {
@@ -486,5 +492,8 @@ MapReader::readTileset(xmlNodePtr node,
         break;
     }
 
+    if (doc)
+        delete doc;
+
     return NULL;
 }
-- 
cgit v1.2.3-70-g09d2


From ff89a2184651b676f0e835ec7991a100361465d1 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sat, 1 Nov 2008 10:52:40 +0000
Subject: Made an option around the syncing, but no way to change it for now.

---
 ChangeLog              |  5 +++++
 src/openglgraphics.cpp | 12 +++++++++++-
 src/openglgraphics.h   |  8 ++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0afb019f..712bac17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-01  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/openglgraphics.h, src/openglgraphics.cpp: Made an option around
+	the syncing, but no way to change it for now.
+
 2008-09-21  Kevin Day ("Blame")     <blame@aethyra.com>
 
 	* Added the update.sh script to work with autobuild.sh
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index eeedcdf1..b3a8db4b 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -43,7 +43,8 @@
 #endif
 
 OpenGLGraphics::OpenGLGraphics():
-    mAlpha(false), mTexture(false), mColorAlpha(false)
+    mAlpha(false), mTexture(false), mColorAlpha(false),
+    mSync(false)
 {
 }
 
@@ -51,6 +52,11 @@ OpenGLGraphics::~OpenGLGraphics()
 {
 }
 
+void OpenGLGraphics::setSync(bool sync)
+{
+    mSync = sync;
+}
+
 bool OpenGLGraphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel)
 {
     logger->log("Setting video mode %dx%d %s",
@@ -74,6 +80,10 @@ bool OpenGLGraphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel)
 #ifdef __APPLE__
 //    long VBL = 1;
 //    CGLSetParameter(CGLGetCurrentContext(), kCGLCPSwapInterval, &VBL);
+    if (mSync) {
+        const GLint VBL = 1;
+        CGLSetParameter(CGLGetCurrentContext(), kCGLCPSwapInterval, &VBL);
+    }
 #endif
 
     // Setup OpenGL
diff --git a/src/openglgraphics.h b/src/openglgraphics.h
index 7d39e306..ea30e019 100644
--- a/src/openglgraphics.h
+++ b/src/openglgraphics.h
@@ -31,6 +31,13 @@ class OpenGLGraphics : public Graphics
 
         ~OpenGLGraphics();
 
+        /**
+         * Sets whether vertical refresh syncing is enabled. Takes effect after
+         * the next call to setVideoMode(). Only implemented on MacOS for now.
+         */
+        void setSync(bool sync);
+        bool getSync() const { return mSync; }
+
         bool setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel);
 
         bool drawImage(Image *image,
@@ -72,6 +79,7 @@ class OpenGLGraphics : public Graphics
     private:
         bool mAlpha, mTexture;
         bool mColorAlpha;
+        bool mSync;
 };
 
 #endif
-- 
cgit v1.2.3-70-g09d2


From 414afae670d09e34a4b5c0528c9ca6c3abb03124 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 3 Dec 2008 12:27:26 -0700
Subject: Updated the update shell script to pull from git, not svn. Thanks
 Softlace for pointing this out.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 update.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/update.sh b/update.sh
index 34c64969..28dfeca1 100755
--- a/update.sh
+++ b/update.sh
@@ -1,15 +1,15 @@
 #!/bin/bash
-#automated script to update aethyra from SVN
+#automated script to update aethyra from git
 #author=Blame <blame@aethyra.com>
-#last modified 2008-09-21 Blame
+#last modified 2008-12-03 Tametomo
 file=~/src/aethyra
 file1=~/src
 # test for the aethyra client folder 
 if [ -e $file ]; then
 	#change to the aethyra directory
 	cd $file;
-	#issue the svn update command
-	svn up;
+	#issue the git update command
+	git pull;
 	#issue the autobuild command 
 	./autobuild.sh;
 	echo "Aethyra has been updated"
@@ -19,8 +19,8 @@ else
 	mkdir $file1
 	#change to directory /home/user-name/src
 	cd $file1
-	#execute the svn command to download the client files
-	svn co svn://www.aethyra.org/client/trunk aethyra
+	#execute the git command to download the client files
+	git clone git://gitorious.org/tmw/aethyra.git
 	#issue the auto build script to compile the client
 	./autobuild
 	echo "congratulations on installing aethyra enjoy"
-- 
cgit v1.2.3-70-g09d2


From 68926c15e6d31c4af90bce9ec57aa39f839d7d6b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 3 Dec 2008 12:30:11 -0700
Subject: Add an effects manager (patch by Kage Jittai)

NOTE: This patch demonstrates the need to fix pixel coordinates in the
eAthena client. Bjorn did the movement patch in the TMWClient, however,
I still haven't got that fully working with the merges. It's likely that
a clone will be developed to tackle this problem.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/CMakeLists.txt       |  2 ++
 src/Makefile.am          |  3 ++
 src/being.cpp            | 90 ------------------------------------------------
 src/being.h              | 10 +-----
 src/game.cpp             |  4 +++
 src/net/beinghandler.cpp |  5 ++-
 src/player.h             |  8 -----
 src/vector.cpp           | 28 +++++++++++++++
 src/vector.h             | 68 +++++++++++++++++++++++++++++++++---
 9 files changed, 105 insertions(+), 113 deletions(-)
 create mode 100644 src/vector.cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e4803230..4e8654e6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -342,6 +342,8 @@ SET(SRCS
     textparticle.h
     tileset.h
     vector.h
+    effectmanager.cpp
+    effectmanager.h
     )
 
 ADD_EXECUTABLE(aethyra ${SRCS})
diff --git a/src/Makefile.am b/src/Makefile.am
index 5c759135..76773d49 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -242,6 +242,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      configlistener.h \
 	      configuration.cpp \
 	      configuration.h \
+	      effectmanager.cpp \
+	      effectmanager.h \
 	      engine.cpp \
 	      engine.h \
 	      equipment.cpp \
@@ -313,6 +315,7 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      textparticle.cpp \
 	      textparticle.h \
 	      tileset.h \
+	      vector.cpp \
 	      vector.h
 
 # set the include path found by configure
diff --git a/src/being.cpp b/src/being.cpp
index 27bd0c57..ded3abd8 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -571,93 +571,3 @@ int Being::getHeight() const
     }
 }
 
-struct EffectDescription 
-{
-    std::string mGFXEffect;
-    std::string mSFXEffect;
-};
-
-static EffectDescription *default_effect = NULL;
-static std::map<int, EffectDescription *> effects;
-static bool effects_initialized = false;
-
-static EffectDescription *getEffectDescription(xmlNodePtr node, int *id)
-{
-    EffectDescription *ed = new EffectDescription;
-
-    *id = atoi(XML::getProperty(node, "id", "-1").c_str());
-    ed->mSFXEffect = XML::getProperty(node, "audio", "");
-    ed->mGFXEffect = XML::getProperty(node, "particle", "");
-
-    return ed;
-}
-
-static EffectDescription *getEffectDescription(int effectId)
-{
-    if (!effects_initialized)
-    {
-        XML::Document doc(BEING_EFFECTS_FILE);
-        xmlNodePtr root = doc.rootNode();
-
-        if (!root || !xmlStrEqual(root->name, BAD_CAST "being-effects"))
-        {
-            logger->log("Error loading being effects file: "
-                    BEING_EFFECTS_FILE);
-            return NULL;
-        }
-
-        for_each_xml_child_node(node, root)
-        {
-            int id;
-
-            if (xmlStrEqual(node->name, BAD_CAST "effect"))
-            {
-                EffectDescription *EffectDescription =
-                    getEffectDescription(node, &id);
-                effects[id] = EffectDescription;
-            } else if (xmlStrEqual(node->name, BAD_CAST "default"))
-            {
-                EffectDescription *EffectDescription =
-                    getEffectDescription(node, &id);
-
-                if (default_effect)
-                    delete default_effect;
-
-                default_effect = EffectDescription;
-            }
-        }
-
-        effects_initialized = true;
-    } // done initializing
-
-    EffectDescription *ed = effects[effectId];
-
-    if (!ed)
-        return default_effect;
-    else
-        return ed;
-}
-
-void Being::internalTriggerEffect(int effectId, bool sfx, bool gfx)
-{
-    logger->log("Special effect #%d on %s", effectId,
-                 getId() == player_node->getId() ? "self" : "other");
-
-    EffectDescription *ed = getEffectDescription(effectId);
- 
-    if (!ed) {
-        logger->log("Unknown special effect and no default recorded");
-        return;
-    }
-
-    if (gfx && ed->mGFXEffect != "" && mParticleEffects) {
-        Particle *selfFX;
-
-        selfFX = particleEngine->addEffect(ed->mGFXEffect, 0, 0);
-        controlParticle(selfFX);
-    }
-
-    if (sfx && ed->mSFXEffect != "") {
-        sound.playSfx(ed->mSFXEffect);
-    }
-}
diff --git a/src/being.h b/src/being.h
index 325ec51a..958e8f60 100644
--- a/src/being.h
+++ b/src/being.h
@@ -29,6 +29,7 @@
 #include <vector>
 
 #include "animatedsprite.h"
+#include "effectmanager.h"
 #include "map.h"
 #include "sprite.h"
 
@@ -358,15 +359,6 @@ class Being : public Sprite
             mEmotionTime = emote_time;
         }
 
-        /**
-         * Triggers a visual effect, such as `level up'
-         *
-         * Only draws the visual effect, does not play sound effects
-         *
-         * \param effectId ID of the effect to trigger
-         */
-        virtual void triggerEffect(int effectId) { internalTriggerEffect(effectId, false, true); }
-
         // Target cursor being used by the being
         Image *mTargetCursor;
 
diff --git a/src/game.cpp b/src/game.cpp
index 16bc082b..e8ba9046 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -31,6 +31,7 @@
 
 #include "beingmanager.h"
 #include "configuration.h"
+#include "effectmanager.h"
 #include "engine.h"
 #include "flooritemmanager.h"
 #include "graphics.h"
@@ -126,6 +127,7 @@ ItemShortcutWindow *itemShortcutWindow;
 BeingManager *beingManager = NULL;
 FloorItemManager *floorItemManager = NULL;
 Particle* particleEngine = NULL;
+EffectManager *effectManager = NULL;
 
 const int MAX_TIME = 10000;
 
@@ -277,6 +279,8 @@ Game::Game(Network *network):
 
     beingManager = new BeingManager(network);
     floorItemManager = new FloorItemManager();
+    effectManager = new EffectManager();
+
     particleEngine = new Particle(NULL);
     particleEngine->setupEngine();
 
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 8a7e61a1..b016b5cf 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -28,6 +28,7 @@
 
 #include "../being.h"
 #include "../beingmanager.h"
+#include "../effectmanager.h"
 #include "../game.h"
 #include "../localplayer.h"
 #include "../log.h"
@@ -269,8 +270,10 @@ void BeingHandler::handleMessage(MessageIn *msg)
                 break;
 
             int effectType = msg->readInt32();
+            Being* being = beingManager->findBeing(id);
 
-            beingManager->findBeing(id)->triggerEffect(effectType);
+            effectManager->trigger(effectType, (int) being->getPixelX(), 
+                                  (int) being->getPixelY());
 
             break;
         }
diff --git a/src/player.h b/src/player.h
index 8b1c8dcb..c91ad3c2 100644
--- a/src/player.h
+++ b/src/player.h
@@ -78,14 +78,6 @@ class Player : public Being
          */
         void flash(int time);
 
-        /**
-         * Triggers a visual/audio effect, such as `level up'
-         *
-         * \param effect_id ID of the effect to trigger
-         */
-        virtual void
-        triggerEffect(int effectId) { internalTriggerEffect(effectId, true, true); }
-
     protected:
         void updateCoords();
     private:
diff --git a/src/vector.cpp b/src/vector.cpp
new file mode 100644
index 00000000..7d5f055a
--- /dev/null
+++ b/src/vector.cpp
@@ -0,0 +1,28 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "vector.h"
+
+std::ostream& operator <<(std::ostream &os, const Vector &v)
+{
+    os << "Vector(" << v.x << ", " << v.y << ", " << v.z << ")";
+    return os;
+}
diff --git a/src/vector.h b/src/vector.h
index b19f6c64..f32b201a 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -22,6 +22,10 @@
 #ifndef _TMW_VECTOR_H_
 #define _TMW_VECTOR_H_
 
+#include <math.h>
+
+#include <iostream>
+
 /**
  * Vector class. Represents either a 3D point in space, a velocity or a force.
  * Provides several convenient operator overloads.
@@ -41,7 +45,7 @@ class Vector
         /**
          * Constructor.
          */
-        Vector(float x, float y, float z):
+        Vector(float x, float y, float z = 0.0f):
             x(x),
             y(y),
             z(z)
@@ -69,11 +73,12 @@ class Vector
         /**
          * In-place scale vector operator.
          */
-        void operator*=(float c)
+        Vector &operator*=(float c)
         {
             x *= c;
             y *= c;
             z *= c;
+            return *this;
         }
 
         /**
@@ -86,6 +91,17 @@ class Vector
                           z / c);
         }
 
+        /**
+         * In-place scale vector operator.
+         */
+        Vector &operator/=(float c)
+        {
+            x /= c;
+            y /= c;
+            z /= c;
+            return *this;
+        }
+
         /**
          * Add vector operator.
          */
@@ -99,11 +115,12 @@ class Vector
         /**
          * In-place add vector operator.
          */
-        void operator+=(const Vector &v)
+        Vector &operator+=(const Vector &v)
         {
             x += v.x;
             y += v.y;
             z += v.z;
+            return *this;
         }
 
         /**
@@ -119,14 +136,55 @@ class Vector
         /**
          * In-place substract vector operator.
          */
-        void operator-=(const Vector &v)
+        Vector &operator-=(const Vector &v)
         {
             x -= v.x;
             y -= v.y;
             z -= v.z;
+            return *this;
+        }
+
+        /**
+         * Returns the length of this vector. This method does a relatively
+         * slow square root.
+         */
+        float length() const
+        {
+            return sqrtf(x * x + y * y + z * z);
+        }
+
+        /**
+         * Returns the squared length of this vector. Avoids the square root.
+         */
+        float squaredLength() const
+        {
+            return x * x + y * y + z * z;
+        }
+
+        /**
+         * Returns the manhattan length of this vector.
+         */
+        float manhattanLength() const
+        {
+            return fabsf(x) + fabsf(y) + fabsf(z);
+        }
+
+        /**
+         * Returns a normalized version of this vector. This is a unit vector
+         * running parallel to it.
+         */
+        Vector normalized() const
+        {
+            const float l = length();
+            return Vector(x / l, y / l, z / l);
         }
 
         float x, y, z;
 };
 
-#endif
+/**
+ * Appends a string representation of a vector to the output stream.
+ */
+std::ostream& operator <<(std::ostream &os, const Vector &v);
+
+#endif // _TMW_VECTOR_H_
-- 
cgit v1.2.3-70-g09d2


From 72b42a7da7580e0eb52170f3d6c7d49dc0925e98 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 3 Dec 2008 12:38:29 -0700
Subject: Added in the effects manager, which was accidently missing from the
 last commit.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/effectmanager.cpp | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/effectmanager.h   | 57 ++++++++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+)
 create mode 100644 src/effectmanager.cpp
 create mode 100644 src/effectmanager.h

diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp
new file mode 100644
index 00000000..4b835355
--- /dev/null
+++ b/src/effectmanager.cpp
@@ -0,0 +1,85 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include "effectmanager.h"
+
+#include "particle.h"
+#include "log.h"
+#include "sound.h"
+
+#include "utils/xml.h"
+
+
+EffectManager::EffectManager()
+{
+    XML::Document doc("effects.xml");
+    xmlNodePtr root = doc.rootNode();
+
+    if (!root || !xmlStrEqual(root->name, BAD_CAST "being-effects"))
+    {
+        logger->log("Error loading being effects file: effects.xml");
+        return;
+    }
+    else
+    {
+        logger->log("Effects are now loading");
+    } 
+
+    for_each_xml_child_node(node, root)
+    {
+        int id;
+
+        if (xmlStrEqual(node->name, BAD_CAST "effect"))
+        {
+            EffectDescription ed;
+            ed.id = XML::getProperty(node, "id", -1);
+            ed.GFX = XML::getProperty(node, "particle", "");
+            ed.SFX = XML::getProperty(node, "audio", "");
+            mEffects.push_back(ed);
+        }
+    }
+}
+
+EffectManager::~EffectManager()
+{
+
+}
+
+bool EffectManager::trigger(int id, int x, int y)
+{
+    bool rValue = false;
+    for (std::list<EffectDescription>::iterator i = mEffects.begin(); i != mEffects.end(); ++i)
+    {
+        if ((*i).id == id)
+        {
+            printf("Found effect, playing it");
+            rValue = true;
+            if((*i).GFX != "")
+                particleEngine->addEffect((*i).GFX, x, y);
+            if((*i).SFX != "")
+                sound.playSfx((*i).SFX);
+            break;            
+        }
+    }
+    return rValue;
+}
+
diff --git a/src/effectmanager.h b/src/effectmanager.h
new file mode 100644
index 00000000..b5451f27
--- /dev/null
+++ b/src/effectmanager.h
@@ -0,0 +1,57 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#ifndef _EFFECT_MANAGER_H
+#define _EFFECT_MANAGER_H
+
+#include <string>
+#include <list>
+
+class EffectManager
+{
+
+    public: 
+        struct EffectDescription {
+             int id;
+             std::string GFX;
+             std::string SFX;
+        };
+
+        
+        EffectManager();
+        
+        ~EffectManager();
+
+        /**
+         * Triggers a effect with the id, at x,y
+         * returns true if ID exists
+         */
+	bool trigger(int id, int x = 0, int y = 0);
+
+   private:
+        std::list<EffectDescription> mEffects;
+
+};
+
+extern EffectManager *effectManager;
+
+#endif // _EFFECT_MANAGER_H
-- 
cgit v1.2.3-70-g09d2


From 7d6c6b7a5711536bbb8262312457b8422cf883bb Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 3 Dec 2008 13:20:58 -0700
Subject: Check doc before deleting, and make sure it's deleted when both xml
 files fail, if the pointer is pointing to something.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/resources/colordb.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index d9c76f18..46acaf39 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -55,7 +55,10 @@ void ColorDB::load()
         logger->log("Trying TMW's color file, %s.", TMW_COLOR_FILE);
 
         TMWHair = true;
-        delete doc;
+
+        if (doc)
+            delete doc;
+
         doc = new XML::Document(TMW_COLOR_FILE);
         root = doc->rootNode();
         if (!root || !xmlStrEqual(root->name, BAD_CAST "colors"))
@@ -63,6 +66,10 @@ void ColorDB::load()
             logger->log("ColorDB: Failed");
             mColors[0] = mFail;
             mLoaded = true;
+
+            if (doc)
+                delete doc;
+
             return;
         }
     }
@@ -84,7 +91,9 @@ void ColorDB::load()
         }
     }
 
-    delete doc;
+    if (doc)
+        delete doc;
+
     mLoaded = true;
 }
 
-- 
cgit v1.2.3-70-g09d2


From 37900285377966500d4f97a67dc37327f097ff8a Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 3 Dec 2008 15:00:30 -0700
Subject: Changed tileset code so that it removes all ... paths. This assumes
 that the tileset to be loaded will not be in a different root directory than
 the tsx file.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/resources/mapreader.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index b1068510..894cc4fc 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -470,7 +470,8 @@ MapReader::readTileset(xmlNodePtr node,
         if (!source.empty())
         {
             std::string sourceStr = source;
-            sourceStr.erase(0, 3);  // Remove "../"
+            while (sourceStr.substr(0, 3) == "../")
+                sourceStr.erase(0, 3);  // Remove "../"
 
             ResourceManager *resman = ResourceManager::getInstance();
             Image* tilebmp = resman->getImage(sourceStr);
@@ -479,8 +480,7 @@ MapReader::readTileset(xmlNodePtr node,
             {
                 Tileset *set = new Tileset(tilebmp, tw, th, firstGid);
                 tilebmp->decRef();
-                if (doc)
-                    delete doc;
+                delete doc;
                 return set;
             }
             else {
@@ -492,8 +492,7 @@ MapReader::readTileset(xmlNodePtr node,
         break;
     }
 
-    if (doc)
-        delete doc;
+    delete doc;
 
     return NULL;
 }
-- 
cgit v1.2.3-70-g09d2


From d413c2ecd33b67ac769849463ab3e96395e626e5 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 3 Dec 2008 16:11:36 -0700
Subject: Deleted a few dangling pointers noticed by Bjorn.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/main.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index b1bfa4c1..a8ed0651 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -430,7 +430,6 @@ void exit_engine()
 
     delete gui;
     delete graphics;
-    delete setupWindow;
 
     // Shutdown libxml
     xmlCleanupParser();
@@ -937,6 +936,8 @@ int main(int argc, char *argv[])
 #endif
                     delete progressBar;
                     delete progressLabel;
+                    delete setup;
+                    delete setupWindow;
                     progressBar = NULL;
                     progressLabel = NULL;
                     currentDialog = NULL;
@@ -1023,6 +1024,8 @@ int main(int argc, char *argv[])
 #endif
     delete progressBar;
     delete progressLabel;
+    delete setup;
+    delete setupWindow;
 
     delete network;
     SDLNet_Quit();
-- 
cgit v1.2.3-70-g09d2


From 0ea51c6337aa5b565633bd55f7bca44e5d65e34b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 3 Dec 2008 16:11:36 -0700
Subject: Deleted a few dangling pointers noticed by Bjorn.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/main.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index b1bfa4c1..a8ed0651 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -430,7 +430,6 @@ void exit_engine()
 
     delete gui;
     delete graphics;
-    delete setupWindow;
 
     // Shutdown libxml
     xmlCleanupParser();
@@ -937,6 +936,8 @@ int main(int argc, char *argv[])
 #endif
                     delete progressBar;
                     delete progressLabel;
+                    delete setup;
+                    delete setupWindow;
                     progressBar = NULL;
                     progressLabel = NULL;
                     currentDialog = NULL;
@@ -1023,6 +1024,8 @@ int main(int argc, char *argv[])
 #endif
     delete progressBar;
     delete progressLabel;
+    delete setup;
+    delete setupWindow;
 
     delete network;
     SDLNet_Quit();
-- 
cgit v1.2.3-70-g09d2


From f0f505df6f760cecfa2ed4652707c2e0ca865d0c Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 3 Dec 2008 16:21:37 -0700
Subject: Fixed pointer deletion so that the setup window doesn't get double
 deleted.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/main.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index a8ed0651..1d4c01d9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1024,8 +1024,6 @@ int main(int argc, char *argv[])
 #endif
     delete progressBar;
     delete progressLabel;
-    delete setup;
-    delete setupWindow;
 
     delete network;
     SDLNet_Quit();
-- 
cgit v1.2.3-70-g09d2


From 778ddd361839eb9a971b99bb3d77a30e59ddc977 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 3 Dec 2008 16:31:14 -0700
Subject: Revised pointer deletion based on Bjorn's suggestion.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/main.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index 1d4c01d9..a85136ab 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -941,6 +941,8 @@ int main(int argc, char *argv[])
                     progressBar = NULL;
                     progressLabel = NULL;
                     currentDialog = NULL;
+                    setup = NULL;
+                    setupWindow = NULL;
                     login_wallpaper->decRef();
                     login_wallpaper = NULL;
 
@@ -1024,6 +1026,8 @@ int main(int argc, char *argv[])
 #endif
     delete progressBar;
     delete progressLabel;
+    delete setup;
+    delete setupWindow;
 
     delete network;
     SDLNet_Quit();
-- 
cgit v1.2.3-70-g09d2


From f71dba822f42428f22741f183df9f1132fa9471c Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Wed, 3 Dec 2008 23:51:01 +0100
Subject: Disabled "Reset Windows" button when appropriate

You shouldn't be able to press "Reset Windows" before the in-game
windows have been created. Previously this would crash.
---
 src/gui/setup.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index b8fdb7de..2c22a426 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -60,6 +60,10 @@ Setup::Setup():
         x -= btn->getWidth() + 5;
         btn->setPosition(x, height - btn->getHeight() - 5);
         add(btn);
+
+        // Disable this button when the windows aren't created yet
+        if (!strcmp(*curBtn, "Reset Windows"))
+            btn->setEnabled(statusWindow != NULL);
     }
 
     TabbedContainer *panel = new TabbedContainer(width, 5, 20, 45, 5, 3);
@@ -116,6 +120,11 @@ void Setup::action(const gcn::ActionEvent &event)
     }
     else if (event.getId() == "Reset Windows")
     {
+        // Bail out if this action happens to be activated before the windows
+        // are created (though it should be disabled then)
+        if (!statusWindow)
+            return;
+
         statusWindow->resetToDefaultSize();
         minimap->resetToDefaultSize();
         chatWindow->resetToDefaultSize();
-- 
cgit v1.2.3-70-g09d2


From 4eec3f17deafad4ed2fc28fae76fe1f4994e3076 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 4 Dec 2008 00:47:20 +0100
Subject: Don't reuse the setupWindow variable from the game

Fixes crash on exit caused by double deletion.
---
 src/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index a85136ab..8f256405 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -96,6 +96,8 @@
 #endif
 
 namespace {
+    Window *setupWindow = 0;
+
     struct SetupListener : public gcn::ActionListener
     {
         /**
@@ -131,8 +133,6 @@ LockedArray<LocalPlayer*> charInfo(MAX_SLOT + 1);
 
 Colour *textColour;
 
-extern Window *setupWindow;
-
 // This anonymous namespace hides whatever is inside from other modules.
 namespace {
 
-- 
cgit v1.2.3-70-g09d2


From 7d5bfc11b5e467b502a3b56e853200b887859808 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 5 Dec 2008 21:38:31 +0100
Subject: Fix race condition with a std::string access

The downloading thread was writing to a std::string while the main
thread was trying to draw it, for example. Now access to the label
caption is guarded with a mutex.

Should fix crashes while downloading updates.
---
 src/Makefile.am          |  1 +
 src/gui/updatewindow.cpp | 31 +++++++++-------
 src/gui/updatewindow.h   | 13 +++++--
 src/utils/mutex.h        | 94 ++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 124 insertions(+), 15 deletions(-)
 create mode 100644 src/utils/mutex.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 76773d49..75434d8e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -229,6 +229,7 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      utils/strprintf.h \
 	      utils/tostring.h \
 	      utils/trim.h \
+	      utils/mutex.h \
 	      utils/xml.cpp \
 	      utils/xml.h \
 	      animatedsprite.cpp \
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 64f02f54..9d9f5616 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -46,7 +46,7 @@
 /**
  * Calculates the Alder-32 checksum for the given file.
  */
-unsigned long fadler32(FILE *file)
+static unsigned long fadler32(FILE *file)
 {
     // Obtain file size
     fseek(file, 0, SEEK_END);
@@ -145,15 +145,9 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost,
 UpdaterWindow::~UpdaterWindow()
 {
     if (mThread)
-    {
-         SDL_WaitThread(mThread, NULL);
-         mThread = NULL;
-    }
+        SDL_WaitThread(mThread, NULL);
 
-    if (mMemoryBuffer)
-    {
-        free(mMemoryBuffer);
-    }
+    free(mMemoryBuffer);
 
     // Remove possibly leftover temporary download
     ::remove((mUpdatesDir + "/download.temp").c_str());
@@ -168,8 +162,9 @@ void UpdaterWindow::setProgress(float p)
 
 void UpdaterWindow::setLabel(const std::string &str)
 {
-    mLabel->setCaption(str);
-    mLabel->adjustSize();
+    // Do delayed label text update, since Guichan isn't thread-safe
+    MutexLocker lock(mLabelMutex);
+    mNewLabelCaption = str;
 }
 
 void UpdaterWindow::enable()
@@ -426,6 +421,17 @@ void UpdaterWindow::logic()
     // Update Scroll logic
     mScrollArea->logic();
 
+    // Synchronize label caption when necessary
+    {
+        MutexLocker lock(mLabelMutex);
+
+        if (mLabel->getCaption() != mNewLabelCaption)
+        {
+            mLabel->setCaption(mNewLabelCaption);
+            mLabel->adjustSize();
+        }
+    }
+
     switch (mDownloadStatus)
     {
         case UPDATE_ERROR:
@@ -447,7 +453,8 @@ void UpdaterWindow::logic()
             mBrowserBox->addRow("##1  It is strongly recommended that");
             mBrowserBox->addRow("##1  you try again later");
             mBrowserBox->addRow(mCurlError);
-            mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll());
+            mScrollArea->setVerticalScrollAmount(
+                    mScrollArea->getVerticalMaxScroll());
             mDownloadStatus = UPDATE_COMPLETE;
             break;
         case UPDATE_NEWS:
diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index 4c302e85..9cd3405e 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.h
@@ -31,12 +31,13 @@
 
 #include "../guichanfwd.h"
 
+#include "../utils/mutex.h"
+
 class BrowserBox;
 class Button;
 class ProgressBar;
 class ScrollArea;
 
-struct SDL_mutex;
 struct SDL_Thread;
 
 /**
@@ -89,7 +90,7 @@ class UpdaterWindow : public Window, public gcn::ActionListener
 
     int updateState;
 
- protected:
+private:
     void download();
 
     /**
@@ -134,6 +135,12 @@ class UpdaterWindow : public Window, public gcn::ActionListener
     /** The file currently downloading. */
     std::string mCurrentFile;
 
+    /** The new label caption to be set in the logic method. */
+    std::string mNewLabelCaption;
+
+    /** The mutex used to guard access to mNewLabelCaption. */
+    Mutex mLabelMutex;
+
     /** The Adler32 checksum of the file currently downloading. */
     unsigned long mCurrentChecksum;
 
@@ -165,7 +172,7 @@ class UpdaterWindow : public Window, public gcn::ActionListener
     Button *mCancelButton;        /**< Button to stop the update process. */
     Button *mPlayButton;          /**< Button to start playing. */
     ProgressBar *mProgressBar;    /**< Update progress bar. */
-    BrowserBox* mBrowserBox;      /**< Box to display news. */
+    BrowserBox *mBrowserBox;      /**< Box to display news. */
     ScrollArea *mScrollArea;      /**< Used to scroll news box. */
 };
 
diff --git a/src/utils/mutex.h b/src/utils/mutex.h
new file mode 100644
index 00000000..6c35987c
--- /dev/null
+++ b/src/utils/mutex.h
@@ -0,0 +1,94 @@
+/*
+ *  The Mana World
+ *  Copyright 2008 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef TMW_MUTEX_H
+#define TMW_MUTEX_H
+
+#include <SDL_thread.h>
+
+#include "../log.h"
+
+/**
+ * A mutex provides mutual exclusion of access to certain data that is
+ * accessed by multiple threads.
+ */
+class Mutex
+{
+public:
+    Mutex();
+    ~Mutex();
+
+    void lock();
+    void unlock();
+
+private:
+    SDL_mutex *mMutex;
+};
+
+/**
+ * A convenience class for locking a mutex.
+ */
+class MutexLocker
+{
+public:
+    MutexLocker(Mutex mutex);
+    ~MutexLocker();
+
+private:
+    Mutex mMutex;
+};
+
+
+inline Mutex::Mutex()
+{
+    mMutex = SDL_CreateMutex();
+}
+
+inline Mutex::~Mutex()
+{
+    SDL_DestroyMutex(mMutex);
+}
+
+inline void Mutex::lock()
+{
+    if (SDL_mutexP(mMutex) == -1)
+        logger->log("Mutex locking failed: %s", SDL_GetError());
+}
+
+inline void Mutex::unlock()
+{
+    if (SDL_mutexV(mMutex) == -1)
+        logger->log("Mutex unlocking failed: %s", SDL_GetError());
+}
+
+
+inline MutexLocker::MutexLocker(Mutex mutex):
+    mMutex(mutex)
+{
+    mMutex.lock();
+}
+
+inline MutexLocker::~MutexLocker()
+{
+    mMutex.unlock();
+}
+
+#endif // TMW_MUTEX_H
-- 
cgit v1.2.3-70-g09d2


From 032f7659014d265a3c34765da2f277b7b0f32691 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 5 Dec 2008 22:26:38 +0100
Subject: Fixed MutexLocker to not work on a copy

The Mutex class wasn't meant to be copied around. Silly last minute
refactorings leading to untested code...
---
 src/gui/updatewindow.cpp |  4 ++--
 src/utils/mutex.h        | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 9d9f5616..1097f072 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -163,7 +163,7 @@ void UpdaterWindow::setProgress(float p)
 void UpdaterWindow::setLabel(const std::string &str)
 {
     // Do delayed label text update, since Guichan isn't thread-safe
-    MutexLocker lock(mLabelMutex);
+    MutexLocker lock(&mLabelMutex);
     mNewLabelCaption = str;
 }
 
@@ -423,7 +423,7 @@ void UpdaterWindow::logic()
 
     // Synchronize label caption when necessary
     {
-        MutexLocker lock(mLabelMutex);
+        MutexLocker lock(&mLabelMutex);
 
         if (mLabel->getCaption() != mNewLabelCaption)
         {
diff --git a/src/utils/mutex.h b/src/utils/mutex.h
index 6c35987c..62c6b4e1 100644
--- a/src/utils/mutex.h
+++ b/src/utils/mutex.h
@@ -40,6 +40,9 @@ public:
     void unlock();
 
 private:
+    Mutex(const Mutex&);  // prevent copying
+    Mutex& operator=(const Mutex&);
+
     SDL_mutex *mMutex;
 };
 
@@ -49,11 +52,11 @@ private:
 class MutexLocker
 {
 public:
-    MutexLocker(Mutex mutex);
+    MutexLocker(Mutex *mutex);
     ~MutexLocker();
 
 private:
-    Mutex mMutex;
+    Mutex *mMutex;
 };
 
 
@@ -80,15 +83,15 @@ inline void Mutex::unlock()
 }
 
 
-inline MutexLocker::MutexLocker(Mutex mutex):
+inline MutexLocker::MutexLocker(Mutex *mutex):
     mMutex(mutex)
 {
-    mMutex.lock();
+    mMutex->lock();
 }
 
 inline MutexLocker::~MutexLocker()
 {
-    mMutex.unlock();
+    mMutex->unlock();
 }
 
 #endif // TMW_MUTEX_H
-- 
cgit v1.2.3-70-g09d2


From 1777c9b48e93e6c5a7aaf5101397566ad61789e1 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 5 Dec 2008 23:01:54 +0100
Subject: Fade out mouse cursor when not used for some time

The mouse cursor will now disappear when not used for 15 seconds. When
using OpenGL it will even fade.

Requested by doorsman.
---
 src/gui/gui.cpp | 47 +++++++++++++++++++++++++++++++++++------------
 src/gui/gui.h   | 11 +++++++++++
 2 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index fcc7ed77..a382ef85 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -37,6 +37,7 @@
 #include "../graphics.h"
 #include "../log.h"
 
+#include "../resources/image.h"
 #include "../resources/imageset.h"
 #include "../resources/imageloader.h"
 #include "../resources/resourcemanager.h"
@@ -81,6 +82,8 @@ class GuiConfigListener : public ConfigListener
 Gui::Gui(Graphics *graphics):
     mCustomCursor(false),
     mMouseCursors(NULL),
+    mMouseCursorAlpha(1.0f),
+    mMouseInactivityTimer(0),
     mCursorType(CURSOR_POINTER)
 {
     logger->log("Initializing GUI...");
@@ -220,32 +223,47 @@ Gui::~Gui()
     delete hitBlueFont;
     delete hitYellowFont;
 
-    if (mMouseCursors) {
+    if (mMouseCursors)
         mMouseCursors->decRef();
-    }
 
     delete mGuiFont;
     delete speechFont;
     delete viewport;
-    delete mTop;
+    delete getTop();
 
     delete guiInput;
 }
 
-void
-Gui::draw()
+void Gui::logic()
+{
+    // Fade out mouse cursor after extended inactivity
+    if (mMouseInactivityTimer < 100 * 15) {
+        ++mMouseInactivityTimer;
+        mMouseCursorAlpha = std::min(1.0f, mMouseCursorAlpha + 0.05f);
+    } else {
+        mMouseCursorAlpha = std::max(0.0f, mMouseCursorAlpha - 0.005f);
+    }
+
+    gcn::Gui::logic();
+}
+
+void Gui::draw()
 {
-    mGraphics->pushClipArea(mTop->getDimension());
-    mTop->draw(mGraphics);
+    mGraphics->pushClipArea(getTop()->getDimension());
+    getTop()->draw(mGraphics);
 
     int mouseX, mouseY;
     Uint8 button = SDL_GetMouseState(&mouseX, &mouseY);
 
-    if ((SDL_GetAppState() & SDL_APPMOUSEFOCUS || button & SDL_BUTTON(1)) &&
-            mCustomCursor)
+    if ((SDL_GetAppState() & SDL_APPMOUSEFOCUS || button & SDL_BUTTON(1))
+            && mCustomCursor
+            && mMouseCursorAlpha > 0.0f)
     {
+        Image *mouseCursor = mMouseCursors->get(mCursorType);
+        mouseCursor->setAlpha(mMouseCursorAlpha);
+
         static_cast<Graphics*>(mGraphics)->drawImage(
-                mMouseCursors->get(mCursorType),
+                mouseCursor,
                 mouseX - 15,
                 mouseY - 17);
     }
@@ -253,8 +271,7 @@ Gui::draw()
     mGraphics->popClipArea();
 }
 
-void
-Gui::setUseCustomCursor(bool customCursor)
+void Gui::setUseCustomCursor(bool customCursor)
 {
     if (customCursor != mCustomCursor)
     {
@@ -287,3 +304,9 @@ Gui::setUseCustomCursor(bool customCursor)
         }
     }
 }
+
+void Gui::handleMouseMoved(const gcn::MouseInput &mouseInput)
+{
+    gcn::Gui::handleMouseMoved(mouseInput);
+    mMouseInactivityTimer = 0;
+}
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 8cf91915..f56b1dbf 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -57,6 +57,12 @@ class Gui : public gcn::Gui
          */
         ~Gui();
 
+        /**
+         * Performs logic of the GUI. Overridden to track mouse pointer
+         * activity.
+         */
+        void logic();
+
         /**
          * Draws the whole Gui by calling draw functions down in the
          * Gui hierarchy. It also draws the mouse pointer.
@@ -94,11 +100,16 @@ class Gui : public gcn::Gui
             CURSOR_TOTAL
         };
 
+    protected:
+        void handleMouseMoved(const gcn::MouseInput &mouseInput);
+
     private:
         GuiConfigListener *mConfigListener;
         gcn::Font *mGuiFont;                  /**< The global GUI font */
         bool mCustomCursor;                   /**< Show custom cursor */
         ImageSet *mMouseCursors;              /**< Mouse cursor images */
+        float mMouseCursorAlpha;
+        int mMouseInactivityTimer;
         int mCursorType;
 };
 
-- 
cgit v1.2.3-70-g09d2


From f55d562d294fe531123fb062003464a479b97e52 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 6 Dec 2008 13:45:45 -0700
Subject: Removed the automate cash, as reccommended by Bjorn.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 autom4te.cache/traces.0 | 698 ------------------------------------------------
 data/help/header.txt    |   4 +-
 2 files changed, 2 insertions(+), 700 deletions(-)
 delete mode 100644 autom4te.cache/traces.0

diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0
deleted file mode 100644
index ac0ed47f..00000000
--- a/autom4te.cache/traces.0
+++ /dev/null
@@ -1,698 +0,0 @@
-m4trace:/usr/share/aclocal-1.10/amversion.m4:14: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10.1], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-m4trace:/usr/share/aclocal-1.10/amversion.m4:33: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.10.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
-m4trace:/usr/share/aclocal-1.10/auxdir.m4:47: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-m4trace:/usr/share/aclocal-1.10/cond.m4:15: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-m4trace:/usr/share/aclocal-1.10/depend.m4:28: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-m4trace:/usr/share/aclocal-1.10/depend.m4:139: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-m4trace:/usr/share/aclocal-1.10/depend.m4:147: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-])
-m4trace:/usr/share/aclocal-1.10/depout.m4:14: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])
-m4trace:/usr/share/aclocal-1.10/depout.m4:64: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-m4trace:/usr/share/aclocal-1.10/init.m4:26: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.60])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-                  [_AM_DEPENDENCIES(OBJC)],
-                  [define([AC_PROG_OBJC],
-                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-])
-m4trace:/usr/share/aclocal-1.10/init.m4:113: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-m4trace:/usr/share/aclocal-1.10/install-sh.m4:11: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-m4trace:/usr/share/aclocal-1.10/lead-dot.m4:12: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-m4trace:/usr/share/aclocal-1.10/make.m4:14: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-m4trace:/usr/share/aclocal-1.10/missing.m4:14: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-m4trace:/usr/share/aclocal-1.10/missing.m4:24: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-m4trace:/usr/share/aclocal-1.10/mkdirp.m4:11: -1- AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-m4trace:/usr/share/aclocal-1.10/options.m4:13: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-m4trace:/usr/share/aclocal-1.10/options.m4:19: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-m4trace:/usr/share/aclocal-1.10/options.m4:25: -1- AC_DEFUN([_AM_SET_OPTIONS], [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-m4trace:/usr/share/aclocal-1.10/options.m4:31: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-m4trace:/usr/share/aclocal-1.10/runlog.m4:12: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   (exit $ac_status); }])
-m4trace:/usr/share/aclocal-1.10/sanity.m4:14: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-m4trace:/usr/share/aclocal-1.10/strip.m4:17: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-m4trace:/usr/share/aclocal-1.10/substnot.m4:12: -1- AC_DEFUN([_AM_SUBST_NOTMAKE])
-m4trace:/usr/share/aclocal-1.10/tar.m4:24: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-])
-m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?A[CHUM]_])
-m4trace:configure.ac:2: -1- m4_pattern_forbid([_AC_])
-m4trace:configure.ac:2: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^AS_FLAGS$])
-m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?m4_])
-m4trace:configure.ac:2: -1- m4_pattern_forbid([^dnl$])
-m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?AS_])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^SHELL$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^PATH_SEPARATOR$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_NAME$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_STRING$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^exec_prefix$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^prefix$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^program_transform_name$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^bindir$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^sbindir$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^libexecdir$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^datarootdir$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^datadir$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^sysconfdir$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^sharedstatedir$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^localstatedir$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^includedir$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^oldincludedir$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^docdir$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^infodir$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^htmldir$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^dvidir$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^pdfdir$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^psdir$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^libdir$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^localedir$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^mandir$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_NAME$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_STRING$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^DEFS$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^ECHO_C$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^ECHO_N$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^ECHO_T$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^build_alias$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^host_alias$])
-m4trace:configure.ac:2: -1- m4_pattern_allow([^target_alias$])
-m4trace:configure.ac:4: -1- _m4_warn([obsolete], [The macro `AC_LANG_CPLUSPLUS' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/c.m4:105: AC_LANG_CPLUSPLUS is expanded from...
-configure.ac:4: the top level])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^CXXFLAGS$])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^ac_ct_CXX$])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^EXEEXT$])
-m4trace:configure.ac:7: -1- m4_pattern_allow([^OBJEXT$])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-m4trace:configure.ac:8: -1- m4_pattern_allow([^INSTALL_DATA$])
-m4trace:configure.ac:9: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^EGREP$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^EGREP$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^HAVE__BOOL$])
-m4trace:configure.ac:12: -1- m4_pattern_allow([^HAVE_STDBOOL_H$])
-m4trace:configure.ac:13: -1- m4_pattern_allow([^const$])
-m4trace:configure.ac:14: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
-m4trace:configure.ac:15: -1- m4_pattern_allow([^volatile$])
-m4trace:configure.ac:18: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:19: -1- m4_pattern_allow([^HAVE_MALLOC$])
-m4trace:configure.ac:19: -1- m4_pattern_allow([^HAVE_MALLOC$])
-m4trace:configure.ac:19: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:19: -1- m4_pattern_allow([^malloc$])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_REALLOC$])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^HAVE_REALLOC$])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:20: -1- m4_pattern_allow([^realloc$])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
-m4trace:configure.ac:21: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
-m4trace:configure.ac:22: -1- m4_pattern_allow([^HAVE_DOPRNT$])
-m4trace:configure.ac:26: -1- m4_pattern_allow([^HAVE_LIBPTHREAD$])
-m4trace:configure.ac:29: -1- m4_pattern_allow([^HAVE_LIBGUICHAN$])
-m4trace:configure.ac:35: -1- m4_pattern_allow([^HAVE_LIBZ$])
-m4trace:configure.ac:38: -1- m4_pattern_allow([^HAVE_LIBPHYSFS$])
-m4trace:configure.ac:41: -1- m4_pattern_allow([^HAVE_LIBCURL$])
-m4trace:configure.ac:45: -1- m4_pattern_allow([^CURL_LIBS$])
-m4trace:configure.ac:46: -1- m4_pattern_allow([^CURL_CFLAGS$])
-m4trace:configure.ac:48: -1- m4_pattern_allow([^HAVE_LIBXML2$])
-m4trace:configure.ac:51: -1- m4_pattern_allow([^HAVE_LIBPNG$])
-m4trace:configure.ac:54: -1- m4_pattern_allow([^HAVE_LIBSDL_IMAGE$])
-m4trace:configure.ac:58: -1- m4_pattern_allow([^HAVE_LIBSDL_MIXER$])
-m4trace:configure.ac:61: -1- m4_pattern_allow([^HAVE_LIBSDL_NET$])
-m4trace:configure.ac:65: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:72: -1- AM_INIT_AUTOMAKE
-m4trace:configure.ac:72: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
-m4trace:configure.ac:72: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
-m4trace:configure.ac:72: -1- AM_AUTOMAKE_VERSION([1.10.1])
-m4trace:configure.ac:72: -1- _AM_AUTOCONF_VERSION([2.61])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^am__isrc$])
-m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([am__isrc])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^CYGPATH_W$])
-m4trace:configure.ac:72: -1- _AM_SET_OPTIONS([])
-m4trace:configure.ac:72: -1- _m4_warn([obsolete], [The macro `AC_FOREACH' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/general.m4:196: AC_FOREACH is expanded from...
-/usr/share/aclocal-1.10/options.m4:25: _AM_SET_OPTIONS is expanded from...
-/usr/share/aclocal-1.10/init.m4:26: AM_INIT_AUTOMAKE is expanded from...
-configure.ac:72: the top level])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:72: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
-m4trace:configure.ac:72: -2- _AM_MANGLE_OPTION([no-define])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:72: -1- AM_SANITY_CHECK
-m4trace:configure.ac:72: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-m4trace:configure.ac:72: -1- AM_MISSING_HAS_RUN
-m4trace:configure.ac:72: -1- AM_AUX_DIR_EXPAND
-m4trace:configure.ac:72: -1- m4_pattern_allow([^ACLOCAL$])
-m4trace:configure.ac:72: -1- AM_MISSING_PROG([AUTOCONF], [autoconf])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^AUTOCONF$])
-m4trace:configure.ac:72: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^AUTOMAKE$])
-m4trace:configure.ac:72: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^AUTOHEADER$])
-m4trace:configure.ac:72: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^MAKEINFO$])
-m4trace:configure.ac:72: -1- AM_PROG_INSTALL_SH
-m4trace:configure.ac:72: -1- m4_pattern_allow([^install_sh$])
-m4trace:configure.ac:72: -1- AM_PROG_INSTALL_STRIP
-m4trace:configure.ac:72: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
-m4trace:configure.ac:72: -1- AM_PROG_MKDIR_P
-m4trace:configure.ac:72: -1- m4_pattern_allow([^mkdir_p$])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^AWK$])
-m4trace:configure.ac:72: -1- AM_SET_LEADING_DOT
-m4trace:configure.ac:72: -1- m4_pattern_allow([^am__leading_dot$])
-m4trace:configure.ac:72: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-m4trace:configure.ac:72: -2- _AM_MANGLE_OPTION([tar-ustar])
-m4trace:configure.ac:72: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])])
-m4trace:configure.ac:72: -2- _AM_MANGLE_OPTION([tar-pax])
-m4trace:configure.ac:72: -1- _AM_PROG_TAR([v7])
-m4trace:configure.ac:72: -1- AM_MISSING_PROG([AMTAR], [tar])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^AMTAR$])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^am__tar$])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^am__untar$])
-m4trace:configure.ac:72: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-                  [_AM_DEPENDENCIES(OBJC)],
-                  [define([AC_PROG_OBJC],
-                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-m4trace:configure.ac:72: -2- _AM_MANGLE_OPTION([no-dependencies])
-m4trace:configure.ac:72: -1- _AM_DEPENDENCIES([CXX])
-m4trace:configure.ac:72: -1- AM_SET_DEPDIR
-m4trace:configure.ac:72: -1- m4_pattern_allow([^DEPDIR$])
-m4trace:configure.ac:72: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
-m4trace:configure.ac:72: -1- AM_MAKE_INCLUDE
-m4trace:configure.ac:72: -1- m4_pattern_allow([^am__include$])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^am__quote$])
-m4trace:configure.ac:72: -1- AM_DEP_TRACK
-m4trace:configure.ac:72: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^AMDEP_TRUE$])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^AMDEP_FALSE$])
-m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
-m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
-m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^CXXDEPMODE$])
-m4trace:configure.ac:72: -1- AM_CONDITIONAL([am__fastdepCXX], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
-m4trace:configure.ac:72: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
-m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
-m4trace:configure.ac:72: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
-m4trace:configure.ac:80: -1- m4_pattern_allow([^HAVE_LIBGL$])
-m4trace:configure.ac:82: -1- m4_pattern_allow([^USE_OPENGL$])
-m4trace:configure.ac:86: -1- m4_pattern_allow([^LIBSDL_CONFIG$])
-m4trace:configure.ac:91: -1- m4_pattern_allow([^LIBSDL_LIBS$])
-m4trace:configure.ac:92: -1- m4_pattern_allow([^LIBSDL_CFLAGS$])
-m4trace:configure.ac:94: -1- m4_pattern_allow([^HAVE_LIBSDL$])
-m4trace:configure.ac:97: -1- m4_pattern_allow([^HAVE_LIBSDL$])
-m4trace:configure.ac:114: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:114: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:114: -1- _AC_AM_CONFIG_HEADER_HOOK([$ac_file])
-m4trace:configure.ac:114: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
diff --git a/data/help/header.txt b/data/help/header.txt
index ea622623..789e3d93 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -2,8 +2,8 @@
 ##1                                 AETHYRA
 ##1               ==========================================
  
-           ##2Version:##6 Aethyra SVN 0.0.25              ##2Date:##3 August 2008
+           ##2Version:##6 Aethyra GIT 0.0.27              ##2Date:##5 December 2008
  
-##2                    Website: http://www.aethyra.com
+##2                    Website: http://www.aethyra.org
  
  
-- 
cgit v1.2.3-70-g09d2


From 1eaa9ddf23eefebd4e48d6019df3fe3ddc94dee0 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 6 Dec 2008 14:45:27 -0700
Subject: More files that Bjorn reccommended aren't needed.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 aclocal.m4 | 868 -------------------------------------------------------------
 depcomp    | 589 -----------------------------------------
 install-sh | 519 ------------------------------------
 missing    | 367 --------------------------
 stamp-h1   |   1 -
 5 files changed, 2344 deletions(-)
 delete mode 100644 aclocal.m4
 delete mode 100755 depcomp
 delete mode 100755 install-sh
 delete mode 100755 missing
 delete mode 100644 stamp-h1

diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644
index eb3b99a2..00000000
--- a/aclocal.m4
+++ /dev/null
@@ -1,868 +0,0 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
-# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10.1], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 9
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 13
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-                  [_AM_DEPENDENCIES(OBJC)],
-                  [define([AC_PROG_OBJC],
-                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
diff --git a/depcomp b/depcomp
deleted file mode 100755
index e5f9736c..00000000
--- a/depcomp
+++ /dev/null
@@ -1,589 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2007-03-29.01
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
-# Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am.  Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-  for arg
-  do
-    case $arg in
-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-    *)  set fnord "$@" "$arg" ;;
-    esac
-    shift # fnord
-    shift # $arg
-  done
-  "$@"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$base.u
-    tmpdepfile3=$dir.libs/$base.u
-    "$@" -Wc,-M
-  else
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$dir$base.u
-    tmpdepfile3=$dir$base.u
-    "$@" -M
-  fi
-  stat=$?
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-    exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp2)
-  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-  # compilers, which have integrated preprocessors.  The correct option
-  # to use with these is +Maked; it writes dependencies to a file named
-  # 'foo.d', which lands next to the object file, wherever that
-  # happens to be.
-  # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir.libs/$base.d
-    "$@" -Wc,+Maked
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    "$@" +Maked
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-     rm -f "$tmpdepfile1" "$tmpdepfile2"
-     exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
-    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
-  else
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile" "$tmpdepfile2"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/install-sh b/install-sh
deleted file mode 100755
index a5897de6..00000000
--- a/install-sh
+++ /dev/null
@@ -1,519 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2006-12-25.00
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
-
-    -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix='/';;
-	-*) prefix='./';;
-	*)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/missing b/missing
deleted file mode 100755
index 1c8ff704..00000000
--- a/missing
+++ /dev/null
@@ -1,367 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2006-05-10.23
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case $1 in
-  lex|yacc)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $1 in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/stamp-h1 b/stamp-h1
deleted file mode 100644
index 4547fe1b..00000000
--- a/stamp-h1
+++ /dev/null
@@ -1 +0,0 @@
-timestamp for config.h
-- 
cgit v1.2.3-70-g09d2


From b03435fd4ad3c19b96dd7ae960e0950fdd35392c Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 7 Dec 2008 00:23:59 +0100
Subject: Fixed wrapping in some cases, removed draw method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The 'draw' method was confusingly named, and was actually for updating
the GUI after a resize. Its functionality has been merged into
'widgetResized'.

The wrapping was broken in the case where text was added to the NPC
dialog, cause it was added to an already wrapped string, causing the
wrapping to become permanent.

Sorry for all the reformatting.

Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
---
 src/gui/npc_text.cpp      | 21 ++++++++-------------
 src/gui/npc_text.h        | 16 ++++------------
 src/gui/npclistdialog.cpp | 22 ++++++----------------
 src/gui/npclistdialog.h   | 22 ++++++----------------
 4 files changed, 24 insertions(+), 57 deletions(-)

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 052b5f33..a8edc1db 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -55,28 +55,21 @@ NpcTextDialog::NpcTextDialog():
     setLocationRelativeTo(getParent());
 }
 
-void
-NpcTextDialog::setText(const std::string &text)
+void NpcTextDialog::setText(const std::string &text)
 {
     mText = text;
-    draw();
+    mTextBox->setTextWrapped(mText);
 }
 
-void
-NpcTextDialog::addText(const std::string &text)
+void NpcTextDialog::addText(const std::string &text)
 {
-    mText = mTextBox->getText() + text + "\n";
-    draw();
+    setText(mText + text + "\n");
 }
 
 void NpcTextDialog::widgetResized(const gcn::Event &event)
 {
     Window::widgetResized(event);
-    draw();
-}
 
-void NpcTextDialog::draw()
-{
     const gcn::Rectangle &area = getChildrenArea();
     const int width = area.width;
     const int height = area.height;
@@ -89,10 +82,12 @@ void NpcTextDialog::draw()
     okButton->setPosition(
             width - 5 - okButton->getWidth(),
             height - 5 - okButton->getHeight());
+
+    // Set the text again so that it gets wrapped according to the new size
+    mTextBox->setTextWrapped(mText);
 }
 
-void
-NpcTextDialog::action(const gcn::ActionEvent &event)
+void NpcTextDialog::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "ok")
     {
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index e26dd870..b647b9a1 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -56,24 +56,17 @@ class NpcTextDialog : public Window, public gcn::ActionListener
          */
         void widgetResized(const gcn::Event &event);
 
-        /**
-         * Redraws the window
-         */
-        void draw();
-
         /**
          * Called when receiving actions from the widgets.
          */
-        void
-        action(const gcn::ActionEvent &event);
+        void action(const gcn::ActionEvent &event);
 
         /**
          * Sets the text shows in the dialog.
          *
          * @param string The new text.
          */
-        void
-        setText(const std::string &string);
+        void setText(const std::string &string);
 
         /**
          * Adds the text to the text shows in the dialog. Also adds a newline
@@ -81,8 +74,7 @@ class NpcTextDialog : public Window, public gcn::ActionListener
          *
          * @param string The text to add.
          */
-        void
-        addText(const std::string &string);
+        void addText(const std::string &string);
 
     private:
         gcn::Button *okButton;
@@ -92,4 +84,4 @@ class NpcTextDialog : public Window, public gcn::ActionListener
         std::string mText;
 };
 
-#endif
+#endif // _TMW_NPC_TEXT_H
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index ba9e3d58..c17cd4aa 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -61,31 +61,26 @@ NpcListDialog::NpcListDialog():
     setLocationRelativeTo(getParent());
 }
 
-int
-NpcListDialog::getNumberOfElements()
+int NpcListDialog::getNumberOfElements()
 {
     return mItems.size();
 }
 
-std::string
-NpcListDialog::getElementAt(int i)
+std::string NpcListDialog::getElementAt(int i)
 {
     return mItems[i];
 }
 
-void
-NpcListDialog::parseItems(const std::string &itemString)
+void NpcListDialog::parseItems(const std::string &itemString)
 {
     std::istringstream iss(itemString);
 
     std::string tmp;
-    while(getline(iss, tmp, ':')) {
+    while (getline(iss, tmp, ':'))
         mItems.push_back(tmp);
-    }
 }
 
-void
-NpcListDialog::reset()
+void NpcListDialog::reset()
 {
     mItems.clear();
 }
@@ -93,11 +88,7 @@ NpcListDialog::reset()
 void NpcListDialog::widgetResized(const gcn::Event &event)
 {
     Window::widgetResized(event);
-    draw();
-}
 
-void NpcListDialog::draw()
-{
     const gcn::Rectangle &area = getChildrenArea();
     const int width = area.width;
     const int height = area.height;
@@ -112,8 +103,7 @@ void NpcListDialog::draw()
             cancelButton->getY());
 }
 
-void
-NpcListDialog::action(const gcn::ActionEvent &event)
+void NpcListDialog::action(const gcn::ActionEvent &event)
 {
     int choice = 0;
 
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index 77f0c177..04c5c4d9 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -57,42 +57,32 @@ class NpcListDialog : public Window, public gcn::ActionListener,
          */
         void widgetResized(const gcn::Event &event);
 
-        /**
-         * Redraws the window
-         */
-        void draw();
-
         /**
          * Called when receiving actions from the widgets.
          */
-        void
-        action(const gcn::ActionEvent &event);
+        void action(const gcn::ActionEvent &event);
 
         /**
          * Returns the number of items in the choices list.
          */
-        int
-        getNumberOfElements();
+        int getNumberOfElements();
 
         /**
          * Returns the name of item number i of the choices list.
          */
-        std::string
-        getElementAt(int i);
+        std::string getElementAt(int i);
 
         /**
          * Fills the options list for an NPC dialog.
          *
          * @param itemString A string with the options separated with colons.
          */
-        void
-        parseItems(const std::string &itemString);
+        void parseItems(const std::string &itemString);
 
         /**
          * Resets the list by removing all items.
          */
-        void
-        reset();
+        void reset();
 
     private:
         gcn::ListBox *mItemList;
@@ -103,4 +93,4 @@ class NpcListDialog : public Window, public gcn::ActionListener,
         std::vector<std::string> mItems;
 };
 
-#endif
+#endif // _TMW_GUI_NPCLISTDIALOG_H
-- 
cgit v1.2.3-70-g09d2


From 64fe627d25841d047c1c7da16a0740ab537973cb Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 6 Dec 2008 17:13:18 -0700
Subject: Fixed NPC dialogs so that they properly wrap. Broken by the last
 cherry commit.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/npc_text.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index a8edc1db..d83e9dea 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -57,7 +57,12 @@ NpcTextDialog::NpcTextDialog():
 
 void NpcTextDialog::setText(const std::string &text)
 {
+    const gcn::Rectangle &area = getChildrenArea();
+    const int width = area.width;
+    const int height = area.height;
+
     mText = text;
+    mTextBox->setMinWidth(width - 30);
     mTextBox->setTextWrapped(mText);
 }
 
-- 
cgit v1.2.3-70-g09d2


From d9fe9f23bfef1371949409016139ece0851808bc Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 6 Dec 2008 17:48:03 -0700
Subject: Prevent the player from continuing to walk after opening a NPC
 dialog. This used to be caused by right clicking on an NPC, then clicking on
 it and telling the sprite to move at the same time.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/net/npchandler.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 65259959..4f3c4354 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -24,6 +24,7 @@
 #include "protocol.h"
 
 #include "../beingmanager.h"
+#include "../localplayer.h"
 #include "../npc.h"
 
 #include "../gui/npc_text.h"
@@ -53,6 +54,7 @@ void NPCHandler::handleMessage(MessageIn *msg)
         case SMSG_NPC_CHOICE:
             msg->readInt16();  // length
             id = msg->readInt32();
+            player_node->setAction(LocalPlayer::STAND);
             current_npc = dynamic_cast<NPC*>(beingManager->findBeing(id));
             npcListDialog->parseItems(msg->readString(msg->getLength() - 8));
             npcListDialog->setVisible(true);
@@ -61,6 +63,7 @@ void NPCHandler::handleMessage(MessageIn *msg)
         case SMSG_NPC_MESSAGE:
             msg->readInt16();  // length
             id = msg->readInt32();
+            player_node->setAction(LocalPlayer::STAND);
             current_npc = dynamic_cast<NPC*>(beingManager->findBeing(id));
             npcTextDialog->addText(msg->readString(msg->getLength() - 8));
             npcListDialog->setVisible(false);
-- 
cgit v1.2.3-70-g09d2


From 7f24abc455a407e84f13d75099e36db77fa8931d Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 2 Dec 2008 20:28:22 +0100
Subject: Fix background on resolutions other than 800x600

The image is now centered and a gray background is drawn behind it so
that parts that are not covered by the image don't show redrawing
issues.
---
 src/main.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 8f256405..279bae71 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -815,7 +815,16 @@ int main(int argc, char *argv[])
                 progressBar->setProgress(0.0f);
         }
 
-        graphics->drawImage(login_wallpaper, 0, 0);
+        if (graphics->getWidth() > login_wallpaper->getWidth() ||
+                graphics->getHeight() > login_wallpaper->getHeight())
+        {
+            graphics->setColor(gcn::Color(64, 64, 64));
+            graphics->fillRectangle(gcn::Rectangle(
+                        0, 0, graphics->getWidth(), graphics->getHeight()));
+        }
+        graphics->drawImage(login_wallpaper,
+                (graphics->getWidth() - login_wallpaper->getWidth()) / 2,
+                (graphics->getHeight() - login_wallpaper->getHeight()) / 2);
         gui->draw();
         graphics->updateScreen();
 
-- 
cgit v1.2.3-70-g09d2


From 3aca1f5b4f11a3bb90ecacfb43346a1e2832397d Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 7 Dec 2008 19:44:30 -0700
Subject: Fixed a few files that apparently weren't updated.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 CMakeLists.txt      |   4 ----
 ChangeLog           |   3 ---
 README              |   6 +-----
 The Mana World.icns | Bin 65136 -> 0 bytes
 configure.ac        |   4 ----
 5 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 The Mana World.icns

diff --git a/CMakeLists.txt b/CMakeLists.txt
index afc6ab69..7ac379de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,6 @@
 PROJECT(AETHYRA)
 
-<<<<<<< HEAD:CMakeLists.txt
 SET(VERSION 0.0.27)
-=======
-SET(VERSION 0.0.26)
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:CMakeLists.txt
 
 # where to look for cmake modules
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)
diff --git a/ChangeLog b/ChangeLog
index dc6d534d..712bac17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< HEAD:ChangeLog
 2008-11-01  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/openglgraphics.h, src/openglgraphics.cpp: Made an option around
@@ -6143,5 +6142,3 @@
 	window a shorter.
 	* data/graphics/images/login_wallpaper.png: New login wallpaper by
 	Momotaro.
-=======
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:ChangeLog
diff --git a/README b/README
index e5053509..6e31ab6e 100644
--- a/README
+++ b/README
@@ -1,11 +1,7 @@
 AETHYRA
 ===================
 
-<<<<<<< HEAD:README
- Version: 0.0.25    Date: 9/16/2008
-=======
- Version: 0.0.26    Date: 29/8/2008
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:README
+ Version: 0.0.27    Date: 12/07/2008
 
  Development team:
   - See AUTHORS file for a list
diff --git a/The Mana World.icns b/The Mana World.icns
deleted file mode 100644
index 7230a099..00000000
Binary files a/The Mana World.icns and /dev/null differ
diff --git a/configure.ac b/configure.ac
index afcca24b..ac227410 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,5 @@
 AC_PREREQ(2.59)
-<<<<<<< HEAD:configure.ac
 AC_INIT([Aethyra], [SVN-0.0.27], [irarice@gmail.com], [aethyra])
-=======
-AC_INIT([The Mana World], [0.0.26], [elvenprogrammer@gmail.com], [tmw])
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:configure.ac
 AC_CONFIG_HEADERS([config.h:config.h.in])
 AC_LANG_CPLUSPLUS
 
-- 
cgit v1.2.3-70-g09d2


From a3859a9078b07865597332ba2d2f274a635b1180 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 7 Dec 2008 13:48:56 +0100
Subject: Tweaked some configuration defaults

Scrolling is now a bit less lazy and the scroll radius is 0. In my
opinion this is a better default.

Framerate limiter is now off by default, since it makes the game appear
a bit choppy. It's basically only useful for laptops anyway, and not too
hard to find.
---
 src/gui/setup_video.cpp | 14 +++++++-------
 src/gui/viewport.cpp    |  4 ++--
 src/main.cpp            |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 15841615..2a7d6855 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -106,8 +106,8 @@ Setup_Video::Setup_Video():
     mParticleEffectsEnabled(config.getValue("particleeffects", 1)),
     mSpeechBubbleEnabled(config.getValue("speechbubble", 1)),
     mOpacity(config.getValue("guialpha", 0.8)),
-    mFps((int)config.getValue("fpslimit", 60)),
-    mModeListModel(new ModeListModel()),
+    mFps((int) config.getValue("fpslimit", 0)),
+    mModeListModel(new ModeListModel),
     mModeList(new ListBox(mModeListModel)),
     mFsCheckBox(new CheckBox("Full screen", mFullScreenEnabled)),
     mOpenGLCheckBox(new CheckBox("OpenGL", mOpenGLEnabled)),
@@ -117,13 +117,13 @@ Setup_Video::Setup_Video():
     mAlphaSlider(new Slider(0.2, 1.0)),
     mFpsCheckBox(new CheckBox("FPS Limit: ")),
     mFpsSlider(new Slider(10, 200)),
-    mFpsField(new TextField()),
-    mOriginalScrollLaziness((int) config.getValue("ScrollLaziness", 32)),
+    mFpsField(new TextField),
+    mOriginalScrollLaziness((int) config.getValue("ScrollLaziness", 16)),
     mScrollLazinessSlider(new Slider(1, 64)),
-    mScrollLazinessField(new TextField()),
-    mOriginalScrollRadius((int) config.getValue("ScrollRadius", 32)),
+    mScrollLazinessField(new TextField),
+    mOriginalScrollRadius((int) config.getValue("ScrollRadius", 0)),
     mScrollRadiusSlider(new Slider(0, 128)),
-    mScrollRadiusField(new TextField()),
+    mScrollRadiusField(new TextField),
     mOverlayDetail((int) config.getValue("OverlayDetail", 2)),
     mOverlayDetailSlider(new Slider(0, 2)),
     mOverlayDetailField(new gcn::Label("")),
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index e50903b6..8ef0b500 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -63,8 +63,8 @@ Viewport::Viewport():
     setOpaque(false);
     addMouseListener(this);
 
-    mScrollLaziness = (int) config.getValue("ScrollLaziness", 32);
-    mScrollRadius = (int) config.getValue("ScrollRadius", 32);
+    mScrollLaziness = (int) config.getValue("ScrollLaziness", 16);
+    mScrollRadius = (int) config.getValue("ScrollRadius", 0);
     mScrollCenterOffsetX = (int) config.getValue("ScrollCenterOffsetX", 0);
     mScrollCenterOffsetY = (int) config.getValue("ScrollCenterOffsetY", 0);
 
diff --git a/src/main.cpp b/src/main.cpp
index 4049aa78..e9ec365f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -319,7 +319,7 @@ void init_engine(const Options &options)
     config.setValue("remember", 1);
     config.setValue("sfxVolume", 100);
     config.setValue("musicVolume", 60);
-    config.setValue("fpslimit", 60);
+    config.setValue("fpslimit", 0);
     config.setValue("updatehost", "http://www.aethyra.org/updates");
     config.setValue("customcursor", 1);
     config.setValue("ChatLogLength", 128);
-- 
cgit v1.2.3-70-g09d2


From b79e554aec966ef6ef847409c079dd7047264a9e Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 7 Dec 2008 15:18:19 +0100
Subject: Made minimap visible by default

Also remember its visibility state.
---
 src/game.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/game.cpp b/src/game.cpp
index 93bec013..e907d97b 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -224,6 +224,8 @@ void createGuiWindows(Network *network)
         miniStatusWindow->getWindowName() + "Visible", true));
     buyDialog->setVisible(false);
     sellDialog->setVisible(false);
+    minimap->setVisible((bool) config.getValue(
+        minimap->getWindowName() + "Visible", true));
     tradeWindow->setVisible(false);
     menuWindow->setVisible((bool) config.getValue(
         menuWindow->getWindowName() + "Visible", true));
-- 
cgit v1.2.3-70-g09d2


From 65e00cfe8c9ec876e3fadadac99a6cad0697283d Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 7 Dec 2008 19:47:10 -0700
Subject: Fixed the minimap name field so that it works for us again. Since I
 originally ported this from TMW's trunk, and they later changed their mind on
 the minimap name property, this was broken on our maps.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/engine.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/engine.cpp b/src/engine.cpp
index 74e11336..8382f775 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -98,6 +98,10 @@ void Engine::changeMap(const std::string &mapPath)
         {
              minimap->setCaption(newMap->getProperty("mapname"));
         }
+        else if (newMap->hasProperty("name"))
+        {
+            minimap->setCaption(newMap->getProperty("name"));
+        }
         else
         {
              minimap->setCaption("Unknown");
@@ -114,12 +118,6 @@ void Engine::changeMap(const std::string &mapPath)
              minimap->setProportion(0.5);
         }
     }
-    if (newMap->hasProperty("name"))
-    {
-        minimap->setCaption(newMap->getProperty("name"));
-    } else {
-        minimap->setCaption("Map");
-    }
     minimap->setMapImage(mapImage);
     beingManager->setMap(newMap);
     particleEngine->setMap(newMap);
-- 
cgit v1.2.3-70-g09d2


From ca96882fe9319f687fce46c18f6edc671e4efc8a Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 7 Dec 2008 15:23:34 +0100
Subject: Fixed inconsistency in default window sizes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The default window sizes were all too small, since they were specified
in content size. On pressing "Reset Windows", the sizes would be
interpreted as such and apply alright.

The inconsistency is now removed, and the default window sizes are
always the size of the whole widget now, not just the contents.

Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
---
 src/gui/chat.cpp               |  7 ++++---
 src/gui/equipmentwindow.cpp    |  2 +-
 src/gui/inventorywindow.cpp    |  2 +-
 src/gui/itemshortcutwindow.cpp |  2 +-
 src/gui/ministatus.cpp         |  3 ++-
 src/gui/setup.cpp              |  2 ++
 src/gui/skill.cpp              |  2 +-
 src/gui/trade.cpp              |  2 +-
 src/gui/window.cpp             | 19 ++++++++-----------
 9 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 3f12c462..eef1150f 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -50,10 +50,9 @@ Window(""), mNetwork(network), mTmpVisible(false)
     setWindowName("Chat");
 
     setResizable(true);
-    setDefaultSize(0, (windowContainer->getHeight() - 123), 600, 100);
-    loadWindowState();
+    setDefaultSize(0, windowContainer->getHeight() - 123, 600, 123);
 
-    mChatInput = new ChatInput();
+    mChatInput = new ChatInput;
     mChatInput->setActionEventId("chatinput");
     mChatInput->addActionListener(this);
 
@@ -71,6 +70,8 @@ Window(""), mNetwork(network), mTmpVisible(false)
     add(mScrollArea);
     add(mChatInput);
 
+    loadWindowState();
+
     // Add key listener to chat input to be able to respond to up/down
     mChatInput->addKeyListener(this);
     mCurHist = mHistory.end();
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 7e1ef315..f1cbb0da 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -40,7 +40,7 @@ EquipmentWindow::EquipmentWindow(Equipment *equipment):
 {
     setWindowName("Equipment");
     setCloseButton(true);
-    setDefaultSize(5, 230, 200, 120);
+    setDefaultSize(5, 230, 200, 140);
     loadWindowState();
     mInventory = player_node->getInventory();
 }
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 424fca59..302d2cab 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -47,7 +47,7 @@ InventoryWindow::InventoryWindow():
     setCloseButton(true);
     setMinWidth(240);
     // If you adjust these defaults, don't forget to adjust the trade window's.
-    setDefaultSize(115, 25, 322, 172);
+    setDefaultSize(115, 25, 322, 200);
 
     mUseButton = new Button("Use", "use", this);
     mDropButton = new Button("Drop", "drop", this);
diff --git a/src/gui/itemshortcutwindow.cpp b/src/gui/itemshortcutwindow.cpp
index 5a4dfacd..08e76241 100644
--- a/src/gui/itemshortcutwindow.cpp
+++ b/src/gui/itemshortcutwindow.cpp
@@ -34,7 +34,7 @@ ItemShortcutWindow::ItemShortcutWindow()
     setResizable(true);
     setDefaultSize(758, 174, 42, 426);
 
-    mItems = new ItemShortcutContainer();
+    mItems = new ItemShortcutContainer;
 
     const int border = SCROLL_PADDING * 2 + getPadding() * 2;
     setMinWidth(mItems->getBoxWidth() + border);
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 59dca0e1..6884f4d6 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -73,8 +73,9 @@ MiniStatusWindow::MiniStatusWindow():
     add(mMpLabel);
     add(mXpLabel);
 
-    setDefaultSize(0, 0, mXpBar->getX() + mXpBar->getWidth(),
+    setContentSize(mXpBar->getX() + mXpBar->getWidth(),
                    mXpBar->getY() + mXpBar->getHeight());
+    setDefaultSize(0, 0, getWidth(), getHeight());
     loadWindowState();
 }
 
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 2c22a426..baa2bf2b 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -41,6 +41,7 @@ extern Window *inventoryWindow;
 extern Window *minimap;
 extern Window *skillDialog;
 extern Window *statusWindow;
+extern Window *itemShortcutWindow;
 
 Setup::Setup():
     Window("Setup")
@@ -132,5 +133,6 @@ void Setup::action(const gcn::ActionEvent &event)
         equipmentWindow->resetToDefaultSize();
         helpWindow->resetToDefaultSize();
         skillDialog->resetToDefaultSize();
+        itemShortcutWindow->resetToDefaultSize();
     }
 }
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 8e61dea4..321a6c52 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -125,7 +125,7 @@ SkillDialog::SkillDialog():
 
     setWindowName("Skills");
     setCloseButton(true);
-    setDefaultSize(windowContainer->getWidth() - 255, 25, 240, 240);
+    setDefaultSize(windowContainer->getWidth() - 260, 25, 255, 260);
 
 //    mSkillListBox = new ListBox(this);
     skillScrollArea = new ScrollArea(&mTable);
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 8c02ab01..843c9663 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -50,7 +50,7 @@ TradeWindow::TradeWindow(Network *network):
     mPartnerInventory(new Inventory(INVENTORY_SIZE))
 {
     setWindowName("Trade");
-    setDefaultSize(115, 197, 332, 209);
+    setDefaultSize(115, 227, 332, 209);
 
     mAddButton = new Button("Add", "add", this);
     mOkButton = new Button("Ok", "ok", this);
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 30456a81..cdace3ae 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -233,7 +233,7 @@ void Window::setMaxHeight(unsigned int height)
 
 void Window::setResizable(bool r)
 {
-    if ((bool)mGrip == r) return;
+    if ((bool) mGrip == r) return;
 
     if (r)
     {
@@ -251,9 +251,12 @@ void Window::setResizable(bool r)
 
 void Window::widgetResized(const gcn::Event &event)
 {
+    const gcn::Rectangle area = getChildrenArea();
+
+    mChrome->setSize(area.width, area.height);
+
     if (mGrip)
     {
-        gcn::Rectangle const &area = getChildrenArea();
         mGrip->setPosition(getWidth() - mGrip->getWidth() - area.x,
                            getHeight() - mGrip->getHeight() - area.y);
     }
@@ -458,13 +461,10 @@ void Window::mouseDragged(gcn::MouseEvent &event)
 
         // Set the new window and content dimensions
         setDimension(newDim);
-        const gcn::Rectangle area = getChildrenArea();
-        mChrome->setSize(area.width, area.height);
     }
 }
 
-void
-Window::loadWindowState()
+void Window::loadWindowState()
 {
     const std::string &name = mWindowName;
     assert(!name.empty());
@@ -477,13 +477,10 @@ Window::loadWindowState()
     {
         setSize((int) config.getValue(name + "WinWidth", mDefaultWidth),
                 (int) config.getValue(name + "WinHeight", mDefaultHeight));
-
-        const gcn::Rectangle area = getChildrenArea();
-        mChrome->setSize(area.width, area.height);
     }
     else
     {
-        setContentSize(mDefaultWidth, mDefaultHeight);
+        setSize(mDefaultWidth, mDefaultHeight);
     }
 }
 
@@ -499,7 +496,7 @@ void Window::setDefaultSize(int defaultX, int defaultY,
 void Window::resetToDefaultSize()
 {
     setPosition(mDefaultX, mDefaultY);
-    setContentSize(mDefaultWidth, mDefaultHeight);
+    setSize(mDefaultWidth, mDefaultHeight);
 }
 
 int Window::getResizeHandles(gcn::MouseEvent &event)
-- 
cgit v1.2.3-70-g09d2


From d11b55a4ad9b24d8fb6597e5b1e0eeb904bd9505 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 7 Dec 2008 20:15:07 -0700
Subject: Added some initialization and removed ChargeDialog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Many member variables of LocalPlayer were not being initialized
properly. In general this shouldn't have caused any problems, but it's
bad style.

The ChargeDialog was removed. This class was long dead anyway.

Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>

Conflicts:

	src/Makefile.am
	src/game.cpp
	src/gui/chargedialog.cpp
	src/gui/chargedialog.h
	src/localplayer.cpp
	src/localplayer.h

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 AethyraLin2WinXcompile.cbp    |  2 --
 src/CMakeLists.txt            |  2 --
 src/Makefile.am               |  2 --
 src/game.cpp                  |  8 -------
 src/gui/chargedialog.cpp      | 56 -------------------------------------------
 src/gui/chargedialog.h        | 50 --------------------------------------
 src/localplayer.cpp           | 14 +++++++++--
 src/localplayer.h             |  2 +-
 src/net/charserverhandler.cpp |  3 ---
 9 files changed, 13 insertions(+), 126 deletions(-)
 delete mode 100644 src/gui/chargedialog.cpp
 delete mode 100644 src/gui/chargedialog.h

diff --git a/AethyraLin2WinXcompile.cbp b/AethyraLin2WinXcompile.cbp
index ec4940ac..e7164f0f 100644
--- a/AethyraLin2WinXcompile.cbp
+++ b/AethyraLin2WinXcompile.cbp
@@ -117,8 +117,6 @@
 		<Unit filename="src\gui\char_select.h" />
 		<Unit filename="src\gui\char_server.cpp" />
 		<Unit filename="src\gui\char_server.h" />
-		<Unit filename="src\gui\chargedialog.cpp" />
-		<Unit filename="src\gui\chargedialog.h" />
 		<Unit filename="src\gui\chat.cpp" />
 		<Unit filename="src\gui\chat.h" />
 		<Unit filename="src\gui\chatinput.cpp" />
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b54c7c6c..e2403b8f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -65,8 +65,6 @@ SET(SRCS
     gui/buy.h
     gui/buysell.cpp
     gui/buysell.h
-    gui/chargedialog.cpp
-    gui/chargedialog.h
     gui/char_server.cpp
     gui/char_server.h
     gui/char_select.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 507db6f8..5f168dda 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,8 +15,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/buy.h \
 	      gui/buysell.cpp \
 	      gui/buysell.h \
-	      gui/chargedialog.cpp \
-	      gui/chargedialog.h \
 	      gui/char_select.cpp \
 	      gui/char_select.h \
 	      gui/char_server.cpp \
diff --git a/src/game.cpp b/src/game.cpp
index e907d97b..85799588 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -46,7 +46,6 @@
 
 #include "gui/buy.h"
 #include "gui/buysell.h"
-//#include "gui/chargedialog.h"
 #include "gui/chat.h"
 #include "gui/confirm_dialog.h"
 #include "gui/debugwindow.h"
@@ -119,7 +118,6 @@ SkillDialog *skillDialog;
 Setup* setupWindow;
 Minimap *minimap;
 EquipmentWindow *equipmentWindow;
-//ChargeDialog *chargeDialog;
 TradeWindow *tradeWindow;
 //BuddyWindow *buddyWindow;
 HelpWindow *helpWindow;
@@ -203,7 +201,6 @@ void createGuiWindows(Network *network)
     setupWindow = new Setup();
     minimap = new Minimap();
     equipmentWindow = new EquipmentWindow(player_node->mEquipment.get());
-    //chargeDialog = new ChargeDialog();
     tradeWindow = new TradeWindow(network);
     //buddyWindow = new BuddyWindow();
     helpWindow = new HelpWindow();
@@ -211,10 +208,6 @@ void createGuiWindows(Network *network)
     itemShortcutWindow = new ItemShortcutWindow();
 
     // Initialize window positions
-    //chargeDialog->setPosition(
-    //        graphics->getWidth() - 5 - chargeDialog->getWidth(),
-    //        graphics->getHeight() - chargeDialog->getHeight() - 15);
-
     //buddyWindow->setPosition(10, minimap->getHeight() + 30);
 
     // Set initial window visibility
@@ -257,7 +250,6 @@ void destroyGuiWindows()
     delete setupWindow;
     delete minimap;
     delete equipmentWindow;
-    //delete chargeDialog;
     delete tradeWindow;
     //delete buddyWindow;
     delete helpWindow;
diff --git a/src/gui/chargedialog.cpp b/src/gui/chargedialog.cpp
deleted file mode 100644
index 1733c7eb..00000000
--- a/src/gui/chargedialog.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
- /* The window supported by this class shows player stats and keeps a charging
-  * action bar in queue.
-  */
-
-#include "chargedialog.h"
-#include "progressbar.h"
-
-#include "../localplayer.h"
-
-ChargeDialog::ChargeDialog():
-    Window("")
-{
-    setContentSize(180, 70);
-    mProgBar = new ProgressBar(0.0f, 140, 25, 128, 128, 128);
-    mProgBar->setPosition(20, 40);
-    add(mProgBar);
-    setVisible(true);
-}
-
-// update the dialog
-void ChargeDialog::logic()
-{
-    // calculate time since the last attack was made
-    player_node->mLastAttackTime += .01; // this a hack until someone explains
-                                      // to me how to work the timer
-    if (player_node->mLastAttackTime > 1)
-    {
-        player_node->mLastAttackTime = 1;
-    }
-
-    // reset the progress bar to display accurate time since attack
-    mProgBar->setProgress(player_node->mLastAttackTime);
-
-    Window::logic();
-}
diff --git a/src/gui/chargedialog.h b/src/gui/chargedialog.h
deleted file mode 100644
index 53998ab8..00000000
--- a/src/gui/chargedialog.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _TMW_CHARGE_H
-#define _TMW_CHARGE_H
-
-#include "window.h"
-
-#include "../guichanfwd.h"
-
-class ProgressBar;
-
-#define CHARGE_TIME 1000 // time in milliseconds it takes to charge up an attack
-
-/**
- * \ingroup Interface
- */
-class ChargeDialog : public Window
-{
-    public:
-        /**
-         * Constructor.
-         */
-        ChargeDialog();
-
-        void logic();
-
-    private:
-        ProgressBar* mProgBar;
-};
-
-#endif
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 292f70e0..24b50d03 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -46,9 +46,19 @@ LocalPlayer *player_node = NULL;
 
 LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map):
     Player(id, job, map),
-    mXpForNextLevel(0),
+    mCharId(0),
+    mJobXp(0),
+    mLevel(0),
+    mJobLevel(0),
+    mXpForNextLevel(0), mJobXpForNextLevel(0),
+    mHp(0), mMaxHp(0), mMp(0), mMaxMp(0),
+    mGp(0),
     mAttackRange(0),
-    mSkillPoint(0),
+    mTotalWeight(0), mMaxWeight(0),
+    ATK(0), MATK(0), DEF(0), MDEF(0), HIT(0), FLEE(0),
+    ATK_BONUS(0), MATK_BONUS(0), DEF_BONUS(0), MDEF_BONUS(0), FLEE_BONUS(0),
+    mStatPoint(0), mSkillPoint(0),
+    mStatsPointsToAttribute(0),
     mXp(0), mNetwork(0),
     mTarget(NULL), mPickUpTarget(NULL),
     mTrading(false), mGoingToTarget(false),
diff --git a/src/localplayer.h b/src/localplayer.h
index ad59d138..0760f226 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -190,7 +190,7 @@ class LocalPlayer : public Player
          */
         int getXp() const { return mXp; }
 
-        Uint32 mCharId;
+        Uint32 mCharId;     /**< Used only during character selection. */
 
         Uint32 mJobXp;
         Uint16 mLevel;
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 281923f8..11754b6f 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -193,9 +193,6 @@ LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
     tempPlayer->setGender(1 - mLoginData->sex);
 
     tempPlayer->mCharId = msg.readInt32();
-    tempPlayer->mTotalWeight = 0;
-    tempPlayer->mMaxWeight = 0;
-    tempPlayer->mLastAttackTime = 0;
     tempPlayer->setXp(msg.readInt32());
     tempPlayer->mGp = msg.readInt32();
     tempPlayer->mJobXp = msg.readInt32();
-- 
cgit v1.2.3-70-g09d2


From 16d8375be2074e21ec3681c5d9b4f984e1db5687 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 7 Dec 2008 20:27:00 -0700
Subject: Fixed a few help files that got messed up a few commits ago.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 data/help/changes.txt  | 72 ++------------------------------------------------
 data/help/commands.txt |  7 -----
 data/help/header.txt   |  8 ++----
 data/help/support.txt  |  4 ---
 4 files changed, 4 insertions(+), 87 deletions(-)

diff --git a/data/help/changes.txt b/data/help/changes.txt
index e679e928..60e78419 100644
--- a/data/help/changes.txt
+++ b/data/help/changes.txt
@@ -2,75 +2,7 @@
  
  
 ##3                         === RECENT CHANGES ===
- 
-<<<<<<< HEAD:data/help/changes.txt
+
 Go to http://gitorious.org/projects/tmw/repos/aethyra for a detailed
 list of changes.
-=======
- 0.0.26 (29 August 2008)
- - Added support for a newer version of eAthena server
- - Added support for showing custom being effects
- - Added new features to the particle engine
- - Position names and chat such that there is no overlap, when possible
- - Fixed a crash when loading a corrupt map that has too much layer data
- 
- 0.0.25 (27 July 2008)
- - Added support for whispering to other players
- - Added ability to ignore other players
- - Added command line argument for specifying the update host (-H)
- - Added support for receiving the update host from the server
- - Added support for displaying a shield sprite
- - Added shortcut window, allowing you to quickly access inventory items
- - Added message when gaining money from trade or quest
- - Added support for an arbitrary number of map layers
- - Added support for basing one sprite definition on another
- - Added the possibility to assign particle effects to NPCs
- - Added remembering whether windows are visible or not
- - Updated to work with Guichan 0.8.x
- - Improved accuracy of monster targeting with the mouse
- - Page up and page down will now scroll the chat window
- - Item icons are now loaded on demand and unloaded when no longer used
- - Fixed display of critical hits
- - Fixed multi-channel image dyeing
- - Fixed updating of money display after buying
- 
- 0.0.24.1 (7 April 2008)
- - Added /clear command to clear chat window
- - Added ability to close quit dialog by pressing ESC
- - Added key for targetting nearest player
- - Added the possibility to assign particle effects to monsters
- - Added possibility to pass through players with key controls
- - Fixed crash on exit after connection to server was lost
- - Fixed initialization of some variables
- - Fixed an error with chat messages without a sender that include a colon
- - Fixed minimap to not keep reappearing when hidden
- - Fixed a GCC 4.3 compile error
- - Fixed music loading from non-default location
- - Fixed crash on trying to show out of range emoticon
- - Updated Dev-C++ and Code::Blocks project files
- 
- 0.0.24 (24 December 2007)
- - Added female specific hair styles
- - Added user-definable key settings
- - Added XP gaining notification
- - Added close button to most windows
- - Added support for dynamic sprite recoloring
- - Added notification when the connection to the server is lost
- - Updated to work with Guichan 0.7.x
- - Mouse cursor now indicates when resize is possible
- - Changed amount slider in buy and sell dialogs to start at 1
- - Made weapon sprites and sounds customizable
- - Made buy and sell dialogs resizable
- - Merged equipment database with items database
- - Chat window log no longer goes back forever
- - Chat messages are trimmed (spaces are removed on both sides)
- - Fixed segmentation fault with some OpenGL drivers
- - Fixed updating of defense when increasing vitality
- - Fixed a bug that prevented being-controlled particles from being deleted
- - Fixed a crash in the particle engine related to child emitters
- - Fixed encoding issues with user home directory
- - Fixed a crash in equipment window on failure to load an item icon
- - Fixed a crash on filling up your inventory
- - Fixed item list in shops not to scroll back when selling
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:data/help/changes.txt
- 
+
diff --git a/data/help/commands.txt b/data/help/commands.txt
index e80c537e..2785869c 100644
--- a/data/help/commands.txt
+++ b/data/help/commands.txt
@@ -48,18 +48,11 @@
 
  /whisper <name> <message>
 
-<<<<<<< HEAD:data/help/commands.txt
  This will send <message> to player <name>, if that player is logged in.
  to whisper to users with spaces in there name you must incase the user name in qoutes
 	(e.g. /whisper "user name" <message>)
 
  For further help type /help in the chat console.
-=======
- This will send <message> to player <name>, if that player is logged in. If the
- name has a space in it, put double quotes around it like this:
-
- /whisper "<name>" <message>
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:data/help/commands.txt
 
 
 ##2IGNORING COMMUNICATION
diff --git a/data/help/header.txt b/data/help/header.txt
index a560895c..f70426fe 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -1,12 +1,8 @@
  
 ##1                                 AETHYRA
 ##1               ==========================================
- 
-<<<<<<< HEAD:data/help/header.txt
-           ##2Version:##6 Aethyra GIT 0.0.27              ##2Date:##5 December 2008
-=======
-           ##2Version:##6 0.0.26              ##2Date:##329 August 2008
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:data/help/header.txt
+
+           ##2Version:##6 Aethyra GIT 0.0.27              ##2Date:##7 December 2008
  
 ##2                    Website: http://www.aethyra.org
  
diff --git a/data/help/support.txt b/data/help/support.txt
index 819516de..44fd08f3 100644
--- a/data/help/support.txt
+++ b/data/help/support.txt
@@ -7,11 +7,7 @@
  can't find a solution to your problem, feel free to check our
  Bugs/Support section of the forum:
  
-<<<<<<< HEAD:data/help/support.txt
 ##2     http://forums.aethyra.com
-=======
-##2     http://forums.themanaworld.org/viewforum.php?f=3
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:data/help/support.txt
  
  or come visit us on our IRC channel:
  
-- 
cgit v1.2.3-70-g09d2


From 224fc155978ebbce35ee42560edab628121d7d2e Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 8 Dec 2008 13:56:04 +0100
Subject: Don't scroll past the edges of the minimap

When centering the minimap on the player, it would often happen that the
minimap scrolled past its edge.

Based on a patch by QOAL.
---
 src/gui/minimap.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 8339e478..bb51d64a 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -84,6 +84,18 @@ void Minimap::draw(gcn::Graphics *graphics)
         {
             mapOriginX += ((a.width) / 2) - (player_node->mX * mProportion);
             mapOriginY += ((a.height) / 2) - (player_node->mY * mProportion);
+
+            const int minOriginX = a.x + a.width - mMapImage->getWidth();
+            const int minOriginY = a.y + a.height - mMapImage->getHeight();
+
+            if (mapOriginX < minOriginX)
+                mapOriginX = minOriginX;
+            if (mapOriginY < minOriginY)
+                mapOriginY = minOriginY;
+            if (mapOriginX > a.x)
+                mapOriginX = a.x;
+            if (mapOriginY > a.y)
+                mapOriginY = a.y;
         }
 
         static_cast<Graphics*>(graphics)->
-- 
cgit v1.2.3-70-g09d2


From 332f02da85370a6a2cd5ddc53e252fe2ae3eb53b Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 8 Dec 2008 14:13:32 +0100
Subject: Clip the minimap image to within its window

The image wasn't clipped so it would draw beneath the map name and on
top of the window border.
---
 src/gui/minimap.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index bb51d64a..578e2ce6 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -74,28 +74,30 @@ void Minimap::draw(gcn::Graphics *graphics)
 
     const gcn::Rectangle a = getChildrenArea();
 
-    int mapOriginX = a.x;
-    int mapOriginY = a.y;
+    graphics->pushClipArea(a);
+
+    int mapOriginX = 0;
+    int mapOriginY = 0;
 
     if (mMapImage)
     {
         if (mMapImage->getWidth() > a.width ||
             mMapImage->getHeight() > a.height)
         {
-            mapOriginX += ((a.width) / 2) - (player_node->mX * mProportion);
-            mapOriginY += ((a.height) / 2) - (player_node->mY * mProportion);
+            mapOriginX = ((a.width) / 2) - (player_node->mX * mProportion);
+            mapOriginY = ((a.height) / 2) - (player_node->mY * mProportion);
 
-            const int minOriginX = a.x + a.width - mMapImage->getWidth();
-            const int minOriginY = a.y + a.height - mMapImage->getHeight();
+            const int minOriginX = a.width - mMapImage->getWidth();
+            const int minOriginY = a.height - mMapImage->getHeight();
 
             if (mapOriginX < minOriginX)
                 mapOriginX = minOriginX;
             if (mapOriginY < minOriginY)
                 mapOriginY = minOriginY;
-            if (mapOriginX > a.x)
-                mapOriginX = a.x;
-            if (mapOriginY > a.y)
-                mapOriginY = a.y;
+            if (mapOriginX > 0)
+                mapOriginX = 0;
+            if (mapOriginY > 0)
+                mapOriginY = 0;
         }
 
         static_cast<Graphics*>(graphics)->
@@ -140,4 +142,6 @@ void Minimap::draw(gcn::Graphics *graphics)
                     (int) (being->mY * mProportion) + mapOriginY - offset,
                     dotSize, dotSize));
     }
+
+    graphics->popClipArea();
 }
-- 
cgit v1.2.3-70-g09d2


From e0f461d88eafac00ce67fe1f980e6b263d9916c6 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 8 Dec 2008 12:17:06 -0700
Subject: Compacted the inventory window layout.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/inventorywindow.cpp | 28 ++++++++--------------------
 src/gui/inventorywindow.h   |  2 --
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 302d2cab..621a85d3 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -67,14 +67,12 @@ InventoryWindow::InventoryWindow():
     mItemDescriptionLabel = new TextBox();
     mItemEffect = "Effect:";
     mItemEffectLabel = new TextBox();
-    mWeight = "Total Weight: " + mTotalWeight + " g - " +
-              "Maximum Weight: " + mMaxWeight + " g";
+    mWeight = "Weight: " + mTotalWeight + " g / " +
+              mMaxWeight + " g Slots: " + 
+              toString(player_node->getInventory()->getNumberOfSlotsUsed()) + 
+              "/" + toString(player_node->getInventory()->getInventorySize());
     mWeightLabel = new TextBox();
     mWeightLabel->setPosition(8, 8);
-    mSlots = "Slots: " + 
-             toString(player_node->getInventory()->getNumberOfSlotsUsed()) + 
-             "/" + toString(player_node->getInventory()->getInventorySize());
-    mSlotsLabel = new TextBox();
     mItemEffectLabel = new TextBox();
 
     draw();
@@ -86,7 +84,6 @@ InventoryWindow::InventoryWindow():
     add(mItemDescriptionLabel);
     add(mItemEffectLabel);
     add(mWeightLabel);
-    add(mSlotsLabel);
 
     mUseButton->setSize(60, mUseButton->getHeight());
 
@@ -108,10 +105,8 @@ void InventoryWindow::logic()
         mMaxWeight = toString(player_node->mMaxWeight);
 
         // Adjust widgets
-        mWeight = "Total Weight: " + mTotalWeight + " g - " +
-                  "Maximum Weight: " + mMaxWeight + " g";
-
-        mSlots = "Slots: " + 
+        mWeight = "Weight: " + mTotalWeight + " g / " +
+                  mMaxWeight + " g  Slots: " + 
                  toString(player_node->getInventory()->getNumberOfSlotsUsed()) + 
                  "/" + toString(player_node->getInventory()->getInventorySize());
 
@@ -230,19 +225,12 @@ void InventoryWindow::draw()
             mItemEffectLabel->getY() - 5 - (mItemDescriptionLabel->getNumberOfRows()*15),
             width - 16,
             (mItemDescriptionLabel->getNumberOfRows()*15)));
-    mSlotsLabel->setMinWidth(width - 16);
-    mSlotsLabel->setTextWrapped(mSlots);
-    mSlotsLabel->setDimension(gcn::Rectangle(8,
-            mItemDescriptionLabel->getY() - 5 - (mSlotsLabel->getNumberOfRows()*15),
-            width - 16,
-            (mSlotsLabel->getNumberOfRows()*15)));
 
     mInvenScroll->setSize(width - 16,
-            mSlotsLabel->getY() - (mWeightLabel->getNumberOfRows()*15) - 18);
+            mItemDescriptionLabel->getY() - (mWeightLabel->getNumberOfRows()*15) - 18);
     mInvenScroll->setPosition(8, (mWeightLabel->getNumberOfRows()*15) + 10);
 
-    setMinHeight(130 + (mSlotsLabel->getNumberOfRows()*15) + 
-                       (mWeightLabel->getNumberOfRows()*15) + 
+    setMinHeight(130 + (mWeightLabel->getNumberOfRows()*15) + 
                        (mItemDescriptionLabel->getNumberOfRows()*15) +
                        (mItemEffectLabel->getNumberOfRows()*15) +
                        (mItemNameLabel->getNumberOfRows()*15));
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 2e589471..c308ac25 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -90,14 +90,12 @@ class InventoryWindow : public Window, gcn::ActionListener,
         std::string mWeight;
         std::string mTotalWeight;
         std::string mMaxWeight;
-        std::string mSlots;
         gcn::Button *mUseButton, *mDropButton;
         gcn::ScrollArea *mInvenScroll;
         TextBox *mItemNameLabel;
         TextBox *mItemDescriptionLabel;
         TextBox *mItemEffectLabel;
         TextBox *mWeightLabel;
-        TextBox *mSlotsLabel;
 };
 
 extern InventoryWindow *inventoryWindow;
-- 
cgit v1.2.3-70-g09d2


From 81cdc7b2d880f44df6e0a6de74183f36c53836a0 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 8 Dec 2008 12:21:38 -0700
Subject: Fixed speech bubbles, which broke on the last merger.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/viewport.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 8ef0b500..35b5ec88 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -208,6 +208,7 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     Beings &beings = beingManager->getAll();
     for (BeingIterator i = beings.begin(); i != beings.end(); i++)
     {
+        (*i)->drawSpeech(graphics, -(int) mPixelViewX, -(int) mPixelViewY);
         (*i)->drawEmotion(graphics, -(int) mPixelViewX, -(int) mPixelViewY);
     }
 
-- 
cgit v1.2.3-70-g09d2


From 48c3263aa2540cd895b72edb0337e0717e136e3a Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 8 Dec 2008 20:58:10 +0100
Subject: Code reformatting

I wish I had never fallen for this weird style, and I hope removing it
will prevent others from introducing new code like this. :-)
---
 src/being.h                       |  6 +++
 src/gui/tabbedcontainer.cpp       |  5 +--
 src/imageparticle.h               |  3 +-
 src/particle.cpp                  | 66 +++++++++++++++----------------
 src/particle.h                    | 81 ++++++++++++++-------------------------
 src/resources/action.cpp          |  6 +--
 src/resources/mapreader.cpp       | 27 ++++++-------
 src/resources/mapreader.h         | 19 ++++-----
 src/resources/monsterdb.cpp       |  6 +--
 src/resources/resourcemanager.cpp | 49 +++++++++--------------
 src/resources/resourcemanager.h   | 54 +++++++++-----------------
 src/textparticle.h                |  4 +-
 12 files changed, 128 insertions(+), 198 deletions(-)

diff --git a/src/being.h b/src/being.h
index 7202701a..ca051811 100644
--- a/src/being.h
+++ b/src/being.h
@@ -234,6 +234,12 @@ class Being : public Sprite
          */
         virtual void nextStep();
 
+        /**
+         * Triggers whether or not to show the name as a GM name.
+         * NOTE: This doesn't mean that just anyone can use this.
+         * If the server doesn't acknowlege you, you won't be shown
+         * as a GM on other people's clients.
+         */
         virtual void setGM() { mIsGM = true; }
 
         /**
diff --git a/src/gui/tabbedcontainer.cpp b/src/gui/tabbedcontainer.cpp
index 8e95aa7c..f8bc451d 100644
--- a/src/gui/tabbedcontainer.cpp
+++ b/src/gui/tabbedcontainer.cpp
@@ -19,8 +19,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <algorithm>
-
 #include "button.h"
 #include "tabbedcontainer.h"
 
@@ -43,8 +41,7 @@ TabbedContainer::TabbedContainer(int width, int padX, int buttonHeight,
 
 TabbedContainer::~TabbedContainer()
 {
-    for_each(mTabs.begin(), mTabs.end(), make_dtor(mTabs));
-
+    delete_all(mTabs);
     mTabs.clear();
     mContents.clear();
 }
diff --git a/src/imageparticle.h b/src/imageparticle.h
index 91c5426c..c18b30b8 100644
--- a/src/imageparticle.h
+++ b/src/imageparticle.h
@@ -49,8 +49,7 @@ class ImageParticle : public Particle
         /**
          * Draws the particle image
          */
-        virtual void
-        draw(Graphics *graphics, int offsetX, int offsetY) const;
+        virtual void draw(Graphics *graphics, int offsetX, int offsetY) const;
 
     protected:
         Image *mImage;   /**< The image used for this particle. */
diff --git a/src/particle.cpp b/src/particle.cpp
index f1896ae2..fd86195c 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -67,12 +67,21 @@ Particle::Particle(Map *map):
     mMomentum(1.0f)
 {
     Particle::particleCount++;
-    if (mMap) setSpriteIterator(mMap->addSprite(this));
+    if (mMap)
+        setSpriteIterator(mMap->addSprite(this));
 }
 
+Particle::~Particle()
+{
+    // Remove from map sprite list
+    if (mMap)
+        mMap->removeSprite(mSpriteIterator);
+    // Delete child emitters and child particles
+    clear();
+    Particle::particleCount--;
+}
 
-void
-Particle::setupEngine()
+void Particle::setupEngine()
 {
     Particle::maxCount = (int)config.getValue("particleMaxCount", 3000);
     Particle::fastPhysics = (int)config.getValue("particleFastPhysics", 0);
@@ -81,17 +90,17 @@ Particle::setupEngine()
     logger->log("Particle engine set up");
 }
 
-void Particle::draw(Graphics *, int, int) const {}
+void Particle::draw(Graphics *, int, int) const
+{
+}
 
-bool
-Particle::update()
+bool Particle::update()
 {
-    if (!mMap) return false;
+    if (!mMap)
+        return false;
 
     if (mLifetimeLeft == 0)
-    {
         mAlive = false;
-    }
 
     Vector oldPos = mPos;
 
@@ -221,9 +230,8 @@ Particle::update()
     return true;
 }
 
-Particle*
-Particle::addEffect(const std::string &particleEffectFile,
-                    int pixelX, int pixelY, int rotation)
+Particle* Particle::addEffect(const std::string &particleEffectFile,
+                              int pixelX, int pixelY, int rotation)
 {
     Particle *newParticle = NULL;
 
@@ -297,11 +305,9 @@ Particle::addEffect(const std::string &particleEffectFile,
     return newParticle;
 }
 
-
-Particle*
-Particle::addTextSplashEffect(const std::string &text,
-                              int colorR, int colorG, int colorB,
-                              gcn::Font *font, int x, int y)
+Particle *Particle::addTextSplashEffect(const std::string &text,
+                                        int colorR, int colorG, int colorB,
+                                        gcn::Font *font, int x, int y)
 {
     Particle *newParticle = new TextParticle(mMap, text, colorR, colorG, colorB,
                                              font);
@@ -319,9 +325,9 @@ Particle::addTextSplashEffect(const std::string &text,
     return newParticle;
 }
 
-Particle*
-Particle::addTextRiseFadeOutEffect(const std::string &text, gcn::Font *font,
-                                   int x, int y)
+Particle *Particle::addTextRiseFadeOutEffect(const std::string &text,
+                                             gcn::Font *font,
+                                             int x, int y)
 {
     Particle *newParticle = new TextParticle(mMap, text, 255, 255, 255, font);
     newParticle->setPosition(x, y, 0);
@@ -336,26 +342,14 @@ Particle::addTextRiseFadeOutEffect(const std::string &text, gcn::Font *font,
     return newParticle;
 }
 
-void
-Particle::setMap(Map *map)
+void Particle::setMap(Map *map)
 {
     mMap = map;
-    if (mMap) setSpriteIterator(mMap->addSprite(this));
+    if (mMap)
+        setSpriteIterator(mMap->addSprite(this));
 }
 
-
-Particle::~Particle()
-{
-    // Remove from map sprite list
-    if (mMap) mMap->removeSprite(mSpriteIterator);
-    // Delete child emitters and child particles
-    clear();
-    Particle::particleCount--;
-}
-
-
-void
-Particle::clear()
+void Particle::clear()
 {
     delete_all(mChildEmitters);
     mChildEmitters.clear();
diff --git a/src/particle.h b/src/particle.h
index 0a53f5af..ab08968f 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -67,22 +67,19 @@ class Particle : public Sprite
         /**
          * Deletes all child particles and emitters.
          */
-        void
-        clear();
+        void clear();
 
         /**
          * Gives a particle the properties of an engine root particle and loads
          * the particle-related config settings.
          */
-        void
-        setupEngine();
+        void setupEngine();
 
         /**
          * Updates particle position, returns false when the particle should
          * be deleted.
          */
-        virtual bool
-        update();
+        virtual bool update();
 
         /**
          * Draws the particle image.
@@ -92,8 +89,7 @@ class Particle : public Sprite
         /**
          * Necessary for sorting with the other sprites.
          */
-        virtual int
-        getPixelY() const
+        virtual int getPixelY() const
         { return (int) (mPos.y + mPos.z) - 64; }
 
         /**
@@ -105,44 +101,39 @@ class Particle : public Sprite
          * Creates a child particle that hosts some emitters described in the
          * particleEffectFile.
          */
-        Particle*
-        addEffect(const std::string &particleEffectFile,
-                  int pixelX, int pixelY, int rotation = 0);
+        Particle* addEffect(const std::string &particleEffectFile,
+                            int pixelX, int pixelY, int rotation = 0);
 
         /**
          * Creates a standalone text particle.
          */
-        Particle*
-        addTextSplashEffect(const std::string &text,
-                            int colorR, int colorG, int colorB,
-                            gcn::Font *font, int x, int y);
+        Particle *addTextSplashEffect(const std::string &text,
+                                      int colorR, int colorG, int colorB,
+                                      gcn::Font *font, int x, int y);
 
         /**
          * Creates a standalone text particle.
          */
-        Particle*
-        addTextRiseFadeOutEffect(const std::string &text, gcn::Font *font,
-                                 int x, int y);
+        Particle *addTextRiseFadeOutEffect(const std::string &text,
+                                           gcn::Font *font,
+                                           int x, int y);
 
         /**
          * Adds an emitter to the particle.
          */
-        void
-        addEmitter (ParticleEmitter* emitter)
+        void addEmitter (ParticleEmitter* emitter)
         { mChildEmitters.push_back(emitter); }
 
         /**
          * Sets the position in 3 dimensional space in pixels relative to map.
          */
-        void
-        setPosition(float x, float y, float z)
+        void setPosition(float x, float y, float z)
         { mPos.x = x; mPos.y = y; mPos.z = z; }
 
         /**
          * Sets the position in 2 dimensional space in pixels relative to map.
          */
-        void
-        setPosition(float x, float y)
+        void setPosition(float x, float y)
         { mPos.x = x; mPos.y = y; }
 
         /**
@@ -154,53 +145,45 @@ class Particle : public Sprite
         /**
          * Changes the particle position relative
          */
-        void
-        moveBy(float x, float y, float z)
+        void moveBy(float x, float y, float z)
         { mPos.x += x; mPos.y += y; mPos.z += z; }
 
-        void
-        moveChildren(Vector change);
+        void moveChildren(Vector change);
 
-        void
-        moveBy (Vector change)
+        void moveBy (Vector change)
         { mPos += change; }
 
         /**
          * Sets the time in game ticks until the particle is destroyed.
          */
-        void
-        setLifetime(int lifetime)
+        void setLifetime(int lifetime)
         { mLifetimeLeft = lifetime; mLifetimePast = 0; }
 
         /**
          * Sets the age of the pixel in game ticks where the particle has
          * faded in completely.
          */
-        void
-        setFadeOut(int fadeOut)
+        void setFadeOut(int fadeOut)
         { mFadeOut = fadeOut; }
 
         /**
          * Sets the remaining particle lifetime where the particle starts to
          * fade out.
          */
-        void
-        setFadeIn(int fadeIn)
+        void setFadeIn(int fadeIn)
         { mFadeIn = fadeIn; }
 
         /**
          * Sets the alpha value of the particle
          */
-        void
-        setAlpha(float alpha)
+        void setAlpha(float alpha)
         { mAlpha = alpha; }
 
         /**
          * Sets the sprite iterator of the particle on the current map to make
          * it easier to remove the particle from the map when it is destroyed.
          */
-        void
-        setSpriteIterator(std::list<Sprite*>::iterator spriteIterator)
+        void setSpriteIterator(std::list<Sprite*>::iterator spriteIterator)
         { mSpriteIterator = spriteIterator; }
 
         /**
@@ -213,44 +196,38 @@ class Particle : public Sprite
         /**
          * Sets the current velocity in 3 dimensional space.
          */
-        void
-        setVelocity(float x, float y, float z)
+        void setVelocity(float x, float y, float z)
         { mVelocity.x = x; mVelocity.y = y; mVelocity.z = z; }
 
         /**
          * Sets the downward acceleration.
          */
-        void
-        setGravity(float gravity)
+        void setGravity(float gravity)
         { mGravity = gravity; }
 
         /**
          * Sets the ammount of random vector changes
          */
-        void
-        setRandomness(int r)
+        void setRandomness(int r)
         { mRandomness = r; }
 
         /**
          * Sets the ammount of velocity particles retain after
          * hitting the ground.
          */
-        void
-        setBounce(float bouncieness)
+        void setBounce(float bouncieness)
         { mBounce = bouncieness; }
 
         /**
          * Sets the flag if the particle is supposed to be moved by its parent
          */
-        void
-        setFollow(bool follow)
+        void setFollow(bool follow)
         { mFollow = follow; }
 
         /**
          * Gets the flag if the particle is supposed to be moved by its parent
          */
-        bool
-        doesFollow()
+        bool doesFollow()
         { return mFollow; }
 
         /**
diff --git a/src/resources/action.cpp b/src/resources/action.cpp
index f40d3109..a017e11c 100644
--- a/src/resources/action.cpp
+++ b/src/resources/action.cpp
@@ -33,8 +33,7 @@ Action::~Action()
     delete_all(mAnimations);
 }
 
-Animation*
-Action::getAnimation(int direction) const
+Animation *Action::getAnimation(int direction) const
 {
     Animations::const_iterator i = mAnimations.find(direction);
 
@@ -48,8 +47,7 @@ Action::getAnimation(int direction) const
     return (i == mAnimations.end()) ? NULL : i->second;
 }
 
-void
-Action::setAnimation(int direction, Animation *animation)
+void Action::setAnimation(int direction, Animation *animation)
 {
     mAnimations[direction] = animation;
 }
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index b4beb558..bb444330 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -42,9 +42,8 @@ const unsigned int DEFAULT_TILE_HEIGHT = 32;
  * Inflates either zlib or gzip deflated memory. The inflated memory is
  * expected to be freed by the caller.
  */
-int
-inflateMemory(unsigned char *in, unsigned int inLength,
-              unsigned char *&out, unsigned int &outLength)
+int inflateMemory(unsigned char *in, unsigned int inLength,
+                  unsigned char *&out, unsigned int &outLength)
 {
     int bufferSize = 256 * 1024;
     int ret;
@@ -108,9 +107,8 @@ inflateMemory(unsigned char *in, unsigned int inLength,
     return ret == Z_STREAM_END ? Z_OK : Z_DATA_ERROR;
 }
 
-int
-inflateMemory(unsigned char *in, unsigned int inLength,
-              unsigned char *&out)
+int inflateMemory(unsigned char *in, unsigned int inLength,
+                  unsigned char *&out)
 {
     unsigned int outLength = 0;
     int ret = inflateMemory(in, inLength, out, outLength);
@@ -142,7 +140,7 @@ inflateMemory(unsigned char *in, unsigned int inLength,
     return outLength;
 }
 
-Map* MapReader::readMap(const std::string &filename)
+Map *MapReader::readMap(const std::string &filename)
 {
     // Load the file through resource manager
     ResourceManager *resman = ResourceManager::getInstance();
@@ -199,8 +197,7 @@ Map* MapReader::readMap(const std::string &filename)
     return map;
 }
 
-Map*
-MapReader::readMap(xmlNodePtr node, const std::string &path)
+Map *MapReader::readMap(xmlNodePtr node, const std::string &path)
 {
     // Take the filename off the path
     const std::string pathDir = path.substr(0, path.rfind("/") + 1);
@@ -284,7 +281,7 @@ MapReader::readMap(xmlNodePtr node, const std::string &path)
     return map;
 }
 
-void MapReader::readProperties(xmlNodePtr node, Properties* props)
+void MapReader::readProperties(xmlNodePtr node, Properties *props)
 {
     for_each_xml_child_node(childNode, node)
     {
@@ -313,8 +310,7 @@ static void setTile(Map *map, MapLayer *layer, int x, int y, int gid)
     }
 }
 
-void
-MapReader::readLayer(xmlNodePtr node, Map *map)
+void MapReader::readLayer(xmlNodePtr node, Map *map)
 {
     // Layers are not necessarily the same size as the map
     const int w = XML::getProperty(node, "width", map->getWidth());
@@ -448,10 +444,9 @@ MapReader::readLayer(xmlNodePtr node, Map *map)
     }
 }
 
-Tileset*
-MapReader::readTileset(xmlNodePtr node,
-                       const std::string &path,
-                       Map *map)
+Tileset *MapReader::readTileset(xmlNodePtr node,
+                                const std::string &path,
+                                Map *map)
 {
     int firstGid = XML::getProperty(node, "firstgid", 0);
     XML::Document* doc = NULL;
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index ef52564e..c85e00d9 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -39,15 +39,13 @@ class MapReader
         /**
          * Read an XML map from a file.
          */
-        static Map*
-        readMap(const std::string &filename);
+        static Map *readMap(const std::string &filename);
 
         /**
          * Read an XML map from a parsed XML tree. The path is used to find the
          * location of referenced tileset images.
          */
-        static Map*
-        readMap(xmlNodePtr node, const std::string &path);
+        static Map *readMap(xmlNodePtr node, const std::string &path);
 
     private:
         /**
@@ -57,26 +55,23 @@ class MapReader
          * @param props The Properties instance to which the properties will
          *              be assigned.
          */
-        static void
-        readProperties(xmlNodePtr node, Properties* props);
+        static void readProperties(xmlNodePtr node, Properties* props);
 
         /**
          * Reads a map layer and adds it to the given map.
          */
-        static void
-        readLayer(xmlNodePtr node, Map *map);
+        static void readLayer(xmlNodePtr node, Map *map);
 
         /**
          * Reads a tile set.
          */
-        static Tileset*
-        readTileset(xmlNodePtr node, const std::string &path, Map *map);
+        static Tileset *readTileset(xmlNodePtr node, const std::string &path,
+                                    Map *map);
 
         /**
          * Gets an integer property from an xmlNodePtr.
          */
-        static int
-        getProperty(xmlNodePtr node, const char* name, int def);
+        static int getProperty(xmlNodePtr node, const char* name, int def);
 };
 
 #endif
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 4d52b8ad..7e2d7a1d 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -141,8 +141,7 @@ MonsterDB::load()
     mLoaded = true;
 }
 
-void
-MonsterDB::unload()
+void MonsterDB::unload()
 {
     delete_all(mMonsterInfos);
     mMonsterInfos.clear();
@@ -151,8 +150,7 @@ MonsterDB::unload()
 }
 
 
-const MonsterInfo&
-MonsterDB::get(int id)
+const MonsterInfo &MonsterDB::get(int id)
 {
     MonsterInfoIterator i = mMonsterInfos.find(id);
 
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 510a16bd..a317e445 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -91,8 +91,7 @@ ResourceManager::~ResourceManager()
     }
 }
 
-void
-ResourceManager::cleanUp(Resource *res)
+void ResourceManager::cleanUp(Resource *res)
 {
     if (res->mRefCount > 0)
     {
@@ -138,14 +137,12 @@ void ResourceManager::cleanOrphans()
     mOldestOrphan = oldest;
 }
 
-bool
-ResourceManager::setWriteDir(const std::string &path)
+bool ResourceManager::setWriteDir(const std::string &path)
 {
     return (bool) PHYSFS_setWriteDir(path.c_str());
 }
 
-bool
-ResourceManager::addToSearchPath(const std::string &path, bool append)
+bool ResourceManager::addToSearchPath(const std::string &path, bool append)
 {
     logger->log("Adding to PhysicsFS: %s", path.c_str());
     if (!PHYSFS_addToSearchPath(path.c_str(), append ? 1 : 0)) {
@@ -155,8 +152,7 @@ ResourceManager::addToSearchPath(const std::string &path, bool append)
     return true;
 }
 
-void
-ResourceManager::searchAndAddArchives(const std::string &path,
+void ResourceManager::searchAndAddArchives(const std::string &path,
                                       const std::string &ext,
                                       bool append)
 {
@@ -182,26 +178,22 @@ ResourceManager::searchAndAddArchives(const std::string &path,
     PHYSFS_freeList(list);
 }
 
-bool
-ResourceManager::mkdir(const std::string &path)
+bool ResourceManager::mkdir(const std::string &path)
 {
     return (bool) PHYSFS_mkdir(path.c_str());
 }
 
-bool
-ResourceManager::exists(const std::string &path)
+bool ResourceManager::exists(const std::string &path)
 {
     return PHYSFS_exists(path.c_str());
 }
 
-bool
-ResourceManager::isDirectory(const std::string &path)
+bool ResourceManager::isDirectory(const std::string &path)
 {
     return PHYSFS_isDirectory(path.c_str());
 }
 
-std::string
-ResourceManager::getPath(const std::string &file)
+std::string ResourceManager::getPath(const std::string &file)
 {
     // get the real path to the file
     const char* tmp = PHYSFS_getRealDir(file.c_str());
@@ -221,7 +213,8 @@ ResourceManager::getPath(const std::string &file)
     return path;
 }
 
-Resource *ResourceManager::get(std::string const &idPath, generator fun, void *data)
+Resource *ResourceManager::get(std::string const &idPath, generator fun,
+                               void *data)
 {
     // Check if the id exists, and return the value if it does.
     ResourceIterator resIter = mResources.find(idPath);
@@ -278,14 +271,12 @@ Resource *ResourceManager::load(std::string const &path, loader fun)
     return get(path, ResourceLoader::load, &l);
 }
 
-Music*
-ResourceManager::getMusic(const std::string &idPath)
+Music *ResourceManager::getMusic(const std::string &idPath)
 {
     return static_cast<Music*>(load(idPath, Music::load));
 }
 
-SoundEffect*
-ResourceManager::getSoundEffect(const std::string &idPath)
+SoundEffect *ResourceManager::getSoundEffect(const std::string &idPath)
 {
     return static_cast<SoundEffect*>(load(idPath, SoundEffect::load));
 }
@@ -338,8 +329,8 @@ struct ImageSetLoader
     }
 };
 
-ImageSet*
-ResourceManager::getImageSet(const std::string &imagePath, int w, int h)
+ImageSet *ResourceManager::getImageSet(const std::string &imagePath,
+                                       int w, int h)
 {
     ImageSetLoader l = { this, imagePath, w, h };
     std::stringstream ss;
@@ -385,23 +376,20 @@ void ResourceManager::release(Resource *res)
     mResources.erase(resIter);
 }
 
-ResourceManager*
-ResourceManager::getInstance()
+ResourceManager *ResourceManager::getInstance()
 {
     // Create a new instance if necessary.
     if (instance == NULL) instance = new ResourceManager();
     return instance;
 }
 
-void
-ResourceManager::deleteInstance()
+void ResourceManager::deleteInstance()
 {
     delete instance;
     instance = NULL;
 }
 
-void*
-ResourceManager::loadFile(const std::string &fileName, int &fileSize)
+void *ResourceManager::loadFile(const std::string &fileName, int &fileSize)
 {
     // Attempt to open the specified file using PhysicsFS
     PHYSFS_file *file = PHYSFS_openRead(fileName.c_str());
@@ -453,8 +441,7 @@ ResourceManager::loadTextFile(const std::string &fileName)
     return lines;
 }
 
-SDL_Surface*
-ResourceManager::loadSDLSurface(const std::string& filename)
+SDL_Surface *ResourceManager::loadSDLSurface(const std::string& filename)
 {
     int fileSize;
     void *buffer = loadFile(filename, fileSize);
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index c814d752..95519da3 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -64,8 +64,7 @@ class ResourceManager
          * @param path The path of the directory to be added.
          * @return <code>true</code> on success, <code>false</code> otherwise.
          */
-        bool
-        setWriteDir(const std::string &path);
+        bool setWriteDir(const std::string &path);
 
         /**
          * Adds a directory or archive to the search path. If append is true
@@ -74,35 +73,30 @@ class ResourceManager
          *
          * @return <code>true</code> on success, <code>false</code> otherwise.
          */
-        bool
-        addToSearchPath(const std::string &path, bool append);
+        bool addToSearchPath(const std::string &path, bool append);
 
         /**
         * Searches for zip files and adds them to the search path.
         */
-        void
-        searchAndAddArchives(const std::string &path,
-                             const std::string &ext,
-                             bool append);
+        void searchAndAddArchives(const std::string &path,
+                                  const std::string &ext,
+                                  bool append);
 
         /**
          * Creates a directory in the write path
          */
-        bool
-        mkdir(const std::string &path);
+        bool mkdir(const std::string &path);
 
         /**
          * Checks whether the given file or directory exists in the search path
          */
-        bool
-        exists(const std::string &path);
+        bool exists(const std::string &path);
 
         /**
          * Checks whether the given path is a directory.
          */
-        bool
-        isDirectory(const std::string &path);
-    
+        bool isDirectory(const std::string &path);
+
         /**
          * Returns the real path to a file
          * 
@@ -136,29 +130,25 @@ class ResourceManager
          * Convenience wrapper around ResourceManager::get for loading
          * images.
          */
-        Image*
-        getImage(const std::string &idPath);
+        Image *getImage(const std::string &idPath);
 
         /**
          * Convenience wrapper around ResourceManager::get for loading
          * songs.
          */
-        Music*
-        getMusic(const std::string &idPath);
+        Music *getMusic(const std::string &idPath);
 
         /**
          * Convenience wrapper around ResourceManager::get for loading
          * samples.
          */
-        SoundEffect*
-        getSoundEffect(const std::string &idPath);
+        SoundEffect *getSoundEffect(const std::string &idPath);
 
         /**
          * Creates a image set based on the image referenced by the given
          * path and the supplied sprite sizes
          */
-        ImageSet*
-        getImageSet(const std::string &imagePath, int w, int h);
+        ImageSet *getImageSet(const std::string &imagePath, int w, int h);
 
         /**
          * Creates a sprite definition based on a given path and the supplied
@@ -181,41 +171,35 @@ class ResourceManager
          * @return An allocated byte array containing the data that was loaded,
          *         or <code>NULL</code> on fail.
          */
-        void*
-        loadFile(const std::string &fileName, int &fileSize);
+        void *loadFile(const std::string &fileName, int &fileSize);
 
         /**
          * Retrieves the contents of a text file.
          */
-        std::vector<std::string>
-        loadTextFile(const std::string &fileName);
+        std::vector<std::string> loadTextFile(const std::string &fileName);
 
         /**
          * Loads the given filename as an SDL surface. The returned surface is
          * expected to be freed by the caller using SDL_FreeSurface.
          */
-        SDL_Surface*
-        loadSDLSurface(const std::string& filename);
+        SDL_Surface *loadSDLSurface(const std::string& filename);
 
         /**
          * Returns an instance of the class, creating one if it does not
          * already exist.
          */
-        static ResourceManager*
-        getInstance();
+        static ResourceManager *getInstance();
 
         /**
          * Deletes the class instance if it exists.
          */
-        static void
-        deleteInstance();
+        static void deleteInstance();
 
     private:
         /**
          * Deletes the resource after logging a cleanup message.
          */
-        static void
-        cleanUp(Resource *resource);
+        static void cleanUp(Resource *resource);
 
         void cleanOrphans();
 
diff --git a/src/textparticle.h b/src/textparticle.h
index f662621f..039c18d7 100644
--- a/src/textparticle.h
+++ b/src/textparticle.h
@@ -36,11 +36,11 @@ class TextParticle : public Particle
         TextParticle(Map *map, const std::string &text,
                      int colorR, int colorG, int colorB,
                      gcn::Font *font);
+
         /**
          * Draws the particle image.
          */
-        virtual void
-        draw(Graphics *graphics, int offsetX, int offsetY) const;
+        virtual void draw(Graphics *graphics, int offsetX, int offsetY) const;
 
         // hack to improve text visibility
         virtual int getPixelY() const
-- 
cgit v1.2.3-70-g09d2


From 208d5a6c0523079ea1b2a2e69fd3e76804ada037 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 8 Dec 2008 21:54:38 +0100
Subject: An attempt to fix the crashes related to particles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The player character is never deleted, and hence might have particles
still active when the map changes. These particles are deleted on map
change, but when the player character was moved, it was trying to mark
these deleted particles for deletion, writing to unallocated memory.

The marking for deletion by the player character now happens before the
particles are deleted.

Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
---
 src/engine.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/engine.cpp b/src/engine.cpp
index 8382f775..04e5f287 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -66,10 +66,15 @@ Engine::~Engine()
 
 void Engine::changeMap(const std::string &mapPath)
 {
-    // Clean up floor items
+    // Clean up floor items, beings and particles
     floorItemManager->clear();
-
     beingManager->clear();
+
+    // Unset the map of the player so that its particles are cleared before
+    // being deleted in the next step
+    if (player_node)
+        player_node->setMap(0);
+
     particleEngine->clear();
 
     // Store full map path in global var
-- 
cgit v1.2.3-70-g09d2


From b06085f83ecf8e801aac26546498de73b02f90fa Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 8 Dec 2008 17:57:55 -0700
Subject: Small maps used to scroll as well as big maps. Fixed.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/minimap.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 578e2ce6..6fbcd5da 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -57,9 +57,9 @@ void Minimap::setMapImage(Image *img)
         mMapImage->setAlpha(0.7);
         setDefaultSize(offsetX, offsetY, 
                        mMapImage->getWidth() < (100 + offsetX) ? 
-                           mMapImage->getWidth() : (100 + offsetX), 
+                           mMapImage->getWidth() + offsetX : (100 + offsetX), 
                        mMapImage->getHeight() < (100 + offsetY) ? 
-                           mMapImage->getHeight() : (100 + offsetY));
+                           mMapImage->getHeight() + offsetY : (100 + offsetY));
         loadWindowState();
     }
     else
-- 
cgit v1.2.3-70-g09d2


From 197b8ef1b728aca409a3a5bd2ac6d52142c6ce4c Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 9 Dec 2008 11:11:03 +0000
Subject: Make the window shortcuts configurable

---
 src/game.cpp           | 38 +++++++++++++++++++++++++++-----------
 src/gui/minimap.cpp    | 12 ++++++------
 src/keyboardconfig.cpp | 11 ++++++++++-
 src/keyboardconfig.h   |  9 +++++++++
 4 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 85799588..91a58d43 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -594,16 +594,6 @@ void Game::handleInput()
                 used = true;
                 break;
 
-            case SDLK_F2: requestedWindow = statusWindow; break;
-            case SDLK_F3: requestedWindow = inventoryWindow; break;
-            case SDLK_F4: requestedWindow = equipmentWindow; break;
-            case SDLK_F5: requestedWindow = skillDialog; break;
-            case SDLK_F6: requestedWindow = minimap; break;
-            case SDLK_F7: requestedWindow = chatWindow; break;
-            case SDLK_F8: requestedWindow = itemShortcutWindow; break;
-            case SDLK_F9: requestedWindow = setupWindow; break;
-            case SDLK_F10: requestedWindow = debugWindow; break;
-
             case SDLK_RETURN:
                 // Input chat window
                 if (chatWindow->isInputFocused() ||
@@ -704,7 +694,6 @@ void Game::handleInput()
 
                     if (item)
                         player_node->pickUp(item);
-
                     used = true;
                 }
                 break;
@@ -726,6 +715,33 @@ void Game::handleInput()
                         debugWindow->setVisible(false);
                     }
                     break;
+                case KeyboardConfig::KEY_WINDOW_STATUS:
+                    requestedWindow = statusWindow;
+                    break;
+                case KeyboardConfig::KEY_WINDOW_INVENTORY:
+                    requestedWindow = inventoryWindow;
+                    break;
+                case KeyboardConfig::KEY_WINDOW_EQUIPMENT:
+                    requestedWindow = equipmentWindow;
+                    break;
+                case KeyboardConfig::KEY_WINDOW_SKILL:
+                    requestedWindow = skillDialog;
+                    break;
+                case KeyboardConfig::KEY_WINDOW_MINIMAP:
+                    requestedWindow = minimap;
+                    break;
+                case KeyboardConfig::KEY_WINDOW_CHAT:
+                    requestedWindow = chatWindow;
+                    break;
+                case KeyboardConfig::KEY_WINDOW_SHORTCUT:
+                    requestedWindow = itemShortcutWindow;
+                    break;
+                case KeyboardConfig::KEY_WINDOW_SETUP:
+                    requestedWindow = setupWindow;
+                    break;
+                case KeyboardConfig::KEY_WINDOW_DEBUG:
+                    requestedWindow = debugWindow;
+                    break;
                 }
             }
 
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 6fbcd5da..fc00ad18 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -52,14 +52,14 @@ void Minimap::setMapImage(Image *img)
 
     if (mMapImage)
     {
-        int offsetX = getPadding();
-        int offsetY = getTitleBarHeight();
+        int offsetX = getPadding() + 4;
+        int offsetY = getTitleBarHeight() + 4;
         mMapImage->setAlpha(0.7);
         setDefaultSize(offsetX, offsetY, 
-                       mMapImage->getWidth() < (100 + offsetX) ? 
-                           mMapImage->getWidth() + offsetX : (100 + offsetX), 
-                       mMapImage->getHeight() < (100 + offsetY) ? 
-                           mMapImage->getHeight() + offsetY : (100 + offsetY));
+                       mMapImage->getWidth() < 100 ? 
+                           mMapImage->getWidth() + offsetX : 100, 
+                       mMapImage->getHeight() < 100 ? 
+                           mMapImage->getHeight() + offsetY : 100);
         loadWindowState();
     }
     else
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index f67c9534..ea40ff38 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -59,7 +59,16 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
     {"keyShortcut6", SDLK_6, "Item Shortcut 6"},
     {"keyShortcut7", SDLK_7, "Item Shortcut 7"},
     {"keyShortcut8", SDLK_8, "Item Shortcut 8"},
-    {"keyShortcut9", SDLK_9, "Item Shortcut 9"}
+    {"keyShortcut9", SDLK_9, "Item Shortcut 9"},
+    {"keyWindowStatus", SDLK_F2, "Status Window"},
+    {"keyWindowInventory", SDLK_F3, "Inventory Window"},
+    {"keyWindowEquipment", SDLK_F4, "Equipment WIndow"},
+    {"keyWindowSkill", SDLK_F5, "Skill Window"},
+    {"keyWindowMinimap", SDLK_F6, "Minimap Window"},
+    {"keyWindowChat", SDLK_F7, "Chat Window"},
+    {"keyWindowShortcut", SDLK_F8, "Item Shortcut Window"},
+    {"keyWindowSetup", SDLK_F9, "Setup Window"},
+    {"keyWindowDebug", SDLK_F10, "Debug Window"}
 };
 
 void KeyboardConfig::init()
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index 158252d4..b51f12f4 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -168,6 +168,15 @@ class KeyboardConfig
             KEY_SHORTCUT_7,
             KEY_SHORTCUT_8,
             KEY_SHORTCUT_9,
+            KEY_WINDOW_STATUS,
+            KEY_WINDOW_INVENTORY,
+            KEY_WINDOW_EQUIPMENT,
+            KEY_WINDOW_SKILL,
+            KEY_WINDOW_MINIMAP,
+            KEY_WINDOW_CHAT,
+            KEY_WINDOW_SHORTCUT,
+            KEY_WINDOW_SETUP,
+            KEY_WINDOW_DEBUG,
             KEY_TOTAL
         };
 
-- 
cgit v1.2.3-70-g09d2


From e2a74899c5ab96a4a1dc848ca8e48df9b126a70a Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 9 Dec 2008 20:29:51 +0100
Subject: Fixed two issues with the chat message parsing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Don't treat anything starting with "Welcome" as a server message, for
example messages starting with a name that starts with "Welcome"
shouldn't belong in that category.

Put the nick in the right place for global announcements.

Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
---
 src/gui/chat.cpp | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index eef1150f..34e7b04b 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -120,22 +120,33 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
     tmp.nick = "";
     tmp.text = line;
 
-    // Fix the owner of welcome message.
-    if (line.substr(0, 7) == "Welcome") {
-        own = BY_SERVER;
-    }
 
     std::string::size_type pos = line.find(" : ");
     if (pos != std::string::npos) {
         tmp.nick = line.substr(0, pos);
         tmp.text = line.substr(pos + 3);
+    } else {
+        // Fix the owner of welcome message.
+        if (line.substr(0, 7) == "Welcome")
+        {
+            own = BY_SERVER;
+        }
     }
 
     std::string lineColor = "##C";
     switch (own) {
         case BY_GM:
-            tmp.nick += std::string("Global announcement: ");
-            lineColor = "##G";
+            if (tmp.nick.empty())
+            {
+                tmp.nick = std::string("Global announcement: ");
+                lineColor = "##G";
+            }
+            else
+            {
+                tmp.nick = std::string("Global announcement from " + tmp.nick
+                        + std::string(": "));
+                lineColor = "##1"; // Equiv. to BrowserBox::RED
+            }
             break;
         case BY_PLAYER:
             tmp.nick += CAT_NORMAL;
-- 
cgit v1.2.3-70-g09d2


From 4d1ec02eb1179769c218b956bb88681efaa2cff6 Mon Sep 17 00:00:00 2001
From: Victor Fury <frictor2@hotmail.com>
Date: Tue, 9 Dec 2008 21:35:42 -0500
Subject: Changed a few references to the SVN so that it uses www.aethyra.org
 instead of 209.168.213.109 Changed a few references to aethyra.com to the
 appropriate aethyra.org values. There's a few other minor changes that mostly
 just replace references to TMW that are not essential with Aethyra
 references.

---
 AUTHORS                 | 2 +-
 INSTALL                 | 4 ++--
 README                  | 3 +--
 WinReadMe.txt           | 2 +-
 data/help/support.txt   | 2 +-
 docs/FAQ.txt            | 4 ++--
 docs/INSTALL/debian.txt | 6 +++---
 docs/INSTALL/win32.txt  | 4 ++--
 docs/items.txt          | 2 +-
 docs/packages.txt       | 2 +-
 docs/progression.txt    | 4 ++--
 docs/win32-release.txt  | 4 ++--
 12 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 34618b84..4f30129b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,7 +12,7 @@ Aethyra Dev Team
 
 == Artists ==
  
- Frictor
+ Frictor		<frictor2(at)hotmail.com>
  Angeliex
  
 == Map Designers ==
diff --git a/INSTALL b/INSTALL
index 4124002d..24669094 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 How to compile and run Aethyra on your GNU/Linux Box
 ================================================
 
-Homepage:  http://www.aethyra.com/
+Homepage:  http://www.aethyra.org/
 IRC:       irc.freenode.net / #aethyra
 
 1) Requirements
@@ -69,7 +69,7 @@ pass a different prefix to configure as usual.
 	4.) su -c "make install"
 
 	you can get help from A.) IRC channel  irc.freenode.net #aedev or #aethyra
-			      B.) http://forum.aethyra.com
+			      B.) http://www.aethyra.org/forums/
 	Make sure you record the output from the konsole window
 
   NOTE: It is possible to compile Aethyra without support for OpenGL rendering.
diff --git a/README b/README
index 6e31ab6e..0e5eb955 100644
--- a/README
+++ b/README
@@ -122,10 +122,9 @@ level 10: enables not used
 If you're having troubles, please first of all read the FAQ.
 If you can't find a solution to your problem, feel free to check our
 Bugs/Support section of the forum:
-- http://forums.aethyra.com
+- http://www.aethyra.org/forums
 or come visit us on our IRC channel:
 - #aethyra @ irc.freenode.net
-- ##aethyra @ irc.freenode.net
 - #aedev @ irc.freenode.net
 
 Otherwise check the AUTHORS file to have a list of developers and how to
diff --git a/WinReadMe.txt b/WinReadMe.txt
index 17870e03..a77ce944 100644
--- a/WinReadMe.txt
+++ b/WinReadMe.txt
@@ -12,7 +12,7 @@ from where it left off.
 To install the client, just copy this folder to your Program Files
 folder and add a shortcut to aethyra.exe to your Start Menu.
 
-For any further questions pop onto the forums at http://forums.aethyra.com/
+For any further questions pop onto the forums at http://www.aethyra.org/forums/
 especially the Windows Way forum, or pop onto the IRC channel #aethyra on the
 FreeNode network
 
diff --git a/data/help/support.txt b/data/help/support.txt
index 44fd08f3..5d7d019f 100644
--- a/data/help/support.txt
+++ b/data/help/support.txt
@@ -7,7 +7,7 @@
  can't find a solution to your problem, feel free to check our
  Bugs/Support section of the forum:
  
-##2     http://forums.aethyra.com
+##2     http://www.aethyra.org/forums/
  
  or come visit us on our IRC channel:
  
diff --git a/docs/FAQ.txt b/docs/FAQ.txt
index b52c0f17..6adfb2b3 100644
--- a/docs/FAQ.txt
+++ b/docs/FAQ.txt
@@ -9,7 +9,7 @@ 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: #aethyra.
    If you don't like IRC just come to our forums:
-   http://forums.aethyra.com/ . Ok, do you think forums are evil?
+   http://www.aethyra.org/ . Ok, do you think forums are evil?
    Don't worry, send me an e-mail at blame582@gmail.com and you're done.
    That's not enough? No, I won't give you my phone number! ;P
    
@@ -60,7 +60,7 @@ DEVELOPMENT
 Q: When will the next version be released?
 
 A: We have scheduled releases. Usually a new release is available every month.
-   Check http://www.aethyra.com/ for further info.
+   Check http://www.aethyra.org/ for further info.
 
 
 Q: How can I contribute?
diff --git a/docs/INSTALL/debian.txt b/docs/INSTALL/debian.txt
index e9cf3183..4e643a55 100644
--- a/docs/INSTALL/debian.txt
+++ b/docs/INSTALL/debian.txt
@@ -9,11 +9,11 @@ to for Aethyra...
 
 WARNING! These instructions are probably outdated!
 
-Check the forums (http://forums.aethyra.com/) where better help can be found.
+Check the forums (http://www.aethyra.org/forums/) where better help can be found.
 
 Aethyra project
 ======================
-Homepage: http://www.aethyra.com/
+Homepage: http://www.aethyra.org/
 IRC:      irc.freenode.net / #aethyra
 
 1) Installing Aethyra and dependencies
@@ -53,7 +53,7 @@ And the debhelper tools:
 Download tmw from Subversion using the command (You'll need Subversion
 installed on your system):
 
-   svn co svn://209.168.213.109/client/trunk aethyra
+   svn co svn://www.aethyra.org/client/trunk aethyra
 
 Rename the aethyra folder into aethyra-XXX and open a console in it.
 You can now type:
diff --git a/docs/INSTALL/win32.txt b/docs/INSTALL/win32.txt
index 3ffd506e..2fd12f8c 100644
--- a/docs/INSTALL/win32.txt
+++ b/docs/INSTALL/win32.txt
@@ -5,7 +5,7 @@ How setup Dev-C++ to compile Aethyra on a Win32 Box
 
 Aethyra project
 ===========================
-Homepage: http://www.aethyra.com
+Homepage: http://www.aethyra.org
 IRC:      irc.freenode.net / #aethyra
 
 
@@ -119,7 +119,7 @@ Check out The Mana Experiment from Subversion using either the command line svn
 tool or TortoiseSVN, pick what you like to use most and install that. Next,
 check out the following directory from our repository:
 
-  svn://209.168.213.109/client/trunk
+  svn://www.aethyra.org/client/trunk
 
 Open "Aethyra.dev" in Dev-C++. From there on you should be able to
 start compilition with Excute -> Compile. A file called aethyra.exe should appear
diff --git a/docs/items.txt b/docs/items.txt
index 19c6b10c..efba35ac 100644
--- a/docs/items.txt
+++ b/docs/items.txt
@@ -1,5 +1,5 @@
 -------------------------------
-THE MANA WORLD INVENTORY SYSTEM
+   AETHYRA INVENTORY SYSTEM
 -------------------------------
 
 1. INTRODUCTION
diff --git a/docs/packages.txt b/docs/packages.txt
index d5735e28..f29fbe8c 100644
--- a/docs/packages.txt
+++ b/docs/packages.txt
@@ -15,7 +15,7 @@ AETHYRA PACKAGE SYSTEM
 
 1. INTRODUCTION
 
-Aethyra (Was The Mana Experiment, original;y The Mana World) is expected to grow continuously with updates to the game
+Aethyra (Was The Mana Experiment, originally part of The Mana World) is expected to grow continuously with updates to the game
 world occurring relatively frequently. More often so than for example new
 releases of the game client. To make sure players don't have to update their
 data manually all the time, by for example downloading the latest from the
diff --git a/docs/progression.txt b/docs/progression.txt
index a25cf11f..cbec77e2 100644
--- a/docs/progression.txt
+++ b/docs/progression.txt
@@ -1,5 +1,5 @@
 -----------------------------------
-THE MANA WORLD PLAYER'S PROGRESSION
+   AETHYRA PLAYER'S PROGRESSION
 -----------------------------------
 
 1. PLAYER'S STATS
@@ -126,4 +126,4 @@ Peon        17          Double Hit, Hard Hit(JL:5)           Beginner Lvl:10
 Every of these notes have to be discussed, if you have any feedback,
 suggestions, updates, commit or tell them at:
 
-address: irc://irc.freenode.net      channel:  #themanaworld
+address: irc://irc.freenode.net      channel:  #aethyra
diff --git a/docs/win32-release.txt b/docs/win32-release.txt
index 64590139..5bd837d0 100644
--- a/docs/win32-release.txt
+++ b/docs/win32-release.txt
@@ -22,9 +22,9 @@ Every Win32 releaser should follow this checklist when creating a new package.
       <configuration>
         <option name="chatlog" value="chatlog.txt"/>
         <option name="guialpha" value="0.8"/>
-        <option name="host" value="209.168.213.109"/>
+        <option name="host" value="www.aethyra.org"/>
         <option name="hwaccel" value="0"/>
-        <option name="port" value="6901"/>
+        <option name="port" value="21001"/>
         <option name="remember" value="0"/>
         <option name="screen" value="0"/>
         <option name="sfxVolume" value="100"/>
-- 
cgit v1.2.3-70-g09d2


From ae7cd9ca453aee25ccf1f4eb277ab77144910da5 Mon Sep 17 00:00:00 2001
From: Fate <fate-tmw@googlemail.com>
Date: Wed, 10 Dec 2008 14:26:53 -0700
Subject: Obscure precise home directory name when making screenshots

---
 src/game.cpp | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 91a58d43..0957dbe8 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -347,28 +347,33 @@ bool saveScreenshot(SDL_Surface *screenshot)
     static unsigned int screenshotCount = 0;
 
     // Search for an unused screenshot name
+    std::stringstream filenameSuffix;
     std::stringstream filename;
     std::fstream testExists;
     bool found = false;
 
     do {
-    screenshotCount++;
-    filename.str("");
+        screenshotCount++;
+        filename.str("");
+        filenameSuffix.str("");
+        filename << PHYSFS_getUserDir();
 #if (defined __USE_UNIX98 || defined __FreeBSD__)
-    filename << PHYSFS_getUserDir() << ".aethyra/";
+        filenameSuffix << ".aethyra/";
 #elif defined __APPLE__
-    filename << PHYSFS_getUserDir() << "Desktop/";
+        filenameSuffix << "Desktop/";
 #endif
-    filename << "Ae_Screenshot_" << screenshotCount << ".png";
-    testExists.open(filename.str().c_str(), std::ios::in);
-    found = !testExists.is_open();
-    testExists.close();
+        filenameSuffix << "Ae_Screenshot_" << screenshotCount << ".png";
+        filename << filenameSuffix.str();
+        std::cerr << "Trying `" << filename.str() << "' from `" << filenameSuffix.str() << "'\n";
+        testExists.open(filename.str().c_str(), std::ios::in);
+        found = !testExists.is_open();
+        testExists.close();
     } while (!found);
 
     if (ImageWriter::writePNG(screenshot, filename.str()))
     {
         std::stringstream chatlogentry;
-        chatlogentry << "Screenshot saved to " << filename.str().c_str();
+        chatlogentry << "Screenshot saved to ~/" << filenameSuffix.str().c_str();
         chatWindow->chatLog(chatlogentry.str(), BY_SERVER);
         return true;
     }
-- 
cgit v1.2.3-70-g09d2


From 712744c5c985a906891a41679adbe6468e82649b Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <crush@themanaworld.org>
Date: Sun, 14 Dec 2008 03:43:37 +0100
Subject: Fixed follow-parent of nested and being-following particle emitters

---
 src/being.cpp             |  6 ++++--
 src/particle.cpp          | 47 ++++++++++++++++++++++++++++++++++++-----------
 src/particle.h            | 17 +++++------------
 src/particlecontainer.cpp | 20 ++++++++------------
 src/particlecontainer.h   |  6 +++---
 src/particleemitter.cpp   | 11 ++++++-----
 6 files changed, 62 insertions(+), 45 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index d98af29c..3f4c5d9c 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -424,8 +424,10 @@ void Being::logic()
         }
     }
 
-    //Update particle effects
-    mChildParticleEffects.setPositions((float)mPx + 16.0f, (float)mPy + 32.0f);
+    // Update particle effects
+    mChildParticleEffects.moveTo((float) mPx + 16.0f,
+                                 (float) mPy + 32.0f);
+
 }
 
 void Being::draw(Graphics *graphics, int offsetX, int offsetY) const
diff --git a/src/particle.cpp b/src/particle.cpp
index fd86195c..adc4aa5b 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -193,7 +193,7 @@ bool Particle::update()
                         p++
                     )
                 {
-                    (*p)->moveBy(mPos.x, mPos.y, mPos.z);
+                    (*p)->moveBy(mPos);
                     mChildParticles.push_back (*p);
                 }
             }
@@ -228,6 +228,30 @@ bool Particle::update()
     }
 
     return true;
+}
+
+void Particle::moveBy(Vector change)
+{
+    mPos += change;
+    for (ParticleIterator p = mChildParticles.begin();
+         p != mChildParticles.end();
+         p++)
+    {
+        if ((*p)->doesFollow())
+        {
+            (*p)->moveBy(change);
+        }
+    }
+    return;
+}
+
+void Particle::moveTo(float x, float y)
+{
+    Vector pos;
+    pos.x = x;
+    pos.y = y;
+    pos.z = mPos.z;
+    moveTo(pos);
 }
 
 Particle* Particle::addEffect(const std::string &particleEffectFile,
@@ -275,17 +299,18 @@ Particle* Particle::addEffect(const std::string &particleEffectFile,
         }
 
         // Read and set the basic properties of the particle
-        int offsetX = XML::getProperty(effectChildNode, "position-x", 0);
-        int offsetY = XML::getProperty(effectChildNode, "position-y", 0);
-        int offsetZ = XML::getProperty(effectChildNode, "position-z", 0);
-
-        int particleX = (int) mPos.x + pixelX + offsetX;
-        int particleY = (int) mPos.y + pixelY + offsetY;
-        int particleZ = (int) mPos.z          + offsetZ;
+        float offsetX = XML::getFloatProperty(effectChildNode, "position-x", 0);
+        float offsetY = XML::getFloatProperty(effectChildNode, "position-y", 0);
+        float offsetZ = XML::getFloatProperty(effectChildNode, "position-z", 0);
+
+        Vector position;
+        position.x = mPos.x + (float)pixelX + offsetX;
+        position.y = mPos.y + (float)pixelY + offsetY;
+        position.z = mPos.z + offsetZ;
 
         int lifetime = XML::getProperty(effectChildNode, "lifetime", -1);
 
-        newParticle->setPosition(particleX, particleY, particleZ);
+        newParticle->moveTo(position);
         newParticle->setLifetime(lifetime);
 
         // Look for additional emitters for this particle
@@ -311,7 +336,7 @@ Particle *Particle::addTextSplashEffect(const std::string &text,
 {
     Particle *newParticle = new TextParticle(mMap, text, colorR, colorG, colorB,
                                              font);
-    newParticle->setPosition(x, y, 0);
+    newParticle->moveTo(x, y);
     newParticle->setVelocity(((rand() % 100) - 50) / 200.0f,    // X
                              ((rand() % 100) - 50) / 200.0f,    // Y
                              ((rand() % 100) / 200.0f) + 4.0f); // Z
@@ -330,7 +355,7 @@ Particle *Particle::addTextRiseFadeOutEffect(const std::string &text,
                                              int x, int y)
 {
     Particle *newParticle = new TextParticle(mMap, text, 255, 255, 255, font);
-    newParticle->setPosition(x, y, 0);
+    newParticle->moveTo(x, y);
     newParticle->setVelocity(0.0f, 0.0f, 0.5f);
     newParticle->setGravity(0.0015f);
     newParticle->setLifetime(300);
diff --git a/src/particle.h b/src/particle.h
index ab08968f..8359ab55 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -127,14 +127,13 @@ class Particle : public Sprite
         /**
          * Sets the position in 3 dimensional space in pixels relative to map.
          */
-        void setPosition(float x, float y, float z)
-        { mPos.x = x; mPos.y = y; mPos.z = z; }
+        void moveTo(Vector pos)
+        { moveBy (pos - mPos);}
 
         /**
          * Sets the position in 2 dimensional space in pixels relative to map.
          */
-        void setPosition(float x, float y)
-        { mPos.x = x; mPos.y = y; }
+        void moveTo(float x, float y);
 
         /**
          * Returns the particle position.
@@ -144,14 +143,8 @@ class Particle : public Sprite
 
         /**
          * Changes the particle position relative
-         */
-        void moveBy(float x, float y, float z)
-        { mPos.x += x; mPos.y += y; mPos.z += z; }
-
-        void moveChildren(Vector change);
-
-        void moveBy (Vector change)
-        { mPos += change; }
+         */
+        void moveBy (Vector change);
 
         /**
          * Sets the time in game ticks until the particle is destroyed.
diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp
index 12ef5733..fbfb1505 100644
--- a/src/particlecontainer.cpp
+++ b/src/particlecontainer.cpp
@@ -44,12 +44,10 @@ ParticleContainer::clear()
         mNext->clear();
 }
 
-
-void
-ParticleContainer::setPositions(float x, float y)
+void ParticleContainer::moveTo(float x, float y)
 {
     if (mNext)
-        mNext->setPositions(x, y);
+        mNext->moveTo(x, y);
 }
 
 // -- particle list ----------------------------------------
@@ -91,15 +89,14 @@ ParticleList::clearLocally()
     mElements.clear();
 }
 
-void
-ParticleList::setPositions(float x, float y)
+void ParticleList::moveTo(float x, float y)
 {
-    ParticleContainer::setPositions(x, y);
+    ParticleContainer::moveTo(x, y);
 
     for (std::list<Particle *>::iterator it = mElements.begin();
          it != mElements.end();)
     {
-        (*it)->setPosition(x, y);
+        (*it)->moveTo(x, y);
         if ((*it)->isExtinct())
         {
             (*it)->kill();
@@ -156,16 +153,15 @@ ParticleVector::clearLocally()
         delLocally(i);
 }
 
-void
-ParticleVector::setPositions(float x, float y)
+void ParticleVector::moveTo(float x, float y)
 {
-    ParticleContainer::setPositions(x, y);
+    ParticleContainer::moveTo(x, y);
 
     for (std::vector<Particle *>::iterator it = mIndexedElements.begin();
          it != mIndexedElements.end(); it++)
         if (*it)
         {
-            (*it)->setPosition(x, y);
+            (*it)->moveTo(x, y);
 
             if ((*it)->isExtinct())
             {
diff --git a/src/particlecontainer.h b/src/particlecontainer.h
index cf002fbc..ae02326e 100644
--- a/src/particlecontainer.h
+++ b/src/particlecontainer.h
@@ -58,7 +58,7 @@ public:
     /**
      * Sets the positions of all elements
      */
-    virtual void setPositions(float x, float y);
+    virtual void moveTo(float x, float y);
 
 protected:
     bool mDelParent;			/**< Delete mNext in destructor */
@@ -88,7 +88,7 @@ public:
 
     virtual void clearLocally();
 
-    virtual void setPositions(float x, float y);
+    virtual void moveTo(float x, float y);
 
 protected:
     std::list<Particle *> mElements;	/**< Contained particle effects */
@@ -116,7 +116,7 @@ public:
     virtual void delLocally(int index);
 
     virtual void clearLocally();
-    virtual void setPositions(float x, float y);
+    virtual void moveTo(float x, float y);
 
 protected:
     std::vector<Particle *> mIndexedElements;
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index 03fe4672..d1ba92ca 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -360,12 +360,13 @@ ParticleEmitter::createParticles(int tick)
         {
             newParticle = new Particle(mMap);
         }
+
+        Vector position;
+        position.x = mParticlePosX.value(tick);
+        position.y = mParticlePosY.value(tick);
+        position.z = mParticlePosZ.value(tick);
 
-
-        newParticle->setPosition(
-                mParticlePosX.value(tick),
-                mParticlePosY.value(tick),
-                mParticlePosZ.value(tick));
+        newParticle->moveTo(position);
 
         float angleH = mParticleAngleHorizontal.value(tick);
         float angleV = mParticleAngleVertical.value(tick);
-- 
cgit v1.2.3-70-g09d2


From 86f666f90322f5d39aa5d0f0ad973e1df8f744d3 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <crush@themanaworld.org>
Date: Sun, 14 Dec 2008 04:47:18 +0100
Subject: Some systactical sugar for 864e33

---
 src/particle.cpp        | 19 ++++++-------------
 src/particleemitter.cpp |  8 +++-----
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/particle.cpp b/src/particle.cpp
index adc4aa5b..f73bd222 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -247,11 +247,7 @@ void Particle::moveBy(Vector change)
 
 void Particle::moveTo(float x, float y)
 {
-    Vector pos;
-    pos.x = x;
-    pos.y = y;
-    pos.z = mPos.z;
-    moveTo(pos);
+    moveTo(Vector(x, y, mPos.z));
 }
 
 Particle* Particle::addEffect(const std::string &particleEffectFile,
@@ -301,16 +297,13 @@ Particle* Particle::addEffect(const std::string &particleEffectFile,
         // Read and set the basic properties of the particle
         float offsetX = XML::getFloatProperty(effectChildNode, "position-x", 0);
         float offsetY = XML::getFloatProperty(effectChildNode, "position-y", 0);
-        float offsetZ = XML::getFloatProperty(effectChildNode, "position-z", 0);
+        float offsetZ = XML::getFloatProperty(effectChildNode, "position-z", 0);
+        Vector position (mPos.x + (float)pixelX + offsetX,
+                         mPos.y + (float)pixelY + offsetY,
+                         mPos.z + offsetZ);
+        newParticle->moveTo(position);
 
-        Vector position;
-        position.x = mPos.x + (float)pixelX + offsetX;
-        position.y = mPos.y + (float)pixelY + offsetY;
-        position.z = mPos.z + offsetZ;
-
         int lifetime = XML::getProperty(effectChildNode, "lifetime", -1);
-
-        newParticle->moveTo(position);
         newParticle->setLifetime(lifetime);
 
         // Look for additional emitters for this particle
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index d1ba92ca..2a4e4c8a 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -361,11 +361,9 @@ ParticleEmitter::createParticles(int tick)
             newParticle = new Particle(mMap);
         }
 
-        Vector position;
-        position.x = mParticlePosX.value(tick);
-        position.y = mParticlePosY.value(tick);
-        position.z = mParticlePosZ.value(tick);
-
+        Vector position(mParticlePosX.value(tick),
+                        mParticlePosY.value(tick),
+                        mParticlePosZ.value(tick));
         newParticle->moveTo(position);
 
         float angleH = mParticleAngleHorizontal.value(tick);
-- 
cgit v1.2.3-70-g09d2


From fbbb9658d4d90a1080d28f3a720d2777939e8cb6 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <crush@themanaworld.org>
Date: Sun, 14 Dec 2008 17:03:30 +0100
Subject: Passing vectors by reference

---
 src/particle.cpp |  45 +++--
 src/particle.h   | 590 +++++++++++++++++++++++++++----------------------------
 2 files changed, 317 insertions(+), 318 deletions(-)

diff --git a/src/particle.cpp b/src/particle.cpp
index f73bd222..1f067de3 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -228,26 +228,25 @@ bool Particle::update()
     }
 
     return true;
-}
-
-void Particle::moveBy(Vector change)
-{
-    mPos += change;
-    for (ParticleIterator p = mChildParticles.begin();
-         p != mChildParticles.end();
-         p++)
-    {
-        if ((*p)->doesFollow())
-        {
-            (*p)->moveBy(change);
-        }
-    }
-    return;
-}
-
-void Particle::moveTo(float x, float y)
-{
-    moveTo(Vector(x, y, mPos.z));
+}
+
+void Particle::moveBy(const Vector &change)
+{
+    mPos += change;
+    for (ParticleIterator p = mChildParticles.begin();
+         p != mChildParticles.end();
+         p++)
+    {
+        if ((*p)->doesFollow())
+        {
+            (*p)->moveBy(change);
+        }
+    }
+}
+
+void Particle::moveTo(float x, float y)
+{
+    moveTo(Vector(x, y, mPos.z));
 }
 
 Particle* Particle::addEffect(const std::string &particleEffectFile,
@@ -297,12 +296,12 @@ Particle* Particle::addEffect(const std::string &particleEffectFile,
         // Read and set the basic properties of the particle
         float offsetX = XML::getFloatProperty(effectChildNode, "position-x", 0);
         float offsetY = XML::getFloatProperty(effectChildNode, "position-y", 0);
-        float offsetZ = XML::getFloatProperty(effectChildNode, "position-z", 0);
+        float offsetZ = XML::getFloatProperty(effectChildNode, "position-z", 0);
         Vector position (mPos.x + (float)pixelX + offsetX,
                          mPos.y + (float)pixelY + offsetY,
                          mPos.z + offsetZ);
-        newParticle->moveTo(position);
-
+        newParticle->moveTo(position);
+
         int lifetime = XML::getProperty(effectChildNode, "lifetime", -1);
         newParticle->setLifetime(lifetime);
 
diff --git a/src/particle.h b/src/particle.h
index 8359ab55..41d7df97 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -1,296 +1,296 @@
-/*
- *  The Mana World
- *  Copyright 2006 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _PARTICLE_H
-#define _PARTICLE_H
-
-#include <list>
-#include <string>
-
-#include <guichan/color.hpp>
-
-#include "guichanfwd.h"
-#include "sprite.h"
-#include "vector.h"
-
-class Map;
-class Particle;
-class ParticleEmitter;
-
-typedef std::list<Particle *> Particles;
-typedef Particles::iterator ParticleIterator;
-typedef std::list<ParticleEmitter *> Emitters;
-typedef Emitters::iterator EmitterIterator;
-
-/**
- * A particle spawned by a ParticleEmitter.
- */
-class Particle : public Sprite
-{
-    public:
-        static const float PARTICLE_SKY; /**< Maximum Z position of particles */
-        static int fastPhysics;          /**< Mode of squareroot calculation */
-        static int particleCount;        /**< Current number of particles */
-        static int maxCount;             /**< Maximum number of particles */
-        static int emitterSkip;          /**< Duration of pause between two emitter updates in ticks */
-
-        /**
-         * Constructor.
-         *
-         * @param map the map this particle will add itself to, may be NULL
-         */
-        Particle(Map *map);
-
-        /**
-         * Destructor.
-         */
-        ~Particle();
-
-        /**
-         * Deletes all child particles and emitters.
-         */
-        void clear();
-
-        /**
-         * Gives a particle the properties of an engine root particle and loads
-         * the particle-related config settings.
-         */
-        void setupEngine();
-
-        /**
-         * Updates particle position, returns false when the particle should
-         * be deleted.
-         */
-        virtual bool update();
-
-        /**
-         * Draws the particle image.
-         */
-        virtual void draw(Graphics *graphics, int offsetX, int offsetY) const;
-
-        /**
-         * Necessary for sorting with the other sprites.
-         */
-        virtual int getPixelY() const
-        { return (int) (mPos.y + mPos.z) - 64; }
-
-        /**
-         * Sets the map the particle is on.
-         */
-        void setMap(Map *map);
-
-        /**
-         * Creates a child particle that hosts some emitters described in the
-         * particleEffectFile.
-         */
-        Particle* addEffect(const std::string &particleEffectFile,
-                            int pixelX, int pixelY, int rotation = 0);
-
-        /**
-         * Creates a standalone text particle.
-         */
-        Particle *addTextSplashEffect(const std::string &text,
-                                      int colorR, int colorG, int colorB,
-                                      gcn::Font *font, int x, int y);
-
-        /**
-         * Creates a standalone text particle.
-         */
-        Particle *addTextRiseFadeOutEffect(const std::string &text,
-                                           gcn::Font *font,
-                                           int x, int y);
-
-        /**
-         * Adds an emitter to the particle.
-         */
-        void addEmitter (ParticleEmitter* emitter)
-        { mChildEmitters.push_back(emitter); }
-
-        /**
-         * Sets the position in 3 dimensional space in pixels relative to map.
-         */
-        void moveTo(Vector pos)
-        { moveBy (pos - mPos);}
-
-        /**
-         * Sets the position in 2 dimensional space in pixels relative to map.
-         */
-        void moveTo(float x, float y);
-
-        /**
-         * Returns the particle position.
-         */
-        const Vector& getPosition() const
-        { return mPos; }
-
-        /**
-         * Changes the particle position relative
-         */
-        void moveBy (Vector change);
-
-        /**
-         * Sets the time in game ticks until the particle is destroyed.
-         */
-        void setLifetime(int lifetime)
-        { mLifetimeLeft = lifetime; mLifetimePast = 0; }
-
-        /**
-         * Sets the age of the pixel in game ticks where the particle has
-         * faded in completely.
-         */
-        void setFadeOut(int fadeOut)
-        { mFadeOut = fadeOut; }
-
-        /**
-         * Sets the remaining particle lifetime where the particle starts to
-         * fade out.
-         */
-        void setFadeIn(int fadeIn)
-        { mFadeIn = fadeIn; }
-
-        /**
-         * Sets the alpha value of the particle
-         */
-        void setAlpha(float alpha)
-        { mAlpha = alpha; }
-
-        /**
-         * Sets the sprite iterator of the particle on the current map to make
-         * it easier to remove the particle from the map when it is destroyed.
-         */
-        void setSpriteIterator(std::list<Sprite*>::iterator spriteIterator)
-        { mSpriteIterator = spriteIterator; }
-
-        /**
-         * Gets the sprite iterator of the particle on the current map.
-         */
-        std::list<Sprite*>::iterator
-        getSpriteIterator() const
-        { return mSpriteIterator; }
-
-        /**
-         * Sets the current velocity in 3 dimensional space.
-         */
-        void setVelocity(float x, float y, float z)
-        { mVelocity.x = x; mVelocity.y = y; mVelocity.z = z; }
-
-        /**
-         * Sets the downward acceleration.
-         */
-        void setGravity(float gravity)
-        { mGravity = gravity; }
-
-        /**
-         * Sets the ammount of random vector changes
-         */
-        void setRandomness(int r)
-        { mRandomness = r; }
-
-        /**
-         * Sets the ammount of velocity particles retain after
-         * hitting the ground.
-         */
-        void setBounce(float bouncieness)
-        { mBounce = bouncieness; }
-
-        /**
-         * Sets the flag if the particle is supposed to be moved by its parent
-         */
-        void setFollow(bool follow)
-        { mFollow = follow; }
-
-        /**
-         * Gets the flag if the particle is supposed to be moved by its parent
-         */
-        bool doesFollow()
-        { return mFollow; }
-
-        /**
-         * Makes the particle move toward another particle with a
-         * given acceleration and momentum
-         */
-        void setDestination(Particle *target, float accel, float moment)
-        { mTarget = target; mAcceleration = accel; mMomentum = moment; }
-
-        /**
-         * Sets the distance in pixel the particle can come near the target
-         * particle before it is destroyed. Does only make sense after a target
-         * particle has been set using setDestination.
-         */
-        void setDieDistance(float dist)
-        { mInvDieDistance = 1.0f / dist; }
-
-        bool isAlive()
-        { return mAlive; }
-
-        /**
-         * Determines whether the particle and its children are all dead
-         */
-        bool isExtinct()
-        { return !isAlive() && mChildParticles.empty(); }
-
-        /**
-         * Manually marks the particle for deletion.
-         */
-        void kill()
-        { mAlive = false; mAutoDelete = true; }
-
-        /**
-         * After calling this function the particle will only request
-         * deletion when kill() is called
-         */
-        void disableAutoDelete()
-        { mAutoDelete = false; }
-
-    protected:
-        bool mAlive;                /**< Is the particle supposed to be drawn and updated?*/
-        Vector mPos;                /**< Position in pixels relative to map. */
-        int mLifetimeLeft;          /**< Lifetime left in game ticks*/
-        int mLifetimePast;          /**< Age of the particle in game ticks*/
-        int mFadeOut;               /**< Lifetime in game ticks left where fading out begins*/
-        int mFadeIn;                /**< Age in game ticks where fading in is finished*/
-        float mAlpha;               /**< Opacity of the graphical representation of the particle */
-
-    private:
-        // generic properties
-        bool mAutoDelete;           /**< May the particle request its deletion by the parent particle? */
-        Map *mMap;                  /**< Map the particle is on. */
-        std::list<Sprite*>::iterator mSpriteIterator;   /**< iterator of the particle on the current map */
-        Emitters mChildEmitters;    /**< List of child emitters. */
-        Particles mChildParticles;  /**< List of particles controlled by this particle */
-
-        // dynamic particle
-        Vector mVelocity;           /**< Speed in pixels per game-tick. */
-        float mGravity;             /**< Downward acceleration in pixels per game-tick. */
-        int mRandomness;            /**< Ammount of random vector change */
-        float mBounce;              /**< How much the particle bounces off when hitting the ground */
-        bool mFollow;               /**< is this particle moved when its parent particle moves? */
-
-        // follow-point particles
-        Particle *mTarget;          /**< The particle that attracts this particle*/
-        float mAcceleration;        /**< Acceleration towards the target particle in pixels per game-tick�*/
-        float mInvDieDistance;      /**< Distance in pixels from the target particle that causes the destruction of the particle*/
-        float mMomentum;            /**< How much speed the particle retains after each game tick*/
-};
-
-extern Particle *particleEngine;
-
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _PARTICLE_H
+#define _PARTICLE_H
+
+#include <list>
+#include <string>
+
+#include <guichan/color.hpp>
+
+#include "guichanfwd.h"
+#include "sprite.h"
+#include "vector.h"
+
+class Map;
+class Particle;
+class ParticleEmitter;
+
+typedef std::list<Particle *> Particles;
+typedef Particles::iterator ParticleIterator;
+typedef std::list<ParticleEmitter *> Emitters;
+typedef Emitters::iterator EmitterIterator;
+
+/**
+ * A particle spawned by a ParticleEmitter.
+ */
+class Particle : public Sprite
+{
+    public:
+        static const float PARTICLE_SKY; /**< Maximum Z position of particles */
+        static int fastPhysics;          /**< Mode of squareroot calculation */
+        static int particleCount;        /**< Current number of particles */
+        static int maxCount;             /**< Maximum number of particles */
+        static int emitterSkip;          /**< Duration of pause between two emitter updates in ticks */
+
+        /**
+         * Constructor.
+         *
+         * @param map the map this particle will add itself to, may be NULL
+         */
+        Particle(Map *map);
+
+        /**
+         * Destructor.
+         */
+        ~Particle();
+
+        /**
+         * Deletes all child particles and emitters.
+         */
+        void clear();
+
+        /**
+         * Gives a particle the properties of an engine root particle and loads
+         * the particle-related config settings.
+         */
+        void setupEngine();
+
+        /**
+         * Updates particle position, returns false when the particle should
+         * be deleted.
+         */
+        virtual bool update();
+
+        /**
+         * Draws the particle image.
+         */
+        virtual void draw(Graphics *graphics, int offsetX, int offsetY) const;
+
+        /**
+         * Necessary for sorting with the other sprites.
+         */
+        virtual int getPixelY() const
+        { return (int) (mPos.y + mPos.z) - 64; }
+
+        /**
+         * Sets the map the particle is on.
+         */
+        void setMap(Map *map);
+
+        /**
+         * Creates a child particle that hosts some emitters described in the
+         * particleEffectFile.
+         */
+        Particle *addEffect(const std::string &particleEffectFile,
+                            int pixelX, int pixelY, int rotation = 0);
+
+        /**
+         * Creates a standalone text particle.
+         */
+        Particle *addTextSplashEffect(const std::string &text,
+                                      int colorR, int colorG, int colorB,
+                                      gcn::Font *font, int x, int y);
+
+        /**
+         * Creates a standalone text particle.
+         */
+        Particle *addTextRiseFadeOutEffect(const std::string &text,
+                                           gcn::Font *font,
+                                           int x, int y);
+
+        /**
+         * Adds an emitter to the particle.
+         */
+        void addEmitter (ParticleEmitter* emitter)
+        { mChildEmitters.push_back(emitter); }
+
+        /**
+         * Sets the position in 3 dimensional space in pixels relative to map.
+         */
+        void moveTo(const Vector &pos)
+        { moveBy (pos - mPos);}
+
+        /**
+         * Sets the position in 2 dimensional space in pixels relative to map.
+         */
+        void moveTo(float x, float y);
+
+        /**
+         * Returns the particle position.
+         */
+        const Vector& getPosition() const
+        { return mPos; }
+
+        /**
+         * Changes the particle position relative
+         */
+        void moveBy (const Vector &change);
+
+        /**
+         * Sets the time in game ticks until the particle is destroyed.
+         */
+        void setLifetime(int lifetime)
+        { mLifetimeLeft = lifetime; mLifetimePast = 0; }
+
+        /**
+         * Sets the age of the pixel in game ticks where the particle has
+         * faded in completely.
+         */
+        void setFadeOut(int fadeOut)
+        { mFadeOut = fadeOut; }
+
+        /**
+         * Sets the remaining particle lifetime where the particle starts to
+         * fade out.
+         */
+        void setFadeIn(int fadeIn)
+        { mFadeIn = fadeIn; }
+
+        /**
+         * Sets the alpha value of the particle
+         */
+        void setAlpha(float alpha)
+        { mAlpha = alpha; }
+
+        /**
+         * Sets the sprite iterator of the particle on the current map to make
+         * it easier to remove the particle from the map when it is destroyed.
+         */
+        void setSpriteIterator(std::list<Sprite*>::iterator spriteIterator)
+        { mSpriteIterator = spriteIterator; }
+
+        /**
+         * Gets the sprite iterator of the particle on the current map.
+         */
+        std::list<Sprite*>::iterator
+        getSpriteIterator() const
+        { return mSpriteIterator; }
+
+        /**
+         * Sets the current velocity in 3 dimensional space.
+         */
+        void setVelocity(float x, float y, float z)
+        { mVelocity.x = x; mVelocity.y = y; mVelocity.z = z; }
+
+        /**
+         * Sets the downward acceleration.
+         */
+        void setGravity(float gravity)
+        { mGravity = gravity; }
+
+        /**
+         * Sets the ammount of random vector changes
+         */
+        void setRandomness(int r)
+        { mRandomness = r; }
+
+        /**
+         * Sets the ammount of velocity particles retain after
+         * hitting the ground.
+         */
+        void setBounce(float bouncieness)
+        { mBounce = bouncieness; }
+
+        /**
+         * Sets the flag if the particle is supposed to be moved by its parent
+         */
+        void setFollow(bool follow)
+        { mFollow = follow; }
+
+        /**
+         * Gets the flag if the particle is supposed to be moved by its parent
+         */
+        bool doesFollow()
+        { return mFollow; }
+
+        /**
+         * Makes the particle move toward another particle with a
+         * given acceleration and momentum
+         */
+        void setDestination(Particle *target, float accel, float moment)
+        { mTarget = target; mAcceleration = accel; mMomentum = moment; }
+
+        /**
+         * Sets the distance in pixel the particle can come near the target
+         * particle before it is destroyed. Does only make sense after a target
+         * particle has been set using setDestination.
+         */
+        void setDieDistance(float dist)
+        { mInvDieDistance = 1.0f / dist; }
+
+        bool isAlive()
+        { return mAlive; }
+
+        /**
+         * Determines whether the particle and its children are all dead
+         */
+        bool isExtinct()
+        { return !isAlive() && mChildParticles.empty(); }
+
+        /**
+         * Manually marks the particle for deletion.
+         */
+        void kill()
+        { mAlive = false; mAutoDelete = true; }
+
+        /**
+         * After calling this function the particle will only request
+         * deletion when kill() is called
+         */
+        void disableAutoDelete()
+        { mAutoDelete = false; }
+
+    protected:
+        bool mAlive;                /**< Is the particle supposed to be drawn and updated?*/
+        Vector mPos;                /**< Position in pixels relative to map. */
+        int mLifetimeLeft;          /**< Lifetime left in game ticks*/
+        int mLifetimePast;          /**< Age of the particle in game ticks*/
+        int mFadeOut;               /**< Lifetime in game ticks left where fading out begins*/
+        int mFadeIn;                /**< Age in game ticks where fading in is finished*/
+        float mAlpha;               /**< Opacity of the graphical representation of the particle */
+
+    private:
+        // generic properties
+        bool mAutoDelete;           /**< May the particle request its deletion by the parent particle? */
+        Map *mMap;                  /**< Map the particle is on. */
+        std::list<Sprite*>::iterator mSpriteIterator;   /**< iterator of the particle on the current map */
+        Emitters mChildEmitters;    /**< List of child emitters. */
+        Particles mChildParticles;  /**< List of particles controlled by this particle */
+
+        // dynamic particle
+        Vector mVelocity;           /**< Speed in pixels per game-tick. */
+        float mGravity;             /**< Downward acceleration in pixels per game-tick. */
+        int mRandomness;            /**< Ammount of random vector change */
+        float mBounce;              /**< How much the particle bounces off when hitting the ground */
+        bool mFollow;               /**< is this particle moved when its parent particle moves? */
+
+        // follow-point particles
+        Particle *mTarget;          /**< The particle that attracts this particle*/
+        float mAcceleration;        /**< Acceleration towards the target particle in pixels per game-tick�*/
+        float mInvDieDistance;      /**< Distance in pixels from the target particle that causes the destruction of the particle*/
+        float mMomentum;            /**< How much speed the particle retains after each game tick*/
+};
+
+extern Particle *particleEngine;
+
 #endif
-- 
cgit v1.2.3-70-g09d2


From 8e86b8c4d0f3d9be979b53689d35f8f0b1381060 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 14 Dec 2008 20:34:42 +0100
Subject: Code reformatting to conform to line length

(cherry picked from mainline)

Conflicts:

	src/game.cpp
---
 src/game.cpp | 311 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 160 insertions(+), 151 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 0957dbe8..a108b9e0 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -342,10 +342,12 @@ Game::~Game()
     joystick = NULL;
 }
 
-bool saveScreenshot(SDL_Surface *screenshot)
+static bool saveScreenshot()
 {
     static unsigned int screenshotCount = 0;
 
+    SDL_Surface *screenshot = graphics->getScreenshot();
+
     // Search for an unused screenshot name
     std::stringstream filenameSuffix;
     std::stringstream filename;
@@ -364,24 +366,28 @@ bool saveScreenshot(SDL_Surface *screenshot)
 #endif
         filenameSuffix << "Ae_Screenshot_" << screenshotCount << ".png";
         filename << filenameSuffix.str();
-        std::cerr << "Trying `" << filename.str() << "' from `" << filenameSuffix.str() << "'\n";
         testExists.open(filename.str().c_str(), std::ios::in);
         found = !testExists.is_open();
         testExists.close();
     } while (!found);
 
-    if (ImageWriter::writePNG(screenshot, filename.str()))
+    const bool success = ImageWriter::writePNG(screenshot, filename.str());
+
+    if (success)
     {
         std::stringstream chatlogentry;
-        chatlogentry << "Screenshot saved to ~/" << filenameSuffix.str().c_str();
+        chatlogentry << "Screenshot saved to ~/" << filenameSuffix.str();
         chatWindow->chatLog(chatlogentry.str(), BY_SERVER);
-        return true;
     }
     else
     {
         chatWindow->chatLog("Saving screenshot failed!", BY_SERVER);
-        return false;
+        logger->log("Error: could not save screenshot.");
     }
+
+    SDL_FreeSurface(screenshot);
+
+    return success;
 }
 
 void Game::optionChanged(const std::string &name)
@@ -404,69 +410,67 @@ void Game::logic()
 
     while (!done)
     {
-    // Handle all necessary game logic
-    while (get_elapsed_time(gameTime) > 0)
-    {
-        handleInput();
-        engine->logic();
-        gameTime++;
-    }
+        // Handle all necessary game logic
+        while (get_elapsed_time(gameTime) > 0)
+        {
+            handleInput();
+            engine->logic();
+            gameTime++;
+        }
 
-    // This is done because at some point tick_time will wrap.
-    gameTime = tick_time;
+        // This is done because at some point tick_time will wrap.
+        gameTime = tick_time;
 
-    // Update the screen when application is active, delay otherwise.
-    if (SDL_GetAppState() & SDL_APPACTIVE)
-    {
-        // Draw a frame if either frames are not limited or enough time has
-        // passed since the last frame.
-        if (!mMinFrameTime ||
-            get_elapsed_time(mDrawTime / 10) > mMinFrameTime)
+        // Update the screen when application is active, delay otherwise.
+        if (SDL_GetAppState() & SDL_APPACTIVE)
         {
-            frame++;
-            gui->draw();
-            graphics->updateScreen();
-            mDrawTime += mMinFrameTime;
-
-            // Make sure to wrap mDrawTime, since tick_time will wrap.
-            if (mDrawTime > MAX_TIME * 10)
-                mDrawTime -= MAX_TIME * 10;
+            // Draw a frame if either frames are not limited or enough time has
+            // passed since the last frame.
+            if (!mMinFrameTime ||
+                get_elapsed_time(mDrawTime / 10) > mMinFrameTime)
+            {
+                frame++;
+                gui->draw();
+                graphics->updateScreen();
+                mDrawTime += mMinFrameTime;
+
+                // Make sure to wrap mDrawTime, since tick_time will wrap.
+                if (mDrawTime > MAX_TIME * 10)
+                    mDrawTime -= MAX_TIME * 10;
+            }
+            else
+            {
+                SDL_Delay(10);
+            }
         }
         else
         {
             SDL_Delay(10);
+            mDrawTime = tick_time * 10;
         }
-    }
-    else
-    {
-        SDL_Delay(10);
-        mDrawTime = tick_time * 10;
-    }
 
-    // Handle network stuff
-    mNetwork->flush();
-    mNetwork->dispatchMessages();
+        // Handle network stuff
+        mNetwork->flush();
+        mNetwork->dispatchMessages();
 
-    if (!mNetwork->isConnected())
-    {
-        if (!disconnectedDialog)
+        if (!mNetwork->isConnected())
         {
-            disconnectedDialog = new
-                OkDialog("Network Error",
-                         "The connection to the server was lost, the program will now quit");
-            disconnectedDialog->addActionListener(&exitListener);
-            disconnectedDialog->requestMoveToTop();
+            if (!disconnectedDialog)
+            {
+                disconnectedDialog = new OkDialog("Network Error",
+                        "The connection to the server was lost, "
+                        "the program will now quit");
+                disconnectedDialog->addActionListener(&exitListener);
+                disconnectedDialog->requestMoveToTop();
+            }
         }
     }
-    }
 }
 
 void Game::handleInput()
 {
-    if (joystick != NULL)
-    {
+    if (joystick)
         joystick->update();
-    }
 
     // Events
     SDL_Event event;
@@ -499,14 +503,7 @@ void Game::handleInput()
                 {
                     case SDLK_p:
                         // Screenshot (picture, hence the p)
-                        {
-                            SDL_Surface *screenshot = graphics->getScreenshot();
-                            if (!saveScreenshot(screenshot))
-                            {
-                                logger->log("Error: could not save Screenshot.");
-                            }
-                            SDL_FreeSurface(screenshot);
-                        }
+                        saveScreenshot();
                         used = true;
                         break;
 
@@ -524,10 +521,14 @@ void Game::handleInput()
                         {
                             unsigned int deflt = player_relations.getDefault();
                             if (deflt & PlayerRelation::TRADE) {
-                                chatWindow->chatLog("Ignoring incoming trade requests", BY_SERVER);
+                                chatWindow->chatLog(
+                                        "Ignoring incoming trade requests",
+                                        BY_SERVER);
                                 deflt &= ~PlayerRelation::TRADE;
                             } else {
-                                chatWindow->chatLog("Accepting incoming trade requests", BY_SERVER);
+                                chatWindow->chatLog(
+                                        "Accepting incoming trade requests",
+                                        BY_SERVER);
                                 deflt |= PlayerRelation::TRADE;
                             }
 
@@ -656,97 +657,102 @@ void Game::handleInput()
 
             default:
                 break;
-        }
-        if (keyboard.isEnabled() && !chatWindow->isInputFocused())
-        {
-            const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
-
-            // Do not activate shortcuts if tradewindow is visible
-            if (!tradeWindow->isVisible())
+            }
+            if (keyboard.isEnabled() && !chatWindow->isInputFocused())
             {
-                // Checks if any item shortcut is pressed.
-                for (int i = KeyboardConfig::KEY_SHORTCUT_0;
-                    i <= KeyboardConfig::KEY_SHORTCUT_9;
-                    i++)
+                const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
+                // Do not activate shortcuts if tradewindow is visible
+                if (!tradeWindow->isVisible())
                 {
-                    if (tKey == i && !used) {
-                        itemShortcut->useItem(i - KeyboardConfig::KEY_SHORTCUT_0);
-                        break;
+                    // Checks if any item shortcut is pressed.
+                    for (int i = KeyboardConfig::KEY_SHORTCUT_0;
+                        i <= KeyboardConfig::KEY_SHORTCUT_9;
+                        i++)
+                    {
+                        if (tKey == i && !used) {
+                            itemShortcut->useItem(
+                                    i - KeyboardConfig::KEY_SHORTCUT_0);
+                            break;
+                        }
                     }
                 }
-            }
-            switch (tKey) {
-                case KeyboardConfig::KEY_PICKUP:
-                {
-                    FloorItem *item = floorItemManager->findByCoordinates(
-                                      player_node->mX, player_node->mY);
-
-                    // If none below the player, try the tile in front
-                    // of the player
-                    if (!item) {
-                        Uint16 x = player_node->mX;
-                        Uint16 y = player_node->mY;
-                        switch (player_node->getSpriteDirection())
+                switch (tKey) {
+                    case KeyboardConfig::KEY_PICKUP:
+                        {
+                            FloorItem *item =
+                                floorItemManager->findByCoordinates(
+                                        player_node->mX, player_node->mY);
+
+                            // If none below the player, try the tile in front
+                            // of the player
+                            if (!item) {
+                                Uint16 x = player_node->mX;
+                                Uint16 y = player_node->mY;
+                                if (player_node->getDirection() & Being::UP)
+                                    y--;
+                                if (player_node->getDirection() & Being::DOWN)
+                                    y++;
+                                if (player_node->getDirection() & Being::LEFT)
+                                    x--;
+                                if (player_node->getDirection() & Being::RIGHT)
+                                    x++;
+
+                                item = floorItemManager->findByCoordinates(
+                                        x, y);
+                            }
+
+                            if (item)
+                                player_node->pickUp(item);
+
+                            used = true;
+                        }
+                        break;
+                    case KeyboardConfig::KEY_SIT:
+                        // Player sit action
+                        player_node->toggleSit();
+                        used = true;
+                        break;
+                    case KeyboardConfig::KEY_HIDE_WINDOWS:
+                         // Hide certain windows
+                        if (!chatWindow->isInputFocused())
                         {
-                            case DIRECTION_UP   : --y; break;
-                            case DIRECTION_DOWN : ++y; break;
-                            case DIRECTION_LEFT : --x; break;
-                            case DIRECTION_RIGHT: ++x; break;
-                            default: break;
+                            statusWindow->setVisible(false);
+                            inventoryWindow->setVisible(false);
+                            skillDialog->setVisible(false);
+                            setupWindow->setVisible(false);
+                            equipmentWindow->setVisible(false);
+                            helpWindow->setVisible(false);
+                            debugWindow->setVisible(false);
                         }
-                        item = floorItemManager->findByCoordinates(x, y);
-                    }
+                        break;
 
-                    if (item)
-                        player_node->pickUp(item);
-                    used = true;
-                }
-                break;
-                case KeyboardConfig::KEY_SIT:
-                   // Player sit action
-                    player_node->toggleSit();
-                    used = true;
-                    break;
-                case KeyboardConfig::KEY_HIDE_WINDOWS:
-                    // Hide certain windows
-                    if (!chatWindow->isInputFocused())
-                    {
-                        statusWindow->setVisible(false);
-                        inventoryWindow->setVisible(false);
-                        skillDialog->setVisible(false);
-                        setupWindow->setVisible(false);
-                        equipmentWindow->setVisible(false);
-                        helpWindow->setVisible(false);
-                        debugWindow->setVisible(false);
-                    }
-                    break;
-                case KeyboardConfig::KEY_WINDOW_STATUS:
-                    requestedWindow = statusWindow;
-                    break;
-                case KeyboardConfig::KEY_WINDOW_INVENTORY:
-                    requestedWindow = inventoryWindow;
-                    break;
-                case KeyboardConfig::KEY_WINDOW_EQUIPMENT:
-                    requestedWindow = equipmentWindow;
-                    break;
-                case KeyboardConfig::KEY_WINDOW_SKILL:
-                    requestedWindow = skillDialog;
-                    break;
-                case KeyboardConfig::KEY_WINDOW_MINIMAP:
-                    requestedWindow = minimap;
-                    break;
-                case KeyboardConfig::KEY_WINDOW_CHAT:
-                    requestedWindow = chatWindow;
-                    break;
-                case KeyboardConfig::KEY_WINDOW_SHORTCUT:
-                    requestedWindow = itemShortcutWindow;
-                    break;
-                case KeyboardConfig::KEY_WINDOW_SETUP:
-                    requestedWindow = setupWindow;
-                    break;
-                case KeyboardConfig::KEY_WINDOW_DEBUG:
-                    requestedWindow = debugWindow;
-                    break;
+                    case KeyboardConfig::KEY_WINDOW_STATUS:
+                        requestedWindow = statusWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_INVENTORY:
+                        requestedWindow = inventoryWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_EQUIPMENT:
+                        requestedWindow = equipmentWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_SKILL:
+                        requestedWindow = skillDialog;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_MINIMAP:
+                        requestedWindow = minimap;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_CHAT:
+                        requestedWindow = chatWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_SHORTCUT:
+                        requestedWindow = itemShortcutWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_SETUP:
+                        requestedWindow = setupWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_DEBUG:
+                        requestedWindow = debugWindow;
+                        break;
                 }
             }
 
@@ -782,11 +788,11 @@ void Game::handleInput()
             }
         }
     } // End while
+
     // If the user is configuring the keys then don't respond.
     if (!keyboard.isEnabled())
-    {
-       return;
-    }
+        return;
+
     // Moving player around
     if (player_node->mAction != Being::DEAD &&
         current_npc == 0 &&
@@ -868,7 +874,8 @@ void Game::handleInput()
             (joystick && joystick->buttonPressed(3))) && 
             !keyboard.isKeyActive(keyboard.KEY_TARGET))
         {
-            Being *target = beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER);
+            Being *target = beingManager->findNearestLivingBeing(
+                    x, y, 20, Being::MONSTER);
 
             player_node->setTarget(target);
         }
@@ -877,7 +884,8 @@ void Game::handleInput()
         if ( keyboard.isKeyActive(keyboard.KEY_TARGET_NPC) && 
              !keyboard.isKeyActive(keyboard.KEY_TARGET) )
         {
-            Being *target = beingManager->findNearestLivingBeing(x, y, 20, Being::NPC);
+            Being *target = beingManager->findNearestLivingBeing(
+                    x, y, 20, Being::NPC);
 
             player_node->setTarget(target);
         }
@@ -891,7 +899,8 @@ void Game::handleInput()
 
                 if (!target)
                 {
-                    target = beingManager->findNearestLivingBeing(x, y, 20, Being::NPC);
+                    target = beingManager->findNearestLivingBeing(
+                      x, y, 20, Being::NPC);
                 }
 
                 if (target)
-- 
cgit v1.2.3-70-g09d2


From 3f000858edfbca044a7d8168bd879ef80285e522 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 20 Dec 2008 23:28:46 -0700
Subject: Enabled video mode switching, as well as got rid of an old, unneeded
 check in the ColorDB.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/graphics.cpp          |  2 ++
 src/gui/setup_video.cpp   | 33 +++++++++++++++++++++++++++++++--
 src/main.cpp              | 21 ++++++++++-----------
 src/resources/colordb.cpp |  2 --
 4 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/src/graphics.cpp b/src/graphics.cpp
index 6920bcb0..82404bce 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -42,6 +42,8 @@ bool Graphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel)
     logger->log("Setting video mode %dx%d %s",
             w, h, fs ? "fullscreen" : "windowed");
 
+    logger->log("Bits per pixel: %d", bpp);
+
     int displayFlags = SDL_ANYFORMAT;
 
     mFullscreen = fs;
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 2a7d6855..262c17e1 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -136,7 +136,7 @@ Setup_Video::Setup_Video():
     ScrollArea *scrollArea = new ScrollArea(mModeList);
     gcn::Label *alphaLabel = new gcn::Label("Gui opacity");
 
-    mModeList->setEnabled(false);
+    mModeList->setEnabled(true);
 #ifndef USE_OPENGL
     mOpenGLCheckBox->setEnabled(false);
 #endif
@@ -165,6 +165,7 @@ Setup_Video::Setup_Video():
     mFpsSlider->setEnabled(mFps > 0);
     mFpsCheckBox->setSelected(mFps > 0);
 
+    mModeList->setActionEventId("videomode");
     mCustomCursorCheckBox->setActionEventId("customcursor");
     mParticleEffectsCheckBox->setActionEventId("particleeffects");
     mSpeechBubbleCheckBox->setActionEventId("speechbubble");
@@ -180,6 +181,7 @@ Setup_Video::Setup_Video():
     mParticleDetailSlider->setActionEventId("particledetailslider");
     mParticleDetailField->setActionEventId("particledetailfield");
 
+    mModeList->addActionListener(this);
     mCustomCursorCheckBox->addActionListener(this);
     mParticleEffectsCheckBox->addActionListener(this);
     mSpeechBubbleCheckBox->addActionListener(this);
@@ -391,7 +393,34 @@ void Setup_Video::cancel()
 
 void Setup_Video::action(const gcn::ActionEvent &event)
 {
-    if (event.getId() == "guialpha")
+    if (event.getId() == "videomode")
+    {
+        const std::string mode = mModeListModel->getElementAt(mModeList->getSelected());
+        const int width = atoi(mode.substr(0, mode.find("x")).c_str());
+        const int height = atoi(mode.substr(mode.find("x") + 1).c_str());
+        const int bpp = 0;
+        const bool fullscreen = ((int) config.getValue("screen", 0) == 1);
+        const bool hwaccel = ((int) config.getValue("hwaccel", 0) == 1);
+        // Try to set the desired video mode
+        if (!graphics->setVideoMode(width, height, bpp, fullscreen, hwaccel))
+        {
+            std::cerr << "Couldn't set "
+                      << width << "x" << height << "x" << bpp << " video mode: "
+                      << SDL_GetError() << std::endl;
+            exit(1);
+        }
+
+        // Initialize for drawing
+        graphics->_beginDraw();
+
+        // TODO: Find out why the drawing area doesn't resize without a restart.
+        new OkDialog("Screen resolution changed",
+                     "Restart your client for the change to take effect.");
+
+        config.setValue("screenwidth", width);
+        config.setValue("screenheight", height);
+    }
+    else if (event.getId() == "guialpha")
     {
         config.setValue("guialpha", mAlphaSlider->getValue());
     }
diff --git a/src/main.cpp b/src/main.cpp
index e9ec365f..b6d2b74f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -378,11 +378,11 @@ void init_engine(const Options &options)
     graphics = new Graphics();
 #endif
 
-    int width = (int) config.getValue("screenwidth", defaultScreenWidth);
-    int height = (int) config.getValue("screenheight", defaultScreenHeight);
-    int bpp = 0;
-    bool fullscreen = ((int) config.getValue("screen", 0) == 1);
-    bool hwaccel = ((int) config.getValue("hwaccel", 0) == 1);
+    const int width = (int) config.getValue("screenwidth", defaultScreenWidth);
+    const int height = (int) config.getValue("screenheight", defaultScreenHeight);
+    const int bpp = 0;
+    const bool fullscreen = ((int) config.getValue("screen", 0) == 1);
+    const bool hwaccel = ((int) config.getValue("hwaccel", 0) == 1);
 
     // Try to set the desired video mode
     if (!graphics->setVideoMode(width, height, bpp, fullscreen, hwaccel))
@@ -759,15 +759,14 @@ int main(int argc, char *argv[])
                                                         defaultScreenHeight));
     std::string wallpaperName;
 
-    if (screenWidth <= 800)
-        wallpaperName = "graphics/images/login_wallpaper.png";
-    else if (screenWidth <= 1024)
+    wallpaperName = "graphics/images/login_wallpaper.png";
+    if (screenWidth == 1024)
         wallpaperName = "graphics/images/login_wallpaper_1024x768.png";
-    else if (screenWidth <= 1280)
+    else if (screenWidth == 1280)
         wallpaperName = "graphics/images/login_wallpaper_1280x960.png";
-    else if (screenWidth <= 1440)
+    else if (screenWidth == 1440)
         wallpaperName = "graphics/images/login_wallpaper_1440x1080.png";
-    else
+    else if (screenWidth >= 1600)
         wallpaperName = "graphics/images/login_wallpaper_1600x1200.png";
 
     login_wallpaper = ResourceManager::getInstance()-> getImage(wallpaperName);
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index 3d2e15e0..bdc6211a 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -84,8 +84,6 @@ void ColorDB::load()
 
             TMWHair ? mColors[id] = XML::getProperty(node, "value", "#FFFFFF") :
                       mColors[id] = XML::getProperty(node, "dye", "#FFFFFF");
-
-            logger->log("%d %s", id, mColors[id].c_str());
         }
     }
 
-- 
cgit v1.2.3-70-g09d2


From 0289c04b5454b42676f3b6beb68571e71617500c Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 21 Dec 2008 00:39:45 -0700
Subject: Fixed wallpaper selection to be handled correctly.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/main.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index b6d2b74f..378e913e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -760,11 +760,11 @@ int main(int argc, char *argv[])
     std::string wallpaperName;
 
     wallpaperName = "graphics/images/login_wallpaper.png";
-    if (screenWidth == 1024)
+    if (screenWidth >= 1024 && screenWidth < 1280)
         wallpaperName = "graphics/images/login_wallpaper_1024x768.png";
-    else if (screenWidth == 1280)
+    else if (screenWidth >= 1280 && screenWidth < 1440)
         wallpaperName = "graphics/images/login_wallpaper_1280x960.png";
-    else if (screenWidth == 1440)
+    else if (screenWidth >= 1440 && screenWidth < 1600)
         wallpaperName = "graphics/images/login_wallpaper_1440x1080.png";
     else if (screenWidth >= 1600)
         wallpaperName = "graphics/images/login_wallpaper_1600x1200.png";
-- 
cgit v1.2.3-70-g09d2


From 4854bc433cd74bb072d02e25aa416f06ff6257b4 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 26 Dec 2008 22:45:24 -0700
Subject: Fixed a potential leak in setup, changed the default border color to
 white for wallpapers (matches our wallpapers better), and fixed the effect
 manager.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/CMakeLists.txt       |  4 ++--
 src/being.cpp            |  4 ----
 src/effectmanager.cpp    | 27 ++++++++++++++++++++++++---
 src/effectmanager.h      | 18 ++++++++++++++----
 src/graphics.cpp         |  3 ++-
 src/gui/setup_video.cpp  |  3 +++
 src/main.cpp             |  2 +-
 src/net/beinghandler.cpp |  3 +--
 8 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e2403b8f..fea11c55 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -284,6 +284,8 @@ SET(SRCS
     configlistener.h
     configuration.cpp
     configuration.h
+    effectmanager.cpp
+    effectmanager.h
     engine.cpp
     engine.h
     equipment.cpp
@@ -348,8 +350,6 @@ SET(SRCS
     textparticle.h
     tileset.h
     vector.h
-    effectmanager.cpp
-    effectmanager.h
     )
 
 ADD_EXECUTABLE(aethyra ${SRCS})
diff --git a/src/being.cpp b/src/being.cpp
index 3f4c5d9c..edacbc26 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -47,10 +47,6 @@
 #include "utils/tostring.h"
 #include "utils/xml.h"
 
-#define BEING_EFFECTS_FILE "effects.xml"
-
-#include "utils/xml.h"
-
 #define BEING_EFFECTS_FILE "effects.xml"
 #define HAIR_FILE "hair.xml"
 
diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp
index 4b835355..89bbf8f5 100644
--- a/src/effectmanager.cpp
+++ b/src/effectmanager.cpp
@@ -21,14 +21,12 @@
  */
 
 #include "effectmanager.h"
-
-#include "particle.h"
 #include "log.h"
+#include "particle.h"
 #include "sound.h"
 
 #include "utils/xml.h"
 
-
 EffectManager::EffectManager()
 {
     XML::Document doc("effects.xml");
@@ -64,6 +62,29 @@ EffectManager::~EffectManager()
 
 }
 
+bool EffectManager::trigger(int id, Being* being)
+{
+    bool rValue = false;
+    for (std::list<EffectDescription>::iterator i = mEffects.begin(); i != mEffects.end(); ++i)
+    {
+        if ((*i).id == id)
+        {
+            printf("Found effect, playing it");
+            rValue = true;
+            if((*i).GFX != "")
+            {
+                Particle *selfFX;
+                selfFX = particleEngine->addEffect((*i).GFX, 0, 0);
+                being->controlParticle(selfFX);
+            }
+            if((*i).SFX != "")
+                sound.playSfx((*i).SFX);
+            break;            
+        }
+    }
+    return rValue;
+}
+
 bool EffectManager::trigger(int id, int x, int y)
 {
     bool rValue = false;
diff --git a/src/effectmanager.h b/src/effectmanager.h
index b5451f27..e6671498 100644
--- a/src/effectmanager.h
+++ b/src/effectmanager.h
@@ -23,8 +23,12 @@
 #ifndef _EFFECT_MANAGER_H
 #define _EFFECT_MANAGER_H
 
-#include <string>
 #include <list>
+#include <string>
+
+#include "being.h"
+
+class Being;
 
 class EffectManager
 {
@@ -42,10 +46,16 @@ class EffectManager
         ~EffectManager();
 
         /**
-         * Triggers a effect with the id, at x,y
-         * returns true if ID exists
+         * Triggers a effect with the id, at
+         * the specified being.
+         */
+	bool trigger(int id, Being* being);
+
+        /**
+         * Triggers a effect with the id, at
+         * the specified x and y coordinate.
          */
-	bool trigger(int id, int x = 0, int y = 0);
+	bool trigger(int id, int x, int y);
 
    private:
         std::list<EffectDescription> mEffects;
diff --git a/src/graphics.cpp b/src/graphics.cpp
index 82404bce..4854d5fa 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -59,6 +59,7 @@ bool Graphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel)
         displayFlags |= SDL_SWSURFACE;
     }
 
+    delete mScreen;
     mScreen = SDL_SetVideoMode(w, h, bpp, displayFlags);
 
     if (!mScreen) {
@@ -71,7 +72,7 @@ bool Graphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel)
         logger->log("Using video driver: %s", videoDriverName);
     }
     else {
-        logger->log("Using video driver: unkown");
+        logger->log("Using video driver: unknown");
     }
 
     const SDL_VideoInfo *vi = SDL_GetVideoInfo();
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 262c17e1..2e620095 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -401,6 +401,7 @@ void Setup_Video::action(const gcn::ActionEvent &event)
         const int bpp = 0;
         const bool fullscreen = ((int) config.getValue("screen", 0) == 1);
         const bool hwaccel = ((int) config.getValue("hwaccel", 0) == 1);
+
         // Try to set the desired video mode
         if (!graphics->setVideoMode(width, height, bpp, fullscreen, hwaccel))
         {
@@ -411,7 +412,9 @@ void Setup_Video::action(const gcn::ActionEvent &event)
         }
 
         // Initialize for drawing
+        graphics->_endDraw();
         graphics->_beginDraw();
+        graphics->updateScreen();
 
         // TODO: Find out why the drawing area doesn't resize without a restart.
         new OkDialog("Screen resolution changed",
diff --git a/src/main.cpp b/src/main.cpp
index 378e913e..818a4e32 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -822,7 +822,7 @@ int main(int argc, char *argv[])
         if (graphics->getWidth() > login_wallpaper->getWidth() ||
                 graphics->getHeight() > login_wallpaper->getHeight())
         {
-            graphics->setColor(gcn::Color(64, 64, 64));
+            graphics->setColor(gcn::Color(255, 255, 255));
             graphics->fillRectangle(gcn::Rectangle(
                         0, 0, graphics->getWidth(), graphics->getHeight()));
         }
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 3c022af6..4f525e8d 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -265,8 +265,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
             int effectType = msg->readInt32();
             Being* being = beingManager->findBeing(id);
 
-            effectManager->trigger(effectType, (int) being->getPixelX(), 
-                                  (int) being->getPixelY());
+            effectManager->trigger(effectType, being);
 
             break;
         }
-- 
cgit v1.2.3-70-g09d2


From f75403c6756e00afebd68832a7ab9d57119c7eb8 Mon Sep 17 00:00:00 2001
From: Eugenio Favalli <elvenprogrammer@gmail.com>
Date: Thu, 24 Jul 2008 17:04:42 +0000
Subject: Added Windows NSIS installer scripts

---
 packaging/windows/setup.nsi         | 237 ++++++++++++++++++++++++++++++++++++
 packaging/windows/setup_finish.bmp  | Bin 0 -> 154542 bytes
 packaging/windows/setup_welcome.bmp | Bin 0 -> 154542 bytes
 3 files changed, 237 insertions(+)
 create mode 100644 packaging/windows/setup.nsi
 create mode 100644 packaging/windows/setup_finish.bmp
 create mode 100644 packaging/windows/setup_welcome.bmp

diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
new file mode 100644
index 00000000..f6dfa798
--- /dev/null
+++ b/packaging/windows/setup.nsi
@@ -0,0 +1,237 @@
+CRCCheck on
+SetCompress off
+SetCompressor /SOLID lzma
+
+;--- (and without !defines ) ---
+!System "%ProgramFiles%\upx\upx.exe --best --crp-ms=999999 --compress-icons=0 --nrv2d tmw.exe"
+
+; HM NIS Edit helper defines
+!define PRODUCT_NAME "The Mana World"
+!define PRODUCT_VERSION "0.0.26"
+!define PRODUCT_PUBLISHER "The Mana World Development Team"
+!define PRODUCT_WEB_SITE "http://themanaworld.org"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\tmw.exe"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+!define PRODUCT_UNINST_ROOT_KEY "HKLM"
+
+; MUI 1.67 compatible ------
+!include "MUI.nsh"
+
+; MUI Settings
+!define MUI_ABORTWARNING
+;!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
+!define MUI_ICON "data\icons\tmw.ico"
+;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
+!define MUI_UNICON "data\icons\tmw.ico"
+
+;Language Selection Dialog Settings
+;Remember the installer language
+!define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
+!define MUI_LANGDLL_REGISTRY_KEY "Software\The Mana World"
+!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
+
+!define MUI_WELCOMEFINISHPAGE_BITMAP "setup_welcome.bmp"
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP "setup_welcome.bmp"
+
+; Welcome page
+
+!define MUI_WELCOMEPAGE_TITLE_3LINES
+!insertmacro MUI_PAGE_WELCOME
+; License page
+!insertmacro MUI_PAGE_LICENSE "COPYING"
+; Directory page
+!insertmacro MUI_PAGE_DIRECTORY
+; Instfiles page
+!insertmacro MUI_PAGE_INSTFILES
+; Finish page
+!define MUI_FINISHPAGE_RUN
+!define MUI_FINISHPAGE_RUN_FUNCTION RunTMW
+!define MUI_FINISHPAGE_SHOWREADME 'notepad.exe "$\"$INSTDIR\README$\""'
+!define MUI_PAGE_CUSTOMFUNCTION_PRE changeFinishBmp
+!define MUI_FINISHPAGE_LINK "Visit TMW website for the latest news, FAQs and support"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://themanaworld.org"
+!insertmacro MUI_PAGE_FINISH
+
+Function RunTMW
+SetOutPath $INSTDIR
+Exec "$INSTDIR\tmw.exe"
+FunctionEnd
+
+Function changeFinishBmp
+!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\setup_finish.bmp"
+FunctionEnd
+
+; Uninstaller pages
+
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!define MUI_FINISHPAGE_TITLE_3LINES
+!insertmacro MUI_UNPAGE_FINISH
+
+;Languages
+!insertmacro MUI_LANGUAGE "English" # first language is the default language
+!insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Spanish"
+!insertmacro MUI_LANGUAGE "SimpChinese"
+!insertmacro MUI_LANGUAGE "TradChinese"
+!insertmacro MUI_LANGUAGE "Japanese"
+!insertmacro MUI_LANGUAGE "Korean"
+!insertmacro MUI_LANGUAGE "Italian"
+!insertmacro MUI_LANGUAGE "Dutch"
+!insertmacro MUI_LANGUAGE "Danish"
+!insertmacro MUI_LANGUAGE "Swedish"
+!insertmacro MUI_LANGUAGE "Norwegian"
+!insertmacro MUI_LANGUAGE "Finnish"
+!insertmacro MUI_LANGUAGE "Greek"
+!insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "Portuguese"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+!insertmacro MUI_LANGUAGE "Polish"
+!insertmacro MUI_LANGUAGE "Ukrainian"
+!insertmacro MUI_LANGUAGE "Czech"
+!insertmacro MUI_LANGUAGE "Slovak"
+!insertmacro MUI_LANGUAGE "Croatian"
+!insertmacro MUI_LANGUAGE "Bulgarian"
+!insertmacro MUI_LANGUAGE "Hungarian"
+!insertmacro MUI_LANGUAGE "Thai"
+!insertmacro MUI_LANGUAGE "Romanian"
+!insertmacro MUI_LANGUAGE "Latvian"
+!insertmacro MUI_LANGUAGE "Macedonian"
+!insertmacro MUI_LANGUAGE "Estonian"
+!insertmacro MUI_LANGUAGE "Turkish"
+!insertmacro MUI_LANGUAGE "Lithuanian"
+!insertmacro MUI_LANGUAGE "Catalan"
+!insertmacro MUI_LANGUAGE "Slovenian"
+!insertmacro MUI_LANGUAGE "Serbian"
+!insertmacro MUI_LANGUAGE "SerbianLatin"
+!insertmacro MUI_LANGUAGE "Arabic"
+!insertmacro MUI_LANGUAGE "Farsi"
+!insertmacro MUI_LANGUAGE "Hebrew"
+!insertmacro MUI_LANGUAGE "Indonesian"
+!insertmacro MUI_LANGUAGE "Mongolian"
+!insertmacro MUI_LANGUAGE "Luxembourgish"
+!insertmacro MUI_LANGUAGE "Albanian"
+!insertmacro MUI_LANGUAGE "Breton"
+!insertmacro MUI_LANGUAGE "Belarusian"
+!insertmacro MUI_LANGUAGE "Icelandic"
+!insertmacro MUI_LANGUAGE "Malay"
+!insertmacro MUI_LANGUAGE "Bosnian"
+!insertmacro MUI_LANGUAGE "Kurdish"
+
+!insertmacro MUI_RESERVEFILE_LANGDLL
+
+ReserveFile "setup_finish.bmp"
+
+; MUI end ------
+
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+OutFile "tmw-${PRODUCT_VERSION}-win32.exe"
+InstallDir "$PROGRAMFILES\The Mana World"
+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
+ShowInstDetails show
+ShowUnInstDetails show
+
+Function .onInit
+  !insertmacro MUI_LANGDLL_DISPLAY
+  InitPluginsDir
+  File /oname=$PLUGINSDIR\setup_finish.bmp "setup_finish.bmp"
+FunctionEnd
+
+Section "Core files (required)" SecCore
+  SectionIn RO
+  SetOutPath "$INSTDIR"
+  SetOverwrite ifnewer
+  CreateDirectory "$SMPROGRAMS\The Mana World"
+  CreateShortCut "$SMPROGRAMS\The Mana World\The Mana World.lnk" "$INSTDIR\tmw.exe"
+  CreateShortCut "$DESKTOP\The Mana World.lnk" "$INSTDIR\tmw.exe"
+  CreateDirectory "$INSTDIR\data"
+  CreateDirectory "$INSTDIR\data\graphics"
+  CreateDirectory "$INSTDIR\data\help"
+  CreateDirectory "$INSTDIR\data\icons"
+  CreateDirectory "$INSTDIR\data\maps"
+  CreateDirectory "$INSTDIR\data\music"
+  CreateDirectory "$INSTDIR\data\sfx"
+  CreateDirectory "$INSTDIR\data\graphics\gui"
+  CreateDirectory "$INSTDIR\data\graphics\images"
+  CreateDirectory "$INSTDIR\data\graphics\items"
+  CreateDirectory "$INSTDIR\data\graphics\tiles"
+  CreateDirectory "$INSTDIR\data\graphics\images\ambient"
+  CreateDirectory "$INSTDIR\docs"
+
+  SetOverwrite ifnewer
+  SetOutPath "$INSTDIR"
+  
+  File "tmw.exe"
+  File "*.dll"
+  File "AUTHORS"
+  File "ChangeLog"
+  File "COPYING"
+  File "NEWS"
+  File "README"
+  SetOutPath "$INSTDIR\data\graphics\gui"
+  File "data\graphics\gui\*.png"
+  SetOutPath "$INSTDIR\data\graphics\images\ambient"
+  File /nonfatal "data\graphics\images\ambient\*.png"
+  SetOutPath "$INSTDIR\data\graphics\images"
+  File /x minimap_*.png data\graphics\images\*.png
+  SetOutPath "$INSTDIR\data\graphics\sprites"
+  File /nonfatal /x monster-*.png data\graphics\sprites\*.png
+  SetOutPath "$INSTDIR\data\graphics\tiles"
+  File /nonfatal "data\graphics\tiles\*.png"
+  SetOutPath "$INSTDIR\data\help"
+  File "data\help\*.txt"
+  SetOutPath "$INSTDIR\data\icons\"
+  File "data\icons\tmw.ico"
+  SetOutPath "$INSTDIR\data\music"
+  File /nonfatal "data\music\*.ogg"
+  SetOutPath "$INSTDIR\docs"
+  File "docs\FAQ.txt"
+SectionEnd
+
+Section -AdditionalIcons
+  WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
+  CreateShortCut "$SMPROGRAMS\The Mana World\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
+  CreateShortCut "$SMPROGRAMS\The Mana World\Readme.lnk" "notepad.exe" "$INSTDIR\README"
+  CreateShortCut "$SMPROGRAMS\The Mana World\FAQ.lnk" "$INSTDIR\docs\FAQ.txt"
+  CreateShortCut "$SMPROGRAMS\The Mana World\Uninstall.lnk" "$INSTDIR\uninst.exe"
+SectionEnd
+
+Section -Post
+  WriteUninstaller "$INSTDIR\uninst.exe"
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\tmw.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\tmw.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}"
+SectionEnd
+
+Function un.onInit
+  !insertmacro MUI_UNGETLANGUAGE
+FunctionEnd
+
+Section Uninstall
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\The Mana World"
+
+  Delete "$INSTDIR\*.*"
+
+  Delete "$SMPROGRAMS\The Mana World\Uninstall.lnk"
+  Delete "$DESKTOP\The Mana World.lnk"
+  Delete "$SMPROGRAMS\The Mana World\The Mana World.lnk"
+  Delete "$SMPROGRAMS\The Mana World\Website.lnk"
+  Delete "$SMPROGRAMS\The Mana World\Readme.lnk"
+  Delete "$SMPROGRAMS\The Mana World\FAQ.lnk"
+
+  RMDir "$SMPROGRAMS\The Mana World"
+  
+  RMDir /r "$INSTDIR\data"
+  RMDir /r "$INSTDIR\docs"
+  RMDir /r "$INSTDIR\updates"
+  RMDir "$INSTDIR"
+
+  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
+  SetAutoClose true
+SectionEnd
\ No newline at end of file
diff --git a/packaging/windows/setup_finish.bmp b/packaging/windows/setup_finish.bmp
new file mode 100644
index 00000000..76b57da6
Binary files /dev/null and b/packaging/windows/setup_finish.bmp differ
diff --git a/packaging/windows/setup_welcome.bmp b/packaging/windows/setup_welcome.bmp
new file mode 100644
index 00000000..3894b91b
Binary files /dev/null and b/packaging/windows/setup_welcome.bmp differ
-- 
cgit v1.2.3-70-g09d2


From 393d5d4eb2e2187e8029b7a10c16de23c98bb7b1 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 26 Dec 2008 23:35:25 -0700
Subject: Moved debian packaging scripts to packaging directory

Conflicts:

	debian/aethyra.docs
	debian/aethyra.sgml
	debian/tmw.docs
	debian/tmw.sgml
	packaging/debian/tmw.docs
	packaging/debian/tmw.sgml

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 debian/changelog                      |  77 ---------
 debian/compat                         |   1 -
 debian/control                        |  43 -----
 debian/copyright                      |  49 ------
 debian/patches/00list                 |   0
 debian/rules                          |  69 --------
 packaging/debian/aethyra-data.install |   6 +
 packaging/debian/aethyra.desktop      |  11 ++
 packaging/debian/aethyra.docs         |   6 +
 packaging/debian/aethyra.install      |   5 +
 packaging/debian/aethyra.menu         |   4 +
 packaging/debian/aethyra.sgml         | 149 ++++++++++++++++
 packaging/debian/aethyra.xpm          | 312 ++++++++++++++++++++++++++++++++++
 packaging/debian/changelog            |  77 +++++++++
 packaging/debian/compat               |   1 +
 packaging/debian/control              |  43 +++++
 packaging/debian/copyright            |  49 ++++++
 packaging/debian/patches/00list       |   0
 packaging/debian/rules                |  69 ++++++++
 packaging/debian/watch                |   2 +
 packaging/windows/setup.nsi           |  72 ++++----
 21 files changed, 770 insertions(+), 275 deletions(-)
 delete mode 100644 debian/changelog
 delete mode 100644 debian/compat
 delete mode 100644 debian/control
 delete mode 100644 debian/copyright
 delete mode 100644 debian/patches/00list
 delete mode 100755 debian/rules
 create mode 100644 packaging/debian/aethyra-data.install
 create mode 100644 packaging/debian/aethyra.desktop
 create mode 100644 packaging/debian/aethyra.docs
 create mode 100644 packaging/debian/aethyra.install
 create mode 100644 packaging/debian/aethyra.menu
 create mode 100644 packaging/debian/aethyra.sgml
 create mode 100644 packaging/debian/aethyra.xpm
 create mode 100644 packaging/debian/changelog
 create mode 100644 packaging/debian/compat
 create mode 100644 packaging/debian/control
 create mode 100644 packaging/debian/copyright
 create mode 100644 packaging/debian/patches/00list
 create mode 100644 packaging/debian/rules
 create mode 100644 packaging/debian/watch

diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index bc5b7579..00000000
--- a/debian/changelog
+++ /dev/null
@@ -1,77 +0,0 @@
-tmw (0.0.24-1) unstable; urgency=low
-
-  * New upstream release.
-  * Wrapped configure script options line to a more human readable
-    format.
-  * Bumped Standards-Version to 3.7.3.
-  * Changed description in debian/tmw.menu, it is now called as an
-    adventure instead of an arcade game.
-  * Removed the ugly hyphen in the description of debian/tmw.desktop.
-  * Removed debian/tmw.6 manpage, because it is in upstream now.
-  * Removed 01-set-gl-texture-zero and 02-guichan_0.7 patches,
-    because they are fixed in the current upstream release.
-  * Removed now useless calls of dh_link and dh_installman in
-    debian/rules.
-  * Removed debian/tmw-data.docs, because the NEWS and AUTHORS file
-    is already in the tmw package.
-  * Removed deprecated encoding flag from debian/tmw.desktop.
-  * Added debian/watch file.
-  * Added homepage field to debian/control and removed the one from
-    the long descriptions.
-  * Added a break to the long description of tmw-data. It looks now
-    realy better.
-  * Added the tmw-dbg package, which provides the debugging symbols.
-
- -- Patrick Matthäi <patrick.matthaei@web.de>  Mon, 24 Dec 2007 17:10:00 +0100
-
-tmw (0.0.23-3) unstable; urgency=low
-
-  * Added missing files data/graphics/images/ambient/*.png to
-    release.
-    Closes: #439861
-  * Added guichan_0.7 patch to build tmw against guichan 0.7.1.
-  * debian/control: Changed guichan version to libguichan2 and
-    changed build dependencie from libcurl3-dev to libcurl4-gnutls-dev.
-  * debian/tmw.menu: Corrected menu entry categorie to Games/Adventure.
-    Thanks lintian.
-  * Fixed clean rule. Thanks lintian.
-
- -- Patrick Matthäi <patrick.matthaei@web.de>  Thu,  6 Sep 2007 18:36:00 +0100
-
-tmw (0.0.23-2) unstable; urgency=low
-
-  * Added set-gl-texture-zero patch to set GL texture index
-    to zero when an image uses the SDL backend.
-    Closes: #427915
-  * debian/control: Removed dependencie of tmw-data to tmw.
-    Closes: #427920
-  * debian/control: Set tmw as recommends to tmw-data.
-  * debian/control: Added dpatch to the build dependencies.
-  * debian/control: Changed guichan version to libguichan1.
-    Closes: #435065
-  * debian/tmw.docs: Added upstream ChangeLog to package.
-  * debian/rules: Removed now unneeded '--with-opengl'
-    configure flag.
-
- -- Patrick Matthäi <patrick.matthaei@web.de>  Wed,  20 Jun 2007 08:55:12 +0100
-
-tmw (0.0.23-1) unstable; urgency=low
-
-  * Uploaded tmw to unstable.
-    Closes: #418725, #423275
-  * New upstream release.
-  * debian/rules: No longer needed the tmw-icon rename
-    hack. Upstream renamed the icon files.
-  * debian/tmw.xpm: Added xpm icon file, because upstream
-    has forgotten it in the newest release.
-
- -- Patrick Matthäi <patrick.matthaei@web.de>  Mon,  5 Jun 2007 21:05:36 +0100
-
-tmw (0.0.22.2-1) experimental; urgency=low
-
-  * Initial release.
-  * Uploading to experimental because we need libguichan0-dev (>= 0.6.1).
-  * src/main.cpp:
-     Moved tmw-icon.png to /usr/share/icons/tmw.png.
-
- -- Patrick Matthäi <patrick.matthaei@web.de>  Tue,  6 Mar 2007 09:08:21 +0100
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7ed6ff82..00000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 0d94b4fd..00000000
--- a/debian/control
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: aethyra
-Section: games
-Priority: optional
-Homepage: http://www.aethyra.org/
-Maintainer: Aethyra Project <www.aethyra.org>
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), dpatch, autotools-dev, libcurl4-gnutls-dev, libgl1-mesa-dev, libguichan-dev (>= 0.8.1-3), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev, libphysfs-dev, libpng12-dev, libxml2-dev, zlib1g-dev
-Standards-Version: 3.7.3
-
-Package: aethyra
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, aethyra-data (= ${source:Version})
-Recommends: aethyra-music
-Description:  Aethyra is a community driven experiment that utilizes eAthena at its core with the end goal of 
- getting its players as involved in the process as much as possible. It's originally forked from 
- The Mana World when its developers came up with the idea of "Why should we have to wait for an 
- MMORPG game in development when we've already got a great server setup here that does everything 
- we've been promised and more?" As such, we are trying to implement as many functions of eAthena 
- as possible while creating our own in the process based on what our players want to see.
-
-Package: aethyra-dbg
-Architecture: any
-Priority: extra
-Depends: aethyra (= ${binary:Version})
-Description:  Aethyra is a community driven experiment that utilizes eAthena at its core with the end goal of 
- getting its players as involved in the process as much as possible. It's originally forked from 
- The Mana World when its developers came up with the idea of "Why should we have to wait for an 
- MMORPG game in development when we've already got a great server setup here that does everything 
- we've been promised and more?" As such, we are trying to implement as many functions of eAthena 
- as possible while creating our own in the process based on what our players want to see.
- .
- This package provides debugging symbols for the aethyra package.
-
-Package: aethyra-data
-Architecture: all
-Recommends: aethyra, aethyra-music
-Description:  Aethyra is a community driven experiment that utilizes eAthena at its core with the end goal of 
- getting its players as involved in the process as much as possible. It's originally forked from 
- The Mana World when its developers came up with the idea of "Why should we have to wait for an 
- MMORPG game in development when we've already got a great server setup here that does everything 
- we've been promised and more?" As such, we are trying to implement as many functions of eAthena 
- as possible while creating our own in the process based on what our players want to see.
- .
- This package contains the data files.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index a6a2b687..00000000
--- a/debian/copyright
+++ /dev/null
@@ -1,49 +0,0 @@
-This package was debianized by Patrick Matthäi <patrick.matthaei@web.de> on
-Wed,  6 Feb 2007 09:16:23 +0100.
-
-It was downloaded from <http://www.themanaworld.org/>.
-
-Upstream Author: Eugenio Favalli <elvenprogrammer@gmail.com>
-
-License (src/utils/base64.h, src/utils/base64.cpp):
-
-	Copyright (C) 1997-1998 PHP Development Team
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of one of the following licenses:
-
-	A) the GNU General Public License as published by the Free Software
-	Foundation; either version 2 of the License, or (at your option)
-	any later version.
-
-	B) the PHP License as published by the PHP Development Team and
-	included in the distribution in the file: LICENSE
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
-
-License (everything else):
-
-	Copyright (C) 2004-2007 The The Mana World Development Team
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e69de29b..00000000
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 6ee08a3b..00000000
--- a/debian/rules
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/dpatch/dpatch.make
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-config.status: patch
-	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
-	--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
-	--datadir=/usr/share/games --bindir=/usr/games --mandir=/usr/share/man
-
-build: build-stamp
-build-stamp: config.status
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs -i ChangeLog
-	dh_installdocs -i
-	dh_install -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs -a ChangeLog
-	dh_installdocs -a
-	dh_install -a
-	dh_desktop -a
-	dh_installmenu -a
-	dh_strip -a --dbg-package=aethyra-dbg
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/packaging/debian/aethyra-data.install b/packaging/debian/aethyra-data.install
new file mode 100644
index 00000000..c652dff3
--- /dev/null
+++ b/packaging/debian/aethyra-data.install
@@ -0,0 +1,6 @@
+data/graphics/gui/*.png usr/share/games/aethyra/data/graphics/gui
+data/graphics/gui/*.xml usr/share/games/aethyra/data/graphics/gui
+data/graphics/images/*.png usr/share/games/aethyra/data/graphics/images
+data/graphics/images/ambient/*.png usr/share/games/aethyra/data/graphics/images/ambient
+data/graphics/tiles/*.png usr/share/games/aethyra/data/graphics/tiles
+data/help/*.txt usr/share/games/aethyra/data/help
diff --git a/packaging/debian/aethyra.desktop b/packaging/debian/aethyra.desktop
new file mode 100644
index 00000000..221d2258
--- /dev/null
+++ b/packaging/debian/aethyra.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Aethyra
+Comment=Aethyra is a 2D MMORPG using eAthena.
+Exec=aethyra
+StartupNotify=false
+Terminal=false
+Type=Game
+Icon=aethyra.png
+Categories=Game
diff --git a/packaging/debian/aethyra.docs b/packaging/debian/aethyra.docs
new file mode 100644
index 00000000..d622a527
--- /dev/null
+++ b/packaging/debian/aethyra.docs
@@ -0,0 +1,6 @@
+AUTHORS
+NEWS
+README
+ChangeLog
+docs/progression.txt
+docs/FAQ.txt
diff --git a/packaging/debian/aethyra.install b/packaging/debian/aethyra.install
new file mode 100644
index 00000000..66ba5126
--- /dev/null
+++ b/packaging/debian/aethyra.install
@@ -0,0 +1,5 @@
+debian/aethyra.desktop usr/share/applications
+debian/aethyra.xpm usr/share/pixmaps
+data/icons/aethyra.png usr/share/icons
+docs/aethyra.6 usr/share/man/man6
+src/aethyra usr/games
diff --git a/packaging/debian/aethyra.menu b/packaging/debian/aethyra.menu
new file mode 100644
index 00000000..42035107
--- /dev/null
+++ b/packaging/debian/aethyra.menu
@@ -0,0 +1,4 @@
+?package(aethyra):needs="X11" section="Games/Adventure"\
+ title="Aethyra"\
+ description="Aethyra is a 2D MMORPG using eAthena."\
+ command="/usr/games/aethyra" icon="/usr/share/pixmaps/aethyra.xpm"
diff --git a/packaging/debian/aethyra.sgml b/packaging/debian/aethyra.sgml
new file mode 100644
index 00000000..0ed18199
--- /dev/null
+++ b/packaging/debian/aethyra.sgml
@@ -0,0 +1,149 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>FERREIRA</firstname>">
+  <!ENTITY dhsurname   "<surname>Yohann</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>avril 13, 2005</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>6</manvolnum>">
+  <!ENTITY dhemail     "<email>bertram@cegetel.net</email>">
+  <!ENTITY dhusername  "FERREIRA Yohann">
+  <!ENTITY dhucpackage "<refentrytitle>TMW</refentrytitle>">
+  <!ENTITY dhpackage   "tmw">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2003</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>tmw is the abreviation of The Mana World : A Fantasy Online Game</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> ingame
+      commands.</para>
+    <para><command>&dhpackage;</command> is a Great Online Game based upon the Seiken Densetsu Serie.
+It has its own universe, and and its own character management system, which will
+give you the opportunity to play in a 2D heroic-fantasy world forever.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>COMMON KEYS</title>
+
+    <para>Arrow Keys, Key Pad Keys (Diagonals Supported).
+Move your character around.
+
+Left Ctrl : 
+Make your character attack.
+
+G : 
+Get Items on the ground or in a chest.
+
+Alt + 1...9 : 
+Shows an Emoticon above your character.
+
+Alt + I : 
+Shows / Hide Inventory Window.
+
+Alt + K : 
+Shows / Hide Skills Window.
+
+Alt + E : 
+Shows / Hide Equipment Window.
+
+Alt + C : 
+Shows Configuration Window.
+</para>
+
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>libguichan (2).</para>
+
+    <para>The program is documented fully by <citetitle>The Mana World Team</citetitle> available via the
+      website http://www.manaworld.org/</para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the &gnu; General Public License, Version 2 any 
+	  later version published by the Free Software Foundation.
+    </para>
+	<para>
+	  On Debian systems, the complete text of the GNU General Public
+	  License can be found in /usr/share/common-licenses/GPL.
+	</para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
+
+
diff --git a/packaging/debian/aethyra.xpm b/packaging/debian/aethyra.xpm
new file mode 100644
index 00000000..515be72e
--- /dev/null
+++ b/packaging/debian/aethyra.xpm
@@ -0,0 +1,312 @@
+/* XPM */
+static char * Aethyra_xpm[] = {
+"32 32 277 2",
+"  	c None",
+". 	c #840000",
+"+ 	c #7E0000",
+"@ 	c #4F0000",
+"# 	c #810000",
+"$ 	c #830000",
+"% 	c #7B0000",
+"& 	c #460000",
+"* 	c #4C0000",
+"= 	c #4B0000",
+"- 	c #750000",
+"; 	c #860000",
+"> 	c #850000",
+", 	c #5D0000",
+"' 	c #490000",
+") 	c #450000",
+"! 	c #4A0000",
+"~ 	c #440000",
+"{ 	c #6A0000",
+"] 	c #7A0000",
+"^ 	c #8B0000",
+"/ 	c #990000",
+"( 	c #960000",
+"_ 	c #720000",
+": 	c #6E0000",
+"< 	c #740000",
+"[ 	c #6B0202",
+"} 	c #550505",
+"| 	c #420404",
+"1 	c #440101",
+"2 	c #4D0000",
+"3 	c #4E0000",
+"4 	c #480000",
+"5 	c #9D0000",
+"6 	c #9B0000",
+"7 	c #6F0000",
+"8 	c #710000",
+"9 	c #760000",
+"0 	c #680404",
+"a 	c #4B0C0C",
+"b 	c #3C0909",
+"c 	c #470202",
+"d 	c #450101",
+"e 	c #500000",
+"f 	c #510000",
+"g 	c #790000",
+"h 	c #890000",
+"i 	c #920000",
+"j 	c #710706",
+"k 	c #7D381F",
+"l 	c #934A1A",
+"m 	c #7B1A09",
+"n 	c #6B1609",
+"o 	c #521E13",
+"p 	c #4F2517",
+"q 	c #5D230F",
+"r 	c #4D0F04",
+"s 	c #350A0A",
+"t 	c #360909",
+"u 	c #470303",
+"v 	c #930000",
+"w 	c #840202",
+"x 	c #712C1C",
+"y 	c #A58248",
+"z 	c #866621",
+"A 	c #835819",
+"B 	c #98681F",
+"C 	c #845C1D",
+"D 	c #BB964A",
+"E 	c #856225",
+"F 	c #3D1B0B",
+"G 	c #241818",
+"H 	c #251717",
+"I 	c #360A0A",
+"J 	c #430000",
+"K 	c #6C0000",
+"L 	c #800000",
+"M 	c #730404",
+"N 	c #6A431E",
+"O 	c #473C1C",
+"P 	c #534420",
+"Q 	c #806125",
+"R 	c #53290B",
+"S 	c #461C09",
+"T 	c #BB9432",
+"U 	c #65490F",
+"V 	c #1F1110",
+"W 	c #1A2323",
+"X 	c #1A2222",
+"Y 	c #261212",
+"Z 	c #440202",
+"` 	c #7F0000",
+" .	c #870000",
+"..	c #6D0505",
+"+.	c #422522",
+"@.	c #454434",
+"#.	c #A18744",
+"$.	c #8F7237",
+"%.	c #A37F48",
+"&.	c #AD8847",
+"*.	c #C6A657",
+"=.	c #644C14",
+"-.	c #211615",
+";.	c #1C2626",
+">.	c #1B2323",
+",.	c #231313",
+"'.	c #420202",
+").	c #6C0404",
+"!.	c #532D23",
+"~.	c #A8915B",
+"{.	c #967C37",
+"].	c #6E5926",
+"^.	c #453512",
+"/.	c #473713",
+"(.	c #A4832A",
+"_.	c #594310",
+":.	c #241F1E",
+"<.	c #232828",
+"[.	c #1C2020",
+"}.	c #241111",
+"|.	c #430202",
+"1.	c #7C5030",
+"2.	c #967C3D",
+"3.	c #3E3318",
+"4.	c #3D3930",
+"5.	c #454442",
+"6.	c #524D44",
+"7.	c #C09E45",
+"8.	c #654F17",
+"9.	c #262524",
+"0.	c #252929",
+"a.	c #410202",
+"b.	c #6B0302",
+"c.	c #A78041",
+"d.	c #6A5621",
+"e.	c #414543",
+"f.	c #696B6B",
+"g.	c #747676",
+"h.	c #7B7566",
+"i.	c #C9A84F",
+"j.	c #665017",
+"k.	c #282725",
+"l.	c #252A2A",
+"m.	c #1B2222",
+"n.	c #3D0202",
+"o.	c #750802",
+"p.	c #B48E41",
+"q.	c #564418",
+"r.	c #4A4B4B",
+"s.	c #6D6F6F",
+"t.	c #797A7A",
+"u.	c #867C62",
+"v.	c #AE9040",
+"w.	c #664F12",
+"x.	c #2D2A25",
+"y.	c #242828",
+"z.	c #1E1E1E",
+"A.	c #291010",
+"B.	c #400202",
+"C.	c #860B02",
+"D.	c #B78C32",
+"E.	c #594013",
+"F.	c #433E3E",
+"G.	c #606464",
+"H.	c #74736C",
+"I.	c #7C6D44",
+"J.	c #433719",
+"K.	c #413311",
+"L.	c #322F1E",
+"M.	c #1C2121",
+"N.	c #271212",
+"O.	c #3C0606",
+"P.	c #8C0200",
+"Q.	c #B5771D",
+"R.	c #765513",
+"S.	c #3F3636",
+"T.	c #555B5B",
+"U.	c #686969",
+"V.	c #5A5957",
+"W.	c #3C3832",
+"X.	c #403826",
+"Y.	c #2F3023",
+"Z.	c #1C1F1D",
+"`.	c #2E0A0A",
+" +	c #460101",
+".+	c #8F0101",
+"++	c #A03F0C",
+"@+	c #AC7E19",
+"#+	c #4B3625",
+"$+	c #474747",
+"%+	c #5B5C5A",
+"&+	c #83775A",
+"*+	c #8C7539",
+"=+	c #67541F",
+"-+	c #6B551C",
+";+	c #8C6D24",
+">+	c #4E1C09",
+",+	c #4A0101",
+"'+	c #8A0606",
+")+	c #8D1203",
+"!+	c #A76713",
+"~+	c #87611B",
+"{+	c #453A32",
+"]+	c #52554E",
+"^+	c #A38A45",
+"/+	c #715818",
+"(+	c #7A6424",
+"_+	c #443212",
+":+	c #947026",
+"<+	c #7D4E11",
+"[+	c #490400",
+"}+	c #420000",
+"|+	c #7F0808",
+"1+	c #8B0101",
+"2+	c #800F01",
+"3+	c #915E11",
+"4+	c #504F40",
+"5+	c #4E4834",
+"6+	c #5A4715",
+"7+	c #5B4814",
+"8+	c #382813",
+"9+	c #917035",
+"0+	c #533209",
+"a+	c #3F0400",
+"b+	c #8E0101",
+"c+	c #8A0000",
+"d+	c #671104",
+"e+	c #663D12",
+"f+	c #786023",
+"g+	c #74612B",
+"h+	c #665320",
+"i+	c #675321",
+"j+	c #785C24",
+"k+	c #684718",
+"l+	c #380B00",
+"m+	c #400000",
+"n+	c #8C0303",
+"o+	c #8D0000",
+"p+	c #780101",
+"q+	c #510808",
+"r+	c #291A16",
+"s+	c #26291C",
+"t+	c #2D2B18",
+"u+	c #321F0E",
+"v+	c #370A02",
+"w+	c #3E0100",
+"x+	c #850202",
+"y+	c #600202",
+"z+	c #331313",
+"A+	c #1E2121",
+"B+	c #1A1E1E",
+"C+	c #270D0D",
+"D+	c #470000",
+"E+	c #7B0404",
+"F+	c #720101",
+"G+	c #4B0D0D",
+"H+	c #2D1717",
+"I+	c #261414",
+"J+	c #380808",
+"K+	c #7E0202",
+"L+	c #5D0606",
+"M+	c #3B0E0E",
+"N+	c #300C0C",
+"O+	c #430303",
+"P+	c #7A0505",
+"Q+	c #7C0000",
+"R+	c #640404",
+"S+	c #430D0D",
+"T+	c #460202",
+"U+	c #610505",
+"V+	c #440E0E",
+"W+	c #390B0B",
+"X+	c #560202",
+"Y+	c #480707",
+"Z+	c #410505",
+"`+	c #4B0101",
+" @	c #480101",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"          . +                                     @             ",
+"          # $ %                               & * @ =           ",
+"          - # ; > $           , '           ) ! @ * ~           ",
+"          { ] ^ / ( $ _ : < [ } | 1 ) ~ ' 2 2 3 3 4             ",
+"            ] ^ 5 6 . 7 8 9 0 a b c * d 4 e f @ 3 4             ",
+"            g h / i j k l m n o p q r s t u e 3 2 4             ",
+"            8 > v w x y z A B C D E F G H I = @ ' J             ",
+"            K L ^ M N O P Q R S T U V W X Y Z e )               ",
+"              `  ...+.@.#.$.%.&.*.=.-.;.>.,.'.e &               ",
+"              ` . ).!.~.{.].^./.(._.:.<.[.}.|.@ 4               ",
+"                # [ 1.2.3.4.5.6.7.8.9.0.[.}.a.=                 ",
+"                ` b.c.d.e.f.g.h.i.j.k.l.m.,.n.)                 ",
+"                L o.p.q.r.s.t.u.v.w.x.y.z.A.B.~                 ",
+"                ; C.D.E.F.G.H.I.J.K.L.M.N.O.4                   ",
+"                  P.Q.R.S.T.U.V.W.X.Y.Z.`. +2                   ",
+"                  .+++@+#+$+%+&+*+=+-+;+>+,+=                   ",
+"                  '+)+!+~+{+]+^+/+(+_+:+<+[+}+                  ",
+"                  |+1+2+3+z 4+5+6+7+8+9+0+a+                    ",
+"                    b+c+d+e+f+g+h+i+j+k+l+m+                    ",
+"                    n+o+p+q+r+s+t+u+v+w+) )                     ",
+"                      x+` y+z+A+B+C+1 e D+                      ",
+"                      E+# F+G+H+I+J+3 @ ~                       ",
+"                        K+% L+M+N+O+e '                         ",
+"                        P+Q+R+S+I T+@ )                         ",
+"                          9 U+V+W+u 2                           ",
+"                            X+Y+Z+ +                            ",
+"                            * `+ @                              ",
+"                                                                ",
+"                                                                "};
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
new file mode 100644
index 00000000..bc5b7579
--- /dev/null
+++ b/packaging/debian/changelog
@@ -0,0 +1,77 @@
+tmw (0.0.24-1) unstable; urgency=low
+
+  * New upstream release.
+  * Wrapped configure script options line to a more human readable
+    format.
+  * Bumped Standards-Version to 3.7.3.
+  * Changed description in debian/tmw.menu, it is now called as an
+    adventure instead of an arcade game.
+  * Removed the ugly hyphen in the description of debian/tmw.desktop.
+  * Removed debian/tmw.6 manpage, because it is in upstream now.
+  * Removed 01-set-gl-texture-zero and 02-guichan_0.7 patches,
+    because they are fixed in the current upstream release.
+  * Removed now useless calls of dh_link and dh_installman in
+    debian/rules.
+  * Removed debian/tmw-data.docs, because the NEWS and AUTHORS file
+    is already in the tmw package.
+  * Removed deprecated encoding flag from debian/tmw.desktop.
+  * Added debian/watch file.
+  * Added homepage field to debian/control and removed the one from
+    the long descriptions.
+  * Added a break to the long description of tmw-data. It looks now
+    realy better.
+  * Added the tmw-dbg package, which provides the debugging symbols.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Mon, 24 Dec 2007 17:10:00 +0100
+
+tmw (0.0.23-3) unstable; urgency=low
+
+  * Added missing files data/graphics/images/ambient/*.png to
+    release.
+    Closes: #439861
+  * Added guichan_0.7 patch to build tmw against guichan 0.7.1.
+  * debian/control: Changed guichan version to libguichan2 and
+    changed build dependencie from libcurl3-dev to libcurl4-gnutls-dev.
+  * debian/tmw.menu: Corrected menu entry categorie to Games/Adventure.
+    Thanks lintian.
+  * Fixed clean rule. Thanks lintian.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Thu,  6 Sep 2007 18:36:00 +0100
+
+tmw (0.0.23-2) unstable; urgency=low
+
+  * Added set-gl-texture-zero patch to set GL texture index
+    to zero when an image uses the SDL backend.
+    Closes: #427915
+  * debian/control: Removed dependencie of tmw-data to tmw.
+    Closes: #427920
+  * debian/control: Set tmw as recommends to tmw-data.
+  * debian/control: Added dpatch to the build dependencies.
+  * debian/control: Changed guichan version to libguichan1.
+    Closes: #435065
+  * debian/tmw.docs: Added upstream ChangeLog to package.
+  * debian/rules: Removed now unneeded '--with-opengl'
+    configure flag.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Wed,  20 Jun 2007 08:55:12 +0100
+
+tmw (0.0.23-1) unstable; urgency=low
+
+  * Uploaded tmw to unstable.
+    Closes: #418725, #423275
+  * New upstream release.
+  * debian/rules: No longer needed the tmw-icon rename
+    hack. Upstream renamed the icon files.
+  * debian/tmw.xpm: Added xpm icon file, because upstream
+    has forgotten it in the newest release.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Mon,  5 Jun 2007 21:05:36 +0100
+
+tmw (0.0.22.2-1) experimental; urgency=low
+
+  * Initial release.
+  * Uploading to experimental because we need libguichan0-dev (>= 0.6.1).
+  * src/main.cpp:
+     Moved tmw-icon.png to /usr/share/icons/tmw.png.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Tue,  6 Mar 2007 09:08:21 +0100
diff --git a/packaging/debian/compat b/packaging/debian/compat
new file mode 100644
index 00000000..7ed6ff82
--- /dev/null
+++ b/packaging/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/packaging/debian/control b/packaging/debian/control
new file mode 100644
index 00000000..0d94b4fd
--- /dev/null
+++ b/packaging/debian/control
@@ -0,0 +1,43 @@
+Source: aethyra
+Section: games
+Priority: optional
+Homepage: http://www.aethyra.org/
+Maintainer: Aethyra Project <www.aethyra.org>
+Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), dpatch, autotools-dev, libcurl4-gnutls-dev, libgl1-mesa-dev, libguichan-dev (>= 0.8.1-3), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev, libphysfs-dev, libpng12-dev, libxml2-dev, zlib1g-dev
+Standards-Version: 3.7.3
+
+Package: aethyra
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, aethyra-data (= ${source:Version})
+Recommends: aethyra-music
+Description:  Aethyra is a community driven experiment that utilizes eAthena at its core with the end goal of 
+ getting its players as involved in the process as much as possible. It's originally forked from 
+ The Mana World when its developers came up with the idea of "Why should we have to wait for an 
+ MMORPG game in development when we've already got a great server setup here that does everything 
+ we've been promised and more?" As such, we are trying to implement as many functions of eAthena 
+ as possible while creating our own in the process based on what our players want to see.
+
+Package: aethyra-dbg
+Architecture: any
+Priority: extra
+Depends: aethyra (= ${binary:Version})
+Description:  Aethyra is a community driven experiment that utilizes eAthena at its core with the end goal of 
+ getting its players as involved in the process as much as possible. It's originally forked from 
+ The Mana World when its developers came up with the idea of "Why should we have to wait for an 
+ MMORPG game in development when we've already got a great server setup here that does everything 
+ we've been promised and more?" As such, we are trying to implement as many functions of eAthena 
+ as possible while creating our own in the process based on what our players want to see.
+ .
+ This package provides debugging symbols for the aethyra package.
+
+Package: aethyra-data
+Architecture: all
+Recommends: aethyra, aethyra-music
+Description:  Aethyra is a community driven experiment that utilizes eAthena at its core with the end goal of 
+ getting its players as involved in the process as much as possible. It's originally forked from 
+ The Mana World when its developers came up with the idea of "Why should we have to wait for an 
+ MMORPG game in development when we've already got a great server setup here that does everything 
+ we've been promised and more?" As such, we are trying to implement as many functions of eAthena 
+ as possible while creating our own in the process based on what our players want to see.
+ .
+ This package contains the data files.
diff --git a/packaging/debian/copyright b/packaging/debian/copyright
new file mode 100644
index 00000000..a6a2b687
--- /dev/null
+++ b/packaging/debian/copyright
@@ -0,0 +1,49 @@
+This package was debianized by Patrick Matthäi <patrick.matthaei@web.de> on
+Wed,  6 Feb 2007 09:16:23 +0100.
+
+It was downloaded from <http://www.themanaworld.org/>.
+
+Upstream Author: Eugenio Favalli <elvenprogrammer@gmail.com>
+
+License (src/utils/base64.h, src/utils/base64.cpp):
+
+	Copyright (C) 1997-1998 PHP Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of one of the following licenses:
+
+	A) the GNU General Public License as published by the Free Software
+	Foundation; either version 2 of the License, or (at your option)
+	any later version.
+
+	B) the PHP License as published by the PHP Development Team and
+	included in the distribution in the file: LICENSE
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+On Debian systems, the complete text of the GNU General Public License
+can be found in /usr/share/common-licenses/GPL file.
+
+License (everything else):
+
+	Copyright (C) 2004-2007 The The Mana World Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General Public License
+can be found in /usr/share/common-licenses/GPL file.
diff --git a/packaging/debian/patches/00list b/packaging/debian/patches/00list
new file mode 100644
index 00000000..e69de29b
diff --git a/packaging/debian/rules b/packaging/debian/rules
new file mode 100644
index 00000000..6ee08a3b
--- /dev/null
+++ b/packaging/debian/rules
@@ -0,0 +1,69 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+config.status: patch
+	dh_testdir
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
+	--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
+	--datadir=/usr/share/games --bindir=/usr/games --mandir=/usr/share/man
+
+build: build-stamp
+build-stamp: config.status
+	dh_testdir
+	$(MAKE)
+	touch build-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+binary-indep: build install
+	dh_testdir -i
+	dh_testroot -i
+	dh_installchangelogs -i ChangeLog
+	dh_installdocs -i
+	dh_install -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary-arch: build install
+	dh_testdir -a
+	dh_testroot -a
+	dh_installchangelogs -a ChangeLog
+	dh_installdocs -a
+	dh_install -a
+	dh_desktop -a
+	dh_installmenu -a
+	dh_strip -a --dbg-package=aethyra-dbg
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/packaging/debian/watch b/packaging/debian/watch
new file mode 100644
index 00000000..5fd35272
--- /dev/null
+++ b/packaging/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://aethyra.org/downloads/aethyra-(.*)\.tar\.gz
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index f6dfa798..71a75346 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -3,14 +3,14 @@ SetCompress off
 SetCompressor /SOLID lzma
 
 ;--- (and without !defines ) ---
-!System "%ProgramFiles%\upx\upx.exe --best --crp-ms=999999 --compress-icons=0 --nrv2d tmw.exe"
+!System "%ProgramFiles%\upx\upx.exe --best --crp-ms=999999 --compress-icons=0 --nrv2d aethyra.exe"
 
 ; HM NIS Edit helper defines
-!define PRODUCT_NAME "The Mana World"
-!define PRODUCT_VERSION "0.0.26"
-!define PRODUCT_PUBLISHER "The Mana World Development Team"
-!define PRODUCT_WEB_SITE "http://themanaworld.org"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\tmw.exe"
+!define PRODUCT_NAME "Aethyra"
+!define PRODUCT_VERSION "0.0.27"
+!define PRODUCT_PUBLISHER "Aethyra Development Team"
+!define PRODUCT_WEB_SITE "http://aethyra.org"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\aethyra.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 
@@ -20,14 +20,14 @@ SetCompressor /SOLID lzma
 ; MUI Settings
 !define MUI_ABORTWARNING
 ;!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
-!define MUI_ICON "data\icons\tmw.ico"
+!define MUI_ICON "data\icons\aethyra.ico"
 ;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
-!define MUI_UNICON "data\icons\tmw.ico"
+!define MUI_UNICON "data\icons\aethyra.ico"
 
 ;Language Selection Dialog Settings
 ;Remember the installer language
 !define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
-!define MUI_LANGDLL_REGISTRY_KEY "Software\The Mana World"
+!define MUI_LANGDLL_REGISTRY_KEY "Software\Aethyra"
 !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
 
 !define MUI_WELCOMEFINISHPAGE_BITMAP "setup_welcome.bmp"
@@ -45,16 +45,16 @@ SetCompressor /SOLID lzma
 !insertmacro MUI_PAGE_INSTFILES
 ; Finish page
 !define MUI_FINISHPAGE_RUN
-!define MUI_FINISHPAGE_RUN_FUNCTION RunTMW
+!define MUI_FINISHPAGE_RUN_FUNCTION Runaethyra
 !define MUI_FINISHPAGE_SHOWREADME 'notepad.exe "$\"$INSTDIR\README$\""'
 !define MUI_PAGE_CUSTOMFUNCTION_PRE changeFinishBmp
-!define MUI_FINISHPAGE_LINK "Visit TMW website for the latest news, FAQs and support"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://themanaworld.org"
+!define MUI_FINISHPAGE_LINK "Visit the Aethyra website for the latest news, FAQs and support"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://aethyra.org"
 !insertmacro MUI_PAGE_FINISH
 
-Function RunTMW
+Function Runaethyra
 SetOutPath $INSTDIR
-Exec "$INSTDIR\tmw.exe"
+Exec "$INSTDIR\aethyra.exe"
 FunctionEnd
 
 Function changeFinishBmp
@@ -126,8 +126,8 @@ ReserveFile "setup_finish.bmp"
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "tmw-${PRODUCT_VERSION}-win32.exe"
-InstallDir "$PROGRAMFILES\The Mana World"
+OutFile "aethyra-${PRODUCT_VERSION}-win32.exe"
+InstallDir "$PROGRAMFILES\Aethyra"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
 ShowUnInstDetails show
@@ -142,9 +142,9 @@ Section "Core files (required)" SecCore
   SectionIn RO
   SetOutPath "$INSTDIR"
   SetOverwrite ifnewer
-  CreateDirectory "$SMPROGRAMS\The Mana World"
-  CreateShortCut "$SMPROGRAMS\The Mana World\The Mana World.lnk" "$INSTDIR\tmw.exe"
-  CreateShortCut "$DESKTOP\The Mana World.lnk" "$INSTDIR\tmw.exe"
+  CreateDirectory "$SMPROGRAMS\Aethyra"
+  CreateShortCut "$SMPROGRAMS\Aethyra\Aethyra.lnk" "$INSTDIR\aethyra.exe"
+  CreateShortCut "$DESKTOP\Aethyra.lnk" "$INSTDIR\aethyra.exe"
   CreateDirectory "$INSTDIR\data"
   CreateDirectory "$INSTDIR\data\graphics"
   CreateDirectory "$INSTDIR\data\help"
@@ -162,7 +162,7 @@ Section "Core files (required)" SecCore
   SetOverwrite ifnewer
   SetOutPath "$INSTDIR"
   
-  File "tmw.exe"
+  File "aethyra.exe"
   File "*.dll"
   File "AUTHORS"
   File "ChangeLog"
@@ -182,7 +182,7 @@ Section "Core files (required)" SecCore
   SetOutPath "$INSTDIR\data\help"
   File "data\help\*.txt"
   SetOutPath "$INSTDIR\data\icons\"
-  File "data\icons\tmw.ico"
+  File "data\icons\aethyra.ico"
   SetOutPath "$INSTDIR\data\music"
   File /nonfatal "data\music\*.ogg"
   SetOutPath "$INSTDIR\docs"
@@ -191,18 +191,18 @@ SectionEnd
 
 Section -AdditionalIcons
   WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
-  CreateShortCut "$SMPROGRAMS\The Mana World\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
-  CreateShortCut "$SMPROGRAMS\The Mana World\Readme.lnk" "notepad.exe" "$INSTDIR\README"
-  CreateShortCut "$SMPROGRAMS\The Mana World\FAQ.lnk" "$INSTDIR\docs\FAQ.txt"
-  CreateShortCut "$SMPROGRAMS\The Mana World\Uninstall.lnk" "$INSTDIR\uninst.exe"
+  CreateShortCut "$SMPROGRAMS\Aethyra\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
+  CreateShortCut "$SMPROGRAMS\Aethyra\Readme.lnk" "notepad.exe" "$INSTDIR\README"
+  CreateShortCut "$SMPROGRAMS\Aethyra\FAQ.lnk" "$INSTDIR\docs\FAQ.txt"
+  CreateShortCut "$SMPROGRAMS\Aethyra\Uninstall.lnk" "$INSTDIR\uninst.exe"
 SectionEnd
 
 Section -Post
   WriteUninstaller "$INSTDIR\uninst.exe"
-  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\tmw.exe"
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\aethyra.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\tmw.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\aethyra.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}"
@@ -213,18 +213,18 @@ Function un.onInit
 FunctionEnd
 
 Section Uninstall
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\The Mana World"
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aethyra"
 
   Delete "$INSTDIR\*.*"
 
-  Delete "$SMPROGRAMS\The Mana World\Uninstall.lnk"
-  Delete "$DESKTOP\The Mana World.lnk"
-  Delete "$SMPROGRAMS\The Mana World\The Mana World.lnk"
-  Delete "$SMPROGRAMS\The Mana World\Website.lnk"
-  Delete "$SMPROGRAMS\The Mana World\Readme.lnk"
-  Delete "$SMPROGRAMS\The Mana World\FAQ.lnk"
+  Delete "$SMPROGRAMS\Aethyra\Uninstall.lnk"
+  Delete "$DESKTOP\Aethyra.lnk"
+  Delete "$SMPROGRAMS\Aethyra\Aethyra.lnk"
+  Delete "$SMPROGRAMS\Aethyra\Website.lnk"
+  Delete "$SMPROGRAMS\Aethyra\Readme.lnk"
+  Delete "$SMPROGRAMS\Aethyra\FAQ.lnk"
 
-  RMDir "$SMPROGRAMS\The Mana World"
+  RMDir "$SMPROGRAMS\Aethyra"
   
   RMDir /r "$INSTDIR\data"
   RMDir /r "$INSTDIR\docs"
@@ -234,4 +234,4 @@ Section Uninstall
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
   SetAutoClose true
-SectionEnd
\ No newline at end of file
+SectionEnd
-- 
cgit v1.2.3-70-g09d2


From 689dcee2ceabc28cedc4fbe582f48a197111c705 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 27 Dec 2008 00:18:20 -0700
Subject: Adapted setup.nsi to 0.0.27 and added instructions

readme.txt explains a bit about how to build the Windows installer.

Conflicts:

	packaging/windows/setup.nsi

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 AethyraLin2WinXcompile.cbp   |  6 +++++
 packaging/windows/readme.txt | 15 ++++++++++++
 packaging/windows/setup.nsi  | 54 ++++++++++++++++++--------------------------
 3 files changed, 43 insertions(+), 32 deletions(-)
 create mode 100644 packaging/windows/readme.txt

diff --git a/AethyraLin2WinXcompile.cbp b/AethyraLin2WinXcompile.cbp
index e7164f0f..75b86127 100644
--- a/AethyraLin2WinXcompile.cbp
+++ b/AethyraLin2WinXcompile.cbp
@@ -88,6 +88,10 @@
 		<Unit filename="src\configlistener.h" />
 		<Unit filename="src\configuration.cpp" />
 		<Unit filename="src\configuration.h" />
+		<Unit filename="src\effectmanager.cpp" />
+		<Unit filename="src\effectmanager.h">
+			<Option target="default" />
+		</Unit>
 		<Unit filename="src\engine.cpp" />
 		<Unit filename="src\engine.h" />
 		<Unit filename="src\equipment.cpp" />
@@ -309,6 +313,8 @@
 		<Unit filename="src\openglgraphics.h" />
 		<Unit filename="src\particle.cpp" />
 		<Unit filename="src\particle.h" />
+		<Unit filename="src\particlecontainer.cpp" />
+		<Unit filename="src\particlecontainer.h" />
 		<Unit filename="src\particleemitter.cpp" />
 		<Unit filename="src\particleemitter.h" />
 		<Unit filename="src\particleemitterprop.h" />
diff --git a/packaging/windows/readme.txt b/packaging/windows/readme.txt
new file mode 100644
index 00000000..03a5717e
--- /dev/null
+++ b/packaging/windows/readme.txt
@@ -0,0 +1,15 @@
+HOW TO BUILD THE INSTALLER
+
+First time setup
+
+* Install NSIS (http://nsis.sourceforge.net)
+* Install UPX (http://upx.sourceforge.net/)
+  (the script expects upx to be in a "upx" subdirectory right here)
+
+Building the installer
+
+* Make sure TMW is compiled at the right version
+* Make sure the correct DLLs are in place
+* Make sure the latest music files are in place
+* Make sure setup.nsi mentions the right TMW version
+* Right-click setup.nsi and select "Compile NSIS Script"
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 71a75346..cd01486d 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -2,8 +2,10 @@ CRCCheck on
 SetCompress off
 SetCompressor /SOLID lzma
 
+!define AETHYRAROOT "..\.."
+
 ;--- (and without !defines ) ---
-!System "%ProgramFiles%\upx\upx.exe --best --crp-ms=999999 --compress-icons=0 --nrv2d aethyra.exe"
+!System "upx\upx.exe --best --crp-ms=999999 --compress-icons=0 --nrv2d ${AETHYRAROOT}\aethyra.exe"
 
 ; HM NIS Edit helper defines
 !define PRODUCT_NAME "Aethyra"
@@ -20,9 +22,9 @@ SetCompressor /SOLID lzma
 ; MUI Settings
 !define MUI_ABORTWARNING
 ;!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
-!define MUI_ICON "data\icons\aethyra.ico"
+!define MUI_ICON "${AETHYRAROOT}\data\icons\aethyra.ico"
 ;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
-!define MUI_UNICON "data\icons\aethyra.ico"
+!define MUI_UNICON "${AETHYRAROOT}\data\icons\aethyra.ico"
 
 ;Language Selection Dialog Settings
 ;Remember the installer language
@@ -38,7 +40,7 @@ SetCompressor /SOLID lzma
 !define MUI_WELCOMEPAGE_TITLE_3LINES
 !insertmacro MUI_PAGE_WELCOME
 ; License page
-!insertmacro MUI_PAGE_LICENSE "COPYING"
+!insertmacro MUI_PAGE_LICENSE "${AETHYRAROOT}\COPYING"
 ; Directory page
 !insertmacro MUI_PAGE_DIRECTORY
 ; Instfiles page
@@ -47,7 +49,7 @@ SetCompressor /SOLID lzma
 !define MUI_FINISHPAGE_RUN
 !define MUI_FINISHPAGE_RUN_FUNCTION Runaethyra
 !define MUI_FINISHPAGE_SHOWREADME 'notepad.exe "$\"$INSTDIR\README$\""'
-!define MUI_PAGE_CUSTOMFUNCTION_PRE changeFinishBmp
+!define MUI_PAGE_CUSTOMFUNCTION_PRE changeFinishImage
 !define MUI_FINISHPAGE_LINK "Visit the Aethyra website for the latest news, FAQs and support"
 !define MUI_FINISHPAGE_LINK_LOCATION "http://aethyra.org"
 !insertmacro MUI_PAGE_FINISH
@@ -57,7 +59,7 @@ SetOutPath $INSTDIR
 Exec "$INSTDIR\aethyra.exe"
 FunctionEnd
 
-Function changeFinishBmp
+Function changeFinishImage
 !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\setup_finish.bmp"
 FunctionEnd
 
@@ -149,44 +151,33 @@ Section "Core files (required)" SecCore
   CreateDirectory "$INSTDIR\data\graphics"
   CreateDirectory "$INSTDIR\data\help"
   CreateDirectory "$INSTDIR\data\icons"
-  CreateDirectory "$INSTDIR\data\maps"
   CreateDirectory "$INSTDIR\data\music"
-  CreateDirectory "$INSTDIR\data\sfx"
   CreateDirectory "$INSTDIR\data\graphics\gui"
   CreateDirectory "$INSTDIR\data\graphics\images"
-  CreateDirectory "$INSTDIR\data\graphics\items"
-  CreateDirectory "$INSTDIR\data\graphics\tiles"
-  CreateDirectory "$INSTDIR\data\graphics\images\ambient"
   CreateDirectory "$INSTDIR\docs"
 
   SetOverwrite ifnewer
   SetOutPath "$INSTDIR"
-  
-  File "aethyra.exe"
-  File "*.dll"
-  File "AUTHORS"
-  File "ChangeLog"
-  File "COPYING"
-  File "NEWS"
-  File "README"
+
+  File "${AETHYRAROOT}\aethyra.exe"
+  File "${AETHYRAROOT}\*.dll"
+  File "${AETHYRAROOT}\AUTHORS"
+  File "${AETHYRAROOT}\COPYING"
+  File "${AETHYRAROOT}\NEWS"
+  File "${AETHYRAROOT}\README"
   SetOutPath "$INSTDIR\data\graphics\gui"
-  File "data\graphics\gui\*.png"
-  SetOutPath "$INSTDIR\data\graphics\images\ambient"
-  File /nonfatal "data\graphics\images\ambient\*.png"
+  File "${AETHYRAROOT}\data\graphics\gui\*.png"
+  File "${AETHYRAROOT}\data\graphics\gui\*.xml"
   SetOutPath "$INSTDIR\data\graphics\images"
-  File /x minimap_*.png data\graphics\images\*.png
-  SetOutPath "$INSTDIR\data\graphics\sprites"
-  File /nonfatal /x monster-*.png data\graphics\sprites\*.png
-  SetOutPath "$INSTDIR\data\graphics\tiles"
-  File /nonfatal "data\graphics\tiles\*.png"
+  File /x minimap_*.png ${AETHYRAROOT}\data\graphics\images\*.png
   SetOutPath "$INSTDIR\data\help"
-  File "data\help\*.txt"
+  File "${AETHYRAROOT}\data\help\*.txt"
   SetOutPath "$INSTDIR\data\icons\"
-  File "data\icons\aethyra.ico"
+  File "${AETHYRAROOT}\data\icons\aethyra.ico"
   SetOutPath "$INSTDIR\data\music"
-  File /nonfatal "data\music\*.ogg"
+  File /nonfatal "${AETHYRAROOT}\data\music\*.ogg"
   SetOutPath "$INSTDIR\docs"
-  File "docs\FAQ.txt"
+  File "${AETHYRAROOT}\docs\FAQ.txt"
 SectionEnd
 
 Section -AdditionalIcons
@@ -225,7 +216,6 @@ Section Uninstall
   Delete "$SMPROGRAMS\Aethyra\FAQ.lnk"
 
   RMDir "$SMPROGRAMS\Aethyra"
-  
   RMDir /r "$INSTDIR\data"
   RMDir /r "$INSTDIR\docs"
   RMDir /r "$INSTDIR\updates"
-- 
cgit v1.2.3-70-g09d2


From c312d9ca72368542990c6c9d7171bebd84c5c9ab Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 27 Dec 2008 00:19:47 -0700
Subject: Adjusted compiling script to work for the most recent git version.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 AethyraLin2WinXcompile.cbp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/AethyraLin2WinXcompile.cbp b/AethyraLin2WinXcompile.cbp
index 75b86127..d79c473e 100644
--- a/AethyraLin2WinXcompile.cbp
+++ b/AethyraLin2WinXcompile.cbp
@@ -89,9 +89,7 @@
 		<Unit filename="src\configuration.cpp" />
 		<Unit filename="src\configuration.h" />
 		<Unit filename="src\effectmanager.cpp" />
-		<Unit filename="src\effectmanager.h">
-			<Option target="default" />
-		</Unit>
+		<Unit filename="src\effectmanager.h" />
 		<Unit filename="src\engine.cpp" />
 		<Unit filename="src\engine.h" />
 		<Unit filename="src\equipment.cpp" />
-- 
cgit v1.2.3-70-g09d2


From 28f93e08a567dfceae93a0b70997eaa3e9593a4b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 27 Dec 2008 13:47:05 -0700
Subject: Remove ../ from tileset files.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/resources/mapreader.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index bb444330..c6b6d1cd 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -454,6 +454,8 @@ Tileset *MapReader::readTileset(xmlNodePtr node,
     if (xmlHasProp(node, BAD_CAST "source"))
     {
         std::string filename = XML::getProperty(node, "source", "");
+        while (filename.substr(0, 3) == "../")
+               filename.erase(0, 3);  // Remove "../"
         doc = new XML::Document(filename);
         node = doc->rootNode();
         firstGid += XML::getProperty(node, "firstgid", 0);
@@ -473,7 +475,7 @@ Tileset *MapReader::readTileset(xmlNodePtr node,
         {
             std::string sourceStr = source;
             while (sourceStr.substr(0, 3) == "../")
-                sourceStr.erase(0, 3);  // Remove "../"
+                   sourceStr.erase(0, 3);  // Remove "../"
 
             ResourceManager *resman = ResourceManager::getInstance();
             Image* tilebmp = resman->getImage(sourceStr);
-- 
cgit v1.2.3-70-g09d2


From 6b680b60af9084767fd50737df763a89ca2c2919 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 28 Dec 2008 19:36:22 -0700
Subject: Fixed some dangling diffs that never got fixed.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 AUTHORS | 46 ----------------------------------------------
 INSTALL | 14 +-------------
 2 files changed, 1 insertion(+), 59 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 4f30129b..5b52a1ec 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,3 @@
-<<<<<<< HEAD:AUTHORS
 ---------------------------
 Aethyra Dev Team
 ---------------------------
@@ -31,50 +30,6 @@ Aethyra Dev Team
 The Mana World Dev Team
 -----------------------
 
- ElvenProgrammer aka Eugenio Favalli (elvenprogrammer@gmail.com)
- Project leader, programmer
-
-== Programmers ==
-
- Bertram          (SDL input, progress bar drawing, Debian package)
- Bj�rn Lindeijer  (various parts, GUI, graphics, A* and map rewrites)
- Bj�rn Steinbrink (various parts)
- Javila           (various parts, GUI)
- nym              (several GUI parts)
- Shura            (configuration, sound, misc. ports)
- zenogais         (resource manager)
- Usiu             (several GUI parts)
- Mra              (some GUI parts)
-
-== Artists ==
-
- Clef             (tiles, concepts)
- Gnulia           (conceptual art)
- Irukard          (item icons)
- Magick           (music and sound effects)
- Neko-mon         (player sprites, various things)
- Neorice          (monster sprites, tiles)
- Modanung         (pixel art, concept art)
- Pajarico         (concepts)
- Rotonen          (backstory, art director, music, sound)
- Talaroc          (sprites)
- Ti Sing Hao      (music)
-
-== Misc thanks ==
-
- Ultramichy       (hosting test server)
-
-== Inactive/retired ==
-
- Chetic           (maps)
- SimEdw           (network code)
- Sull             (hosting CVS and related services)
- Vlady            (several items)
-=======
----------------------------------
--- The Mana World Contributors --
----------------------------------
-
  This file lists all contributors up to the current release. Check the wiki
  for the currently active development team.
 
@@ -131,4 +86,3 @@ Jean-Francois Lampron  <sull.kf gmail.com>
 Rodney Dawes  <dobey novell.com>
 Ultramichy
 Zuzanna K. Filutowska  <platyna users.sourceforge.net>
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:AUTHORS
diff --git a/INSTALL b/INSTALL
index 24669094..38b035fe 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,11 +5,7 @@ Homepage:  http://www.aethyra.org/
 IRC:       irc.freenode.net / #aethyra
 
 1) Requirements
-<<<<<<< HEAD:INSTALL
 2) Compiling Aethyra
-=======
-2) Compiling And Installing The Mana World
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:INSTALL
 3) Notes
 
 
@@ -30,12 +26,8 @@ a source release. To get Aethyra to compile, you need a compiler
 * zlib 1.2.x        http://www.gzip.org/zlib/
 * libcurl           http://curl.haxx.se/libcurl/
 
-<<<<<<< HEAD:INSTALL
-If you checked Aethyra out from Subversion you will also need these tools to
+If you cloned Aethyra from the Git repository, you will also need these tools to
 compile:
-=======
-If you've cloned the Git repository, you will also need these tools to compile:
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:INSTALL
 
 * GNU automake 1.9  http://www.gnu.org/software/automake/
 * GNU autoconf      http://www.gnu.org/software/autoconf/
@@ -48,15 +40,11 @@ you to figure this out.
 ===============================================
 
 1) Go to the directory you have extracted the source to.
-<<<<<<< HEAD:INSTALL
-2) If you checked out from SVN, run "./autobuild.sh" to install the client.
-=======
 2) If you've cloned the Git repository, run "autoreconf -i" to generate
    configure and install any missing auxiliary files.
 3) Run "./configure"
 4) Run "make"
 5) Run "make install" as root
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:INSTALL
 
 It should have installed Aethyra on your system now, and you can
 run it with "aethyra". By default all files are installed to /usr/local, you can
-- 
cgit v1.2.3-70-g09d2


From a5c8eae057746618443c788fcaa04221d8ad7ba4 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 29 Dec 2008 14:02:01 -0700
Subject: Added support for True Type Fonts using GUIChan's inbuilt SDLTrueType
 class.

NOTE: This commit adds a brand new dependency (SDL_TTF). Make sure to
install it, regenerate your config files, reconfigure, and then install
before attempting to compile.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 AethyraLin2WinXcompile.cbp             |   2 +
 INSTALL                                |   1 +
 configure.ac                           |   6 +-
 data/CMakeLists.txt                    |   1 +
 data/Makefile.am                       |   2 +-
 data/fonts/CMakeLists.txt              |   5 +
 data/fonts/Makefile.am                 |   8 +
 data/fonts/dejavusans.ttf              | Bin 0 -> 569716 bytes
 src/CMakeLists.txt                     |   2 +
 src/Makefile.am                        |   4 +
 src/gui/browserbox.cpp                 |  56 ++-----
 src/gui/browserbox.h                   |   5 -
 src/gui/gui.cpp                        |  33 ++--
 src/gui/itemcontainer.cpp              |   1 +
 src/gui/itemshortcutcontainer.cpp      |   1 +
 src/gui/sdltruetypefont.cpp            | 171 ++++++++++++++++++++
 src/gui/widgets/adjustingcontainer.cpp | 279 +++++++++++++++++++++++++++++++++
 src/gui/widgets/adjustingcontainer.hpp | 235 +++++++++++++++++++++++++++
 src/gui/window.cpp                     |   1 +
 src/main.cpp                           |   4 +
 src/sdltruetypefont.cpp                | 171 ++++++++++++++++++++
 src/sdltruetypefont.hpp                | 157 +++++++++++++++++++
 22 files changed, 1078 insertions(+), 67 deletions(-)
 create mode 100644 data/fonts/CMakeLists.txt
 create mode 100644 data/fonts/Makefile.am
 create mode 100644 data/fonts/dejavusans.ttf
 create mode 100644 src/gui/sdltruetypefont.cpp
 create mode 100644 src/gui/widgets/adjustingcontainer.cpp
 create mode 100644 src/gui/widgets/adjustingcontainer.hpp
 create mode 100644 src/sdltruetypefont.cpp
 create mode 100644 src/sdltruetypefont.hpp

diff --git a/AethyraLin2WinXcompile.cbp b/AethyraLin2WinXcompile.cbp
index d79c473e..3b03aca2 100644
--- a/AethyraLin2WinXcompile.cbp
+++ b/AethyraLin2WinXcompile.cbp
@@ -230,6 +230,8 @@
 		<Unit filename="src\gui\textfield.h" />
 		<Unit filename="src\gui\trade.cpp" />
 		<Unit filename="src\gui\trade.h" />
+		<Unit filename="src\gui\truetypefont.cpp"/>
+		<Unit filename="src\gui\truetypefont.h"/>
 		<Unit filename="src\gui\updatewindow.cpp" />
 		<Unit filename="src\gui\updatewindow.h" />
 		<Unit filename="src\gui\vbox.cpp" />
diff --git a/INSTALL b/INSTALL
index 38b035fe..85fe946f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -20,6 +20,7 @@ a source release. To get Aethyra to compile, you need a compiler
 * SDL_mixer         http://www.libsdl.org/projects/SDL_mixer/
 * SDL_image         http://www.libsdl.org/projects/SDL_image/
 * SDL_net           http://www.libsdl.org/projects/SDL_net/
+* SDL_ttf           http://www.libsdl.org/projects/SDL_ttf/
 * Guichan 0.8.x     http://guichan.sourceforge.net/
 * libxml2           http://www.xmlsoft.org/
 * physfs 1.0.x      http://icculus.org/physfs/
diff --git a/configure.ac b/configure.ac
index ac227410..4424d152 100755
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,9 @@ AC_CHECK_LIB(SDL_image, IMG_LoadPNG_RW, ,
 AC_MSG_ERROR([ *** Unable to find SDL_image library with PNG support
 (http://www.libsdl.org/projects/SDL_image/)]))
 
+AC_CHECK_LIB(SDL_ttf, TTF_Quit, ,
+AC_MSG_ERROR([ *** Unable to find SDL_ttf library (http://www.libsdl.org/projects/SDL_ttf/)]))
+
 AC_CHECK_LIB([SDL_mixer], [Mix_OpenAudio], ,
 AC_MSG_ERROR([ *** Unable to find SDL_mixer library (http://www.libsdl.org/projects/SDL_mixer/)]))
 
@@ -86,7 +89,7 @@ fi
 AC_PATH_PROG(LIBSDL_CONFIG, sdl-config)
 
 if test -n "$LIBSDL_CONFIG"; then
-  LIBSDL_LIBS="`$LIBSDL_CONFIG --libs` -lSDL_image -lSDL_mixer"
+  LIBSDL_LIBS="`$LIBSDL_CONFIG --libs` -lSDL_image -lSDL_mixer -lSDL_ttf"
   LIBSDL_CFLAGS="`$LIBSDL_CONFIG --cflags`"
   AC_SUBST(LIBSDL_LIBS)
   AC_SUBST(LIBSDL_CFLAGS)
@@ -103,6 +106,7 @@ AC_CONFIG_FILES([
 Makefile
 src/Makefile
 data/Makefile
+data/fonts/Makefile
 data/graphics/Makefile
 data/graphics/gui/Makefile
 data/graphics/images/Makefile
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 3c482b49..4aa0cdd5 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,5 +1,6 @@
 SET(DATA_DIR ${PKG_DATADIR}/data)
 
+ADD_SUBDIRECTORY(fonts)
 ADD_SUBDIRECTORY(graphics)
 ADD_SUBDIRECTORY(help)
 ADD_SUBDIRECTORY(icons)
diff --git a/data/Makefile.am b/data/Makefile.am
index 508e6e0e..44f795ef 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
 
-SUBDIRS = graphics help icons
+SUBDIRS = fonts graphics help icons
 
 aethyradatadir = $(pkgdatadir)/data
diff --git a/data/fonts/CMakeLists.txt b/data/fonts/CMakeLists.txt
new file mode 100644
index 00000000..8393b923
--- /dev/null
+++ b/data/fonts/CMakeLists.txt
@@ -0,0 +1,5 @@
+SET (FILES
+    dejavusans.ttf
+    )
+
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/fonts)
diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am
new file mode 100644
index 00000000..1384818c
--- /dev/null
+++ b/data/fonts/Makefile.am
@@ -0,0 +1,8 @@
+
+fontdir = $(pkgdatadir)/data/fonts
+
+font_DATA =				\
+	dejavusans.ttf
+
+EXTRA_DIST =				\
+	$(font_DATA)
diff --git a/data/fonts/dejavusans.ttf b/data/fonts/dejavusans.ttf
new file mode 100644
index 00000000..627cef46
Binary files /dev/null and b/data/fonts/dejavusans.ttf differ
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fea11c55..a7735e41 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -338,6 +338,8 @@ SET(SRCS
     player_relations.cpp
     player_relations.h
     properties.h
+    sdltruetypefont.cpp
+    sdltruetypefont.hpp
     serverinfo.h
     shopitem.cpp
     shopitem.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 5f168dda..f6b343f6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -74,6 +74,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/npc_text.h \
 	      gui/ok_dialog.cpp \
 	      gui/ok_dialog.h \
+	      gui/truetypefont.cpp \
+	      gui/truetypefont.h \
 	      gui/passwordfield.cpp \
 	      gui/passwordfield.h \
 	      gui/playerbox.cpp \
@@ -301,6 +303,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      properties.h \
               recorder.cpp \
               recorder.h \
+	      sdltruetypefont.cpp \
+	      sdltruetypefont.h \
 	      serverinfo.h \
 	      shopitem.cpp \
 	      shopitem.h \
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 430a2aa2..18acfa6a 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -29,13 +29,7 @@
 #include "colour.h"
 #include "linkhandler.h"
 
-#ifdef USE_OPENGL
-#include "../configuration.h"
-#include "../resources/resourcemanager.h"
-
-int BrowserBox::instances = 0;
-gcn::ImageFont* BrowserBox::browserFont = NULL;
-#endif
+#include "../sdltruetypefont.hpp"
 
 BrowserBox::BrowserBox(unsigned int mode):
     gcn::Widget(),
@@ -47,35 +41,10 @@ BrowserBox::BrowserBox(unsigned int mode):
 {
     setFocusable(true);
     addMouseListener(this);
-
-#ifdef USE_OPENGL
-    if (config.getValue("opengl", 0.0f)) {
-        if (instances == 0) {
-            browserFont = new gcn::ImageFont(
-                    "graphics/gui/browserfont.png",
-                    " abcdefghijklmnopqrstuvwxyz"
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZ01234567"
-                    "89:@!\"$%&/=?^+*#[]{}()<>_;'.,\\|-~`"
-                    "�������������륣�������������������");
-        }
-        setFont(browserFont);
-        instances++;
-    }
-#endif
 }
 
 BrowserBox::~BrowserBox()
 {
-#ifdef USE_OPENGL
-    instances--;
-
-    if (instances == 0)
-    {
-        // Clean up static resource font
-        delete browserFont;
-        browserFont = NULL;
-    }
-#endif
 }
 
 void BrowserBox::setLinkHandler(LinkHandler* linkHandler)
@@ -104,7 +73,7 @@ void BrowserBox::addRow(const std::string &row)
     std::string newRow;
     BROWSER_LINK bLink;
     int idx1, idx2, idx3;
-    gcn::ImageFont *font = dynamic_cast<gcn::ImageFont*>(getFont());
+    gcn::Font *font = getFont();
 
     // Use links and user defined colors
     if (mUseLinksAndUserColors)
@@ -178,7 +147,7 @@ void BrowserBox::addRow(const std::string &row)
     {
         unsigned int j, y = 0;
         unsigned int nextChar;
-        char hyphen = '~';
+        const char *hyphen = "~";
         int hyphenWidth = font->getWidth(hyphen);
         int x = 0;
 
@@ -187,7 +156,8 @@ void BrowserBox::addRow(const std::string &row)
             std::string row = *i;
             for (j = 0; j < row.size(); j++)
             {
-                x += font->getWidth(row.at(j));
+                std::string character = row.substr(j, 1);
+                x += font->getWidth(character);
                 nextChar = j + 1;
 
                 // Wraping between words (at blank spaces)
@@ -302,7 +272,7 @@ BrowserBox::draw(gcn::Graphics *graphics)
     unsigned int j;
     int x = 0, y = 0;
     int wrappedLines = 0;
-    gcn::ImageFont *font = dynamic_cast<gcn::ImageFont*>(getFont());
+    gcn::Font *font = getFont();
 
     graphics->setColor(BLACK);
     for (TextRowIterator i = mTextRows.begin(); i != mTextRows.end(); i++)
@@ -353,22 +323,24 @@ BrowserBox::draw(gcn::Graphics *graphics)
             {
                 for (x = 0; x < getWidth(); x++)
                 {
-                    font->drawGlyph(graphics, '-', x, y);
-                    x += font->getWidth('-') - 2;
+                    const std::string dash = "-";
+                    font->drawString(graphics, dash, x, y);
+                    x += font->getWidth("-") - 2;
                 }
                 break;
             }
             // Draw each char
             else
             {
-                font->drawGlyph(graphics, row.at(j), x, y);
-                x += font->getWidth(row.at(j));
+                std::string character = row.substr(j, 1);
+                font->drawString(graphics, character, x, y);
+                x += font->getWidth(character.c_str());
 
                 // Auto wrap mode
                 if (mMode == AUTO_WRAP)
                 {
                     unsigned int nextChar = j + 1;
-                    char hyphen = '~';
+                    const std::string hyphen = "~";
                     int hyphenWidth =  font->getWidth(hyphen);
 
                     // Wraping between words (at blank spaces)
@@ -395,7 +367,7 @@ BrowserBox::draw(gcn::Graphics *graphics)
                     // Wrapping looong lines (brutal force)
                     else if ((x + 2 * hyphenWidth) > getWidth())
                     {
-                        font->drawGlyph(graphics, hyphen,
+                        font->drawString(graphics, hyphen,
                                 getWidth() - hyphenWidth, y);
                         x = 15; // Ident in new line
                         y += font->getHeight();
diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h
index 267e0fea..1c1e283a 100644
--- a/src/gui/browserbox.h
+++ b/src/gui/browserbox.h
@@ -145,11 +145,6 @@ class BrowserBox : public gcn::Widget, public gcn::MouseListener
         bool mUseLinksAndUserColors;
         int mSelectedLink;
         unsigned int mMaxRows;
-
-#ifdef USE_OPENGL
-        static int instances;      /**< Number of Window instances */
-        static gcn::ImageFont* browserFont;
-#endif
 };
 
 #endif
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 70f82d9d..846a0f44 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -36,6 +36,7 @@
 #include "../configuration.h"
 #include "../graphics.h"
 #include "../log.h"
+#include "../sdltruetypefont.hpp"
 
 #include "../resources/image.h"
 #include "../resources/imageset.h"
@@ -110,26 +111,20 @@ Gui::Gui(Graphics *graphics):
     Window::setWindowContainer(guiTop);
     setTop(guiTop);
 
-    // Set global font (based on ISO-8859-15)
+    // Set global font
     try {
-        mGuiFont = new gcn::ImageFont("graphics/gui/sansserif8.png",
-                " !\"#$%&'()*+,-./"
-                "0123456789:;<=>?"
-                "@ABCDEFGHIJKLMNO"
-                "PQRSTUVWXYZ[\\]^_"
-                "`abcdefghijklmno"
-                "pqrstuvwxyz{|}~|"
-                "����������������"
-                "����������������"
-                "����������������"
-                "����������������"
-                "����������������"
-                "����������������"
-                );
+        mGuiFont = new gcn::contrib::SDLTrueTypeFont("/usr/local/share/aethyra/data/fonts/dejavusans.ttf", 10);
     }
     catch (gcn::Exception e)
     {
-        logger->error("Unable to load sansserif8.png!");
+        try {
+            mGuiFont = new gcn::contrib::SDLTrueTypeFont("data/fonts/dejavusans.ttf", 10);
+        }
+        catch (gcn::Exception e)
+        {
+        logger->error(std::string("Unable to load dejavusans.ttf: ")
+            + e.getMessage());
+        }
     }
 
     // Set speech font
@@ -142,7 +137,8 @@ Gui::Gui(Graphics *graphics):
     }
     catch (gcn::Exception e)
     {
-        logger->error("Unable to load rpgfont_wider.png!");
+        logger->error(std::string("Unable to load rpgfont_wider.png: ")
+            + e.getMessage());
     }
 
     // Set npc name font
@@ -198,7 +194,8 @@ Gui::Gui(Graphics *graphics):
     }
     catch (gcn::Exception e)
     {
-        logger->error("Unable to load colored hits' fonts!");
+        logger->error(std::string("Unable to load colored hits' fonts: ")
+                + e.getMessage());
     }
 
     // Initialize mouse cursor and listen for changes to the option
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 9e17f3da..26ca3379 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -118,6 +118,7 @@ void ItemContainer::draw(gcn::Graphics *graphics)
         }
 
         // Draw item caption
+        graphics->setColor(0x000000);
         graphics->drawText(
                 (item->isEquipped() ? "Eq." : toString(item->getQuantity())),
                 itemX + gridWidth / 2,
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index de5e1956..77657169 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -87,6 +87,7 @@ ItemShortcutContainer::draw(gcn::Graphics *graphics)
         // Draw item keyboard shortcut.
         const char *key = SDL_GetKeyName(
             (SDLKey) keyboard.getKeyValue(keyboard.KEY_SHORTCUT_0 + i));
+        graphics->setColor(0x000000);
         g->drawText(key, itemX + 2, itemY + 2, gcn::Graphics::LEFT);
 
         if (itemShortcut->getItem(i) < 0)
diff --git a/src/gui/sdltruetypefont.cpp b/src/gui/sdltruetypefont.cpp
new file mode 100644
index 00000000..ee09f64d
--- /dev/null
+++ b/src/gui/sdltruetypefont.cpp
@@ -0,0 +1,171 @@
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naess�n and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naess�n a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * For comments regarding functions please see the header file. 
+ */
+
+#include "sdltruetypefont.hpp"
+
+#include <guichan/exception.hpp>
+#include <guichan/image.hpp>
+#include <guichan/graphics.hpp>
+#include <guichan/sdl/sdlgraphics.hpp>
+
+namespace gcn
+{
+    namespace contrib
+    {
+        SDLTrueTypeFont::SDLTrueTypeFont (const std::string& filename, int size)
+        {
+            mRowSpacing = 0;
+            mGlyphSpacing = 0;
+            mAntiAlias = true;        
+            mFilename = filename;
+            mFont = NULL;
+        
+            mFont = TTF_OpenFont(filename.c_str(), size);
+        
+            if (mFont == NULL)
+            {
+                throw GCN_EXCEPTION("SDLTrueTypeFont::SDLTrueTypeFont. "+std::string(TTF_GetError()));
+            }
+        }
+    
+        SDLTrueTypeFont::~SDLTrueTypeFont()
+        {
+            TTF_CloseFont(mFont);
+        }
+  
+        int SDLTrueTypeFont::getWidth(const std::string& text) const
+        {
+            int w, h;
+            TTF_SizeText(mFont, text.c_str(), &w, &h);
+        
+            return w;
+        }
+
+        int SDLTrueTypeFont::getHeight() const
+        {
+            return TTF_FontHeight(mFont) + mRowSpacing;
+        }
+    
+        void SDLTrueTypeFont::drawString(gcn::Graphics* graphics, const std::string& text, const int x, const int y)
+        {
+            if (text == "")
+            {
+                return;
+            }
+        
+            SDLGraphics *sdlGraphics = dynamic_cast<SDLGraphics *>(graphics);
+
+            if (sdlGraphics == NULL)
+            {
+                throw GCN_EXCEPTION("SDLTrueTypeFont::drawString. Graphics object not an SDL graphics object!");
+                return;
+            }
+        
+            // This is needed for drawing the Glyph in the middle if we have spacing
+            int yoffset = getRowSpacing() / 2;
+        
+            Color col = sdlGraphics->getColor();
+
+            SDL_Color sdlCol;
+            sdlCol.b = col.b;
+            sdlCol.r = col.r;
+            sdlCol.g = col.g;
+
+            SDL_Surface *textSurface;
+            if (mAntiAlias)
+            {
+                textSurface = TTF_RenderText_Blended(mFont, text.c_str(), sdlCol);
+            }
+            else
+            {
+                textSurface = TTF_RenderText_Solid(mFont, text.c_str(), sdlCol);
+            }
+        
+            SDL_Rect dst, src;
+            dst.x = x;
+            dst.y = y + yoffset;
+            src.w = textSurface->w;
+            src.h = textSurface->h;
+            src.x = 0;
+            src.y = 0;
+        
+            sdlGraphics->drawSDLSurface(textSurface, src, dst);
+            SDL_FreeSurface(textSurface);        
+        }
+    
+        void SDLTrueTypeFont::setRowSpacing(int spacing)
+        {
+            mRowSpacing = spacing;
+        }
+
+        int SDLTrueTypeFont::getRowSpacing()
+        {
+            return mRowSpacing;
+        }
+    
+        void SDLTrueTypeFont::setGlyphSpacing(int spacing)
+        {
+            mGlyphSpacing = spacing;
+        }
+    
+        int SDLTrueTypeFont::getGlyphSpacing()
+        {
+            return mGlyphSpacing;
+        }
+
+        void SDLTrueTypeFont::setAntiAlias(bool antiAlias)
+        {
+            mAntiAlias = antiAlias;
+        }
+
+        bool SDLTrueTypeFont::isAntiAlias()
+        {
+            return mAntiAlias;        
+        }    
+    }
+}
+
diff --git a/src/gui/widgets/adjustingcontainer.cpp b/src/gui/widgets/adjustingcontainer.cpp
new file mode 100644
index 00000000..2c613fbe
--- /dev/null
+++ b/src/gui/widgets/adjustingcontainer.cpp
@@ -0,0 +1,279 @@
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2007 - 2008 Josh Matthews and Olof Naess�n
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naess�n a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * For comments regarding functions please see the header file.
+ */
+
+#include "adjustingcontainer.hpp"
+
+#include <guichan.hpp>
+
+namespace gcn
+{
+    namespace contrib
+    {
+        AdjustingContainer::AdjustingContainer()
+                : mWidth(0),
+                  mHeight(0),
+                  mNumberOfColumns(1),
+                  mNumberOfRows(1),
+                  mPaddingLeft(0),
+                  mPaddingRight(0),
+                  mPaddingTop(0),
+                  mPaddingBottom(0),
+                  mVerticalSpacing(0),
+                  mHorizontalSpacing(0)
+            
+            
+        {
+            mColumnWidths.push_back(0);
+            mRowHeights.push_back(0);
+        }
+    
+        AdjustingContainer::~AdjustingContainer()
+        {
+
+        }
+
+        void AdjustingContainer::setNumberOfColumns(unsigned int numberOfColumns)
+        {
+            mNumberOfColumns = numberOfColumns;
+        
+            if (mColumnAlignment.size() < numberOfColumns)
+            {
+                while (mColumnAlignment.size() < numberOfColumns)
+                {
+                    mColumnAlignment.push_back(LEFT);
+                }
+            }
+            else
+            {
+                while (mColumnAlignment.size() >  numberOfColumns)
+                {
+                    mColumnAlignment.pop_back();
+                }
+            }
+        }
+
+        void AdjustingContainer::setColumnAlignment(unsigned int column,
+                                                    unsigned int alignment)
+        {
+            if (column < mColumnAlignment.size())
+            {
+                mColumnAlignment[column] = alignment;
+            }
+        }
+
+        void AdjustingContainer::setPadding(unsigned int paddingLeft,
+                                            unsigned int paddingRight,
+                                            unsigned int paddingTop,
+                                            unsigned int paddingBottom)
+        {
+            mPaddingLeft = paddingLeft;
+            mPaddingRight = paddingRight;
+            mPaddingTop = paddingTop;
+            mPaddingBottom = paddingBottom;
+        }
+
+        void AdjustingContainer::setVerticalSpacing(unsigned int verticalSpacing)
+        {
+            mVerticalSpacing = verticalSpacing;
+        }
+
+        void AdjustingContainer::setHorizontalSpacing(unsigned int horizontalSpacing)
+        {
+            mHorizontalSpacing = horizontalSpacing;
+        }
+
+        void AdjustingContainer::logic()
+        {
+            Container::logic();
+            adjustContent();
+        }
+    
+        void AdjustingContainer::add(Widget *widget)
+        {
+            Container::add(widget);
+            mContainedWidgets.push_back(widget);
+        }
+    
+        void AdjustingContainer::add(Widget *widget, int x, int y)
+        {
+            add(widget);
+        }
+    
+        void AdjustingContainer::clear()
+        {
+            Container::clear();
+            mContainedWidgets.clear();
+        }
+
+        void AdjustingContainer::remove(Widget *widget)
+        {
+            Container::remove(widget);
+            std::vector<gcn::Widget *>::iterator it;
+            for(it = mContainedWidgets.begin(); it != mContainedWidgets.end(); it++)
+            {
+                if(*it == widget)
+                {
+                    mContainedWidgets.erase(it);
+                    break;
+                }
+            }
+        }
+
+        void AdjustingContainer::adjustSize()
+        {
+            mNumberOfRows = mContainedWidgets.size()
+            / mNumberOfColumns + mContainedWidgets.size() % mNumberOfColumns;
+
+            mColumnWidths.clear();
+
+            unsigned int i;
+            for (i = 0; i < mNumberOfColumns; i++)
+            {
+                mColumnWidths.push_back(0);
+            }
+        
+            mRowHeights.clear();
+
+            for (i = 0; i < mNumberOfRows; i++)
+            {
+                mRowHeights.push_back(0);
+            }
+
+            for (i = 0; i < mNumberOfColumns; i++)
+            {
+                unsigned int j;
+                for (j = 0; j < mNumberOfRows && mNumberOfColumns * j + i < mContainedWidgets.size(); j++)
+                {
+                    if ((unsigned int)mContainedWidgets[mNumberOfColumns * j + i]->getWidth() > mColumnWidths[i])
+                    {
+                        mColumnWidths[i] = mContainedWidgets[mNumberOfColumns * j + i]->getWidth();
+                    }
+                    if ((unsigned int)mContainedWidgets[mNumberOfColumns * j + i]->getHeight() > mRowHeights[j])
+                    {
+                        mRowHeights[j] = mContainedWidgets[mNumberOfColumns * j + i]->getHeight();
+                    }
+                }
+            }
+
+            mWidth = mPaddingLeft;
+
+            for (i = 0; i < mColumnWidths.size(); i++)
+            {
+                mWidth += mColumnWidths[i] + mHorizontalSpacing;
+            }
+
+            mWidth -= mHorizontalSpacing;
+            mWidth += mPaddingRight;
+
+            mHeight = mPaddingTop;
+
+            for (i = 0; i < mRowHeights.size(); i++)
+            {
+                mHeight += mRowHeights[i] + mVerticalSpacing;
+            }
+        
+            mHeight -= mVerticalSpacing;
+            mHeight += mPaddingBottom;
+
+            setHeight(mHeight);
+            setWidth(mWidth);
+        }
+
+        void AdjustingContainer::adjustContent()
+        {
+            adjustSize();
+
+            unsigned int columnCount = 0;
+            unsigned int rowCount = 0;
+            unsigned int y = mPaddingTop;
+
+            for (unsigned int i = 0; i < mContainedWidgets.size(); i++)
+            {
+                unsigned  basex;
+                if (columnCount % mNumberOfColumns)
+                {
+                    basex = mPaddingLeft;
+                    unsigned int j;
+
+                    for (j = 0; j < columnCount; j++)
+                    {
+                        basex += mColumnWidths[j] + mHorizontalSpacing;
+                    }
+                }
+                else
+                {
+                    basex = mPaddingLeft;
+                }
+
+                switch (mColumnAlignment[columnCount])
+                {
+                    case LEFT:
+                        mContainedWidgets[i]->setX(basex);
+                        break;
+                    case CENTER:
+                        mContainedWidgets[i]->setX(basex + (mColumnWidths[columnCount] - mContainedWidgets[i]->getWidth()) / 2);
+                        break;
+                    case RIGHT:
+                        mContainedWidgets[i]->setX(basex + mColumnWidths[columnCount] - mContainedWidgets[i]->getWidth());
+                        break;
+                    default:
+                        throw GCN_EXCEPTION("Unknown alignment.");
+                }
+
+                mContainedWidgets[i]->setY(y);
+                columnCount++;
+
+                if (columnCount == mNumberOfColumns)
+                {
+                    columnCount = 0;
+                    y += mRowHeights[rowCount] + mVerticalSpacing;
+                    rowCount++;
+                }
+            }
+        }
+    }
+}
diff --git a/src/gui/widgets/adjustingcontainer.hpp b/src/gui/widgets/adjustingcontainer.hpp
new file mode 100644
index 00000000..3227274e
--- /dev/null
+++ b/src/gui/widgets/adjustingcontainer.hpp
@@ -0,0 +1,235 @@
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2007 - 2008 Josh Matthews and Olof Naess�n
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naess�n a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GCN_CONTRIB_ADJUSTINGCONTAINER_HPP
+#define GCN_CONTRIB_ADJUSTINGCONTAINER_HPP
+
+#include <vector>
+
+namespace gcn
+{
+    namespace contrib
+    {
+        /**
+         * Self-adjusting Container class. AdjustingContainers are an easy way to
+         * have Guichan position a group of widgets for you. It organizes elements
+         * in a table layout, with fixed columns and variable rows.  The user specifies
+         *
+         * @verbitam
+         * <ul>
+         *   <li>the number of columns</li>
+         *   <li>horizontal spacing between columns</li>
+         *   <li>vertical spacing between rows</li>
+         *   <li>padding around the sides of the container</li>
+         *   <li>each column's alignment</li>
+         * </ul>
+         * @endverbitam
+         *
+         * These properties give the user a lot of flexibility to make the
+         * widgets look just right.
+         * @code
+         * AdjustingContainer *adjust = new AdjustingContainer;
+         * adjust->setPadding(5, 5, 5, 5); //left, right, top, bottom
+         * adjust->setHorizontalSpacing(3);
+         * adjust->setVerticalSpacing(3);
+         * adjust->setColumns(3);
+         * adjust->setColumnAlignment(0, AdjustingContainer::LEFT);
+         * adjust->setColumnAlignment(1, AdjustingContainer::CENTER);
+         * adjust->setColumnAlignment(2, AdjustingContainer::RIGHT);
+         * top->add(adjust);
+         *
+         * for(int j = 0; j < 9; j++)
+         * {
+         *   gcn::Label *l;
+         *   int r = rand() % 3;
+         *   if(r == 0)
+         *     l = new gcn::Label("Short");
+         *   else if(r == 1)
+         *     l = new gcn::Label("A longer phrase");
+         *   else
+         *     l = new gcn::Label("Extravagent and wordy text");
+         *   adjust->add(l);
+         * @endcode
+         *
+         * Output:
+         * @verbitam
+         * <pre>
+         *+---------------------------------------------------------------------------+
+         *|                                                                           |
+         *| A longer phrase              Short             Extravagent and wordy text |
+         *|                                                                           |
+         *| Short             Extravagent and wordy text                        Short |
+         *|                                                                           |
+         *| Short                   A longer phrase                   A longer phrase |
+         *|                                                                           |
+         *+---------------------------------------------------------------------------+
+         * </pre>
+         * @endverbitam
+         * As you can see, each column is only as big as its largest element.
+         * The AdjustingContainer will resize itself and rearrange its contents
+         * based on whatever widgets it contains, allowing dynamic addition and
+         * removal while the program is running.  It also plays nicely with ScrollAreas,
+         * allowing you to show a fixed, maximum size while not limiting the actual
+         * container.
+         *
+         * For more help with using AdjustingContainers, try the Guichan forums
+         * (http://guichan.sourceforge.net/forum/) or email mrlachatte@gmail.com.
+         *
+         * @author Josh Matthews
+         */
+        class AdjustingContainer : public gcn::Container
+        {
+        public:
+            /**
+             * Constructor.
+             */
+            AdjustingContainer();
+        
+            /**
+             * Destructor.
+             */
+            virtual ~AdjustingContainer();
+        
+            /**
+             * Set the number of columns to divide the widgets into.
+             * The number of rows is derived automatically from the number
+             * of widgets based on the number of columns.  Default column
+             * alignment is left.
+             *
+             * @param numberOfColumns the number of columns.
+             */
+            virtual void setNumberOfColumns(unsigned int numberOfColumns);
+        
+            /**
+             * Set a specific column's alignment.
+             *
+             * @param column the column number, starting from 0.
+             * @param alignment the column's alignment. See enum with alignments.
+             */
+            virtual void setColumnAlignment(unsigned int column, unsigned int alignment);
+        
+            /**
+             * Set the padding for the sides of the container.
+             *
+             * @param paddingLeft left padding.
+             * @param paddingRight right padding.
+             * @param paddingTop top padding.
+             * @param paddingBottom bottom padding.
+             */
+            virtual void setPadding(unsigned int paddingLeft,
+                                    unsigned int paddingRight,
+                                    unsigned int paddingTop,
+                                    unsigned int paddingBottom);
+        
+            /**
+             * Set the spacing between rows.
+             *
+             * @param verticalSpacing spacing in pixels.
+             */
+            virtual void setVerticalSpacing(unsigned int verticalSpacing);
+        
+            /**
+             * Set the horizontal spacing between columns.
+             *
+             * @param horizontalSpacing spacing in pixels.
+             */
+            virtual void setHorizontalSpacing(unsigned int horizontalSpacing);
+        
+            /**
+             * Rearrange the widgets and resize the container.
+             */
+            virtual void adjustContent();
+
+
+            // Inherited from Container
+
+            virtual void logic();
+        
+            virtual void add(Widget *widget);
+
+            virtual void add(Widget *widget, int x, int y);
+
+            virtual void remove(Widget *widget);
+
+            virtual void clear();
+               
+            /**
+             * Possible alignment values for each column.
+             *
+             * LEFT   - Align content to the left of the column.
+             * MIDDLE - Align content to the middle of the column.
+             * RIGHT  - Align content to the right of the column.
+             */
+            enum
+            {
+                LEFT = 0,
+                CENTER,
+                RIGHT
+            };
+
+        protected:
+        
+            /**
+             * Adjust the size of the container to fit all the widgets.
+             */
+            virtual void adjustSize();
+
+            std::vector<Widget*> mContainedWidgets;
+            std::vector<unsigned int> mColumnWidths;
+            std::vector<unsigned int> mColumnAlignment;
+            std::vector<unsigned int> mRowHeights;
+            unsigned int mWidth;
+            unsigned int mHeight;
+            unsigned int mNumberOfColumns;
+            unsigned int mNumberOfRows;
+            unsigned int mPaddingLeft;
+            unsigned int mPaddingRight;
+            unsigned int mPaddingTop;
+            unsigned int mPaddingBottom;
+            unsigned int mVerticalSpacing;
+            unsigned int mHorizontalSpacing;
+        };
+    }
+}
+
+#endif
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index cdace3ae..dee5832a 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -177,6 +177,7 @@ void Window::draw(gcn::Graphics *graphics)
     // Draw title
     if (mShowTitle)
     {
+        g->setColor(gcn::Color(0, 0, 0));
         g->setFont(getFont());
         g->drawText(getCaption(), 7, 5, gcn::Graphics::LEFT);
     }
diff --git a/src/main.cpp b/src/main.cpp
index 818a4e32..12789d80 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -34,6 +34,8 @@
 
 #include <libxml/parser.h>
 
+#include <SDL/SDL_ttf.h>
+
 #include "configuration.h"
 #include "game.h"
 #include "graphics.h"
@@ -399,6 +401,7 @@ void init_engine(const Options &options)
     // Initialize the item shortcuts.
     itemShortcut = new ItemShortcut();
 
+    TTF_Init();
     gui = new Gui(graphics);
     state = LOGIN_STATE; /**< Initial game state */
 
@@ -1052,6 +1055,7 @@ int main(int argc, char *argv[])
 
     delete network;
     SDLNet_Quit();
+    TTF_Quit();
 
     if (nullFile)
     {
diff --git a/src/sdltruetypefont.cpp b/src/sdltruetypefont.cpp
new file mode 100644
index 00000000..937d2d63
--- /dev/null
+++ b/src/sdltruetypefont.cpp
@@ -0,0 +1,171 @@
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naess�n and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naess�n a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * For comments regarding functions please see the header file. 
+ */
+
+#include "sdltruetypefont.hpp"
+
+#include <guichan/exception.hpp>
+#include <guichan/image.hpp>
+#include <guichan/graphics.hpp>
+#include <guichan/sdl/sdlgraphics.hpp>
+
+namespace gcn
+{
+    namespace contrib
+    {
+        SDLTrueTypeFont::SDLTrueTypeFont (const std::string& filename, int size)
+        {
+            mRowSpacing = 0;
+            mGlyphSpacing = 0;
+            mAntiAlias = true;        
+            mFilename = filename;
+            mFont = NULL;
+        
+            mFont = TTF_OpenFont(filename.c_str(), size);
+        
+            if (mFont == NULL)
+            {
+                throw GCN_EXCEPTION("SDLTrueTypeFont::SDLTrueTypeFont. "+std::string(TTF_GetError()));
+            }
+        }
+    
+        SDLTrueTypeFont::~SDLTrueTypeFont()
+        {
+            TTF_CloseFont(mFont);
+        }
+  
+        int SDLTrueTypeFont::getWidth(const std::string& text) const
+        {
+            int w, h;
+            TTF_SizeText(mFont, text.c_str(), &w, &h);
+        
+            return w;
+        }
+
+        int SDLTrueTypeFont::getHeight() const
+        {
+            return TTF_FontHeight(mFont) + mRowSpacing;
+        }
+    
+        void SDLTrueTypeFont::drawString(Graphics* graphics, const std::string& text, const int x, const int y)
+        {
+            if (text == "")
+            {
+                return;
+            }
+        
+            SDLGraphics *sdlGraphics = dynamic_cast<SDLGraphics *>(graphics);
+
+            if (sdlGraphics == NULL)
+            {
+                throw GCN_EXCEPTION("SDLTrueTypeFont::drawString. Graphics object not an SDL graphics object!");
+                return;
+            }
+        
+            // This is needed for drawing the Glyph in the middle if we have spacing
+            int yoffset = getRowSpacing() / 2;
+        
+            Color col = sdlGraphics->getColor();
+
+            SDL_Color sdlCol;
+            sdlCol.b = col.b;
+            sdlCol.r = col.r;
+            sdlCol.g = col.g;
+
+            SDL_Surface *textSurface;
+            if (mAntiAlias)
+            {
+                textSurface = TTF_RenderText_Blended(mFont, text.c_str(), sdlCol);
+            }
+            else
+            {
+                textSurface = TTF_RenderText_Solid(mFont, text.c_str(), sdlCol);
+            }
+        
+            SDL_Rect dst, src;
+            dst.x = x;
+            dst.y = y + yoffset;
+            src.w = textSurface->w;
+            src.h = textSurface->h;
+            src.x = 0;
+            src.y = 0;
+        
+            sdlGraphics->drawSDLSurface(textSurface, src, dst);
+            SDL_FreeSurface(textSurface);        
+        }
+    
+        void SDLTrueTypeFont::setRowSpacing(int spacing)
+        {
+            mRowSpacing = spacing;
+        }
+
+        int SDLTrueTypeFont::getRowSpacing()
+        {
+            return mRowSpacing;
+        }
+    
+        void SDLTrueTypeFont::setGlyphSpacing(int spacing)
+        {
+            mGlyphSpacing = spacing;
+        }
+    
+        int SDLTrueTypeFont::getGlyphSpacing()
+        {
+            return mGlyphSpacing;
+        }
+
+        void SDLTrueTypeFont::setAntiAlias(bool antiAlias)
+        {
+            mAntiAlias = antiAlias;
+        }
+
+        bool SDLTrueTypeFont::isAntiAlias()
+        {
+            return mAntiAlias;        
+        }    
+    }
+}
+
diff --git a/src/sdltruetypefont.hpp b/src/sdltruetypefont.hpp
new file mode 100644
index 00000000..7a1dd658
--- /dev/null
+++ b/src/sdltruetypefont.hpp
@@ -0,0 +1,157 @@
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naess�n and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naess�n a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GCN_CONTRIB_SDLTRUETYPEFONT_HPP
+#define GCN_CONTRIB_SDLTRUETYPEFONT_HPP
+
+#include <map>
+#include <string>
+
+#include <SDL/SDL_ttf.h>
+
+#include <guichan/font.hpp>
+#include <guichan/platform.hpp>
+
+namespace gcn
+{
+    class Graphics;
+
+    namespace contrib
+    {
+        
+        /**
+         * SDL True Type Font implementation of Font. It uses the SDL_ttf library
+         * to display True Type Fonts with SDL.
+         *
+         * NOTE: You must initialize the SDL_ttf library before using this
+         *       class. Also, remember to call the SDL_ttf libraries quit
+         *       function.
+         *
+         * @author Walluce Pinkham
+         * @author Olof Naess�n
+         */
+        class GCN_EXTENSION_DECLSPEC SDLTrueTypeFont: public Font
+        {
+        public:
+
+            /**
+             * Constructor.
+             *     
+             * @param filename the filename of the True Type Font.
+             * @param size the size the font should be in.
+             */
+            SDLTrueTypeFont (const std::string& filename, int size);
+
+            /**
+             * Destructor.
+             */
+            virtual ~SDLTrueTypeFont();
+      
+            /**
+             * Sets the spacing between rows in pixels. Default is 0 pixels.
+             * The spacing can be negative.
+             *
+             * @param spacing the spacing in pixels.
+             */
+            virtual void setRowSpacing (int spacing);
+      
+            /**
+             * Gets the spacing between rows in pixels.
+             *
+             * @return the spacing.
+             */
+            virtual int getRowSpacing();
+      
+            /**
+             * Sets the spacing between letters in pixels. Default is 0 pixels.
+             * The spacing can be negative.
+             *
+             * @param spacing the spacing in pixels.
+             */
+            virtual void setGlyphSpacing(int spacing);
+
+            /**
+             * Gets the spacing between letters in pixels.
+             *
+             * @return the spacing.
+             */
+            virtual int getGlyphSpacing();
+      
+            /**
+             * Sets the use of anti aliasing..
+             *
+             * @param antaAlias true for use of antia aliasing.
+             */
+            virtual void setAntiAlias(bool antiAlias);
+      
+            /**
+             * Checks if anti aliasing is used.
+             *
+             * @return true if anti aliasing is used.
+             */
+            virtual bool isAntiAlias();
+      
+        
+            // Inherited from Font
+      
+            virtual int getWidth(const std::string& text) const;
+      
+            virtual int getHeight() const;        
+      
+            virtual void drawString(gcn::Graphics* graphics, const std::string& text, int x, int y);
+      
+        protected:
+            TTF_Font *mFont;
+      
+            int mHeight;
+            int mGlyphSpacing;
+            int mRowSpacing;
+      
+            std::string mFilename;
+            bool mAntiAlias;      
+        }; 
+    }
+}
+
+#endif
+
-- 
cgit v1.2.3-70-g09d2


From d30b083dba49dd12a9740fc892b74bc60fbd42dc Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 29 Dec 2008 14:18:28 -0700
Subject: Removed a few now unnecessary data files.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 data/graphics/gui/CMakeLists.txt  |   3 ---
 data/graphics/gui/Makefile.am     |   3 ---
 data/graphics/gui/browserfont.png | Bin 1846 -> 0 bytes
 data/graphics/gui/fixedfont.png   | Bin 1895 -> 0 bytes
 data/graphics/gui/sansserif8.png  | Bin 2134 -> 0 bytes
 5 files changed, 6 deletions(-)
 delete mode 100644 data/graphics/gui/browserfont.png
 delete mode 100644 data/graphics/gui/fixedfont.png
 delete mode 100644 data/graphics/gui/sansserif8.png

diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 0ad4bd13..71031113 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -1,6 +1,5 @@
 SET (FILES
     bg_quad_dis.png
-    browserfont.png
     button.png
     button_disabled.png
     buttonhi.png
@@ -9,7 +8,6 @@ SET (FILES
     close_button.png
     deepbox.png
     default.png
-    fixedfont.png
     gui.xml
     hits_blue.png
     hits_red.png
@@ -31,7 +29,6 @@ SET (FILES
     resize.png
     rpgfont_wider.png
     selection.png
-    sansserif8.png
     slider.png
     speech_bubble.png
     speech_bubble.xml
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index f2abf035..32028bfd 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -3,7 +3,6 @@ guidir = $(pkgdatadir)/data/graphics/gui
 
 gui_DATA =				\
 	bg_quad_dis.png			\
-	browserfont.png			\
 	button.png			\
 	button_disabled.png		\
 	buttonhi.png			\
@@ -13,7 +12,6 @@ gui_DATA =				\
 	deepbox.png			\
 	default.png			\
 	emotions.png			\
-	fixedfont.png			\
 	gui.xml				\
 	hits_blue.png			\
 	hits_red.png			\
@@ -38,7 +36,6 @@ gui_DATA =				\
     rpgfont_wider-green.png	\
     rpgfont_wider-orange.png	\
 	selection.png			\
-	sansserif8.png			\
 	slider.png			\
 	speech_bubble.png		\
 	speechbubble.xml		\
diff --git a/data/graphics/gui/browserfont.png b/data/graphics/gui/browserfont.png
deleted file mode 100644
index 431777c5..00000000
Binary files a/data/graphics/gui/browserfont.png and /dev/null differ
diff --git a/data/graphics/gui/fixedfont.png b/data/graphics/gui/fixedfont.png
deleted file mode 100644
index 10319291..00000000
Binary files a/data/graphics/gui/fixedfont.png and /dev/null differ
diff --git a/data/graphics/gui/sansserif8.png b/data/graphics/gui/sansserif8.png
deleted file mode 100644
index a4738548..00000000
Binary files a/data/graphics/gui/sansserif8.png and /dev/null differ
-- 
cgit v1.2.3-70-g09d2


From e460949ae081fc953b429ad1b5305b29c7f2d34b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 29 Dec 2008 15:53:46 -0700
Subject: Removed TMW's truetype file, since we don't use it (accidentaly left
 it in) Signed-off-by: Ira Rice <irarice@gmail.com>

---
 src/Makefile.am | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index f6b343f6..658f3a10 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -74,8 +74,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/npc_text.h \
 	      gui/ok_dialog.cpp \
 	      gui/ok_dialog.h \
-	      gui/truetypefont.cpp \
-	      gui/truetypefont.h \
 	      gui/passwordfield.cpp \
 	      gui/passwordfield.h \
 	      gui/playerbox.cpp \
-- 
cgit v1.2.3-70-g09d2


From bf8206da2b59f3703392063e59de9f556d3b74ae Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 29 Dec 2008 15:56:03 -0700
Subject: Removed a duplicate file that was overlooked. Signed-off-by: Ira Rice
 <irarice@gmail.com>

---
 src/gui/sdltruetypefont.cpp | 171 --------------------------------------------
 1 file changed, 171 deletions(-)
 delete mode 100644 src/gui/sdltruetypefont.cpp

diff --git a/src/gui/sdltruetypefont.cpp b/src/gui/sdltruetypefont.cpp
deleted file mode 100644
index ee09f64d..00000000
--- a/src/gui/sdltruetypefont.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naess�n and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naess�n a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file. 
- */
-
-#include "sdltruetypefont.hpp"
-
-#include <guichan/exception.hpp>
-#include <guichan/image.hpp>
-#include <guichan/graphics.hpp>
-#include <guichan/sdl/sdlgraphics.hpp>
-
-namespace gcn
-{
-    namespace contrib
-    {
-        SDLTrueTypeFont::SDLTrueTypeFont (const std::string& filename, int size)
-        {
-            mRowSpacing = 0;
-            mGlyphSpacing = 0;
-            mAntiAlias = true;        
-            mFilename = filename;
-            mFont = NULL;
-        
-            mFont = TTF_OpenFont(filename.c_str(), size);
-        
-            if (mFont == NULL)
-            {
-                throw GCN_EXCEPTION("SDLTrueTypeFont::SDLTrueTypeFont. "+std::string(TTF_GetError()));
-            }
-        }
-    
-        SDLTrueTypeFont::~SDLTrueTypeFont()
-        {
-            TTF_CloseFont(mFont);
-        }
-  
-        int SDLTrueTypeFont::getWidth(const std::string& text) const
-        {
-            int w, h;
-            TTF_SizeText(mFont, text.c_str(), &w, &h);
-        
-            return w;
-        }
-
-        int SDLTrueTypeFont::getHeight() const
-        {
-            return TTF_FontHeight(mFont) + mRowSpacing;
-        }
-    
-        void SDLTrueTypeFont::drawString(gcn::Graphics* graphics, const std::string& text, const int x, const int y)
-        {
-            if (text == "")
-            {
-                return;
-            }
-        
-            SDLGraphics *sdlGraphics = dynamic_cast<SDLGraphics *>(graphics);
-
-            if (sdlGraphics == NULL)
-            {
-                throw GCN_EXCEPTION("SDLTrueTypeFont::drawString. Graphics object not an SDL graphics object!");
-                return;
-            }
-        
-            // This is needed for drawing the Glyph in the middle if we have spacing
-            int yoffset = getRowSpacing() / 2;
-        
-            Color col = sdlGraphics->getColor();
-
-            SDL_Color sdlCol;
-            sdlCol.b = col.b;
-            sdlCol.r = col.r;
-            sdlCol.g = col.g;
-
-            SDL_Surface *textSurface;
-            if (mAntiAlias)
-            {
-                textSurface = TTF_RenderText_Blended(mFont, text.c_str(), sdlCol);
-            }
-            else
-            {
-                textSurface = TTF_RenderText_Solid(mFont, text.c_str(), sdlCol);
-            }
-        
-            SDL_Rect dst, src;
-            dst.x = x;
-            dst.y = y + yoffset;
-            src.w = textSurface->w;
-            src.h = textSurface->h;
-            src.x = 0;
-            src.y = 0;
-        
-            sdlGraphics->drawSDLSurface(textSurface, src, dst);
-            SDL_FreeSurface(textSurface);        
-        }
-    
-        void SDLTrueTypeFont::setRowSpacing(int spacing)
-        {
-            mRowSpacing = spacing;
-        }
-
-        int SDLTrueTypeFont::getRowSpacing()
-        {
-            return mRowSpacing;
-        }
-    
-        void SDLTrueTypeFont::setGlyphSpacing(int spacing)
-        {
-            mGlyphSpacing = spacing;
-        }
-    
-        int SDLTrueTypeFont::getGlyphSpacing()
-        {
-            return mGlyphSpacing;
-        }
-
-        void SDLTrueTypeFont::setAntiAlias(bool antiAlias)
-        {
-            mAntiAlias = antiAlias;
-        }
-
-        bool SDLTrueTypeFont::isAntiAlias()
-        {
-            return mAntiAlias;        
-        }    
-    }
-}
-
-- 
cgit v1.2.3-70-g09d2


From 5576b9efc3f9fe63ecebeaa63d1e5951a3d8d2cf Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 29 Dec 2008 19:11:45 -0700
Subject: Fixed a video resolution switching crash.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/graphics.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/graphics.cpp b/src/graphics.cpp
index 4854d5fa..784e6e77 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -59,7 +59,6 @@ bool Graphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel)
         displayFlags |= SDL_SWSURFACE;
     }
 
-    delete mScreen;
     mScreen = SDL_SetVideoMode(w, h, bpp, displayFlags);
 
     if (!mScreen) {
-- 
cgit v1.2.3-70-g09d2


From da857b4386d53bed713871f31f1b4e6b0851373f Mon Sep 17 00:00:00 2001
From: Forge <jgrimbert@free.fr>
Date: Thu, 1 Jan 2009 21:04:00 +0100
Subject: Customisable shortkey for smiley (defaulting to keypad 0-9/*) First
 step to more smileys... Fully functionnal, very minor modifications
 Provisions made for second step (windows for choosing smiley)

Signed-off-by: Forge <jgrimbert@free.fr>
---
 src/game.cpp           | 74 ++++++++++++++++++++++++++++++++------------------
 src/keyboardconfig.cpp | 16 ++++++++++-
 src/keyboardconfig.h   | 14 ++++++++++
 3 files changed, 77 insertions(+), 27 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index a108b9e0..1b84833c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -541,32 +541,54 @@ void Game::handleInput()
 
         // Smilie
         if (keyboard.isKeyActive(keyboard.KEY_SMILIE))
-        {
-            // Emotions
-            Uint8 emotion;
-            switch (event.key.keysym.sym)
-            {
-                case SDLK_1: emotion = 1; break;
-                case SDLK_2: emotion = 2; break;
-                case SDLK_3: emotion = 3; break;
-                case SDLK_4: emotion = 4; break;
-                case SDLK_5: emotion = 5; break;
-                case SDLK_6: emotion = 6; break;
-                case SDLK_7: emotion = 7; break;
-                case SDLK_8: emotion = 8; break;
-                case SDLK_9: emotion = 9; break;
-                case SDLK_0: emotion = 10; break;
-                case SDLK_MINUS: emotion = 11; break;
-                case SDLK_EQUALS: emotion = 12; break;
-                default: emotion = 0; break;
-            }
-
-            if (emotion)
-            {
-                player_node->emote(emotion);
-                used = true;
-            }
-        }
+		{
+			// Emotions
+			Uint8 emotion;
+			/** 
+			 *
+			 * Might be simpler to perform as follow
+			 * emotion=0;
+			 * const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
+			 * if ((tKey <=KeyboardConfig::KEY_SMILEY_12)
+			 *     &&(tKey >=KeyboardConfig::KEY_SMILEY_1)
+			 *     )
+			 * {
+			 *    emotion= 1+tKey-KeyboardConfig::KEY_SMILEY_1;
+			 * }
+			 *
+			 * But this add constraints over KEY_SMILEY_* allocation 
+			 * (ordering, consecutive positive values)
+			 * Old story... compiler optimisation 
+			 * or code complexity for update, which one is better ?
+			 * I won't rely on enum allocation, let's keep the switch, 
+			 * it does not add such undocumented constraints on that enum.
+			 *
+			 * Speed consideration ? not even sure!
+			 */
+			const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
+			switch (tKey)
+			{
+				case KeyboardConfig::KEY_SMILEY_1: emotion = 1; break;
+				case KeyboardConfig::KEY_SMILEY_2: emotion = 2; break;
+				case KeyboardConfig::KEY_SMILEY_3: emotion = 3; break;
+				case KeyboardConfig::KEY_SMILEY_4: emotion = 4; break;
+				case KeyboardConfig::KEY_SMILEY_5: emotion = 5; break;
+				case KeyboardConfig::KEY_SMILEY_6: emotion = 6; break;
+				case KeyboardConfig::KEY_SMILEY_7: emotion = 7; break;
+				case KeyboardConfig::KEY_SMILEY_8: emotion = 8; break;
+				case KeyboardConfig::KEY_SMILEY_9: emotion = 9; break;
+				case KeyboardConfig::KEY_SMILEY_10: emotion = 10; break;
+				case KeyboardConfig::KEY_SMILEY_11: emotion = 11; break;
+				case KeyboardConfig::KEY_SMILEY_12: emotion = 12; break;
+				default: emotion = 0; break;
+			}
+
+			if (emotion)
+			{
+				player_node->emote(emotion);
+				used = true;
+			}
+		}
         switch (event.key.keysym.sym)
         {
             case SDLK_PAGEUP:
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index ea40ff38..d23410bd 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -68,7 +68,21 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
     {"keyWindowChat", SDLK_F7, "Chat Window"},
     {"keyWindowShortcut", SDLK_F8, "Item Shortcut Window"},
     {"keyWindowSetup", SDLK_F9, "Setup Window"},
-    {"keyWindowDebug", SDLK_F10, "Debug Window"}
+    {"keyWindowDebug", SDLK_F10, "Debug Window"},
+    {"keyWindowSmileyList", SDLK_F11, "Smiley List Window"},
+    {"keyWindowSmileyBar", SDLK_F12, "Smiley Shortcut Window"},
+    {"keySmileyShortcut1", SDLK_KP1, "Smiley Shortcut 1"},
+    {"keySmileyShortcut2", SDLK_KP2, "Smiley Shortcut 2"},
+    {"keySmileyShortcut3", SDLK_KP3, "Smiley Shortcut 3"},
+    {"keySmileyShortcut4", SDLK_KP4, "Smiley Shortcut 4"},
+    {"keySmileyShortcut5", SDLK_KP5, "Smiley Shortcut 5"},
+    {"keySmileyShortcut6", SDLK_KP6, "Smiley Shortcut 6"},
+    {"keySmileyShortcut7", SDLK_KP7, "Smiley Shortcut 7"},
+    {"keySmileyShortcut8", SDLK_KP8, "Smiley Shortcut 8"},
+    {"keySmileyShortcut9", SDLK_KP9, "Smiley Shortcut 9"},
+    {"keySmileyShortcut10", SDLK_KP0, "Smiley Shortcut 10"},
+    {"keySmileyShortcut11", SDLK_KP_DIVIDE, "Smiley Shortcut 11"},
+    {"keySmileyShortcut12", SDLK_KP_MULTIPLY, "Smiley Shortcut 12"}
 };
 
 void KeyboardConfig::init()
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index b51f12f4..08c1dba7 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -177,6 +177,20 @@ class KeyboardConfig
             KEY_WINDOW_SHORTCUT,
             KEY_WINDOW_SETUP,
             KEY_WINDOW_DEBUG,
+            KEY_WINDOW_ALLSMILEY,
+            KEY_WINDOW_SMILEY_SHORTCUT,
+            KEY_SMILEY_1,
+            KEY_SMILEY_2,
+            KEY_SMILEY_3,
+            KEY_SMILEY_4,
+            KEY_SMILEY_5,
+            KEY_SMILEY_6,
+            KEY_SMILEY_7,
+            KEY_SMILEY_8,
+            KEY_SMILEY_9,
+            KEY_SMILEY_10,
+            KEY_SMILEY_11,
+            KEY_SMILEY_12,
             KEY_TOTAL
         };
 
-- 
cgit v1.2.3-70-g09d2


From 402ac13b30d9bcd3c0f67184c9886a2d46516d2f Mon Sep 17 00:00:00 2001
From: Forge <jgrimbert@free.fr>
Date: Fri, 2 Jan 2009 21:31:39 +0100
Subject: Step 1.5 of smiley update: allow usage of same key for smiley and
 different purpose (as smiley are requiring a special key press, that's not a
 problem to assign the same key to differents purpose)

The function of game.cpp get reindented in the process, but the actual
change is minor.
The keyboardconfig get a new function, returning directly the emoticon
offset from the key pressed. (later, that function will return the index
of the smiley shortcut/array that has been selected... later)

Signed-off-by: Forge <jgrimbert@free.fr>
---
 src/game.cpp           | 886 ++++++++++++++++++++++++-------------------------
 src/keyboardconfig.cpp |  29 +-
 src/keyboardconfig.h   |   7 +
 3 files changed, 460 insertions(+), 462 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 1b84833c..f886f859 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -470,488 +470,454 @@ void Game::logic()
 void Game::handleInput()
 {
     if (joystick)
-        joystick->update();
+	joystick->update();
 
     // Events
     SDL_Event event;
     while (SDL_PollEvent(&event))
     {
-        bool used = false;
-
-        // Keyboard events (for discontinuous keys)
-        if (event.type == SDL_KEYDOWN)
-        {
-            gcn::Window *requestedWindow = NULL;
-
-            if (setupWindow->isVisible() && 
-                keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE)
-            {
-                keyboard.setNewKey((int) event.key.keysym.sym);
-                keyboard.callbackNewKey();
-                keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
-                return;
-            }
-            // Keys pressed together with Alt/Meta
-            // Emotions and some internal gui windows
-            #ifndef __APPLE__
-            if (event.key.keysym.mod & KMOD_LALT)
-            #else
-            if (event.key.keysym.mod & KMOD_LMETA)
-            #endif
-            {
-                switch (event.key.keysym.sym)
-                {
-                    case SDLK_p:
-                        // Screenshot (picture, hence the p)
-                        saveScreenshot();
-                        used = true;
-                        break;
-
-                    default:
-                        break;
-
-                    case SDLK_f:
-                        // Find path to mouse (debug purpose)
-                        viewport->toggleDebugPath();
-                        used = true;
-                        break;
-
-                    case SDLK_t:
-                        // Toggle accepting of incoming trade requests
-                        {
-                            unsigned int deflt = player_relations.getDefault();
-                            if (deflt & PlayerRelation::TRADE) {
-                                chatWindow->chatLog(
-                                        "Ignoring incoming trade requests",
-                                        BY_SERVER);
-                                deflt &= ~PlayerRelation::TRADE;
-                            } else {
-                                chatWindow->chatLog(
-                                        "Accepting incoming trade requests",
-                                        BY_SERVER);
-                                deflt |= PlayerRelation::TRADE;
-                            }
-
-                            player_relations.setDefault(deflt);
-                        }
-                        used = true;
-                        break;
-            }
-        }
+	bool used = false;
+
+	// Keyboard events (for discontinuous keys)
+	if (event.type == SDL_KEYDOWN)
+	{
+	    gcn::Window *requestedWindow = NULL;
+
+	    if (setupWindow->isVisible() && 
+		    keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE)
+	    {
+		keyboard.setNewKey((int) event.key.keysym.sym);
+		keyboard.callbackNewKey();
+		keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
+		return;
+	    }
+	    // Keys pressed together with Alt/Meta
+	    // Emotions and some internal gui windows
+#ifndef __APPLE__
+	    if (event.key.keysym.mod & KMOD_LALT)
+#else
+		if (event.key.keysym.mod & KMOD_LMETA)
+#endif
+		{
+		    switch (event.key.keysym.sym)
+		    {
+			case SDLK_p:
+			    // Screenshot (picture, hence the p)
+			    saveScreenshot();
+			    used = true;
+			    break;
+
+			default:
+			    break;
+
+			case SDLK_f:
+			    // Find path to mouse (debug purpose)
+			    viewport->toggleDebugPath();
+			    used = true;
+			    break;
+
+			case SDLK_t:
+			    // Toggle accepting of incoming trade requests
+			    {
+				unsigned int deflt = player_relations.getDefault();
+				if (deflt & PlayerRelation::TRADE) {
+				    chatWindow->chatLog(
+					    "Ignoring incoming trade requests",
+					    BY_SERVER);
+				    deflt &= ~PlayerRelation::TRADE;
+				} else {
+				    chatWindow->chatLog(
+					    "Accepting incoming trade requests",
+					    BY_SERVER);
+				    deflt |= PlayerRelation::TRADE;
+				}
+
+				player_relations.setDefault(deflt);
+			    }
+			    used = true;
+			    break;
+		    }
+		}
 
-        // Smilie
-        if (keyboard.isKeyActive(keyboard.KEY_SMILIE))
+	    // Smilie
+	    if (keyboard.isKeyActive(keyboard.KEY_SMILIE))
+	    {
+		// Emotions
+		Uint8 emotion=keyboard.getKeySmilieOffset(event.key.keysym.sym);
+		/**
+		 * Later here: increase the size of emotion, 
+		 * and get the entry from the smiley
+		 * shortcut object
+		 */
+		if (emotion)
 		{
-			// Emotions
-			Uint8 emotion;
-			/** 
-			 *
-			 * Might be simpler to perform as follow
-			 * emotion=0;
-			 * const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
-			 * if ((tKey <=KeyboardConfig::KEY_SMILEY_12)
-			 *     &&(tKey >=KeyboardConfig::KEY_SMILEY_1)
-			 *     )
-			 * {
-			 *    emotion= 1+tKey-KeyboardConfig::KEY_SMILEY_1;
-			 * }
-			 *
-			 * But this add constraints over KEY_SMILEY_* allocation 
-			 * (ordering, consecutive positive values)
-			 * Old story... compiler optimisation 
-			 * or code complexity for update, which one is better ?
-			 * I won't rely on enum allocation, let's keep the switch, 
-			 * it does not add such undocumented constraints on that enum.
-			 *
-			 * Speed consideration ? not even sure!
-			 */
-			const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
-			switch (tKey)
+		    player_node->emote(emotion);
+		    used = true;
+		}
+	    }
+	    switch (event.key.keysym.sym)
+	    {
+		case SDLK_PAGEUP:
+		    if (chatWindow->isVisible())
+		    {
+			chatWindow->scroll(-DEFAULT_CHAT_WINDOW_SCROLL);
+			used = true;
+		    }
+		    break;
+
+		case SDLK_PAGEDOWN:
+		    if (chatWindow->isVisible())
+		    {
+			chatWindow->scroll(DEFAULT_CHAT_WINDOW_SCROLL);
+			used = true;
+			return;
+		    }
+		    break;
+
+		case SDLK_F1:
+		    // In-game Help
+		    if (helpWindow->isVisible())
+		    {
+			helpWindow->setVisible(false);
+		    }
+		    else
+		    {
+			helpWindow->loadHelp("index");
+			helpWindow->requestMoveToTop();
+		    }
+		    used = true;
+		    break;
+
+		case SDLK_RETURN:
+		    // Input chat window
+		    if (chatWindow->isInputFocused() ||
+			    deathNotice != NULL ||
+			    weightNotice != NULL)
+		    {
+			break;
+		    }
+
+		    // Quit by pressing Enter if the exit confirm is there
+		    if (exitConfirm)
+		    {
+			done = true;
+		    }
+		    // Close the Browser if opened
+		    else if (helpWindow->isVisible())
+		    {
+			helpWindow->setVisible(false);
+		    }
+		    // Close the config window, cancelling changes if opened
+		    else if (setupWindow->isVisible())
+		    {
+			setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
+		    }
+		    // Proceed to the next dialog option, or close the window
+		    else if (npcTextDialog->isVisible())
+		    {
+			npcTextDialog->action(gcn::ActionEvent(NULL, "ok"));
+		    }
+		    // Choose the currently highlighted dialogue option
+		    else if (npcListDialog->isVisible())
+		    {
+			npcListDialog->action(gcn::ActionEvent(NULL, "ok"));
+		    }
+		    // Else, open the chat edit box
+		    else
+		    {
+			chatWindow->requestChatFocus();
+			used = true;
+		    }
+		    break;
+		    // Quitting confirmation dialog
+		case SDLK_ESCAPE:
+		    if (!exitConfirm) {
+			exitConfirm = new ConfirmDialog(
+				"Quit", "Are you sure you want to quit?");
+			exitConfirm->addActionListener(&exitListener);
+			exitConfirm->requestMoveToTop();
+		    }
+		    else
+		    {
+			exitConfirm->action(gcn::ActionEvent(NULL, "no"));
+		    }
+		    break;
+
+		default:
+		    break;
+	    }
+	    if (keyboard.isEnabled() && !chatWindow->isInputFocused())
+	    {
+		const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
+		// Do not activate shortcuts if tradewindow is visible
+		if (!tradeWindow->isVisible())
+		{
+		    // Checks if any item shortcut is pressed.
+		    for (int i = KeyboardConfig::KEY_SHORTCUT_0;
+			    i <= KeyboardConfig::KEY_SHORTCUT_9;
+			    i++)
+		    {
+			if (tKey == i && !used) {
+			    itemShortcut->useItem(
+				    i - KeyboardConfig::KEY_SHORTCUT_0);
+			    break;
+			}
+		    }
+		}
+		switch (tKey) {
+		    case KeyboardConfig::KEY_PICKUP:
 			{
-				case KeyboardConfig::KEY_SMILEY_1: emotion = 1; break;
-				case KeyboardConfig::KEY_SMILEY_2: emotion = 2; break;
-				case KeyboardConfig::KEY_SMILEY_3: emotion = 3; break;
-				case KeyboardConfig::KEY_SMILEY_4: emotion = 4; break;
-				case KeyboardConfig::KEY_SMILEY_5: emotion = 5; break;
-				case KeyboardConfig::KEY_SMILEY_6: emotion = 6; break;
-				case KeyboardConfig::KEY_SMILEY_7: emotion = 7; break;
-				case KeyboardConfig::KEY_SMILEY_8: emotion = 8; break;
-				case KeyboardConfig::KEY_SMILEY_9: emotion = 9; break;
-				case KeyboardConfig::KEY_SMILEY_10: emotion = 10; break;
-				case KeyboardConfig::KEY_SMILEY_11: emotion = 11; break;
-				case KeyboardConfig::KEY_SMILEY_12: emotion = 12; break;
-				default: emotion = 0; break;
+			    FloorItem *item =
+				floorItemManager->findByCoordinates(
+					player_node->mX, player_node->mY);
+
+			    // If none below the player, try the tile in front
+			    // of the player
+			    if (!item) {
+				Uint16 x = player_node->mX;
+				Uint16 y = player_node->mY;
+				if (player_node->getDirection() & Being::UP)
+				    y--;
+				if (player_node->getDirection() & Being::DOWN)
+				    y++;
+				if (player_node->getDirection() & Being::LEFT)
+				    x--;
+				if (player_node->getDirection() & Being::RIGHT)
+				    x++;
+
+				item = floorItemManager->findByCoordinates(
+					x, y);
+			    }
+
+			    if (item)
+				player_node->pickUp(item);
+
+			    used = true;
 			}
-
-			if (emotion)
+			break;
+		    case KeyboardConfig::KEY_SIT:
+			// Player sit action
+			player_node->toggleSit();
+			used = true;
+			break;
+		    case KeyboardConfig::KEY_HIDE_WINDOWS:
+			// Hide certain windows
+			if (!chatWindow->isInputFocused())
 			{
-				player_node->emote(emotion);
-				used = true;
+			    statusWindow->setVisible(false);
+			    inventoryWindow->setVisible(false);
+			    skillDialog->setVisible(false);
+			    setupWindow->setVisible(false);
+			    equipmentWindow->setVisible(false);
+			    helpWindow->setVisible(false);
+			    debugWindow->setVisible(false);
 			}
+			break;
+
+		    case KeyboardConfig::KEY_WINDOW_STATUS:
+			requestedWindow = statusWindow;
+			break;
+		    case KeyboardConfig::KEY_WINDOW_INVENTORY:
+			requestedWindow = inventoryWindow;
+			break;
+		    case KeyboardConfig::KEY_WINDOW_EQUIPMENT:
+			requestedWindow = equipmentWindow;
+			break;
+		    case KeyboardConfig::KEY_WINDOW_SKILL:
+			requestedWindow = skillDialog;
+			break;
+		    case KeyboardConfig::KEY_WINDOW_MINIMAP:
+			requestedWindow = minimap;
+			break;
+		    case KeyboardConfig::KEY_WINDOW_CHAT:
+			requestedWindow = chatWindow;
+			break;
+		    case KeyboardConfig::KEY_WINDOW_SHORTCUT:
+			requestedWindow = itemShortcutWindow;
+			break;
+		    case KeyboardConfig::KEY_WINDOW_SETUP:
+			requestedWindow = setupWindow;
+			break;
+		    case KeyboardConfig::KEY_WINDOW_DEBUG:
+			requestedWindow = debugWindow;
+			break;
 		}
-        switch (event.key.keysym.sym)
-        {
-            case SDLK_PAGEUP:
-                if (chatWindow->isVisible())
-                {
-                    chatWindow->scroll(-DEFAULT_CHAT_WINDOW_SCROLL);
-                    used = true;
-                }
-                break;
-
-            case SDLK_PAGEDOWN:
-                if (chatWindow->isVisible())
-                {
-                    chatWindow->scroll(DEFAULT_CHAT_WINDOW_SCROLL);
-                    used = true;
-                    return;
-                }
-                break;
-
-            case SDLK_F1:
-                // In-game Help
-                if (helpWindow->isVisible())
-                {
-                    helpWindow->setVisible(false);
-                }
-                else
-                {
-                    helpWindow->loadHelp("index");
-                    helpWindow->requestMoveToTop();
-                }
-                used = true;
-                break;
-
-            case SDLK_RETURN:
-                // Input chat window
-                if (chatWindow->isInputFocused() ||
-                    deathNotice != NULL ||
-                    weightNotice != NULL)
-                {
-                    break;
-                }
-
-                // Quit by pressing Enter if the exit confirm is there
-                if (exitConfirm)
-                {
-                    done = true;
-                }
-                // Close the Browser if opened
-                else if (helpWindow->isVisible())
-                {
-                    helpWindow->setVisible(false);
-                }
-                // Close the config window, cancelling changes if opened
-                else if (setupWindow->isVisible())
-                {
-                    setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
-                }
-                // Proceed to the next dialog option, or close the window
-                else if (npcTextDialog->isVisible())
-                {
-                    npcTextDialog->action(gcn::ActionEvent(NULL, "ok"));
-                }
-                // Choose the currently highlighted dialogue option
-                else if (npcListDialog->isVisible())
-                {
-                    npcListDialog->action(gcn::ActionEvent(NULL, "ok"));
-                }
-                // Else, open the chat edit box
-                else
-                {
-                    chatWindow->requestChatFocus();
-                    used = true;
-                }
-                break;
-                // Quitting confirmation dialog
-            case SDLK_ESCAPE:
-                if (!exitConfirm) {
-                    exitConfirm = new ConfirmDialog(
-                        "Quit", "Are you sure you want to quit?");
-                    exitConfirm->addActionListener(&exitListener);
-                    exitConfirm->requestMoveToTop();
-                }
-                else
-                {
-                    exitConfirm->action(gcn::ActionEvent(NULL, "no"));
-                }
-                break;
-
-            default:
-                break;
-            }
-            if (keyboard.isEnabled() && !chatWindow->isInputFocused())
-            {
-                const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
-                // Do not activate shortcuts if tradewindow is visible
-                if (!tradeWindow->isVisible())
-                {
-                    // Checks if any item shortcut is pressed.
-                    for (int i = KeyboardConfig::KEY_SHORTCUT_0;
-                        i <= KeyboardConfig::KEY_SHORTCUT_9;
-                        i++)
-                    {
-                        if (tKey == i && !used) {
-                            itemShortcut->useItem(
-                                    i - KeyboardConfig::KEY_SHORTCUT_0);
-                            break;
-                        }
-                    }
-                }
-                switch (tKey) {
-                    case KeyboardConfig::KEY_PICKUP:
-                        {
-                            FloorItem *item =
-                                floorItemManager->findByCoordinates(
-                                        player_node->mX, player_node->mY);
-
-                            // If none below the player, try the tile in front
-                            // of the player
-                            if (!item) {
-                                Uint16 x = player_node->mX;
-                                Uint16 y = player_node->mY;
-                                if (player_node->getDirection() & Being::UP)
-                                    y--;
-                                if (player_node->getDirection() & Being::DOWN)
-                                    y++;
-                                if (player_node->getDirection() & Being::LEFT)
-                                    x--;
-                                if (player_node->getDirection() & Being::RIGHT)
-                                    x++;
-
-                                item = floorItemManager->findByCoordinates(
-                                        x, y);
-                            }
-
-                            if (item)
-                                player_node->pickUp(item);
-
-                            used = true;
-                        }
-                        break;
-                    case KeyboardConfig::KEY_SIT:
-                        // Player sit action
-                        player_node->toggleSit();
-                        used = true;
-                        break;
-                    case KeyboardConfig::KEY_HIDE_WINDOWS:
-                         // Hide certain windows
-                        if (!chatWindow->isInputFocused())
-                        {
-                            statusWindow->setVisible(false);
-                            inventoryWindow->setVisible(false);
-                            skillDialog->setVisible(false);
-                            setupWindow->setVisible(false);
-                            equipmentWindow->setVisible(false);
-                            helpWindow->setVisible(false);
-                            debugWindow->setVisible(false);
-                        }
-                        break;
-
-                    case KeyboardConfig::KEY_WINDOW_STATUS:
-                        requestedWindow = statusWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_INVENTORY:
-                        requestedWindow = inventoryWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_EQUIPMENT:
-                        requestedWindow = equipmentWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_SKILL:
-                        requestedWindow = skillDialog;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_MINIMAP:
-                        requestedWindow = minimap;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_CHAT:
-                        requestedWindow = chatWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_SHORTCUT:
-                        requestedWindow = itemShortcutWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_SETUP:
-                        requestedWindow = setupWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_DEBUG:
-                        requestedWindow = debugWindow;
-                        break;
-                }
-            }
-
-            if (requestedWindow)
-            {
-                requestedWindow->setVisible(!requestedWindow->isVisible());
-                if (requestedWindow->isVisible())
-                {
-                    requestedWindow->requestMoveToTop();
-                }
-                used = true;
-            }
-
-        }
-
-        // Quit event
-        else if (event.type == SDL_QUIT)
-        {
-            done = true;
-        }
+	    }
 
-        // Push input to GUI when not used
-        if (!used)
-        {
-            try
-            {
-                guiInput->pushInput(event);
-            }
-            catch (gcn::Exception e)
-            {
-                const char* err = e.getMessage().c_str();
-                logger->log("Warning: guichan input exception: %s", err);
-            }
-        }
+	    if (requestedWindow)
+	    {
+		requestedWindow->setVisible(!requestedWindow->isVisible());
+		if (requestedWindow->isVisible())
+		{
+		    requestedWindow->requestMoveToTop();
+		}
+		used = true;
+	    }
+
+	}
+
+	// Quit event
+	else if (event.type == SDL_QUIT)
+	{
+	    done = true;
+	}
+
+	// Push input to GUI when not used
+	if (!used)
+	{
+	    try
+	    {
+		guiInput->pushInput(event);
+	    }
+	    catch (gcn::Exception e)
+	    {
+		const char* err = e.getMessage().c_str();
+		logger->log("Warning: guichan input exception: %s", err);
+	    }
+	}
     } // End while
 
     // If the user is configuring the keys then don't respond.
     if (!keyboard.isEnabled())
-        return;
+	return;
 
     // Moving player around
     if (player_node->mAction != Being::DEAD &&
-        current_npc == 0 &&
-        !chatWindow->isInputFocused())
+	    current_npc == 0 &&
+	    !chatWindow->isInputFocused())
     {
-        // Get the state of the keyboard keys
-        keyboard.refreshActiveKeys();
-
-        const Uint16 x = player_node->mX;
-        const Uint16 y = player_node->mY;
-        unsigned char direction = 0;
-
-        // Translate pressed keys to movement and direction
-        if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP) ||
-            (joystick && joystick->isUp()))
-        {
-            direction |= Being::UP;
-        }
-        else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) ||
-             (joystick && joystick->isDown()))
-        {
-            direction |= Being::DOWN;
-        }
-
-        if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) ||
-            (joystick && joystick->isLeft()))
-        {
-            direction |= Being::LEFT;
-        }
-        else if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) ||
-                 (joystick && joystick->isRight()))
-        {
-            direction |= Being::RIGHT;
-        }
-
-        player_node->setWalkingDir(direction);
-
-        // Attacking monsters
-        if (keyboard.isKeyActive(keyboard.KEY_ATTACK) ||
-            (joystick && joystick->buttonPressed(0)))
-        {
-            Being *target = beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER);
-
-            bool newTarget = !keyboard.isKeyActive(keyboard.KEY_TARGET);
-            // A set target has highest priority
-            if (newTarget || !player_node->getTarget())
-            {
-                Uint16 targetX = x, targetY = y;
-
-                switch (player_node->getSpriteDirection())
-                {
-                    case DIRECTION_UP   : --targetY; break;
-                    case DIRECTION_DOWN : ++targetY; break;
-                    case DIRECTION_LEFT : --targetX; break;
-                    case DIRECTION_RIGHT: ++targetX; break;
-                    default: break;
-                }
-
-                // Attack priorioty is: Monster, Player, auto target
-                target = beingManager->findBeing(targetX, targetY, Being::MONSTER);
-                if (!target)
-                    target = beingManager->findBeing(targetX, targetY, Being::PLAYER);
-            }
-
-            player_node->attack(target, newTarget);
-        }
-
-        // Target the nearest player if 'q' is pressed
-        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) && 
-             !keyboard.isKeyActive(keyboard.KEY_TARGET) )
-        {
-            Being *target = beingManager->findNearestLivingBeing(player_node, 20, Being::PLAYER);
-
-            player_node->setTarget(target);
-        }
-
-        // Target the nearest monster if 'a' pressed
-        if ((keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) || 
-            (joystick && joystick->buttonPressed(3))) && 
-            !keyboard.isKeyActive(keyboard.KEY_TARGET))
-        {
-            Being *target = beingManager->findNearestLivingBeing(
-                    x, y, 20, Being::MONSTER);
-
-            player_node->setTarget(target);
-        }
-
-        // Target the nearest npc if 'n' pressed
-        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_NPC) && 
-             !keyboard.isKeyActive(keyboard.KEY_TARGET) )
-        {
-            Being *target = beingManager->findNearestLivingBeing(
-                    x, y, 20, Being::NPC);
-
-            player_node->setTarget(target);
-        }
-
-        // Talk to the nearest NPC if 't' pressed
-        if ( keyboard.isKeyActive(keyboard.KEY_TALK) )
-        {
-            if (!npcTextDialog->isVisible() && !npcListDialog->isVisible())
-            {
-                Being *target = player_node->getTarget();
-
-                if (!target)
-                {
-                    target = beingManager->findNearestLivingBeing(
-                      x, y, 20, Being::NPC);
-                }
-
-                if (target)
-                {
-                    if (target->getType() == Being::NPC)
-                        dynamic_cast<NPC*>(target)->talk();
-                }
-            }
-        }
-
-        // Stop attacking if shift is pressed
-        if (keyboard.isKeyActive(keyboard.KEY_TARGET))
-        {
-            player_node->stopAttack();
-        }
+	// Get the state of the keyboard keys
+	keyboard.refreshActiveKeys();
+
+	const Uint16 x = player_node->mX;
+	const Uint16 y = player_node->mY;
+	unsigned char direction = 0;
+
+	// Translate pressed keys to movement and direction
+	if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP) ||
+		(joystick && joystick->isUp()))
+	{
+	    direction |= Being::UP;
+	}
+	else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) ||
+		(joystick && joystick->isDown()))
+	{
+	    direction |= Being::DOWN;
+	}
+
+	if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) ||
+		(joystick && joystick->isLeft()))
+	{
+	    direction |= Being::LEFT;
+	}
+	else if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) ||
+		(joystick && joystick->isRight()))
+	{
+	    direction |= Being::RIGHT;
+	}
+
+	player_node->setWalkingDir(direction);
+
+	// Attacking monsters
+	if (keyboard.isKeyActive(keyboard.KEY_ATTACK) ||
+		(joystick && joystick->buttonPressed(0)))
+	{
+	    Being *target = beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER);
+
+	    bool newTarget = !keyboard.isKeyActive(keyboard.KEY_TARGET);
+	    // A set target has highest priority
+	    if (newTarget || !player_node->getTarget())
+	    {
+		Uint16 targetX = x, targetY = y;
+
+		switch (player_node->getSpriteDirection())
+		{
+		    case DIRECTION_UP   : --targetY; break;
+		    case DIRECTION_DOWN : ++targetY; break;
+		    case DIRECTION_LEFT : --targetX; break;
+		    case DIRECTION_RIGHT: ++targetX; break;
+		    default: break;
+		}
 
-        if (joystick)
-        {
-            if (joystick->buttonPressed(1))
-            {
-                FloorItem *item = floorItemManager->findByCoordinates(x, y);
+		// Attack priorioty is: Monster, Player, auto target
+		target = beingManager->findBeing(targetX, targetY, Being::MONSTER);
+		if (!target)
+		    target = beingManager->findBeing(targetX, targetY, Being::PLAYER);
+	    }
+
+	    player_node->attack(target, newTarget);
+	}
+
+	// Target the nearest player if 'q' is pressed
+	if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) && 
+		!keyboard.isKeyActive(keyboard.KEY_TARGET) )
+	{
+	    Being *target = beingManager->findNearestLivingBeing(player_node, 20, Being::PLAYER);
+
+	    player_node->setTarget(target);
+	}
+
+	// Target the nearest monster if 'a' pressed
+	if ((keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) || 
+		    (joystick && joystick->buttonPressed(3))) && 
+		!keyboard.isKeyActive(keyboard.KEY_TARGET))
+	{
+	    Being *target = beingManager->findNearestLivingBeing(
+		    x, y, 20, Being::MONSTER);
+
+	    player_node->setTarget(target);
+	}
+
+	// Target the nearest npc if 'n' pressed
+	if ( keyboard.isKeyActive(keyboard.KEY_TARGET_NPC) && 
+		!keyboard.isKeyActive(keyboard.KEY_TARGET) )
+	{
+	    Being *target = beingManager->findNearestLivingBeing(
+		    x, y, 20, Being::NPC);
+
+	    player_node->setTarget(target);
+	}
+
+	// Talk to the nearest NPC if 't' pressed
+	if ( keyboard.isKeyActive(keyboard.KEY_TALK) )
+	{
+	    if (!npcTextDialog->isVisible() && !npcListDialog->isVisible())
+	    {
+		Being *target = player_node->getTarget();
+
+		if (!target)
+		{
+		    target = beingManager->findNearestLivingBeing(
+			    x, y, 20, Being::NPC);
+		}
 
-                if (item)
-                    player_node->pickUp(item);
-            }
-            else if (joystick->buttonPressed(2))
-            {
-                player_node->toggleSit();
-            }
-        }
+		if (target)
+		{
+		    if (target->getType() == Being::NPC)
+			dynamic_cast<NPC*>(target)->talk();
+		}
+	    }
+	}
+
+	// Stop attacking if shift is pressed
+	if (keyboard.isKeyActive(keyboard.KEY_TARGET))
+	{
+	    player_node->stopAttack();
+	}
+
+	if (joystick)
+	{
+	    if (joystick->buttonPressed(1))
+	    {
+		FloorItem *item = floorItemManager->findByCoordinates(x, y);
+
+		if (item)
+		    player_node->pickUp(item);
+	    }
+	    else if (joystick->buttonPressed(2))
+	    {
+		player_node->toggleSit();
+	    }
+	}
     }
 }
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index d23410bd..930d8944 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -128,11 +128,24 @@ void KeyboardConfig::makeDefault()
 bool KeyboardConfig::hasConflicts()
 {
     int i, j;
+/**
+ * No need to parse the square matrix: only check one triangle
+ * that's enough to detect conflicts
+ */
     for (i = 0; i < KEY_TOTAL; i++)
     {
-        for (j = 0; j < KEY_TOTAL; j++)
+        for (j = i,j++; j < KEY_TOTAL; j++)
         {
-            if (i != j && mKey[i].value == mKey[j].value)
+/**
+ * KEY_SMILEY_* are separated from other keys, duplicate in different
+ *  area is allowed, but not in same area (of course)
+ *  (i.e.: not two identical key for smiley, not two identical for other;
+ *  but same key for a smiley and a not-smiley is ok)
+ *  
+ */
+            if (!((i<KEY_SMILEY_1)&&(j>=KEY_SMILEY_1))
+                 && mKey[i].value == mKey[j].value
+	       )
             {
                 return true;
             }
@@ -158,6 +171,18 @@ int KeyboardConfig::getKeyIndex(int keyValue) const
     return KEY_NO_VALUE;
 }
 
+int KeyboardConfig::getKeySmilieOffset(int keyValue) const
+{
+    for (int i = KEY_SMILEY_1; i <= KEY_SMILEY_12; i++)
+    {
+        if(keyValue == mKey[i].value)
+        {
+            return 1+i-KEY_SMILEY_1;
+        }
+    }
+    return KEY_NO_VALUE;
+}
+
 bool KeyboardConfig::isKeyActive(int index)
 {
     return mActiveKeys[ mKey[index].value];
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index 08c1dba7..a0b67f5d 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -101,6 +101,11 @@ class KeyboardConfig
          */
         int getKeyIndex(int keyValue) const;
 
+        /**
+         * Get the key function index for smiley by providing the offset value.
+         */
+        int getKeySmilieOffset(int keyValue) const;
+
         /**
          * Set the enable flag, which will stop the user from doing actions.
          */
@@ -141,6 +146,8 @@ class KeyboardConfig
          * KEY_TOTAL should always be last (used as a conditional in loops).
          * The key assignment view gets arranged according to the order of
          * these values.
+         *
+         * KEY_SMILEY_* must be also at the end (just before KEY_TOTAL)
          */
         enum KeyAction {
             KEY_NO_VALUE = -1,
-- 
cgit v1.2.3-70-g09d2


From 0bfa55e0fe6e73bec360658eb8b0660178a60d55 Mon Sep 17 00:00:00 2001
From: Forge <jgrimbert@free.fr>
Date: Sun, 4 Jan 2009 20:07:14 +0100
Subject: Smiley track: step 1.9 The window listing the smiley is ok (F11). The
 window for shortcut of smiley is in progress (F12)

So far, you can use any available smiley directly (mouse interface)
and can get a reminder of the keybinding in the shortcut window.

Yet to be done (for final step 2.0):
* Transform the keybinding into the actual mapping of the shortcut seen in
F12
* Drag & Drop from F11 to F12 windows and from F12 to F12
* Code factorisation for class ShortcutContainer and derivatives Item &
Smiley (so far, most code is shared, but actually in 3 places, should
keep only specific code in leaf-class, and main code in parent)
Revision of copyright message (so far, only a cut-paste of inspiring
previous files)
* Save shortcut-smiley mapping on exit (and reload on start)
(with protection against changing smiley-list)
---
 src/gui/itemshortcutwindow.cpp      |  70 -----------
 src/gui/itemshortcutwindow.h        |  63 ----------
 src/gui/shortcutcontainer.cpp       | 237 +++++++++++++++++++++++++++++++++++
 src/gui/shortcutcontainer.h         | 115 +++++++++++++++++
 src/gui/shortcutwindow.cpp          |  70 +++++++++++
 src/gui/shortcutwindow.h            |  65 ++++++++++
 src/gui/smileycontainer.cpp         | 164 ++++++++++++++++++++++++
 src/gui/smileycontainer.h           | 139 +++++++++++++++++++++
 src/gui/smileyshortcutcontainer.cpp | 243 ++++++++++++++++++++++++++++++++++++
 src/gui/smileyshortcutcontainer.h   | 111 ++++++++++++++++
 src/gui/smileywindow.cpp            |  96 ++++++++++++++
 src/gui/smileywindow.h              |  80 ++++++++++++
 12 files changed, 1320 insertions(+), 133 deletions(-)
 delete mode 100644 src/gui/itemshortcutwindow.cpp
 delete mode 100644 src/gui/itemshortcutwindow.h
 create mode 100644 src/gui/shortcutcontainer.cpp
 create mode 100644 src/gui/shortcutcontainer.h
 create mode 100644 src/gui/shortcutwindow.cpp
 create mode 100644 src/gui/shortcutwindow.h
 create mode 100644 src/gui/smileycontainer.cpp
 create mode 100644 src/gui/smileycontainer.h
 create mode 100644 src/gui/smileyshortcutcontainer.cpp
 create mode 100644 src/gui/smileyshortcutcontainer.h
 create mode 100644 src/gui/smileywindow.cpp
 create mode 100644 src/gui/smileywindow.h

diff --git a/src/gui/itemshortcutwindow.cpp b/src/gui/itemshortcutwindow.cpp
deleted file mode 100644
index 08e76241..00000000
--- a/src/gui/itemshortcutwindow.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2007 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "itemshortcutcontainer.h"
-#include "itemshortcutwindow.h"
-#include "scrollarea.h"
-
-static const int SCROLL_PADDING = 0;
-
-ItemShortcutWindow::ItemShortcutWindow()
-{
-    setWindowName("ItemShortcut");
-    // no title presented, title bar is padding so window can be moved.
-    gcn::Window::setTitleBarHeight(gcn::Window::getPadding());
-    setShowTitle(false);
-    setResizable(true);
-    setDefaultSize(758, 174, 42, 426);
-
-    mItems = new ItemShortcutContainer;
-
-    const int border = SCROLL_PADDING * 2 + getPadding() * 2;
-    setMinWidth(mItems->getBoxWidth() + border);
-    setMinHeight(mItems->getBoxHeight() + border);
-    setMaxWidth(mItems->getBoxWidth() * mItems->getMaxItems() + border);
-    setMaxHeight(mItems->getBoxHeight() * mItems->getMaxItems() + border);
-
-    mScrollArea = new ScrollArea(mItems);
-    mScrollArea->setPosition(SCROLL_PADDING, SCROLL_PADDING);
-    mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    mScrollArea->setOpaque(false);
-
-    add(mScrollArea);
-
-    loadWindowState();
-}
-
-ItemShortcutWindow::~ItemShortcutWindow()
-{
-    delete mItems;
-    delete mScrollArea;
-}
-
-void ItemShortcutWindow::widgetResized(const gcn::Event &event)
-{
-    Window::widgetResized(event);
-
-    const gcn::Rectangle &area = getChildrenArea();
-
-    mScrollArea->setSize(
-            area.width - SCROLL_PADDING,
-            area.height - SCROLL_PADDING);
-}
diff --git a/src/gui/itemshortcutwindow.h b/src/gui/itemshortcutwindow.h
deleted file mode 100644
index 587f15c8..00000000
--- a/src/gui/itemshortcutwindow.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2007 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _TMW_ITEMSHORTCUTWINDOW_H
-#define _TMW_ITEMSHORTCUTWINDOW_H
-
-#include "window.h"
-
-#include "../guichanfwd.h"
-
-class ItemShortcutContainer;
-class ScrollArea;
-
-/**
- * A window around the ItemShortcutContainer.
- *
- * \ingroup Interface
- */
-class ItemShortcutWindow : public Window
-{
-    public:
-        /**
-         * Constructor.
-         */
-        ItemShortcutWindow();
-
-        /**
-         * Destructor.
-         */
-        ~ItemShortcutWindow();
-
-        /**
-         * Called whenever the widget changes size.
-         */
-        void widgetResized(const gcn::Event &event);
-
-    private:
-        ItemShortcutContainer *mItems;
-
-        ScrollArea *mScrollArea;
-};
-
-extern ItemShortcutWindow *itemShortcutWindow;
-
-#endif
diff --git a/src/gui/shortcutcontainer.cpp b/src/gui/shortcutcontainer.cpp
new file mode 100644
index 00000000..f1a60189
--- /dev/null
+++ b/src/gui/shortcutcontainer.cpp
@@ -0,0 +1,237 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "shortcutcontainer.h"
+
+#include "../graphics.h"
+#include "../inventory.h"
+#include "../item.h"
+#include "../itemshortcut.h"
+#include "../keyboardconfig.h"
+#include "../localplayer.h"
+
+#include "../resources/image.h"
+#include "../resources/resourcemanager.h"
+
+#include "../utils/tostring.h"
+
+ShortcutContainer::ShortcutContainer():
+    mGridWidth(1),
+    mGridHeight(1),
+    mItemClicked(false),
+    mItemMoved(NULL)
+{
+    addMouseListener(this);
+    addWidgetListener(this);
+
+    ResourceManager *resman = ResourceManager::getInstance();
+
+    mBackgroundImg = resman->getImage("graphics/gui/item_shortcut_bgr.png");
+    mMaxItems = itemShortcut->getItemCount();
+
+    mBoxHeight = 42;
+    mBoxWidth = 36;
+}
+
+ShortcutContainer::~ShortcutContainer()
+{
+    mBackgroundImg->decRef();
+}
+
+void
+ShortcutContainer::logic()
+{
+    gcn::Widget::logic();
+
+    int i = itemShortcut->getItemCount();
+
+    if (i != mMaxItems)
+    {
+        mMaxItems = i;
+        setWidth(getWidth());
+    }
+}
+
+void
+ShortcutContainer::draw(gcn::Graphics *graphics)
+{
+    Graphics *g = static_cast<Graphics*>(graphics);
+
+    graphics->setFont(getFont());
+
+    for (int i = 0; i < mMaxItems; i++)
+    {
+        const int itemX = (i % mGridWidth) * mBoxWidth;
+        const int itemY = (i / mGridWidth) * mBoxHeight;
+
+        g->drawImage(mBackgroundImg, itemX, itemY);
+
+        // Draw item keyboard shortcut.
+        const char *key = SDL_GetKeyName(
+            (SDLKey) keyboard.getKeyValue(keyboard.KEY_SHORTCUT_0 + i));
+        graphics->setColor(0x000000);
+        g->drawText(key, itemX + 2, itemY + 2, gcn::Graphics::LEFT);
+
+        if (itemShortcut->getItem(i) < 0)
+            continue;
+
+        Item *item =
+            player_node->getInventory()->findItem(itemShortcut->getItem(i));
+        if (item) {
+            // Draw item icon.
+            const std::string label =
+                item->isEquipped() ? "Eq." : toString(item->getQuantity());
+            Image* image = item->getImage();
+            if (image) {
+                const std::string label =
+                    item->isEquipped() ? "Eq." : toString(item->getQuantity());
+                g->drawImage(image, itemX, itemY);
+                g->drawText(
+                        label,
+                        itemX + mBoxWidth / 2,
+                        itemY + mBoxHeight - 14,
+                        gcn::Graphics::CENTER);
+            }
+        }
+    }
+    if (mItemMoved)
+    {
+        // Draw the item image being dragged by the cursor.
+        Image* image = mItemMoved->getImage();
+        if (image)
+        {
+            const int tPosX = mCursorPosX - (image->getWidth() / 2);
+            const int tPosY = mCursorPosY - (image->getHeight() / 2);
+
+            g->drawImage(image, tPosX, tPosY);
+            g->drawText(
+                    toString(mItemMoved->getQuantity()),
+                    tPosX + mBoxWidth / 2,
+                    tPosY + mBoxHeight - 14,
+                    gcn::Graphics::CENTER);
+        }
+    }
+}
+
+void ShortcutContainer::widgetResized(const gcn::Event &event)
+{
+    mGridWidth = getWidth() / mBoxWidth;
+    if (mGridWidth < 1) {
+        mGridWidth = 1;
+    }
+
+    setHeight((mMaxItems / mGridWidth +
+                (mMaxItems % mGridWidth > 0 ? 1 : 0)) * mBoxHeight);
+
+    mGridHeight = getHeight() / mBoxHeight;
+    if (mGridHeight < 1) {
+        mGridHeight = 1;
+    }
+}
+
+void
+ShortcutContainer::mouseDragged(gcn::MouseEvent &event)
+{
+    if (event.getButton() == gcn::MouseEvent::LEFT) {
+        if (!mItemMoved && mItemClicked) {
+            const int index = getIndexFromGrid(event.getX(), event.getY());
+            if (index == -1) {
+                return;
+            }
+            const int itemId = itemShortcut->getItem(index);
+            if (itemId < 0)
+                return;
+            Item *item = player_node->getInventory()->findItem(itemId);
+            if (item)
+            {
+                mItemMoved = item;
+                itemShortcut->removeItem(index);
+            }
+        }
+        if (mItemMoved) {
+            mCursorPosX = event.getX();
+            mCursorPosY = event.getY();
+        }
+    }
+}
+
+void
+ShortcutContainer::mousePressed(gcn::MouseEvent &event)
+{
+    const int index = getIndexFromGrid(event.getX(), event.getY());
+    if (index == -1) {
+        return;
+    }
+
+    // Stores the selected item if theirs one.
+    if (itemShortcut->isItemSelected()) {
+        itemShortcut->setItem(index);
+        itemShortcut->setItemSelected(-1);
+    }
+    else if (itemShortcut->getItem(index)) {
+        mItemClicked = true;
+    }
+}
+
+void
+ShortcutContainer::mouseReleased(gcn::MouseEvent &event)
+{
+    if (event.getButton() == gcn::MouseEvent::LEFT)
+    {
+        if (itemShortcut->isItemSelected())
+        {
+            itemShortcut->setItemSelected(-1);
+        }
+        const int index = getIndexFromGrid(event.getX(), event.getY());
+        if (index == -1) {
+            mItemMoved = NULL;
+            return;
+        }
+        if (mItemMoved) {
+            itemShortcut->setItems(index, mItemMoved->getId());
+            mItemMoved = NULL;
+        }
+        else if (itemShortcut->getItem(index) && mItemClicked)
+        {
+            itemShortcut->useItem(index);
+        }
+        if (mItemClicked) {
+            mItemClicked = false;
+        }
+    }
+}
+
+int
+ShortcutContainer::getIndexFromGrid(int pointX, int pointY) const
+{
+    const gcn::Rectangle tRect = gcn::Rectangle(
+        0, 0, mGridWidth * mBoxWidth, mGridHeight * mBoxHeight);
+    if (!tRect.isPointInRect(pointX, pointY)) {
+        return -1;
+    }
+    const int index = ((pointY / mBoxHeight) * mGridWidth) +
+        pointX / mBoxWidth;
+    if (index >= mMaxItems)
+    {
+        return -1;
+    }
+    return index;
+}
diff --git a/src/gui/shortcutcontainer.h b/src/gui/shortcutcontainer.h
new file mode 100644
index 00000000..5ca56899
--- /dev/null
+++ b/src/gui/shortcutcontainer.h
@@ -0,0 +1,115 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _TMW_SHORTCUTCONTAINER_H__
+#define _TMW_SHORTCUTCONTAINER_H__
+
+#include <guichan/mouselistener.hpp>
+#include <guichan/widget.hpp>
+#include <guichan/widgetlistener.hpp>
+
+#include "../guichanfwd.h"
+
+class Image;
+class Item;
+
+/**
+ * An item shortcut container. Used to quickly use items.
+ *
+ * \ingroup GUI
+ */
+class ShortcutContainer : public gcn::Widget,
+                              public gcn::WidgetListener,
+                              public gcn::MouseListener
+{
+    public:
+        /**
+         * Constructor. Initializes the graphic.
+         */
+        ShortcutContainer();
+
+        /**
+         * Destructor.
+         */
+        virtual ~ShortcutContainer();
+
+        /**
+         * Handles the logic of the ItemContainer
+         */
+        virtual void logic();
+
+        /**
+         * Draws the items.
+         */
+        virtual void draw(gcn::Graphics *graphics);
+
+        /**
+         * Invoked when a widget changes its size. This is used to determine
+         * the new height of the container.
+         */
+        virtual void widgetResized(const gcn::Event &event);
+
+        /**
+         * Handles mouse when dragged.
+         */
+        virtual void mouseDragged(gcn::MouseEvent &event);
+
+        /**
+         * Handles mouse when pressed.
+         */
+        virtual void mousePressed(gcn::MouseEvent &event);
+
+        /**
+         * Handles mouse release.
+         */
+        virtual void mouseReleased(gcn::MouseEvent &event);
+
+        virtual int getMaxItems()
+        { return mMaxItems; }
+
+        virtual int getBoxWidth()
+        { return mBoxWidth; }
+
+        virtual int getBoxHeight()
+        { return mBoxHeight; }
+
+    protected:
+        /**
+         * Gets the index from the grid provided the point is in an item box.
+         *
+         * @param pointX X coordinate of the point.
+         * @param pointY Y coordinate of the point.
+         * @return index on success, -1 on failure.
+         */
+        int getIndexFromGrid(int pointX, int pointY) const;
+
+        Image *mBackgroundImg;
+
+        int mMaxItems;
+        int mBoxWidth;
+        int mBoxHeight;
+        int mCursorPosX, mCursorPosY;
+        int mGridWidth, mGridHeight;
+        bool mItemClicked;
+        Item *mItemMoved;
+};
+
+#endif
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
new file mode 100644
index 00000000..d2aa2c2c
--- /dev/null
+++ b/src/gui/shortcutwindow.cpp
@@ -0,0 +1,70 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "shortcutcontainer.h"
+#include "shortcutwindow.h"
+#include "scrollarea.h"
+
+static const int SCROLL_PADDING = 0;
+
+ShortcutWindow::ShortcutWindow(const char * title,ShortcutContainer *content)
+{
+    setWindowName(title);
+    // no title presented, title bar is padding so window can be moved.
+    gcn::Window::setTitleBarHeight(gcn::Window::getPadding());
+    setShowTitle(false);
+    setResizable(true);
+    setDefaultSize(758, 174, 42, 426);
+
+    mItems = content;
+
+    const int border = SCROLL_PADDING * 2 + getPadding() * 2;
+    setMinWidth(mItems->getBoxWidth() + border);
+    setMinHeight(mItems->getBoxHeight() + border);
+    setMaxWidth(mItems->getBoxWidth() * mItems->getMaxItems() + border);
+    setMaxHeight(mItems->getBoxHeight() * mItems->getMaxItems() + border);
+
+    mScrollArea = new ScrollArea(mItems);
+    mScrollArea->setPosition(SCROLL_PADDING, SCROLL_PADDING);
+    mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mScrollArea->setOpaque(false);
+
+    add(mScrollArea);
+
+    loadWindowState();
+}
+
+ShortcutWindow::~ShortcutWindow()
+{
+    delete mItems;
+    delete mScrollArea;
+}
+
+void ShortcutWindow::widgetResized(const gcn::Event &event)
+{
+    Window::widgetResized(event);
+
+    const gcn::Rectangle &area = getChildrenArea();
+
+    mScrollArea->setSize(
+            area.width - SCROLL_PADDING,
+            area.height - SCROLL_PADDING);
+}
diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h
new file mode 100644
index 00000000..c9ba9d2e
--- /dev/null
+++ b/src/gui/shortcutwindow.h
@@ -0,0 +1,65 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _TMW_SHORTCUTWINDOW_H
+#define _TMW_SHORTCUTWINDOW_H
+
+#include "window.h"
+
+#include "../guichanfwd.h"
+
+class ShortcutContainer;
+class ScrollArea;
+
+/**
+ * A window around the ItemShortcutContainer.
+ *
+ * \ingroup Interface
+ */
+class ShortcutWindow : public Window
+{
+    public:
+        /**
+         * Constructor.
+         */
+        ShortcutWindow(const char *title,ShortcutContainer *content);
+
+        /**
+         * Destructor.
+         */
+        ~ShortcutWindow();
+
+        /**
+         * Called whenever the widget changes size.
+         */
+        void widgetResized(const gcn::Event &event);
+
+    private:
+        ShortcutWindow();
+        ShortcutContainer *mItems;
+
+        ScrollArea *mScrollArea;
+};
+
+extern ShortcutWindow *itemShortcutWindow;
+extern ShortcutWindow *smileyShortcutWindow;
+
+#endif
diff --git a/src/gui/smileycontainer.cpp b/src/gui/smileycontainer.cpp
new file mode 100644
index 00000000..5eb99723
--- /dev/null
+++ b/src/gui/smileycontainer.cpp
@@ -0,0 +1,164 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "smileycontainer.h"
+
+#include <guichan/mouseinput.hpp>
+#include <guichan/selectionlistener.hpp>
+
+#include "../graphics.h"
+#include "../log.h"
+
+#include "../resources/image.h"
+#include "../resources/iteminfo.h"
+#include "../resources/resourcemanager.h"
+
+#include "../utils/tostring.h"
+
+const int SmileyContainer::gridWidth = 34;  // item icon width + 4
+const int SmileyContainer::gridHeight = 36; // item icon height + 4
+
+static const int NO_ITEM = -1;
+
+SmileyContainer::SmileyContainer():
+    mSelectedItemIndex(NO_ITEM)
+{
+    ResourceManager *resman = ResourceManager::getInstance();
+
+    mSmileyImg = resman->getImageSet("graphics/gui/emotions.png",30,32);
+    if (!mSmileyImg) logger->error("Unable to load emotions");
+
+    mSelImg = resman->getImage("graphics/gui/selection.png");
+    if (!mSelImg) logger->error("Unable to load selection.png");
+
+    mMaxSmiley = mSmileyImg->size(); 
+
+    addMouseListener(this);
+    addWidgetListener(this);
+}
+
+SmileyContainer::~SmileyContainer()
+{
+    if (mSmileyImg)
+    {
+       mSmileyImg->decRef();
+       mSmileyImg=NULL;
+    }
+    if (!mSelImg)
+    {
+       mSelImg->decRef();
+       mSelImg=NULL;
+    }
+}
+
+void SmileyContainer::draw(gcn::Graphics *graphics)
+{
+    int columns = getWidth() / gridWidth;
+
+    // Have at least 1 column
+    if (columns < 1)
+    {
+        columns = 1;
+    }
+
+    for (int i = 0; i < mMaxSmiley ; i++)
+    {
+        int itemX = ((i) % columns) * gridWidth;
+        int itemY = ((i) / columns) * gridHeight;
+           
+
+        // Draw item icon
+        static_cast<Graphics*>(graphics)->drawImage(
+                    mSmileyImg->get(i), itemX, itemY);
+
+        // Draw selection image below selected item
+        if (mSelectedItemIndex == i)
+        {
+            static_cast<Graphics*>(graphics)->drawImage(
+                    mSelImg, itemX, itemY);
+        }
+    }
+}
+
+void SmileyContainer::widgetResized(const gcn::Event &event)
+{
+    recalculateHeight();
+}
+
+void SmileyContainer::recalculateHeight()
+{
+    int cols = getWidth() / gridWidth;
+
+    if (cols < 1)
+        cols = 1;
+
+    const int rows = (mMaxSmiley / cols) + (mMaxSmiley % cols > 0 ? 1 : 0);
+    const int height = rows * gridHeight + 8;
+    if (height != getHeight())
+        setHeight(height);
+}
+
+int SmileyContainer::getSelectedSmiley() 
+{
+    if (mSelectedItemIndex == NO_ITEM)
+        return 0;
+
+    return 1+mSelectedItemIndex;
+}
+
+void SmileyContainer::selectNone()
+{
+    setSelectedItemIndex(NO_ITEM);
+}
+
+void SmileyContainer::setSelectedItemIndex(int index)
+{
+    if (index < 0 || index >= mMaxSmiley )
+        mSelectedItemIndex = NO_ITEM;
+    else
+        mSelectedItemIndex = index;
+}
+
+void SmileyContainer::distributeValueChangedEvent()
+{
+    gcn::SelectionEvent event(this);
+    std::list<gcn::SelectionListener*>::iterator i_end = mListeners.end();
+    std::list<gcn::SelectionListener*>::iterator i;
+
+    for (i = mListeners.begin(); i != i_end; ++i)
+    {
+        (*i)->valueChanged(event);
+    }
+}
+
+void SmileyContainer::mousePressed(gcn::MouseEvent &event)
+{
+    int button = event.getButton();
+    if (button == gcn::MouseEvent::LEFT || button == gcn::MouseEvent::RIGHT)
+    {
+        int columns = getWidth() / gridWidth;
+        int mx = event.getX();
+        int my = event.getY();
+        int index = mx / gridWidth + ((my / gridHeight) * columns);
+
+        setSelectedItemIndex(index);
+    }
+}
diff --git a/src/gui/smileycontainer.h b/src/gui/smileycontainer.h
new file mode 100644
index 00000000..a6dadab6
--- /dev/null
+++ b/src/gui/smileycontainer.h
@@ -0,0 +1,139 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _TMW_SMILEYCONTAINER_H__
+#define _TMW_SMILEYCONTAINER_H__
+
+#include <list>
+
+#include <resources/imageset.h>
+#include <guichan/mouselistener.hpp>
+#include <guichan/widget.hpp>
+#include <guichan/widgetlistener.hpp>
+
+#include "../guichanfwd.h"
+
+class Image;
+class Inventory;
+class Item;
+
+namespace gcn {
+    class SelectionListener;
+}
+
+/**
+ * An item container. Used to show items in inventory and trade dialog.
+ *
+ * \ingroup GUI
+ */
+class SmileyContainer : public gcn::Widget, 
+                      public gcn::MouseListener,
+                      public gcn::WidgetListener
+{
+    public:
+        /**
+         * Constructor. Initializes the graphic.
+         */
+        SmileyContainer();
+
+        /**
+         * Destructor.
+         */
+        virtual ~SmileyContainer();
+
+        /**
+         * Draws the items.
+         */
+        void draw(gcn::Graphics *graphics);
+
+        /**
+         * Called whenever the widget changes size.
+         */
+        void widgetResized(const gcn::Event &event);
+
+        /**
+         * Handles mouse click.
+         */
+        void mousePressed(gcn::MouseEvent &event);
+
+        /**
+         * Returns the selected item.
+         */
+        int getSelectedSmiley();
+
+        /**
+         * Sets selected item to NULL.
+         */
+        void selectNone();
+
+        /**
+         * Adds a listener to the list that's notified each time a change to
+         * the selection occurs.
+         */
+        void addSelectionListener(gcn::SelectionListener *listener)
+        {
+            mListeners.push_back(listener);
+        }
+
+        /**
+         * Removes a listener from the list that's notified each time a change
+         * to the selection occurs.
+         */
+        void removeSelectionListener(gcn::SelectionListener *listener)
+        {
+            mListeners.remove(listener);
+        }
+
+    private:
+        /**
+
+         * Sets the currently selected item.  Invalid (e.g., negative) indices set `no item'.
+         */
+        void setSelectedItemIndex(int index);
+
+        /**
+         * Find the current item index by the most recently used item ID
+         */
+        void refindSelectedItem(void);
+
+        /**
+         * Determine and set the height of the container.
+         */
+        void recalculateHeight(void);
+
+        /**
+         * Sends out selection events to the list of selection listeners.
+         */
+        void distributeValueChangedEvent(void);
+
+        ImageSet *mSmileyImg;
+        Image *mSelImg;
+        int mSelectedItemIndex;
+
+        int mMaxSmiley;
+
+        std::list<gcn::SelectionListener*> mListeners;
+
+        static const int gridWidth;
+        static const int gridHeight;
+};
+
+#endif
diff --git a/src/gui/smileyshortcutcontainer.cpp b/src/gui/smileyshortcutcontainer.cpp
new file mode 100644
index 00000000..5a9c3036
--- /dev/null
+++ b/src/gui/smileyshortcutcontainer.cpp
@@ -0,0 +1,243 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "smileyshortcutcontainer.h"
+
+#include "../graphics.h"
+#include "../inventory.h"
+#include "../item.h"
+#include "../itemshortcut.h"
+#include "../keyboardconfig.h"
+#include "../localplayer.h"
+#include "../log.h"
+
+
+#include "../resources/image.h"
+#include "../resources/resourcemanager.h"
+
+#include "../utils/tostring.h"
+
+SmileyShortcutContainer::SmileyShortcutContainer():
+    mGridWidth(1),
+    mGridHeight(1),
+    mItemClicked(false),
+    mItemMoved(NULL)
+{
+    addMouseListener(this);
+    addWidgetListener(this);
+
+    ResourceManager *resman = ResourceManager::getInstance();
+
+    mBackgroundImg = resman->getImage("graphics/gui/item_shortcut_bgr.png");
+    mSmileyImg = resman->getImageSet("graphics/gui/emotions.png",30,32);
+    if (!mSmileyImg) logger->error("Unable to load emotions");
+
+    mMaxItems = 12; 
+
+    mBoxHeight = 42;
+    mBoxWidth = 36;
+}
+
+SmileyShortcutContainer::~SmileyShortcutContainer()
+{
+    mBackgroundImg->decRef();
+    if (mSmileyImg)
+    {
+       mSmileyImg->decRef();
+       mSmileyImg=NULL;
+    }
+
+}
+
+void
+SmileyShortcutContainer::draw(gcn::Graphics *graphics)
+{
+    Graphics *g = static_cast<Graphics*>(graphics);
+
+    graphics->setFont(getFont());
+
+    for (int i = 0; i < mMaxItems; i++)
+    {
+        const int itemX = (i % mGridWidth) * mBoxWidth;
+        const int itemY = (i / mGridWidth) * mBoxHeight;
+
+        g->drawImage(mBackgroundImg, itemX, itemY);
+
+        // Draw item keyboard shortcut.
+        const char *key = SDL_GetKeyName(
+            (SDLKey) keyboard.getKeyValue(keyboard.KEY_SMILEY_1 + i));
+        graphics->setColor(0x000000);
+        g->drawText(key, itemX + 2, itemY + 2, gcn::Graphics::LEFT);
+        static_cast<Graphics*>(graphics)->drawImage(
+                    mSmileyImg->get(i), itemX+2, itemY+10);
+
+#if 0
+        if (itemShortcut->getItem(i) < 0)
+            continue;
+
+        Item *item =
+            player_node->getInventory()->findItem(itemShortcut->getItem(i));
+        if (item) {
+            // Draw item icon.
+            const std::string label =
+                item->isEquipped() ? "Eq." : toString(item->getQuantity());
+            Image* image = item->getImage();
+            if (image) {
+                const std::string label =
+                    item->isEquipped() ? "Eq." : toString(item->getQuantity());
+                g->drawImage(image, itemX, itemY);
+                g->drawText(
+                        label,
+                        itemX + mBoxWidth / 2,
+                        itemY + mBoxHeight - 14,
+                        gcn::Graphics::CENTER);
+            }
+        }
+#endif
+    }
+    if (mItemMoved)
+    {
+        // Draw the item image being dragged by the cursor.
+        Image* image = mItemMoved->getImage();
+        if (image)
+        {
+            const int tPosX = mCursorPosX - (image->getWidth() / 2);
+            const int tPosY = mCursorPosY - (image->getHeight() / 2);
+
+            g->drawImage(image, tPosX, tPosY);
+            g->drawText(
+                    toString(mItemMoved->getQuantity()),
+                    tPosX + mBoxWidth / 2,
+                    tPosY + mBoxHeight - 14,
+                    gcn::Graphics::CENTER);
+        }
+    }
+}
+
+void SmileyShortcutContainer::widgetResized(const gcn::Event &event)
+{
+    mGridWidth = getWidth() / mBoxWidth;
+    if (mGridWidth < 1) {
+        mGridWidth = 1;
+    }
+
+    setHeight((mMaxItems / mGridWidth +
+                (mMaxItems % mGridWidth > 0 ? 1 : 0)) * mBoxHeight);
+
+    mGridHeight = getHeight() / mBoxHeight;
+    if (mGridHeight < 1) {
+        mGridHeight = 1;
+    }
+}
+
+void
+SmileyShortcutContainer::mouseDragged(gcn::MouseEvent &event)
+{
+    if (event.getButton() == gcn::MouseEvent::LEFT) {
+        if (!mItemMoved && mItemClicked) {
+            const int index = getIndexFromGrid(event.getX(), event.getY());
+            if (index == -1) {
+                return;
+            }
+#if 0
+            const int itemId = itemShortcut->getItem(index);
+            if (itemId < 0)
+                return;
+            Item *item = player_node->getInventory()->findItem(itemId);
+            if (item)
+            {
+                mItemMoved = item;
+                itemShortcut->removeItem(index);
+            }
+#endif
+        }
+        if (mItemMoved) {
+            mCursorPosX = event.getX();
+            mCursorPosY = event.getY();
+        }
+    }
+}
+
+void
+SmileyShortcutContainer::mousePressed(gcn::MouseEvent &event)
+{
+    const int index = getIndexFromGrid(event.getX(), event.getY());
+    if (index == -1) {
+        return;
+    }
+#if 0
+    // Stores the selected item if theirs one.
+    if (itemShortcut->isItemSelected()) {
+        itemShortcut->setItem(index);
+        itemShortcut->setItemSelected(-1);
+    }
+    else if (itemShortcut->getItem(index)) {
+        mItemClicked = true;
+    }
+#endif
+}
+
+void
+SmileyShortcutContainer::mouseReleased(gcn::MouseEvent &event)
+{
+    if (event.getButton() == gcn::MouseEvent::LEFT)
+    {
+#if 0
+        if (itemShortcut->isItemSelected())
+        {
+            itemShortcut->setItemSelected(-1);
+        }
+        const int index = getIndexFromGrid(event.getX(), event.getY());
+        if (index == -1) {
+            mItemMoved = NULL;
+            return;
+        }
+        if (mItemMoved) {
+            itemShortcut->setItems(index, mItemMoved->getId());
+            mItemMoved = NULL;
+        }
+        else if (itemShortcut->getItem(index) && mItemClicked)
+        {
+            itemShortcut->useItem(index);
+        }
+        if (mItemClicked) {
+            mItemClicked = false;
+        }
+#endif
+    }
+}
+
+int
+SmileyShortcutContainer::getIndexFromGrid(int pointX, int pointY) const
+{
+    const gcn::Rectangle tRect = gcn::Rectangle(
+        0, 0, mGridWidth * mBoxWidth, mGridHeight * mBoxHeight);
+    if (!tRect.isPointInRect(pointX, pointY)) {
+        return -1;
+    }
+    const int index = ((pointY / mBoxHeight) * mGridWidth) +
+        pointX / mBoxWidth;
+    if (index >= mMaxItems)
+    {
+        return -1;
+    }
+    return index;
+}
diff --git a/src/gui/smileyshortcutcontainer.h b/src/gui/smileyshortcutcontainer.h
new file mode 100644
index 00000000..72ddd54a
--- /dev/null
+++ b/src/gui/smileyshortcutcontainer.h
@@ -0,0 +1,111 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _TMW_SMILEYSHORTCUTCONTAINER_H__
+#define _TMW_SMILEYSHORTCUTCONTAINER_H__
+
+#include <guichan/mouselistener.hpp>
+#include <guichan/widget.hpp>
+#include <guichan/widgetlistener.hpp>
+#include <resources/imageset.h>
+
+#include "../guichanfwd.h"
+#include "shortcutcontainer.h"
+
+class Image;
+class Item;
+
+/**
+ * A smiley shortcut container. Used to quickly use items.
+ *
+ * \ingroup GUI
+ */
+class SmileyShortcutContainer : public ShortcutContainer
+{
+    public:
+        /**
+         * Constructor. Initializes the graphic.
+         */
+        SmileyShortcutContainer();
+
+        /**
+         * Destructor.
+         */
+        virtual ~SmileyShortcutContainer();
+
+        /**
+         * Draws the items.
+         */
+        void draw(gcn::Graphics *graphics);
+
+        /**
+         * Invoked when a widget changes its size. This is used to determine
+         * the new height of the container.
+         */
+        void widgetResized(const gcn::Event &event);
+
+        /**
+         * Handles mouse when dragged.
+         */
+        void mouseDragged(gcn::MouseEvent &event);
+
+        /**
+         * Handles mouse when pressed.
+         */
+        void mousePressed(gcn::MouseEvent &event);
+
+        /**
+         * Handles mouse release.
+         */
+        void mouseReleased(gcn::MouseEvent &event);
+
+        int getMaxItems()
+        { return mMaxItems; }
+
+        int getBoxWidth()
+        { return mBoxWidth; }
+
+        int getBoxHeight()
+        { return mBoxHeight; }
+
+    private:
+        /**
+         * Gets the index from the grid provided the point is in an item box.
+         *
+         * @param pointX X coordinate of the point.
+         * @param pointY Y coordinate of the point.
+         * @return index on success, -1 on failure.
+         */
+        int getIndexFromGrid(int pointX, int pointY) const;
+
+        Image *mBackgroundImg;
+        ImageSet *mSmileyImg;
+
+        int mMaxItems;
+        int mBoxWidth;
+        int mBoxHeight;
+        int mCursorPosX, mCursorPosY;
+        int mGridWidth, mGridHeight;
+        bool mItemClicked;
+        Item *mItemMoved;
+};
+
+#endif
diff --git a/src/gui/smileywindow.cpp b/src/gui/smileywindow.cpp
new file mode 100644
index 00000000..c7c9d995
--- /dev/null
+++ b/src/gui/smileywindow.cpp
@@ -0,0 +1,96 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <string>
+
+#include <guichan/mouseinput.hpp>
+
+#include "button.h"
+#include "gui.h"
+#include "smileywindow.h"
+#include "smileycontainer.h"
+#include "scrollarea.h"
+#include "../localplayer.h"      
+#include "../utils/tostring.h"
+
+SmileyWindow::SmileyWindow():
+    Window("Smiley")
+{
+    setWindowName("Smiley");
+    setResizable(true);
+    setCloseButton(true);
+    setMinWidth(80);
+    setDefaultSize(115, 25, 322, 200);
+
+    mUseButton = new Button("Use", "use", this);
+
+    mItems = new SmileyContainer();
+    mItems->addSelectionListener(this);
+
+    mInvenScroll = new ScrollArea(mItems);
+    mInvenScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+
+    draw();
+
+    add(mUseButton);
+    add(mInvenScroll);
+
+    mUseButton->setSize(60, mUseButton->getHeight());
+
+    loadWindowState();
+}
+
+void SmileyWindow::action(const gcn::ActionEvent &event)
+{
+    int item = mItems->getSelectedSmiley();
+
+    if (!item)
+        return;
+
+    player_node->emote(item);
+}
+
+
+void SmileyWindow::draw()
+{
+    const gcn::Rectangle &area = getChildrenArea();
+    const int width = area.width;
+    const int height = area.height;
+
+    mUseButton->setPosition(8, height - 8 - mUseButton->getHeight());
+
+    mInvenScroll->setSize(width - 16, mUseButton->getY() - 18);
+    mInvenScroll->setPosition(8,  10);
+
+    setMinHeight(130);
+}
+
+void SmileyWindow::widgetResized(const gcn::Event &event)
+{
+    Window::widgetResized(event);
+    draw();
+}
+
+
+int SmileyWindow::getSelectedSmiley() const
+{
+    return mItems->getSelectedSmiley();
+}
diff --git a/src/gui/smileywindow.h b/src/gui/smileywindow.h
new file mode 100644
index 00000000..81ec6663
--- /dev/null
+++ b/src/gui/smileywindow.h
@@ -0,0 +1,80 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _TMW_SMILEYWINDOW_H
+#define _TMW_SMILEYWINDOW_H
+
+#include <guichan/actionlistener.hpp>
+#include <guichan/selectionlistener.hpp>
+
+#include "textbox.h"
+#include "window.h"
+
+#include "../guichanfwd.h"
+
+class Item;
+class SmileyContainer;
+
+/**
+ * smiley dialog.
+ *
+ * \ingroup Interface
+ */
+class SmileyWindow : public Window, gcn::ActionListener,
+    gcn::SelectionListener
+{
+    public:
+        /**
+         * Constructor.
+         */
+        SmileyWindow();
+
+        /**
+         * Called when receiving actions from the widgets.
+         */
+        void action(const gcn::ActionEvent &event);
+
+        /**
+         * Returns the selected item.
+         */
+        int getSelectedSmiley() const;
+
+        /**
+         * Updates window drawing.
+         */
+        void draw();
+
+        /**
+         * Called whenever the widget changes size.
+         */
+        void widgetResized(const gcn::Event &event);
+
+    private:
+
+        SmileyContainer *mItems;
+
+        gcn::Button *mUseButton;
+        gcn::ScrollArea *mInvenScroll;
+};
+
+extern SmileyWindow *smileyWindow;
+
+#endif
-- 
cgit v1.2.3-70-g09d2


From fde40d91bceb1c7e7818d898f8731089ff87a9f4 Mon Sep 17 00:00:00 2001
From: Forge <jgrimbert@free.fr>
Date: Sun, 4 Jan 2009 20:18:25 +0100
Subject: Smiley step 1.91, the little part to make it work TODO list of 1.9
 still intact.

---
 src/Makefile.am                 | 12 ++++++++++--
 src/game.cpp                    | 26 +++++++++++++++++++++++---
 src/gui/itemshortcutcontainer.h |  5 ++---
 src/keyboardconfig.cpp          |  2 +-
 4 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 658f3a10..382f33e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,12 +49,20 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/inttextbox.cpp \
 	      gui/inventorywindow.cpp \
 	      gui/inventorywindow.h \
+	      gui/smileywindow.cpp \
+	      gui/smileywindow.h \
+	      gui/smileycontainer.cpp \
+	      gui/smileycontainer.h \
 	      gui/itemcontainer.cpp \
 	      gui/itemcontainer.h \
 	      gui/itemshortcutcontainer.cpp \
 	      gui/itemshortcutcontainer.h \
-	      gui/itemshortcutwindow.cpp \
-	      gui/itemshortcutwindow.h \
+	      gui/shortcutwindow.cpp \
+	      gui/shortcutwindow.h \
+	      gui/smileyshortcutcontainer.cpp \
+	      gui/smileyshortcutcontainer.h \
+	      gui/shortcutcontainer.cpp \
+	      gui/shortcutcontainer.h \
 	      gui/item_amount.cpp \
 	      gui/item_amount.h \
 	      gui/linkhandler.h \
diff --git a/src/game.cpp b/src/game.cpp
index f886f859..666820f5 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -53,7 +53,11 @@
 #include "gui/gui.h"
 #include "gui/help.h"
 #include "gui/inventorywindow.h"
-#include "gui/itemshortcutwindow.h"
+#include "gui/smileywindow.h"
+#include "gui/shortcutwindow.h"
+#include "gui/shortcutcontainer.h"
+#include "gui/itemshortcutcontainer.h"
+#include "gui/smileyshortcutcontainer.h"
 #include "gui/menuwindow.h"
 #include "gui/minimap.h"
 #include "gui/ministatus.h"
@@ -112,6 +116,7 @@ BuyDialog *buyDialog;
 SellDialog *sellDialog;
 BuySellDialog *buySellDialog;
 InventoryWindow *inventoryWindow;
+SmileyWindow *smileyWindow;
 NpcListDialog *npcListDialog;
 NpcTextDialog *npcTextDialog;
 SkillDialog *skillDialog;
@@ -122,7 +127,8 @@ TradeWindow *tradeWindow;
 //BuddyWindow *buddyWindow;
 HelpWindow *helpWindow;
 DebugWindow *debugWindow;
-ItemShortcutWindow *itemShortcutWindow;
+ShortcutWindow *itemShortcutWindow;
+ShortcutWindow *smileyShortcutWindow;
 
 BeingManager *beingManager = NULL;
 FloorItemManager *floorItemManager = NULL;
@@ -195,6 +201,7 @@ void createGuiWindows(Network *network)
     sellDialog = new SellDialog(network);
     buySellDialog = new BuySellDialog();
     inventoryWindow = new InventoryWindow();
+    smileyWindow = new SmileyWindow();
     npcTextDialog = new NpcTextDialog();
     npcListDialog = new NpcListDialog();
     skillDialog = new SkillDialog();
@@ -205,7 +212,8 @@ void createGuiWindows(Network *network)
     //buddyWindow = new BuddyWindow();
     helpWindow = new HelpWindow();
     debugWindow = new DebugWindow();
-    itemShortcutWindow = new ItemShortcutWindow();
+    itemShortcutWindow = new ShortcutWindow("ItemShortcut",new ItemShortcutContainer);
+    smileyShortcutWindow = new ShortcutWindow("SmileyShortcut",new SmileyShortcutContainer);
 
     // Initialize window positions
     //buddyWindow->setPosition(10, minimap->getHeight() + 30);
@@ -224,6 +232,8 @@ void createGuiWindows(Network *network)
         menuWindow->getWindowName() + "Visible", true));
     itemShortcutWindow->setVisible((bool) config.getValue(
         itemShortcutWindow->getWindowName() + "Visible", true));
+    smileyShortcutWindow->setVisible((bool) config.getValue(
+        smileyShortcutWindow->getWindowName() + "Visible", true));
 
     if (config.getValue("logToChat", 0))
     {
@@ -244,6 +254,7 @@ void destroyGuiWindows()
     delete sellDialog;
     delete buySellDialog;
     delete inventoryWindow;
+    delete smileyWindow;
     delete npcListDialog;
     delete npcTextDialog;
     delete skillDialog;
@@ -255,6 +266,7 @@ void destroyGuiWindows()
     delete helpWindow;
     delete debugWindow;
     delete itemShortcutWindow;
+    delete smileyShortcutWindow;
 }
 
 Game::Game(Network *network):
@@ -553,6 +565,7 @@ void Game::handleInput()
 		{
 		    player_node->emote(emotion);
 		    used = true;
+                    return;
 		}
 	    }
 	    switch (event.key.keysym.sym)
@@ -706,6 +719,7 @@ void Game::handleInput()
 			{
 			    statusWindow->setVisible(false);
 			    inventoryWindow->setVisible(false);
+			    smileyWindow->setVisible(false);
 			    skillDialog->setVisible(false);
 			    setupWindow->setVisible(false);
 			    equipmentWindow->setVisible(false);
@@ -741,6 +755,12 @@ void Game::handleInput()
 		    case KeyboardConfig::KEY_WINDOW_DEBUG:
 			requestedWindow = debugWindow;
 			break;
+		    case KeyboardConfig::KEY_WINDOW_ALLSMILEY:
+			requestedWindow = smileyWindow;
+			break;
+		    case KeyboardConfig::KEY_WINDOW_SMILEY_SHORTCUT:
+			requestedWindow = smileyShortcutWindow;
+			break;
 		}
 	    }
 
diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h
index a8daca0b..92b9b968 100644
--- a/src/gui/itemshortcutcontainer.h
+++ b/src/gui/itemshortcutcontainer.h
@@ -27,6 +27,7 @@
 #include <guichan/widgetlistener.hpp>
 
 #include "../guichanfwd.h"
+#include "shortcutcontainer.h"
 
 class Image;
 class Item;
@@ -36,9 +37,7 @@ class Item;
  *
  * \ingroup GUI
  */
-class ItemShortcutContainer : public gcn::Widget,
-                              public gcn::WidgetListener,
-                              public gcn::MouseListener
+class ItemShortcutContainer : public ShortcutContainer
 {
     public:
         /**
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 930d8944..0923f331 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -180,7 +180,7 @@ int KeyboardConfig::getKeySmilieOffset(int keyValue) const
             return 1+i-KEY_SMILEY_1;
         }
     }
-    return KEY_NO_VALUE;
+    return 0;
 }
 
 bool KeyboardConfig::isKeyActive(int index)
-- 
cgit v1.2.3-70-g09d2


From 77db175ceabe8d05665191835d0250a927d93d32 Mon Sep 17 00:00:00 2001
From: Björn Steinbrink <B.Steinbrink@gmx.de>
Date: Fri, 21 Sep 2007 03:58:07 +0000
Subject: Refactor the way in which browser box text is drawn and wrapped.

(cherry picked from mainline commit ecabe82d8720689905a6d035b0597d97037287c7)

Conflicts:

	src/gui/browserbox.cpp
---
 src/gui/browserbox.cpp | 215 +++++++++++++++++++++++++++++--------------------
 src/gui/browserbox.h   |  30 +++++--
 2 files changed, 151 insertions(+), 94 deletions(-)

diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 18acfa6a..1441109f 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -21,14 +21,10 @@
 
 #include <algorithm>
 
-#include <guichan/graphics.hpp>
-#include <guichan/imagefont.hpp>
-#include <guichan/mouseinput.hpp>
-
 #include "browserbox.h"
-#include "colour.h"
 #include "linkhandler.h"
 
+#include "../graphics.h"
 #include "../sdltruetypefont.hpp"
 
 BrowserBox::BrowserBox(unsigned int mode):
@@ -73,7 +69,7 @@ void BrowserBox::addRow(const std::string &row)
     std::string newRow;
     BROWSER_LINK bLink;
     int idx1, idx2, idx3;
-    gcn::Font *font = getFont();
+    gcn::contrib::SDLTrueTypeFont *font = static_cast<gcn::contrib::SDLTrueTypeFont*>(getFont());
 
     // Use links and user defined colors
     if (mUseLinksAndUserColors)
@@ -103,12 +99,12 @@ void BrowserBox::addRow(const std::string &row)
 
             mLinks.push_back(bLink);
 
-            newRow += "##<" + bLink.caption;
+            newRow += "##L" + bLink.caption;
 
             tmp.erase(0, idx3 + 2);
             if(tmp != "")
             {
-                newRow += "##>";
+                newRow += "##P";
             }
             idx1 = tmp.find("@@");
         }
@@ -145,7 +141,7 @@ void BrowserBox::addRow(const std::string &row)
 
     if (mMode == AUTO_WRAP)
     {
-        unsigned int j, y = 0;
+        unsigned int y = 0;
         unsigned int nextChar;
         const char *hyphen = "~";
         int hyphenWidth = font->getWidth(hyphen);
@@ -154,7 +150,7 @@ void BrowserBox::addRow(const std::string &row)
         for (TextRowIterator i = mTextRows.begin(); i != mTextRows.end(); i++)
         {
             std::string row = *i;
-            for (j = 0; j < row.size(); j++)
+            for (unsigned int j = 0; j < row.size(); j++)
             {
                 std::string character = row.substr(j, 1);
                 x += font->getWidth(character);
@@ -259,8 +255,7 @@ BrowserBox::draw(gcn::Graphics *graphics)
 
         if ((mHighMode & UNDERLINE))
         {
-            bool valid;
-            graphics->setColor(gcn::Color(textColour->getColour('<', valid)));
+            graphics->setColor(gcn::Color(LINK));
             graphics->drawLine(
                     mLinks[mSelectedLink].x1,
                     mLinks[mSelectedLink].y2,
@@ -269,10 +264,9 @@ BrowserBox::draw(gcn::Graphics *graphics)
         }
     }
 
-    unsigned int j;
     int x = 0, y = 0;
     int wrappedLines = 0;
-    gcn::Font *font = getFont();
+    gcn::contrib::SDLTrueTypeFont *font = static_cast<gcn::contrib::SDLTrueTypeFont*>(getFont());
 
     graphics->setColor(BLACK);
     for (TextRowIterator i = mTextRows.begin(); i != mTextRows.end(); i++)
@@ -280,103 +274,148 @@ BrowserBox::draw(gcn::Graphics *graphics)
         int selColor = BLACK;
         int prevColor = selColor;
         std::string row = *(i);
+        bool wrapped = false;
         x = 0;
 
-        for (j = 0; j < row.size(); j++)
+        // Check for separator lines
+        if (row.find("---", 0) == 0)
+        {
+            for (x = 0; x < getWidth(); x++)
+            {
+                font->drawString(graphics, "-", x, y);
+                x += font->getWidth("-") - 2;
+            }
+            y += font->getHeight();
+            continue;
+        }
+
+        // TODO: Check if we must take texture size limits into account here
+        // TODO: Check if some of the O(n) calls can be removed
+        for (std::string::size_type start = 0, end = std::string::npos;
+                start != std::string::npos;
+                start = end, end = std::string::npos)
         {
-            if ( (mUseLinksAndUserColors && (j + 3) <= row.size()) ||
-                    (!mUseLinksAndUserColors && (j == 0)) )
+            // Wrapped line continuation shall be indented
+            if (wrapped)
+            {
+                y += font->getHeight();
+                x = 15;
+            }
+
+            // "Tokenize" the string at control sequences
+            if (mUseLinksAndUserColors)
+                end = row.find("##", start + 1);
+
+            if (mUseLinksAndUserColors ||
+                    (!mUseLinksAndUserColors && (start == 0)))
             {
-                // Check for color change in format "##x"
-                if ((row.at(j) == '#') && (row.at(j + 1) == '#'))
+                // Check for color change in format "##x", x = [L,P,0..9]
+                if (row.find("##", start) == start && row.size() > start + 2)
                 {
-                    char c = row.at(j + 2);
-                    if (c == '>')
+                    switch (row.at(start + 2))
                     {
-                        selColor = prevColor;
-                    }
-                    else
-                    {
-                        bool valid;
-                        int rgb = textColour->getColour(c, valid);
-                        if (c == '<')
-                        {
+                        case 'L': // Link color
                             prevColor = selColor;
-                        }
-                        if (valid)
-                        {
-                            selColor = rgb;
-                        }
-                    }
-                    j += 3;
-
-                    if (j == row.size())
-                    {
-                        break;
+                            selColor = LINK;
+                            break;
+                        case 'P': // Previous color
+                            selColor = prevColor;
+                            break;
+                        case '1':
+                            prevColor = selColor;
+                            selColor = RED;
+                            break;
+                        case '2':
+                            prevColor = selColor;
+                            selColor = GREEN;
+                            break;
+                        case '3':
+                            prevColor = selColor;
+                            selColor = BLUE;
+                            break;
+                        case '4':
+                            prevColor = selColor;
+                            selColor = ORANGE;
+                            break;
+                        case '5':
+                            prevColor = selColor;
+                            selColor = YELLOW;
+                            break;
+                        case '6':
+                            prevColor = selColor;
+                            selColor = PINK;
+                            break;
+                        case '7':
+                            prevColor = selColor;
+                            selColor = PURPLE;
+                            break;
+                        case '8':
+                            prevColor = selColor;
+                            selColor = GRAY;
+                            break;
+                        case '9':
+                            prevColor = selColor;
+                            selColor = BROWN;
+                            break;
+                        case '0':
+                        default:
+                            prevColor = selColor;
+                            selColor = BLACK;
                     }
+                    start += 3;
                 }
                 graphics->setColor(gcn::Color(selColor));
             }
 
-            // Check for line separators in format "---"
-            if (row == "---")
-            {
-                for (x = 0; x < getWidth(); x++)
-                {
-                    const std::string dash = "-";
-                    font->drawString(graphics, dash, x, y);
-                    x += font->getWidth("-") - 2;
-                }
-                break;
-            }
-            // Draw each char
-            else
+            std::string::size_type len =
+                end == std::string::npos ? end : end - start;
+            std::string part = row.substr(start, len);
+
+            // Auto wrap mode
+            if (mMode == AUTO_WRAP &&
+                    (x + font->getWidth(part.c_str()) + 10) > getWidth())
             {
-                std::string character = row.substr(j, 1);
-                font->drawString(graphics, character, x, y);
-                x += font->getWidth(character.c_str());
+                bool forced = false;
+                char const *hyphen = "~";
+                int hyphenWidth =  font->getWidth(hyphen);
 
-                // Auto wrap mode
-                if (mMode == AUTO_WRAP)
+                do
                 {
-                    unsigned int nextChar = j + 1;
-                    const std::string hyphen = "~";
-                    int hyphenWidth =  font->getWidth(hyphen);
+                    if (!forced)
+                        end = row.rfind(" ", end);
 
-                    // Wraping between words (at blank spaces)
-                    if ((nextChar < row.size()) && (row.at(nextChar) == ' '))
+                    // Check if we have to (stupidly) force-wrap
+                    if (end == std::string::npos || end <= start)
                     {
-                        int nextSpacePos = row.find(" ", (nextChar + 1));
-                        if (nextSpacePos <= 0)
-                        {
-                            nextSpacePos = row.size() - 1;
-                        }
-                        int nextWordWidth = font->getWidth(
-                                row.substr(nextChar,
-                                    (nextSpacePos - nextChar)));
-
-                        if ((x + nextWordWidth + 10) > getWidth())
-                        {
-                            x = 15; // Ident in new line
-                            y += font->getHeight();
-                            wrappedLines++;
-                            j++;
-                        }
+                        forced = true;
+                        end = row.size();
+                        x += hyphenWidth * 2; // Account for the wrap-notifier
+                        continue;
                     }
 
-                    // Wrapping looong lines (brutal force)
-                    else if ((x + 2 * hyphenWidth) > getWidth())
-                    {
-                        font->drawString(graphics, hyphen,
-                                getWidth() - hyphenWidth, y);
-                        x = 15; // Ident in new line
-                        y += font->getHeight();
-                        wrappedLines++;
-                    }
+                    end--;
+
+                    part = row.substr(start, end - start + 1);
+                } while ((x + font->getWidth(part.c_str()) + 10) > getWidth());
+
+                if (forced)
+                {
+                    x -= hyphenWidth; // Remove the wrap-notifier accounting
+                    font->drawString(graphics, hyphen,
+                            getWidth() - hyphenWidth, y);
+                    end++; // Skip to the next character
                 }
+                else
+                    end += 2; // Skip to after the space
+
+                wrapped = true;
+                wrappedLines++;
             }
+            font->drawString(graphics, part, x, y);
+            x += font->getWidth(part.c_str());
         }
         y += font->getHeight();
         setHeight((mTextRows.size() + wrappedLines) * font->getHeight());
     }
 }
+
diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h
index 1c1e283a..7f871c96 100644
--- a/src/gui/browserbox.h
+++ b/src/gui/browserbox.h
@@ -25,8 +25,8 @@
 #include <iosfwd>
 #include <vector>
 
-#include <guichan/mouselistener.hpp>
 #include <guichan/widget.hpp>
+#include <guichan/mouselistener.hpp>
 
 #include "../guichanfwd.h"
 #include "../main.h"
@@ -111,13 +111,30 @@ class BrowserBox : public gcn::Widget, public gcn::MouseListener
         };
 
         /**
-         * Some colours used in the browser box
+         * BrowserBox colors.
+         *
+         * NOTES (by Javila):
+         *  - color values is "0x" prefix followed by HTML color style.
+         *  - we can add up to 10 different colors: [0..9].
+         *  - we need a link and a highlighted link colors.
+         *  - not all colors will be fine with all backgrounds due transparent
+         *    windows and widgets. So, I think it's better keep BrowserBox
+         *    opaque (white background) by default.
          */
-
         enum {
-            BLACK = 0x000000,
-            BGCOLOR = 0xffffff,
-            HIGHLIGHT = 0xcacaca
+            BLACK = 0x000000,       /**< Color 0 */
+            RED = 0xff0000,         /**< Color 1 */
+            GREEN = 0x1fa052,       /**< Color 2 */
+            BLUE = 0x0000ff,        /**< Color 3 */
+            ORANGE = 0xe0980e,      /**< Color 4 */
+            YELLOW = 0xf1dc27,      /**< Color 5 */
+            PINK = 0xff00d8,        /**< Color 6 */
+            PURPLE = 0x8415e2,      /**< Color 7 */
+            GRAY = 0x919191,        /**< Color 8 */
+            BROWN = 0x8e4c17,       /**< Color 9 */
+            BGCOLOR = 0xffffff,     /**< Bg color for opacity */
+            LINK = 0xe50d0d,        /**< Color L */
+            HIGHLIGHT = 0xcacaca    /**< Bg color for highlighted link */
         };
 
         /**
@@ -148,3 +165,4 @@ class BrowserBox : public gcn::Widget, public gcn::MouseListener
 };
 
 #endif
+
-- 
cgit v1.2.3-70-g09d2


From b6e7b6c6cb3ea26157e3a78713cc9621dc46b2d7 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Fri, 22 Feb 2008 19:58:29 +0000
Subject: Handling gender with an enum everywhere.

(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97)

Conflicts:

	src/net/beinghandler.cpp
	src/net/charserverhandler.cpp
	src/player.cpp
	src/player.h
---
 src/being.cpp                 |  4 ++--
 src/being.h                   | 12 +++++++++---
 src/gui/char_select.cpp       |  4 ++--
 src/gui/char_select.h         |  7 ++++---
 src/main.cpp                  |  4 +++-
 src/net/beinghandler.cpp      |  6 ++++--
 src/net/charserverhandler.cpp |  5 +++--
 src/npc.cpp                   |  2 +-
 src/npc.h                     |  2 +-
 src/player.cpp                | 20 ++++++--------------
 src/player.h                  |  2 +-
 src/resources/itemdb.cpp      |  8 ++++----
 src/resources/iteminfo.cpp    |  2 +-
 src/resources/iteminfo.h      |  6 ++++--
 14 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index edacbc26..07895eb2 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -73,7 +73,7 @@ Being::Being(int id, int job, Map *map):
     mParticleEffects(config.getValue("particleeffects", 1)),
     mEquippedWeapon(NULL),
     mHairStyle(1), mHairColor(0),
-    mGender(2),
+    mGender(GENDER_UNSPECIFIED),
     mSpeechTime(0),
     mPx(0), mPy(0),
     mSprites(VECTOREND_SPRITE, NULL),
@@ -95,7 +95,7 @@ Being::Being(int id, int job, Map *map):
 
         // Hairstyles are encoded as negative numbers.  Count how far negative we can go.
         int hairstyles = 1;
-        while (ItemDB::get(-hairstyles).getSprite(0) != "error.xml")
+        while (ItemDB::get(-hairstyles).getSprite(GENDER_MALE) != "error.xml")
         {
             hairstyles++;
         }
diff --git a/src/being.h b/src/being.h
index ca051811..ccb1c4c4 100644
--- a/src/being.h
+++ b/src/being.h
@@ -70,6 +70,12 @@ struct PATH_NODE
 typedef std::list<PATH_NODE> Path;
 typedef Path::iterator PathIterator;
 
+enum Gender {
+    GENDER_MALE = 0,
+    GENDER_FEMALE = 1,
+    GENDER_UNSPECIFIED = 2
+};
+
 class Being : public Sprite
 {
     public:
@@ -222,12 +228,12 @@ class Being : public Sprite
         /**
          * Sets the gender of this being.
          */
-        virtual void setGender(int gender) { mGender = gender; }
+        virtual void setGender(Gender gender) { mGender = gender; }
 
         /**
          * Gets the gender of this being.
          */
-        int getGender() const { return mGender; }
+        Gender getGender() const { return mGender; }
 
         /**
          * Makes this being take the next step of his path.
@@ -419,7 +425,7 @@ class Being : public Sprite
         std::string mSpeech;
         Text *mText;
         Uint16 mHairStyle, mHairColor;
-        Uint8 mGender;
+        Gender mGender;
         Uint32 mSpeechTime;
         Sint32 mPx, mPy;                /**< Pixel coordinates */
         Uint16 mStunMode;		/**< Stun mode; zero if not stunned */
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 53cc1e8d..6a52a745 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -73,7 +73,7 @@ void CharDeleteConfirm::action(const gcn::ActionEvent &event)
 
 CharSelectDialog::CharSelectDialog(Network *network,
                                    LockedArray<LocalPlayer*> *charInfo,
-                                   unsigned char gender):
+                                   Gender gender):
     Window("Select Character"), mNetwork(network),
     mCharInfo(charInfo), mGender(gender), mCharSelected(false)
 {
@@ -248,7 +248,7 @@ bool CharSelectDialog::selectByName(const std::string &name)
 }
 
 CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network,
-                                   unsigned char gender):
+                                   Gender gender):
     Window("Create Character", true, parent), mNetwork(network), mSlot(slot)
 {
     mPlayer = new Player(0, 0, NULL);
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index 63630736..d592ce48 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -28,6 +28,7 @@
 
 #include "../guichanfwd.h"
 #include "../lockedarray.h"
+#include "../being.h"
 
 class LocalPlayer;
 class Network;
@@ -48,7 +49,7 @@ class CharSelectDialog : public Window, public gcn::ActionListener
          */
         CharSelectDialog(Network *network,
                          LockedArray<LocalPlayer*> *charInfo,
-                         unsigned char gender);
+                         Gender gender);
 
         void action(const gcn::ActionEvent &event);
 
@@ -76,7 +77,7 @@ class CharSelectDialog : public Window, public gcn::ActionListener
 
         PlayerBox *mPlayerBox;
 
-        unsigned char mGender;
+        Gender mGender;
         bool mCharSelected;
 
         /**
@@ -102,7 +103,7 @@ class CharCreateDialog : public Window, public gcn::ActionListener
          * Constructor.
          */
         CharCreateDialog(Window *parent, int slot, Network *network,
-                         unsigned char gender);
+                         Gender gender);
 
         /**
          * Destructor.
diff --git a/src/main.cpp b/src/main.cpp
index 12789d80..7de3823f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -937,8 +937,10 @@ int main(int argc, char *argv[])
                 case CHAR_SELECT_STATE:
                     logger->log("State: CHAR_SELECT");
                     currentDialog = new CharSelectDialog(network, &charInfo,
-                                                         1 - loginData.sex);
+                                                        (loginData.sex == 0) ?
+                                                         GENDER_FEMALE : GENDER_MALE);
                     positionDialog(currentDialog, screenWidth, screenHeight);
+
                     if (((CharSelectDialog*) currentDialog)->
                             selectByName(options.playername))
                         options.chooseDefault = true;
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 4f525e8d..5b689266 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -137,7 +137,8 @@ void BeingHandler::handleMessage(MessageIn *msg)
             msg->readInt16();  // manner
             msg->readInt16();  // karma
             msg->readInt8();   // unknown
-            dstBeing->setGender(1 - msg->readInt8());   // gender
+            dstBeing->setGender(
+                    (msg->readInt8() == 0) ? GENDER_FEMALE : GENDER_MALE);
 
             // Set these after the gender, as the sprites may be gender-specific
             dstBeing->setSprite(Being::BOTTOMCLOTHES_SPRITE, headBottom);
@@ -404,7 +405,8 @@ void BeingHandler::handleMessage(MessageIn *msg)
             msg->readInt32();  // emblem
             msg->readInt16();  // manner
             msg->readInt8();   // karma
-            dstBeing->setGender(1 - msg->readInt8());   // gender
+            dstBeing->setGender(
+                    (msg->readInt8() == 0) ? GENDER_FEMALE : GENDER_MALE);
 
             // Set these after the gender, as the sprites may be gender-specific
             dstBeing->setSprite(Being::WEAPON_SPRITE, weapon);
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 11754b6f..eb724630 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -187,10 +187,11 @@ void CharServerHandler::handleMessage(MessageIn *msg)
     }
 }
 
-LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
+LocalPlayer *CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
 {
     LocalPlayer *tempPlayer = new LocalPlayer(mLoginData->account_ID, 0, NULL);
-    tempPlayer->setGender(1 - mLoginData->sex);
+    tempPlayer->setGender(
+            (mLoginData->sex == 0) ? GENDER_FEMALE : GENDER_MALE);
 
     tempPlayer->mCharId = msg.readInt32();
     tempPlayer->setXp(msg.readInt32());
diff --git a/src/npc.cpp b/src/npc.cpp
index 8dbbf83c..2aa15209 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -94,7 +94,7 @@ void NPC::setName(const std::string &name)
     Being::setName(displayName + " (NPC)");
 }
 
-void NPC::setGender(int gender)
+void NPC::setGender(Gender gender)
 {
     Being::setGender(gender);
 }
diff --git a/src/npc.h b/src/npc.h
index a37e8c66..6e150e2b 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -36,7 +36,7 @@ class NPC : public Player
         ~NPC();
 
         void setName(const std::string &name);
-        void setGender(int gender);
+        void setGender(Gender gender);
         void setSprite(int slot, int id, std::string color);
 
         virtual Type
diff --git a/src/player.cpp b/src/player.cpp
index e6244bb5..47275c81 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -124,25 +124,17 @@ Player::flash(int time)
     }
 }
 
-void Player::setGender(int gender)
+void Player::setGender(Gender gender)
 {
-    // Players can only be male or female
-    if (gender > 1)
-    {
-        logger->log("Warning: unsupported gender %i, assuming male.", gender);
-        gender = 0;
-    }
-
-
     if (gender != mGender)
     {
         Being::setGender(gender);
 
-        setSprite(Being::BASE_SPRITE, -100); /* Human base sprite. When implementing
-                                              * different races remove this line
-                                              * and set the base sprite when setting
-                                              * the race of the player character.
-                                              */
+        /* Human base sprite. When implementing different races remove this
+         * line and set the base sprite when setting the race of the player
+         * character.
+         */
+        setSprite(Being::BASE_SPRITE, -100);
 
         // Reload all subsprites
         for (int i = 1; i < VECTOREND_SPRITE; i++)
diff --git a/src/player.h b/src/player.h
index c91ad3c2..97ff15d9 100644
--- a/src/player.h
+++ b/src/player.h
@@ -53,7 +53,7 @@ class Player : public Being
         getType() const;
 
         virtual void
-        setGender(int gender);
+        setGender(Gender gender);
 
         /**
          * Sets the hair style and color for this player.
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index f4ccc511..bca2b030 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -53,8 +53,8 @@ void ItemDB::load()
     mUnknown = new ItemInfo();
     mUnknown->setName("Unknown item");
     mUnknown->setImageName("");
-    mUnknown->setSprite("error.xml", 0);
-    mUnknown->setSprite("error.xml", 1);
+    mUnknown->setSprite("error.xml", GENDER_MALE);
+    mUnknown->setSprite("error.xml", GENDER_FEMALE);
 
     XML::Document doc("items.xml");
     xmlNodePtr rootNode = doc.rootNode();
@@ -172,11 +172,11 @@ void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node)
 
     if (gender == "male" || gender == "unisex")
     {
-        itemInfo->setSprite(filename, 0);
+        itemInfo->setSprite(filename, GENDER_MALE);
     }
     if (gender == "female" || gender == "unisex")
     {
-        itemInfo->setSprite(filename, 1);
+        itemInfo->setSprite(filename, GENDER_FEMALE);
     }
 }
 
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 5daeafe6..6f669376 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -23,7 +23,7 @@
 #include "iteminfo.h"
 
 const std::string&
-ItemInfo::getSprite(int gender) const
+ItemInfo::getSprite(Gender gender) const
 {
     if (mView)
     {
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 4678bc08..b7729d2c 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -28,6 +28,8 @@
 
 #include "spritedef.h"
 
+#include "../being.h"
+
 enum EquipmentSoundEvent
 {
     EQUIP_EVENT_STRIKE,
@@ -91,10 +93,10 @@ class ItemInfo
         void setView(int view)
         { mView = view; }
 
-        void setSprite(const std::string &animationFile, int gender)
+        void setSprite(const std::string &animationFile, Gender gender)
         { mAnimationFiles[gender] = animationFile; }
 
-        const std::string& getSprite(int gender) const;
+        const std::string& getSprite(Gender gender) const;
 
         void setWeaponType(int);
 
-- 
cgit v1.2.3-70-g09d2


From 4b540f3007e18a85a6d31d301526217393792451 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 5 Jan 2009 00:15:27 +0100
Subject: Renamed PATH_NODE to Position as on mainline

---
 src/CMakeLists.txt |  2 ++
 src/Makefile.am    |  2 ++
 src/being.cpp      | 16 +++++++--------
 src/being.h        | 19 +-----------------
 src/map.cpp        |  2 +-
 src/map.h          | 20 +++++++++----------
 src/position.cpp   | 45 ++++++++++++++++++++++++++++++++++++++++++
 src/position.h     | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 126 insertions(+), 38 deletions(-)
 create mode 100644 src/position.cpp
 create mode 100644 src/position.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a7735e41..83f35dfb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -337,6 +337,8 @@ SET(SRCS
     player.h
     player_relations.cpp
     player_relations.h
+    position.cpp
+    position.h
     properties.h
     sdltruetypefont.cpp
     sdltruetypefont.hpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 382f33e0..e89afd8f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -306,6 +306,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      player.h \
 	      player_relations.cpp \
 	      player_relations.h \
+	      position.cpp \
+	      position.h \
 	      properties.h \
               recorder.cpp \
               recorder.h \
diff --git a/src/being.cpp b/src/being.cpp
index 07895eb2..aff52757 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -351,29 +351,29 @@ void Being::nextStep()
         return;
     }
 
-    PATH_NODE node = mPath.front();
+    Position pos = mPath.front();
     mPath.pop_front();
 
     int dir = 0;
-    if (node.x > mX)
+    if (pos.x > mX)
         dir |= RIGHT;
-    else if (node.x < mX)
+    else if (pos.x < mX)
         dir |= LEFT;
-    if (node.y > mY)
+    if (pos.y > mY)
         dir |= DOWN;
-    else if (node.y < mY)
+    else if (pos.y < mY)
         dir |= UP;
 
     setDirection(dir);
 
-    if (mMap->tileCollides(node.x, node.y))
+    if (mMap->tileCollides(pos.x, pos.y))
     {
         setAction(STAND);
         return;
     }
 
-    mX = node.x;
-    mY = node.y;
+    mX = pos.x;
+    mY = pos.y;
     setAction(WALK);
     mWalkTime += mWalkSpeed / 10;
 }
diff --git a/src/being.h b/src/being.h
index ccb1c4c4..54c9d717 100644
--- a/src/being.h
+++ b/src/being.h
@@ -33,6 +33,7 @@
 #include "effectmanager.h"
 #include "map.h"
 #include "particlecontainer.h"
+#include "position.h"
 #include "sprite.h"
 
 #include "gui/speechbubble.h"
@@ -52,24 +53,6 @@ class Particle;
 class SpeechBubble;
 class Text;
 
-/**
- * A position along a being's path.
- */
-struct PATH_NODE
-{
-    /**
-     * Constructor.
-     */
-    PATH_NODE(unsigned short x, unsigned short y):
-        x(x), y(y)
-    { }
-
-    unsigned short x;
-    unsigned short y;
-};
-typedef std::list<PATH_NODE> Path;
-typedef Path::iterator PathIterator;
-
 enum Gender {
     GENDER_MALE = 0,
     GENDER_FEMALE = 1,
diff --git a/src/map.cpp b/src/map.cpp
index 02b046fb..217a14e3 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -480,7 +480,7 @@ Path Map::findPath(int startX, int startY, int destX, int destY)
         while (pathX != startX || pathY != startY)
         {
             // Add the new path node to the start of the path list
-            path.push_front(PATH_NODE(pathX, pathY));
+            path.push_front(Position(pathX, pathY));
 
             // Find out the next parent
             MetaTile *tile = getMetaTile(pathX, pathY);
diff --git a/src/map.h b/src/map.h
index 6eaf9e43..56183abf 100644
--- a/src/map.h
+++ b/src/map.h
@@ -25,6 +25,7 @@
 #include <list>
 #include <vector>
 
+#include "position.h"
 #include "properties.h"
 
 class AmbientOverlay;
@@ -35,8 +36,6 @@ class Particle;
 class Sprite;
 class Tileset;
 
-struct PATH_NODE;
-
 typedef std::vector<Tileset*> Tilesets;
 typedef std::list<Sprite*> Sprites;
 typedef Sprites::iterator SpriteIterator;
@@ -55,13 +54,13 @@ struct MetaTile
     MetaTile():whichList(0) {};
 
     // Pathfinding members
-    int Fcost;              /**< Estimation of total path cost */
-    int Gcost;              /**< Cost from start to this location */
-    int Hcost;              /**< Estimated cost to goal */
-    int whichList;          /**< No list, open list or closed list */
-    int parentX;            /**< X coordinate of parent tile */
-    int parentY;            /**< Y coordinate of parent tile */
-    bool walkable;          /**< Can beings walk on this tile */
+    int Fcost;               /**< Estimation of total path cost */
+    int Gcost;               /**< Cost from start to this location */
+    int Hcost;               /**< Estimated cost to goal */
+    int whichList;           /**< No list, open list or closed list */
+    int parentX;             /**< X coordinate of parent tile */
+    int parentY;             /**< Y coordinate of parent tile */
+    bool walkable;           /**< Can beings walk on this tile */
 };
 
 /**
@@ -204,8 +203,7 @@ class Map : public Properties
         /**
          * Find a path from one location to the next.
          */
-        std::list<PATH_NODE>
-        findPath(int startX, int startY, int destX, int destY);
+        Path findPath(int startX, int startY, int destX, int destY);
 
         /**
          * Adds a sprite to the map.
diff --git a/src/position.cpp b/src/position.cpp
new file mode 100644
index 00000000..cc39a1af
--- /dev/null
+++ b/src/position.cpp
@@ -0,0 +1,45 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "position.h"
+
+std::ostream& operator <<(std::ostream &os, const Position &p)
+{
+    os << "(" << p.x << ", " << p.y << ")";
+    return os;
+}
+
+std::ostream& operator <<(std::ostream &os, const Path &path)
+{
+    Path::const_iterator i = path.begin();
+
+    os << "(";
+    while (i != path.end())
+    {
+        os << *i;
+        ++i;
+        if (i != path.end())
+            os << ", ";
+    }
+    os << ")";
+
+    return os;
+}
diff --git a/src/position.h b/src/position.h
new file mode 100644
index 00000000..7beb3ef7
--- /dev/null
+++ b/src/position.h
@@ -0,0 +1,58 @@
+/*
+ *  The Mana World
+ *  Copyright 2008 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef TMW_POSITION_H
+#define TMW_POSITION_H
+
+#include <list>
+#include <iostream>
+
+/**
+ * A position along a being's path.
+ */
+struct Position
+{
+    /**
+     * Constructor.
+     */
+    Position(int x, int y):
+        x(x), y(y)
+    { }
+
+    int x;
+    int y;
+};
+
+typedef std::list<Position> Path;
+typedef Path::iterator PathIterator;
+
+/**
+ * Appends a string representation of a position to the output stream.
+ */
+std::ostream& operator <<(std::ostream &os, const Position &p);
+
+/**
+ * Appends a string representation of a path (sequence of positions) to the
+ * output stream.
+ */
+std::ostream& operator <<(std::ostream &os, const Path &path);
+
+#endif // TMW_POSITION_H
-- 
cgit v1.2.3-70-g09d2


From 7238080904f11f2e62e5851a247810971c426ea4 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 4 Jan 2009 23:51:48 +0100
Subject: Merged Vector class improvements from mainline

---
 src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 83f35dfb..6411d19f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -353,6 +353,7 @@ SET(SRCS
     textparticle.cpp
     textparticle.h
     tileset.h
+    vector.cpp
     vector.h
     )
 
-- 
cgit v1.2.3-70-g09d2


From 4a4b1d993a1c230b0769630949187f299ec6072c Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Wed, 31 Dec 2008 17:13:53 +0100
Subject: Made an option around the syncing, but no way to change it for now.

(cherry picked from mainline commit f6f8b2f885145d4cacf7a6c42d88b6a39f71b366)

Conflicts:

	src/openglgraphics.cpp
---
 src/openglgraphics.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index b3a8db4b..24be9438 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -78,8 +78,6 @@ bool OpenGLGraphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel)
     }
 
 #ifdef __APPLE__
-//    long VBL = 1;
-//    CGLSetParameter(CGLGetCurrentContext(), kCGLCPSwapInterval, &VBL);
     if (mSync) {
         const GLint VBL = 1;
         CGLSetParameter(CGLGetCurrentContext(), kCGLCPSwapInterval, &VBL);
@@ -360,7 +358,7 @@ void OpenGLGraphics::setTexturingAndBlending(bool enable)
 
 void OpenGLGraphics::drawRectangle(const gcn::Rectangle& rect, bool filled)
 {
-    float offset = filled ? 0 : 0.5f;
+    const float offset = filled ? 0 : 0.5f;
 
     setTexturingAndBlending(false);
 
-- 
cgit v1.2.3-70-g09d2


From d87d6368b23fe11e5217d674ed1a4bad05d9bf90 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 1 Jan 2009 04:01:00 +0100
Subject: Made trade window resizable

Also fixed overlap between description label and the buttons and added the
SDL_ttf library to the Code::Blocks project file.
---
 AethyraLin2WinXcompile.cbp |  6 +++--
 src/gui/npc_text.h         |  2 +-
 src/gui/setup.cpp          |  2 ++
 src/gui/trade.cpp          | 64 +++++++++++++++++++++++++++++-----------------
 src/gui/trade.h            | 10 ++++++--
 5 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/AethyraLin2WinXcompile.cbp b/AethyraLin2WinXcompile.cbp
index 3b03aca2..a2b5df59 100644
--- a/AethyraLin2WinXcompile.cbp
+++ b/AethyraLin2WinXcompile.cbp
@@ -32,6 +32,7 @@
 					<Add library="SDL_image" />
 					<Add library="SDL_mixer" />
 					<Add library="SDL_net" />
+					<Add library="SDL_ttf" />
 					<Add library="mingw32" />
 					<Add library="SDLmain" />
 					<Add library="SDL.dll" />
@@ -67,6 +68,7 @@
 					<Add library="SDL_mixer" />
 					<Add library="SDL_net" />
 					<Add library="SDL_image" />
+					<Add library="SDL_ttf" />
 					<Add library="png" />
 				</Linker>
 			</Target>
@@ -230,8 +232,8 @@
 		<Unit filename="src\gui\textfield.h" />
 		<Unit filename="src\gui\trade.cpp" />
 		<Unit filename="src\gui\trade.h" />
-		<Unit filename="src\gui\truetypefont.cpp"/>
-		<Unit filename="src\gui\truetypefont.h"/>
+		<Unit filename="src\gui\truetypefont.cpp" />
+		<Unit filename="src\gui\truetypefont.h" />
 		<Unit filename="src\gui\updatewindow.cpp" />
 		<Unit filename="src\gui\updatewindow.h" />
 		<Unit filename="src\gui\vbox.cpp" />
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index b647b9a1..75968fa9 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -50,7 +50,7 @@ class NpcTextDialog : public Window, public gcn::ActionListener
         NpcTextDialog();
 
         /**
-         * Called when resizing the window
+         * Called when resizing the window.
          *
          * @param event The calling event
          */
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index baa2bf2b..a61d3bb2 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -42,6 +42,7 @@ extern Window *minimap;
 extern Window *skillDialog;
 extern Window *statusWindow;
 extern Window *itemShortcutWindow;
+extern Window *tradeWindow;
 
 Setup::Setup():
     Window("Setup")
@@ -134,5 +135,6 @@ void Setup::action(const gcn::ActionEvent &event)
         helpWindow->resetToDefaultSize();
         skillDialog->resetToDefaultSize();
         itemShortcutWindow->resetToDefaultSize();
+        tradeWindow->resetToDefaultSize();
     }
 }
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 843c9663..bae8daa6 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -50,7 +50,11 @@ TradeWindow::TradeWindow(Network *network):
     mPartnerInventory(new Inventory(INVENTORY_SIZE))
 {
     setWindowName("Trade");
-    setDefaultSize(115, 227, 332, 209);
+    setDefaultSize(115, 227, 342, 209);
+    setResizable(true);
+
+    setMinWidth(342);
+    setMinHeight(209);
 
     mAddButton = new Button("Add", "add", this);
     mOkButton = new Button("Ok", "ok", this);
@@ -73,7 +77,8 @@ TradeWindow::TradeWindow(Network *network):
 
     mMoneyLabel = new gcn::Label("You get: 0 GP");
     mMoneyLabel2 = new gcn::Label("You give:");
-    mMoneyField = new TextField();
+    mMoneyField = new TextField;
+    mMoneyField->setWidth(50);
 
     mAddButton->adjustSize();
     mOkButton->adjustSize();
@@ -98,38 +103,49 @@ TradeWindow::TradeWindow(Network *network):
     add(mMoneyLabel);
 
     loadWindowState();
+}
+
+TradeWindow::~TradeWindow()
+{
+}
 
-    gcn::Rectangle area = getChildrenArea();
-    int width = area.width;
-    int height = area.height;
+void TradeWindow::widgetResized(const gcn::Event &event)
+{
+    Window::widgetResized(event);
 
-    mMoneyField->setPosition(8 + 60, height - 20);
-    mMoneyField->setWidth(50);
+    const gcn::Rectangle &area = getChildrenArea();
+    const int width = area.width;
+    const int height = area.height;
+
+    mMoneyLabel2->setPosition(8, height - 8 - mMoneyLabel2->getHeight());
+    mMoneyField->setPosition(
+        8 + mMoneyLabel2->getWidth(),
+        height - 8 - mMoneyField->getHeight());
+    mMoneyLabel->setPosition(
+        mMoneyField->getX() + mMoneyField->getWidth() + 6,
+        mMoneyLabel2->getY());
 
-    mMoneyLabel->setPosition(8 + 60 + 50 + 6, height - 20);
-    mMoneyLabel2->setPosition(8, height - 20);
+    mCancelButton->setPosition(width - 54, height - 8 - mCancelButton->getHeight());
+    mTradeButton->setPosition(mCancelButton->getX() - 41, mCancelButton->getY());
+    mOkButton->setPosition(mTradeButton->getX() - 24, mCancelButton->getY());
+    mAddButton->setPosition(mOkButton->getX() - 31, mCancelButton->getY());
 
-    mCancelButton->setPosition(width - 54, height - 49);
-    mTradeButton->setPosition(mCancelButton->getX() - 41, height - 49);
-    mOkButton->setPosition(mTradeButton->getX() - 24, height - 49);
-    mAddButton->setPosition(mOkButton->getX() - 31, height - 49);
+    mItemDescriptionLabel->setPosition(8,
+        mOkButton->getY() - mItemDescriptionLabel->getHeight() - 4);
+    mItemNameLabel->setPosition(8,
+        mItemDescriptionLabel->getY() - mItemNameLabel->getHeight() - 4);
+
+    const int remaining = mItemNameLabel->getY() - 4 - 8 - 8;
+    const int itemContainerHeight = remaining / 2;
 
     mMyItemContainer->setSize(width - 24 - 12 - 1,
         (INVENTORY_SIZE * 24) / (width / 24) - 1);
-    mMyScroll->setSize(width - 16, (height - 76) / 2);
+    mMyScroll->setSize(width - 16, itemContainerHeight);
 
     mPartnerItemContainer->setSize(width - 24 - 12 - 1,
         (INVENTORY_SIZE * 24) / (width / 24) - 1);
-    mPartnerScroll->setSize(width - 16, (height - 76) / 2);
-
-    mItemNameLabel->setPosition(8,
-        mPartnerScroll->getY() + mPartnerScroll->getHeight() + 4);
-    mItemDescriptionLabel->setPosition(8,
-        mItemNameLabel->getY() + mItemNameLabel->getHeight() + 4);
-}
-
-TradeWindow::~TradeWindow()
-{
+    mPartnerScroll->setSize(width - 16, itemContainerHeight);
+    mPartnerScroll->setPosition(8, 8 + itemContainerHeight + 8);
 }
 
 void TradeWindow::addMoney(int amount)
diff --git a/src/gui/trade.h b/src/gui/trade.h
index 5d587991..fafe138a 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -55,6 +55,13 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
          */
         ~TradeWindow();
 
+        /**
+         * Called when resizing the window.
+         *
+         * @param event The calling event
+         */
+        void widgetResized(const gcn::Event &event);
+
         /**
          * Add money to the trade window.
          */
@@ -98,8 +105,7 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
         /**
          * Send trade packet.
          */
-        void
-        tradeItem(Item *item, int quantity);
+        void tradeItem(Item *item, int quantity);
 
         /**
          * Updates the labels and makes sure only one item is selected in
-- 
cgit v1.2.3-70-g09d2


From 999b87a31b42bfc65b721054a947c54cc720ec6f Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 5 Jan 2009 21:04:54 +0100
Subject: CMake warning fixes by Roderic

(merged from mainline)
---
 data/graphics/CMakeLists.txt        | 1 -
 data/graphics/images/CMakeLists.txt | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt
index 9a916db3..58d75523 100644
--- a/data/graphics/CMakeLists.txt
+++ b/data/graphics/CMakeLists.txt
@@ -1,3 +1,2 @@
 ADD_SUBDIRECTORY(gui)
 ADD_SUBDIRECTORY(images)
-ADD_SUBDIRECTORY(tiles)
diff --git a/data/graphics/images/CMakeLists.txt b/data/graphics/images/CMakeLists.txt
index 1e1cf19f..5181b4e1 100644
--- a/data/graphics/images/CMakeLists.txt
+++ b/data/graphics/images/CMakeLists.txt
@@ -1,6 +1,4 @@
-ADD_SUBDIRECTORY(ambient)
-
-SET (FILES
+SET(FILES
     error.png
     login_wallpaper.png
     )
-- 
cgit v1.2.3-70-g09d2


From 210af5c1a97dc565430803f5a295134d9b3046bc Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 5 Jan 2009 21:01:20 -0700
Subject: Added emote window button.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/menuwindow.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index 79281631..56bc48fd 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -31,6 +31,7 @@ extern Window *chatWindow;
 extern Window *equipmentWindow;
 extern Window *inventoryWindow;
 extern Window *itemShortcutWindow;
+extern Window *smileyWindow;
 extern Window *setupWindow;
 extern Window *skillDialog;
 extern Window *statusWindow;
@@ -62,6 +63,7 @@ MenuWindow::MenuWindow():
         "Inventory",
         "Skills",
         "Shortcut",
+        "Emote",
         "Setup",
         0
     };
@@ -114,6 +116,10 @@ void MenuWindowListener::action(const gcn::ActionEvent &event)
     {
         window = itemShortcutWindow;
     }
+    else if (event.getId() == "Emote")
+    {
+        window = smileyWindow;
+    }
     else if (event.getId() == "Setup")
     {
         window = setupWindow;
-- 
cgit v1.2.3-70-g09d2


From 68bf58ccb8f57491ee4f1579217de6f95743b059 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 5 Jan 2009 21:04:27 -0700
Subject: Changed smiley window to say emote. (I like emote better, so that's
 why. :P)

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/smileywindow.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/smileywindow.cpp b/src/gui/smileywindow.cpp
index c7c9d995..faf634af 100644
--- a/src/gui/smileywindow.cpp
+++ b/src/gui/smileywindow.cpp
@@ -32,9 +32,9 @@
 #include "../utils/tostring.h"
 
 SmileyWindow::SmileyWindow():
-    Window("Smiley")
+    Window("Emote")
 {
-    setWindowName("Smiley");
+    setWindowName("Emote");
     setResizable(true);
     setCloseButton(true);
     setMinWidth(80);
-- 
cgit v1.2.3-70-g09d2


From cb7292a77b421e943518edd64b9f11a256b0a691 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 5 Jan 2009 21:36:10 -0700
Subject: Fixed browser box so that it'd work again.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/browserbox.cpp | 75 +++++++++++++++++---------------------------------
 src/gui/browserbox.h   |  2 +-
 2 files changed, 26 insertions(+), 51 deletions(-)

diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 1441109f..78f3fef2 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -22,6 +22,7 @@
 #include <algorithm>
 
 #include "browserbox.h"
+#include "colour.h"
 #include "linkhandler.h"
 
 #include "../graphics.h"
@@ -99,12 +100,12 @@ void BrowserBox::addRow(const std::string &row)
 
             mLinks.push_back(bLink);
 
-            newRow += "##L" + bLink.caption;
+            newRow += "##<" + bLink.caption;
 
             tmp.erase(0, idx3 + 2);
             if(tmp != "")
             {
-                newRow += "##P";
+                newRow += "##>";
             }
             idx1 = tmp.find("@@");
         }
@@ -255,7 +256,8 @@ BrowserBox::draw(gcn::Graphics *graphics)
 
         if ((mHighMode & UNDERLINE))
         {
-            graphics->setColor(gcn::Color(LINK));
+            bool valid;
+            graphics->setColor(gcn::Color(textColour->getColour('<', valid)));
             graphics->drawLine(
                     mLinks[mSelectedLink].x1,
                     mLinks[mSelectedLink].y2,
@@ -312,57 +314,30 @@ BrowserBox::draw(gcn::Graphics *graphics)
                 // Check for color change in format "##x", x = [L,P,0..9]
                 if (row.find("##", start) == start && row.size() > start + 2)
                 {
-                    switch (row.at(start + 2))
+                    char c = row.at(start + 2);
+                    if (c == '>')
                     {
-                        case 'L': // Link color
-                            prevColor = selColor;
-                            selColor = LINK;
-                            break;
-                        case 'P': // Previous color
-                            selColor = prevColor;
-                            break;
-                        case '1':
-                            prevColor = selColor;
-                            selColor = RED;
-                            break;
-                        case '2':
-                            prevColor = selColor;
-                            selColor = GREEN;
-                            break;
-                        case '3':
-                            prevColor = selColor;
-                            selColor = BLUE;
-                            break;
-                        case '4':
-                            prevColor = selColor;
-                            selColor = ORANGE;
-                            break;
-                        case '5':
-                            prevColor = selColor;
-                            selColor = YELLOW;
-                            break;
-                        case '6':
-                            prevColor = selColor;
-                            selColor = PINK;
-                            break;
-                        case '7':
-                            prevColor = selColor;
-                            selColor = PURPLE;
-                            break;
-                        case '8':
-                            prevColor = selColor;
-                            selColor = GRAY;
-                            break;
-                        case '9':
-                            prevColor = selColor;
-                            selColor = BROWN;
-                            break;
-                        case '0':
-                        default:
+                        selColor = prevColor;
+                    }
+                    else
+                    {
+                        bool valid;
+                        int rgb = textColour->getColour(c, valid);
+                        if (c == '<')
+                        {
                             prevColor = selColor;
-                            selColor = BLACK;
+                        }
+                        if (valid)
+                        {
+                            selColor = rgb;
+                        }
                     }
                     start += 3;
+
+                    if (start == row.size())
+                    {
+                        break;
+                    }
                 }
                 graphics->setColor(gcn::Color(selColor));
             }
diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h
index 7f871c96..e4411637 100644
--- a/src/gui/browserbox.h
+++ b/src/gui/browserbox.h
@@ -25,8 +25,8 @@
 #include <iosfwd>
 #include <vector>
 
-#include <guichan/widget.hpp>
 #include <guichan/mouselistener.hpp>
+#include <guichan/widget.hpp>
 
 #include "../guichanfwd.h"
 #include "../main.h"
-- 
cgit v1.2.3-70-g09d2


From 12c742f538bd24b8d25b4fe971c7eef507c3b4c9 Mon Sep 17 00:00:00 2001
From: Eugenio Favalli <elvenprogrammer@gmail.com>
Date: Mon, 10 Sep 2007 07:46:51 +0000
Subject: Modified the Aethyra client to use the TMW TrueType class, rather
 than the inbuilt GUIChan TrueType class. (Didn't use it originally because I
 didn't see the difference, when there's a considerable speedup, and that
 originally the import for TMW was broken code at the time, which has been
 fixed since.)

---
 AethyraLin2WinXcompile.cbp |   4 +-
 src/Makefile.am            |   4 +-
 src/gui/browserbox.cpp     |   8 +--
 src/gui/gui.cpp            |   7 +-
 src/gui/truetypefont.cpp   | 170 ++++++++++++++++++++++++++++++++++++++++++++
 src/gui/truetypefont.h     |  67 ++++++++++++++++++
 src/sdltruetypefont.cpp    | 171 ---------------------------------------------
 src/sdltruetypefont.hpp    | 157 -----------------------------------------
 8 files changed, 248 insertions(+), 340 deletions(-)
 create mode 100644 src/gui/truetypefont.cpp
 create mode 100644 src/gui/truetypefont.h
 delete mode 100644 src/sdltruetypefont.cpp
 delete mode 100644 src/sdltruetypefont.hpp

diff --git a/AethyraLin2WinXcompile.cbp b/AethyraLin2WinXcompile.cbp
index a2b5df59..ff6699d8 100644
--- a/AethyraLin2WinXcompile.cbp
+++ b/AethyraLin2WinXcompile.cbp
@@ -232,8 +232,8 @@
 		<Unit filename="src\gui\textfield.h" />
 		<Unit filename="src\gui\trade.cpp" />
 		<Unit filename="src\gui\trade.h" />
-		<Unit filename="src\gui\truetypefont.cpp" />
-		<Unit filename="src\gui\truetypefont.h" />
+		<Unit filename="src\gui\truetypefont.cpp"/>
+		<Unit filename="src\gui\truetypefont.h"/>
 		<Unit filename="src\gui\updatewindow.cpp" />
 		<Unit filename="src\gui\updatewindow.h" />
 		<Unit filename="src\gui\vbox.cpp" />
diff --git a/src/Makefile.am b/src/Makefile.am
index e89afd8f..9426171d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -82,6 +82,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/npc_text.h \
 	      gui/ok_dialog.cpp \
 	      gui/ok_dialog.h \
+	      gui/truetypefont.cpp \
+	      gui/truetypefont.h \
 	      gui/passwordfield.cpp \
 	      gui/passwordfield.h \
 	      gui/playerbox.cpp \
@@ -311,8 +313,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      properties.h \
               recorder.cpp \
               recorder.h \
-	      sdltruetypefont.cpp \
-	      sdltruetypefont.h \
 	      serverinfo.h \
 	      shopitem.cpp \
 	      shopitem.h \
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 78f3fef2..ebd92e5a 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -24,9 +24,7 @@
 #include "browserbox.h"
 #include "colour.h"
 #include "linkhandler.h"
-
-#include "../graphics.h"
-#include "../sdltruetypefont.hpp"
+#include "truetypefont.h"
 
 BrowserBox::BrowserBox(unsigned int mode):
     gcn::Widget(),
@@ -70,7 +68,7 @@ void BrowserBox::addRow(const std::string &row)
     std::string newRow;
     BROWSER_LINK bLink;
     int idx1, idx2, idx3;
-    gcn::contrib::SDLTrueTypeFont *font = static_cast<gcn::contrib::SDLTrueTypeFont*>(getFont());
+    TrueTypeFont *font = static_cast<TrueTypeFont*>(getFont());
 
     // Use links and user defined colors
     if (mUseLinksAndUserColors)
@@ -268,7 +266,7 @@ BrowserBox::draw(gcn::Graphics *graphics)
 
     int x = 0, y = 0;
     int wrappedLines = 0;
-    gcn::contrib::SDLTrueTypeFont *font = static_cast<gcn::contrib::SDLTrueTypeFont*>(getFont());
+    TrueTypeFont *font = static_cast<TrueTypeFont*>(getFont());
 
     graphics->setColor(BLACK);
     for (TextRowIterator i = mTextRows.begin(); i != mTextRows.end(); i++)
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 846a0f44..f33d9495 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -22,12 +22,14 @@
 #include <guichan/exception.hpp>
 #include <guichan/image.hpp>
 #include <guichan/imagefont.hpp>
+#include <SDL/SDL_ttf.h>
 
 // Should stay here because of Guichan being sensitive to headers order
 #include <guichan/sdl/sdlinput.hpp>
 
 #include "focushandler.h"
 #include "gui.h"
+#include "truetypefont.h"
 #include "viewport.h"
 #include "window.h"
 #include "windowcontainer.h"
@@ -36,7 +38,6 @@
 #include "../configuration.h"
 #include "../graphics.h"
 #include "../log.h"
-#include "../sdltruetypefont.hpp"
 
 #include "../resources/image.h"
 #include "../resources/imageset.h"
@@ -113,12 +114,12 @@ Gui::Gui(Graphics *graphics):
 
     // Set global font
     try {
-        mGuiFont = new gcn::contrib::SDLTrueTypeFont("/usr/local/share/aethyra/data/fonts/dejavusans.ttf", 10);
+        mGuiFont = new TrueTypeFont("/usr/local/share/aethyra/data/fonts/dejavusans.ttf", 10);
     }
     catch (gcn::Exception e)
     {
         try {
-            mGuiFont = new gcn::contrib::SDLTrueTypeFont("data/fonts/dejavusans.ttf", 10);
+            mGuiFont = new TrueTypeFont("data/fonts/dejavusans.ttf", 10);
         }
         catch (gcn::Exception e)
         {
diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
new file mode 100644
index 00000000..bf95ca37
--- /dev/null
+++ b/src/gui/truetypefont.cpp
@@ -0,0 +1,170 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "truetypefont.h"
+
+#include <list>
+
+#include <guichan/exception.hpp>
+
+#include "../graphics.h"
+#include "../resources/image.h"
+
+#define CACHE_SIZE 30
+
+class TextChunk
+{
+    public:
+        TextChunk(const std::string &text, gcn::Color color) :
+            img(NULL), text(text), color(color)
+        {
+        }
+
+        ~TextChunk()
+        {
+            delete img;
+        }
+
+        bool operator==(const TextChunk &chunk) const
+        {
+            return (
+                chunk.text == text && chunk.color == color);
+        }
+
+        void generate(TTF_Font *font)
+        {
+            SDL_Color sdlCol;
+            sdlCol.b = color.b;
+            sdlCol.r = color.r;
+            sdlCol.g = color.g;
+
+            SDL_Surface *surface = TTF_RenderUTF8_Blended(
+                    font, text.c_str(), sdlCol);
+
+            if (!surface)
+            {
+                throw "Rendering font to surface failed: " +
+                    std::string(TTF_GetError());
+            }
+
+            img = Image::load(surface);
+
+            SDL_FreeSurface(surface);
+        }
+
+        Image *img;
+        std::string text;
+        gcn::Color color;
+};
+
+
+// Word surfaces cache
+static std::list<TextChunk> cache;
+typedef std::list<TextChunk>::iterator CacheIterator;
+
+
+TrueTypeFont::TrueTypeFont(const std::string& filename, int size)
+{
+    if (!TTF_WasInit() && TTF_Init() == -1)
+    {
+        throw GCN_EXCEPTION("Unable to initialize SDL_ttf: " +
+            std::string(TTF_GetError()));
+    }
+
+    mFont = TTF_OpenFont(filename.c_str(), size);
+
+    if (mFont == NULL)
+    {
+        throw GCN_EXCEPTION("SDLTrueTypeFont::SDLTrueTypeFont: " +
+            std::string(TTF_GetError()));
+    }
+}
+
+TrueTypeFont::~TrueTypeFont()
+{
+    TTF_CloseFont(mFont);
+
+    if (TTF_WasInit())
+    {
+        TTF_Quit();
+    }
+}
+
+void TrueTypeFont::drawString(gcn::Graphics *graphics,
+                               const std::string &text,
+                               int x, int y)
+{
+    if (text.empty())
+    {
+        return;
+    }
+
+    Graphics *g = dynamic_cast<Graphics *>(graphics);
+
+    if (!g)
+    {
+        throw "Not a valid graphics object!";
+    }
+
+    gcn::Color col = g->getColor();
+
+    TextChunk chunk(text, col);
+
+    bool found = false;
+
+    for (CacheIterator i = cache.begin(); i != cache.end(); i++)
+    {
+        if (chunk == (*i))
+        {
+            // Raise priority: move it to front
+            cache.splice(cache.begin(), cache, i);
+            found = true;
+            break;
+        }
+    }
+
+    // Surface not found
+    if (!found)
+    {
+        if (cache.size() >= CACHE_SIZE)
+        {
+            cache.pop_back();
+        }
+        cache.push_front(chunk);
+        cache.front().generate(mFont);
+    }
+
+    g->drawImage(cache.front().img, x, y);
+}
+
+int TrueTypeFont::getWidth(const std::string& text) const
+{
+    int w, h;
+    TTF_SizeUTF8(mFont, text.c_str(), &w, &h);
+    return w;
+}
+
+int TrueTypeFont::getHeight() const
+{
+    return TTF_FontHeight(mFont);
+}
diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
new file mode 100644
index 00000000..d496d82e
--- /dev/null
+++ b/src/gui/truetypefont.h
@@ -0,0 +1,67 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_TRUETYPEFONT_H
+#define _TMW_TRUETYPEFONT_H
+
+#include <string>
+
+#include <guichan/font.hpp>
+#include <guichan/graphics.hpp>
+#include <SDL/SDL_ttf.h>
+
+/**
+ * A wrapper around SDL_ttf for allowing the use of TrueType fonts.
+ *
+ * <b>NOTE:</b> This class needs SDL_ttf to be initialized.
+ */
+class TrueTypeFont : public gcn::Font
+{
+    public:
+        /**
+         * Constructor.
+         *
+         * @param filename  Font filename.
+         * @param size      Font size.
+         */
+        TrueTypeFont(const std::string& filename, int size);
+
+        /**
+         * Destructor.
+         */
+        ~TrueTypeFont();
+
+        virtual int getWidth(const std::string& text) const;
+
+        virtual int getHeight() const;
+
+        /**
+         * @see Font::drawString
+         */
+        void drawString(gcn::Graphics* graphics, const std::string& text, int x, int y);
+
+    private:
+        TTF_Font *mFont;
+};
+
+#endif
diff --git a/src/sdltruetypefont.cpp b/src/sdltruetypefont.cpp
deleted file mode 100644
index 937d2d63..00000000
--- a/src/sdltruetypefont.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naess�n and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naess�n a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file. 
- */
-
-#include "sdltruetypefont.hpp"
-
-#include <guichan/exception.hpp>
-#include <guichan/image.hpp>
-#include <guichan/graphics.hpp>
-#include <guichan/sdl/sdlgraphics.hpp>
-
-namespace gcn
-{
-    namespace contrib
-    {
-        SDLTrueTypeFont::SDLTrueTypeFont (const std::string& filename, int size)
-        {
-            mRowSpacing = 0;
-            mGlyphSpacing = 0;
-            mAntiAlias = true;        
-            mFilename = filename;
-            mFont = NULL;
-        
-            mFont = TTF_OpenFont(filename.c_str(), size);
-        
-            if (mFont == NULL)
-            {
-                throw GCN_EXCEPTION("SDLTrueTypeFont::SDLTrueTypeFont. "+std::string(TTF_GetError()));
-            }
-        }
-    
-        SDLTrueTypeFont::~SDLTrueTypeFont()
-        {
-            TTF_CloseFont(mFont);
-        }
-  
-        int SDLTrueTypeFont::getWidth(const std::string& text) const
-        {
-            int w, h;
-            TTF_SizeText(mFont, text.c_str(), &w, &h);
-        
-            return w;
-        }
-
-        int SDLTrueTypeFont::getHeight() const
-        {
-            return TTF_FontHeight(mFont) + mRowSpacing;
-        }
-    
-        void SDLTrueTypeFont::drawString(Graphics* graphics, const std::string& text, const int x, const int y)
-        {
-            if (text == "")
-            {
-                return;
-            }
-        
-            SDLGraphics *sdlGraphics = dynamic_cast<SDLGraphics *>(graphics);
-
-            if (sdlGraphics == NULL)
-            {
-                throw GCN_EXCEPTION("SDLTrueTypeFont::drawString. Graphics object not an SDL graphics object!");
-                return;
-            }
-        
-            // This is needed for drawing the Glyph in the middle if we have spacing
-            int yoffset = getRowSpacing() / 2;
-        
-            Color col = sdlGraphics->getColor();
-
-            SDL_Color sdlCol;
-            sdlCol.b = col.b;
-            sdlCol.r = col.r;
-            sdlCol.g = col.g;
-
-            SDL_Surface *textSurface;
-            if (mAntiAlias)
-            {
-                textSurface = TTF_RenderText_Blended(mFont, text.c_str(), sdlCol);
-            }
-            else
-            {
-                textSurface = TTF_RenderText_Solid(mFont, text.c_str(), sdlCol);
-            }
-        
-            SDL_Rect dst, src;
-            dst.x = x;
-            dst.y = y + yoffset;
-            src.w = textSurface->w;
-            src.h = textSurface->h;
-            src.x = 0;
-            src.y = 0;
-        
-            sdlGraphics->drawSDLSurface(textSurface, src, dst);
-            SDL_FreeSurface(textSurface);        
-        }
-    
-        void SDLTrueTypeFont::setRowSpacing(int spacing)
-        {
-            mRowSpacing = spacing;
-        }
-
-        int SDLTrueTypeFont::getRowSpacing()
-        {
-            return mRowSpacing;
-        }
-    
-        void SDLTrueTypeFont::setGlyphSpacing(int spacing)
-        {
-            mGlyphSpacing = spacing;
-        }
-    
-        int SDLTrueTypeFont::getGlyphSpacing()
-        {
-            return mGlyphSpacing;
-        }
-
-        void SDLTrueTypeFont::setAntiAlias(bool antiAlias)
-        {
-            mAntiAlias = antiAlias;
-        }
-
-        bool SDLTrueTypeFont::isAntiAlias()
-        {
-            return mAntiAlias;        
-        }    
-    }
-}
-
diff --git a/src/sdltruetypefont.hpp b/src/sdltruetypefont.hpp
deleted file mode 100644
index 7a1dd658..00000000
--- a/src/sdltruetypefont.hpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naess�n and Per Larsson
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naess�n a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_CONTRIB_SDLTRUETYPEFONT_HPP
-#define GCN_CONTRIB_SDLTRUETYPEFONT_HPP
-
-#include <map>
-#include <string>
-
-#include <SDL/SDL_ttf.h>
-
-#include <guichan/font.hpp>
-#include <guichan/platform.hpp>
-
-namespace gcn
-{
-    class Graphics;
-
-    namespace contrib
-    {
-        
-        /**
-         * SDL True Type Font implementation of Font. It uses the SDL_ttf library
-         * to display True Type Fonts with SDL.
-         *
-         * NOTE: You must initialize the SDL_ttf library before using this
-         *       class. Also, remember to call the SDL_ttf libraries quit
-         *       function.
-         *
-         * @author Walluce Pinkham
-         * @author Olof Naess�n
-         */
-        class GCN_EXTENSION_DECLSPEC SDLTrueTypeFont: public Font
-        {
-        public:
-
-            /**
-             * Constructor.
-             *     
-             * @param filename the filename of the True Type Font.
-             * @param size the size the font should be in.
-             */
-            SDLTrueTypeFont (const std::string& filename, int size);
-
-            /**
-             * Destructor.
-             */
-            virtual ~SDLTrueTypeFont();
-      
-            /**
-             * Sets the spacing between rows in pixels. Default is 0 pixels.
-             * The spacing can be negative.
-             *
-             * @param spacing the spacing in pixels.
-             */
-            virtual void setRowSpacing (int spacing);
-      
-            /**
-             * Gets the spacing between rows in pixels.
-             *
-             * @return the spacing.
-             */
-            virtual int getRowSpacing();
-      
-            /**
-             * Sets the spacing between letters in pixels. Default is 0 pixels.
-             * The spacing can be negative.
-             *
-             * @param spacing the spacing in pixels.
-             */
-            virtual void setGlyphSpacing(int spacing);
-
-            /**
-             * Gets the spacing between letters in pixels.
-             *
-             * @return the spacing.
-             */
-            virtual int getGlyphSpacing();
-      
-            /**
-             * Sets the use of anti aliasing..
-             *
-             * @param antaAlias true for use of antia aliasing.
-             */
-            virtual void setAntiAlias(bool antiAlias);
-      
-            /**
-             * Checks if anti aliasing is used.
-             *
-             * @return true if anti aliasing is used.
-             */
-            virtual bool isAntiAlias();
-      
-        
-            // Inherited from Font
-      
-            virtual int getWidth(const std::string& text) const;
-      
-            virtual int getHeight() const;        
-      
-            virtual void drawString(gcn::Graphics* graphics, const std::string& text, int x, int y);
-      
-        protected:
-            TTF_Font *mFont;
-      
-            int mHeight;
-            int mGlyphSpacing;
-            int mRowSpacing;
-      
-            std::string mFilename;
-            bool mAntiAlias;      
-        }; 
-    }
-}
-
-#endif
-
-- 
cgit v1.2.3-70-g09d2


From 97fb7026570f60bd3286c27e6049e19f08baa35e Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@gmail.com>
Date: Thu, 18 Oct 2007 11:12:42 +0000
Subject: Fixed double-free of true-type resources.

(cherry-picked from mainline)
---
 src/gui/truetypefont.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index bf95ca37..3986cca5 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.cpp
@@ -82,15 +82,17 @@ class TextChunk
 static std::list<TextChunk> cache;
 typedef std::list<TextChunk>::iterator CacheIterator;
 
+static int fontCounter;
 
 TrueTypeFont::TrueTypeFont(const std::string& filename, int size)
 {
-    if (!TTF_WasInit() && TTF_Init() == -1)
+    if (fontCounter == 0 && TTF_Init() == -1)
     {
         throw GCN_EXCEPTION("Unable to initialize SDL_ttf: " +
             std::string(TTF_GetError()));
     }
 
+    ++fontCounter;
     mFont = TTF_OpenFont(filename.c_str(), size);
 
     if (mFont == NULL)
@@ -103,8 +105,9 @@ TrueTypeFont::TrueTypeFont(const std::string& filename, int size)
 TrueTypeFont::~TrueTypeFont()
 {
     TTF_CloseFont(mFont);
+    --fontCounter;
 
-    if (TTF_WasInit())
+    if (fontCounter == 0)
     {
         TTF_Quit();
     }
-- 
cgit v1.2.3-70-g09d2


From c5331a575468ee94b4cde35d157b74d9776676e5 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Sat, 26 Jan 2008 01:52:46 +0000
Subject: Added support for alpha blending to true type font drawing.

(cherry picked from mainline commit 89a1dcb59be3e531cc0761c32d1aa70e141d4a12)
---
 src/gui/truetypefont.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index 3986cca5..82a22bc2 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.cpp
@@ -130,6 +130,12 @@ void TrueTypeFont::drawString(gcn::Graphics *graphics,
     }
 
     gcn::Color col = g->getColor();
+    float alpha = 1.0f;
+    if (col.a != 255) alpha = col.a / 255.0f;
+    col.a = 255;
+    /* alpha value is ignored at sting generation so it makes no sense to
+     * cache the same text with different alpha values.
+     */
 
     TextChunk chunk(text, col);
 
@@ -157,6 +163,7 @@ void TrueTypeFont::drawString(gcn::Graphics *graphics,
         cache.front().generate(mFont);
     }
 
+    if (alpha != 1.0f) cache.front().img->setAlpha(alpha);
     g->drawImage(cache.front().img, x, y);
 }
 
-- 
cgit v1.2.3-70-g09d2


From b5f54a7bc2e8df4187e847d72a6fee2ffd6c5299 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sat, 26 Jan 2008 21:00:03 +0000
Subject: Image alpha should also be set to 1, in case it was changed before.

(cherry picked from mainline commit 0962fc8b567279a6e97e13e4b3f2f9f2ffe304c0)
---
 src/gui/truetypefont.cpp | 14 +++++++-------
 src/gui/truetypefont.h   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index 82a22bc2..5576eaab 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.cpp
@@ -35,7 +35,7 @@
 class TextChunk
 {
     public:
-        TextChunk(const std::string &text, gcn::Color color) :
+        TextChunk(const std::string &text, const gcn::Color &color) :
             img(NULL), text(text), color(color)
         {
         }
@@ -130,12 +130,12 @@ void TrueTypeFont::drawString(gcn::Graphics *graphics,
     }
 
     gcn::Color col = g->getColor();
-    float alpha = 1.0f;
-    if (col.a != 255) alpha = col.a / 255.0f;
-    col.a = 255;
-    /* alpha value is ignored at sting generation so it makes no sense to
-     * cache the same text with different alpha values.
+    const float alpha = col.a / 255.0f;
+
+    /* The alpha value is ignored at string generation so avoid caching the
+     * same text with different alpha values.
      */
+    col.a = 255;
 
     TextChunk chunk(text, col);
 
@@ -163,7 +163,7 @@ void TrueTypeFont::drawString(gcn::Graphics *graphics,
         cache.front().generate(mFont);
     }
 
-    if (alpha != 1.0f) cache.front().img->setAlpha(alpha);
+    cache.front().img->setAlpha(alpha);
     g->drawImage(cache.front().img, x, y);
 }
 
diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
index d496d82e..7a4ee9ac 100644
--- a/src/gui/truetypefont.h
+++ b/src/gui/truetypefont.h
@@ -33,7 +33,7 @@
 /**
  * A wrapper around SDL_ttf for allowing the use of TrueType fonts.
  *
- * <b>NOTE:</b> This class needs SDL_ttf to be initialized.
+ * <b>NOTE:</b> This class initializes SDL_ttf as necessary.
  */
 class TrueTypeFont : public gcn::Font
 {
-- 
cgit v1.2.3-70-g09d2


From 2dd65bbffb6f4c8e066232754a8e80b86925e6fd Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Fri, 19 Oct 2007 00:16:03 +0000
Subject: Increased text chunk cache size to improve performance when a lot of
 text is on the screen.

(cherry picked from mainline commit 483c76d1b2433bc34f67406a10bf409fb2daafe1)
---
 src/gui/truetypefont.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index 5576eaab..7f9abd3a 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.cpp
@@ -30,7 +30,7 @@
 #include "../graphics.h"
 #include "../resources/image.h"
 
-#define CACHE_SIZE 30
+#define CACHE_SIZE 256
 
 class TextChunk
 {
-- 
cgit v1.2.3-70-g09d2


From 3d7d18e75b0ea5ac1328f2187a89be4e31f73d3f Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 4 Jan 2009 13:31:19 +0100
Subject: Fixed rendering of special characters

The font was interpreting the strings as UTF8, as they are in the
mainline client. But in the eAthena client they are regular text.
---
 src/gui/truetypefont.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index 7f9abd3a..f81ea9c2 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.cpp
@@ -58,7 +58,7 @@ class TextChunk
             sdlCol.r = color.r;
             sdlCol.g = color.g;
 
-            SDL_Surface *surface = TTF_RenderUTF8_Blended(
+            SDL_Surface *surface = TTF_RenderText_Blended(
                     font, text.c_str(), sdlCol);
 
             if (!surface)
@@ -170,7 +170,7 @@ void TrueTypeFont::drawString(gcn::Graphics *graphics,
 int TrueTypeFont::getWidth(const std::string& text) const
 {
     int w, h;
-    TTF_SizeUTF8(mFont, text.c_str(), &w, &h);
+    TTF_SizeText(mFont, text.c_str(), &w, &h);
     return w;
 }
 
-- 
cgit v1.2.3-70-g09d2


From 6cf01b1bd92cfb9bb3b074b6a4976cbe99f965c2 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 5 Jan 2009 22:55:51 -0700
Subject: Removed a redundant directory, as well as got rid of Windows type
 newlines. Signed-off-by: Ira Rice <irarice@gmail.com>

---
 debian/aethyra-data.install  |   6 -
 debian/aethyra.docs          |   6 -
 debian/aethyra.install       |   5 -
 debian/aethyra.menu          |   4 -
 debian/aethyra.sgml          | 149 -----------
 debian/aethyra.xpm           | 312 ----------------------
 packaging/debian/aethyra.xpm | 622 +++++++++++++++++++++----------------------
 src/particle.h               | 590 ++++++++++++++++++++--------------------
 src/particleemitter.cpp      |   6 +-
 9 files changed, 609 insertions(+), 1091 deletions(-)
 delete mode 100644 debian/aethyra-data.install
 delete mode 100644 debian/aethyra.docs
 delete mode 100644 debian/aethyra.install
 delete mode 100644 debian/aethyra.menu
 delete mode 100644 debian/aethyra.sgml
 delete mode 100644 debian/aethyra.xpm

diff --git a/debian/aethyra-data.install b/debian/aethyra-data.install
deleted file mode 100644
index c652dff3..00000000
--- a/debian/aethyra-data.install
+++ /dev/null
@@ -1,6 +0,0 @@
-data/graphics/gui/*.png usr/share/games/aethyra/data/graphics/gui
-data/graphics/gui/*.xml usr/share/games/aethyra/data/graphics/gui
-data/graphics/images/*.png usr/share/games/aethyra/data/graphics/images
-data/graphics/images/ambient/*.png usr/share/games/aethyra/data/graphics/images/ambient
-data/graphics/tiles/*.png usr/share/games/aethyra/data/graphics/tiles
-data/help/*.txt usr/share/games/aethyra/data/help
diff --git a/debian/aethyra.docs b/debian/aethyra.docs
deleted file mode 100644
index d622a527..00000000
--- a/debian/aethyra.docs
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTHORS
-NEWS
-README
-ChangeLog
-docs/progression.txt
-docs/FAQ.txt
diff --git a/debian/aethyra.install b/debian/aethyra.install
deleted file mode 100644
index 66ba5126..00000000
--- a/debian/aethyra.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/aethyra.desktop usr/share/applications
-debian/aethyra.xpm usr/share/pixmaps
-data/icons/aethyra.png usr/share/icons
-docs/aethyra.6 usr/share/man/man6
-src/aethyra usr/games
diff --git a/debian/aethyra.menu b/debian/aethyra.menu
deleted file mode 100644
index 42035107..00000000
--- a/debian/aethyra.menu
+++ /dev/null
@@ -1,4 +0,0 @@
-?package(aethyra):needs="X11" section="Games/Adventure"\
- title="Aethyra"\
- description="Aethyra is a 2D MMORPG using eAthena."\
- command="/usr/games/aethyra" icon="/usr/share/pixmaps/aethyra.xpm"
diff --git a/debian/aethyra.sgml b/debian/aethyra.sgml
deleted file mode 100644
index 0ed18199..00000000
--- a/debian/aethyra.sgml
+++ /dev/null
@@ -1,149 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>FERREIRA</firstname>">
-  <!ENTITY dhsurname   "<surname>Yohann</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>avril 13, 2005</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>6</manvolnum>">
-  <!ENTITY dhemail     "<email>bertram@cegetel.net</email>">
-  <!ENTITY dhusername  "FERREIRA Yohann">
-  <!ENTITY dhucpackage "<refentrytitle>TMW</refentrytitle>">
-  <!ENTITY dhpackage   "tmw">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2003</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>tmw is the abreviation of The Mana World : A Fantasy Online Game</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> ingame
-      commands.</para>
-    <para><command>&dhpackage;</command> is a Great Online Game based upon the Seiken Densetsu Serie.
-It has its own universe, and and its own character management system, which will
-give you the opportunity to play in a 2D heroic-fantasy world forever.</para>
-
-  </refsect1>
-  <refsect1>
-    <title>COMMON KEYS</title>
-
-    <para>Arrow Keys, Key Pad Keys (Diagonals Supported).
-Move your character around.
-
-Left Ctrl : 
-Make your character attack.
-
-G : 
-Get Items on the ground or in a chest.
-
-Alt + 1...9 : 
-Shows an Emoticon above your character.
-
-Alt + I : 
-Shows / Hide Inventory Window.
-
-Alt + K : 
-Shows / Hide Skills Window.
-
-Alt + E : 
-Shows / Hide Equipment Window.
-
-Alt + C : 
-Shows Configuration Window.
-</para>
-
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>libguichan (2).</para>
-
-    <para>The program is documented fully by <citetitle>The Mana World Team</citetitle> available via the
-      website http://www.manaworld.org/</para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-
diff --git a/debian/aethyra.xpm b/debian/aethyra.xpm
deleted file mode 100644
index 515be72e..00000000
--- a/debian/aethyra.xpm
+++ /dev/null
@@ -1,312 +0,0 @@
-/* XPM */
-static char * Aethyra_xpm[] = {
-"32 32 277 2",
-"  	c None",
-". 	c #840000",
-"+ 	c #7E0000",
-"@ 	c #4F0000",
-"# 	c #810000",
-"$ 	c #830000",
-"% 	c #7B0000",
-"& 	c #460000",
-"* 	c #4C0000",
-"= 	c #4B0000",
-"- 	c #750000",
-"; 	c #860000",
-"> 	c #850000",
-", 	c #5D0000",
-"' 	c #490000",
-") 	c #450000",
-"! 	c #4A0000",
-"~ 	c #440000",
-"{ 	c #6A0000",
-"] 	c #7A0000",
-"^ 	c #8B0000",
-"/ 	c #990000",
-"( 	c #960000",
-"_ 	c #720000",
-": 	c #6E0000",
-"< 	c #740000",
-"[ 	c #6B0202",
-"} 	c #550505",
-"| 	c #420404",
-"1 	c #440101",
-"2 	c #4D0000",
-"3 	c #4E0000",
-"4 	c #480000",
-"5 	c #9D0000",
-"6 	c #9B0000",
-"7 	c #6F0000",
-"8 	c #710000",
-"9 	c #760000",
-"0 	c #680404",
-"a 	c #4B0C0C",
-"b 	c #3C0909",
-"c 	c #470202",
-"d 	c #450101",
-"e 	c #500000",
-"f 	c #510000",
-"g 	c #790000",
-"h 	c #890000",
-"i 	c #920000",
-"j 	c #710706",
-"k 	c #7D381F",
-"l 	c #934A1A",
-"m 	c #7B1A09",
-"n 	c #6B1609",
-"o 	c #521E13",
-"p 	c #4F2517",
-"q 	c #5D230F",
-"r 	c #4D0F04",
-"s 	c #350A0A",
-"t 	c #360909",
-"u 	c #470303",
-"v 	c #930000",
-"w 	c #840202",
-"x 	c #712C1C",
-"y 	c #A58248",
-"z 	c #866621",
-"A 	c #835819",
-"B 	c #98681F",
-"C 	c #845C1D",
-"D 	c #BB964A",
-"E 	c #856225",
-"F 	c #3D1B0B",
-"G 	c #241818",
-"H 	c #251717",
-"I 	c #360A0A",
-"J 	c #430000",
-"K 	c #6C0000",
-"L 	c #800000",
-"M 	c #730404",
-"N 	c #6A431E",
-"O 	c #473C1C",
-"P 	c #534420",
-"Q 	c #806125",
-"R 	c #53290B",
-"S 	c #461C09",
-"T 	c #BB9432",
-"U 	c #65490F",
-"V 	c #1F1110",
-"W 	c #1A2323",
-"X 	c #1A2222",
-"Y 	c #261212",
-"Z 	c #440202",
-"` 	c #7F0000",
-" .	c #870000",
-"..	c #6D0505",
-"+.	c #422522",
-"@.	c #454434",
-"#.	c #A18744",
-"$.	c #8F7237",
-"%.	c #A37F48",
-"&.	c #AD8847",
-"*.	c #C6A657",
-"=.	c #644C14",
-"-.	c #211615",
-";.	c #1C2626",
-">.	c #1B2323",
-",.	c #231313",
-"'.	c #420202",
-").	c #6C0404",
-"!.	c #532D23",
-"~.	c #A8915B",
-"{.	c #967C37",
-"].	c #6E5926",
-"^.	c #453512",
-"/.	c #473713",
-"(.	c #A4832A",
-"_.	c #594310",
-":.	c #241F1E",
-"<.	c #232828",
-"[.	c #1C2020",
-"}.	c #241111",
-"|.	c #430202",
-"1.	c #7C5030",
-"2.	c #967C3D",
-"3.	c #3E3318",
-"4.	c #3D3930",
-"5.	c #454442",
-"6.	c #524D44",
-"7.	c #C09E45",
-"8.	c #654F17",
-"9.	c #262524",
-"0.	c #252929",
-"a.	c #410202",
-"b.	c #6B0302",
-"c.	c #A78041",
-"d.	c #6A5621",
-"e.	c #414543",
-"f.	c #696B6B",
-"g.	c #747676",
-"h.	c #7B7566",
-"i.	c #C9A84F",
-"j.	c #665017",
-"k.	c #282725",
-"l.	c #252A2A",
-"m.	c #1B2222",
-"n.	c #3D0202",
-"o.	c #750802",
-"p.	c #B48E41",
-"q.	c #564418",
-"r.	c #4A4B4B",
-"s.	c #6D6F6F",
-"t.	c #797A7A",
-"u.	c #867C62",
-"v.	c #AE9040",
-"w.	c #664F12",
-"x.	c #2D2A25",
-"y.	c #242828",
-"z.	c #1E1E1E",
-"A.	c #291010",
-"B.	c #400202",
-"C.	c #860B02",
-"D.	c #B78C32",
-"E.	c #594013",
-"F.	c #433E3E",
-"G.	c #606464",
-"H.	c #74736C",
-"I.	c #7C6D44",
-"J.	c #433719",
-"K.	c #413311",
-"L.	c #322F1E",
-"M.	c #1C2121",
-"N.	c #271212",
-"O.	c #3C0606",
-"P.	c #8C0200",
-"Q.	c #B5771D",
-"R.	c #765513",
-"S.	c #3F3636",
-"T.	c #555B5B",
-"U.	c #686969",
-"V.	c #5A5957",
-"W.	c #3C3832",
-"X.	c #403826",
-"Y.	c #2F3023",
-"Z.	c #1C1F1D",
-"`.	c #2E0A0A",
-" +	c #460101",
-".+	c #8F0101",
-"++	c #A03F0C",
-"@+	c #AC7E19",
-"#+	c #4B3625",
-"$+	c #474747",
-"%+	c #5B5C5A",
-"&+	c #83775A",
-"*+	c #8C7539",
-"=+	c #67541F",
-"-+	c #6B551C",
-";+	c #8C6D24",
-">+	c #4E1C09",
-",+	c #4A0101",
-"'+	c #8A0606",
-")+	c #8D1203",
-"!+	c #A76713",
-"~+	c #87611B",
-"{+	c #453A32",
-"]+	c #52554E",
-"^+	c #A38A45",
-"/+	c #715818",
-"(+	c #7A6424",
-"_+	c #443212",
-":+	c #947026",
-"<+	c #7D4E11",
-"[+	c #490400",
-"}+	c #420000",
-"|+	c #7F0808",
-"1+	c #8B0101",
-"2+	c #800F01",
-"3+	c #915E11",
-"4+	c #504F40",
-"5+	c #4E4834",
-"6+	c #5A4715",
-"7+	c #5B4814",
-"8+	c #382813",
-"9+	c #917035",
-"0+	c #533209",
-"a+	c #3F0400",
-"b+	c #8E0101",
-"c+	c #8A0000",
-"d+	c #671104",
-"e+	c #663D12",
-"f+	c #786023",
-"g+	c #74612B",
-"h+	c #665320",
-"i+	c #675321",
-"j+	c #785C24",
-"k+	c #684718",
-"l+	c #380B00",
-"m+	c #400000",
-"n+	c #8C0303",
-"o+	c #8D0000",
-"p+	c #780101",
-"q+	c #510808",
-"r+	c #291A16",
-"s+	c #26291C",
-"t+	c #2D2B18",
-"u+	c #321F0E",
-"v+	c #370A02",
-"w+	c #3E0100",
-"x+	c #850202",
-"y+	c #600202",
-"z+	c #331313",
-"A+	c #1E2121",
-"B+	c #1A1E1E",
-"C+	c #270D0D",
-"D+	c #470000",
-"E+	c #7B0404",
-"F+	c #720101",
-"G+	c #4B0D0D",
-"H+	c #2D1717",
-"I+	c #261414",
-"J+	c #380808",
-"K+	c #7E0202",
-"L+	c #5D0606",
-"M+	c #3B0E0E",
-"N+	c #300C0C",
-"O+	c #430303",
-"P+	c #7A0505",
-"Q+	c #7C0000",
-"R+	c #640404",
-"S+	c #430D0D",
-"T+	c #460202",
-"U+	c #610505",
-"V+	c #440E0E",
-"W+	c #390B0B",
-"X+	c #560202",
-"Y+	c #480707",
-"Z+	c #410505",
-"`+	c #4B0101",
-" @	c #480101",
-"                                                                ",
-"                                                                ",
-"                                                                ",
-"          . +                                     @             ",
-"          # $ %                               & * @ =           ",
-"          - # ; > $           , '           ) ! @ * ~           ",
-"          { ] ^ / ( $ _ : < [ } | 1 ) ~ ' 2 2 3 3 4             ",
-"            ] ^ 5 6 . 7 8 9 0 a b c * d 4 e f @ 3 4             ",
-"            g h / i j k l m n o p q r s t u e 3 2 4             ",
-"            8 > v w x y z A B C D E F G H I = @ ' J             ",
-"            K L ^ M N O P Q R S T U V W X Y Z e )               ",
-"              `  ...+.@.#.$.%.&.*.=.-.;.>.,.'.e &               ",
-"              ` . ).!.~.{.].^./.(._.:.<.[.}.|.@ 4               ",
-"                # [ 1.2.3.4.5.6.7.8.9.0.[.}.a.=                 ",
-"                ` b.c.d.e.f.g.h.i.j.k.l.m.,.n.)                 ",
-"                L o.p.q.r.s.t.u.v.w.x.y.z.A.B.~                 ",
-"                ; C.D.E.F.G.H.I.J.K.L.M.N.O.4                   ",
-"                  P.Q.R.S.T.U.V.W.X.Y.Z.`. +2                   ",
-"                  .+++@+#+$+%+&+*+=+-+;+>+,+=                   ",
-"                  '+)+!+~+{+]+^+/+(+_+:+<+[+}+                  ",
-"                  |+1+2+3+z 4+5+6+7+8+9+0+a+                    ",
-"                    b+c+d+e+f+g+h+i+j+k+l+m+                    ",
-"                    n+o+p+q+r+s+t+u+v+w+) )                     ",
-"                      x+` y+z+A+B+C+1 e D+                      ",
-"                      E+# F+G+H+I+J+3 @ ~                       ",
-"                        K+% L+M+N+O+e '                         ",
-"                        P+Q+R+S+I T+@ )                         ",
-"                          9 U+V+W+u 2                           ",
-"                            X+Y+Z+ +                            ",
-"                            * `+ @                              ",
-"                                                                ",
-"                                                                "};
diff --git a/packaging/debian/aethyra.xpm b/packaging/debian/aethyra.xpm
index 515be72e..25d3dc73 100644
--- a/packaging/debian/aethyra.xpm
+++ b/packaging/debian/aethyra.xpm
@@ -1,312 +1,312 @@
-/* XPM */
-static char * Aethyra_xpm[] = {
-"32 32 277 2",
-"  	c None",
-". 	c #840000",
-"+ 	c #7E0000",
-"@ 	c #4F0000",
-"# 	c #810000",
-"$ 	c #830000",
-"% 	c #7B0000",
-"& 	c #460000",
-"* 	c #4C0000",
-"= 	c #4B0000",
-"- 	c #750000",
-"; 	c #860000",
-"> 	c #850000",
-", 	c #5D0000",
-"' 	c #490000",
-") 	c #450000",
-"! 	c #4A0000",
-"~ 	c #440000",
-"{ 	c #6A0000",
-"] 	c #7A0000",
-"^ 	c #8B0000",
-"/ 	c #990000",
-"( 	c #960000",
-"_ 	c #720000",
-": 	c #6E0000",
-"< 	c #740000",
-"[ 	c #6B0202",
-"} 	c #550505",
-"| 	c #420404",
-"1 	c #440101",
-"2 	c #4D0000",
-"3 	c #4E0000",
-"4 	c #480000",
-"5 	c #9D0000",
-"6 	c #9B0000",
-"7 	c #6F0000",
-"8 	c #710000",
-"9 	c #760000",
-"0 	c #680404",
-"a 	c #4B0C0C",
-"b 	c #3C0909",
-"c 	c #470202",
-"d 	c #450101",
-"e 	c #500000",
-"f 	c #510000",
-"g 	c #790000",
-"h 	c #890000",
-"i 	c #920000",
-"j 	c #710706",
-"k 	c #7D381F",
-"l 	c #934A1A",
-"m 	c #7B1A09",
-"n 	c #6B1609",
-"o 	c #521E13",
-"p 	c #4F2517",
-"q 	c #5D230F",
-"r 	c #4D0F04",
-"s 	c #350A0A",
-"t 	c #360909",
-"u 	c #470303",
-"v 	c #930000",
-"w 	c #840202",
-"x 	c #712C1C",
-"y 	c #A58248",
-"z 	c #866621",
-"A 	c #835819",
-"B 	c #98681F",
-"C 	c #845C1D",
-"D 	c #BB964A",
-"E 	c #856225",
-"F 	c #3D1B0B",
-"G 	c #241818",
-"H 	c #251717",
-"I 	c #360A0A",
-"J 	c #430000",
-"K 	c #6C0000",
-"L 	c #800000",
-"M 	c #730404",
-"N 	c #6A431E",
-"O 	c #473C1C",
-"P 	c #534420",
-"Q 	c #806125",
-"R 	c #53290B",
-"S 	c #461C09",
-"T 	c #BB9432",
-"U 	c #65490F",
-"V 	c #1F1110",
-"W 	c #1A2323",
-"X 	c #1A2222",
-"Y 	c #261212",
-"Z 	c #440202",
-"` 	c #7F0000",
-" .	c #870000",
-"..	c #6D0505",
-"+.	c #422522",
-"@.	c #454434",
-"#.	c #A18744",
-"$.	c #8F7237",
-"%.	c #A37F48",
-"&.	c #AD8847",
-"*.	c #C6A657",
-"=.	c #644C14",
-"-.	c #211615",
-";.	c #1C2626",
-">.	c #1B2323",
-",.	c #231313",
-"'.	c #420202",
-").	c #6C0404",
-"!.	c #532D23",
-"~.	c #A8915B",
-"{.	c #967C37",
-"].	c #6E5926",
-"^.	c #453512",
-"/.	c #473713",
-"(.	c #A4832A",
-"_.	c #594310",
-":.	c #241F1E",
-"<.	c #232828",
-"[.	c #1C2020",
-"}.	c #241111",
-"|.	c #430202",
-"1.	c #7C5030",
-"2.	c #967C3D",
-"3.	c #3E3318",
-"4.	c #3D3930",
-"5.	c #454442",
-"6.	c #524D44",
-"7.	c #C09E45",
-"8.	c #654F17",
-"9.	c #262524",
-"0.	c #252929",
-"a.	c #410202",
-"b.	c #6B0302",
-"c.	c #A78041",
-"d.	c #6A5621",
-"e.	c #414543",
-"f.	c #696B6B",
-"g.	c #747676",
-"h.	c #7B7566",
-"i.	c #C9A84F",
-"j.	c #665017",
-"k.	c #282725",
-"l.	c #252A2A",
-"m.	c #1B2222",
-"n.	c #3D0202",
-"o.	c #750802",
-"p.	c #B48E41",
-"q.	c #564418",
-"r.	c #4A4B4B",
-"s.	c #6D6F6F",
-"t.	c #797A7A",
-"u.	c #867C62",
-"v.	c #AE9040",
-"w.	c #664F12",
-"x.	c #2D2A25",
-"y.	c #242828",
-"z.	c #1E1E1E",
-"A.	c #291010",
-"B.	c #400202",
-"C.	c #860B02",
-"D.	c #B78C32",
-"E.	c #594013",
-"F.	c #433E3E",
-"G.	c #606464",
-"H.	c #74736C",
-"I.	c #7C6D44",
-"J.	c #433719",
-"K.	c #413311",
-"L.	c #322F1E",
-"M.	c #1C2121",
-"N.	c #271212",
-"O.	c #3C0606",
-"P.	c #8C0200",
-"Q.	c #B5771D",
-"R.	c #765513",
-"S.	c #3F3636",
-"T.	c #555B5B",
-"U.	c #686969",
-"V.	c #5A5957",
-"W.	c #3C3832",
-"X.	c #403826",
-"Y.	c #2F3023",
-"Z.	c #1C1F1D",
-"`.	c #2E0A0A",
-" +	c #460101",
-".+	c #8F0101",
-"++	c #A03F0C",
-"@+	c #AC7E19",
-"#+	c #4B3625",
-"$+	c #474747",
-"%+	c #5B5C5A",
-"&+	c #83775A",
-"*+	c #8C7539",
-"=+	c #67541F",
-"-+	c #6B551C",
-";+	c #8C6D24",
-">+	c #4E1C09",
-",+	c #4A0101",
-"'+	c #8A0606",
-")+	c #8D1203",
-"!+	c #A76713",
-"~+	c #87611B",
-"{+	c #453A32",
-"]+	c #52554E",
-"^+	c #A38A45",
-"/+	c #715818",
-"(+	c #7A6424",
-"_+	c #443212",
-":+	c #947026",
-"<+	c #7D4E11",
-"[+	c #490400",
-"}+	c #420000",
-"|+	c #7F0808",
-"1+	c #8B0101",
-"2+	c #800F01",
-"3+	c #915E11",
-"4+	c #504F40",
-"5+	c #4E4834",
-"6+	c #5A4715",
-"7+	c #5B4814",
-"8+	c #382813",
-"9+	c #917035",
-"0+	c #533209",
-"a+	c #3F0400",
-"b+	c #8E0101",
-"c+	c #8A0000",
-"d+	c #671104",
-"e+	c #663D12",
-"f+	c #786023",
-"g+	c #74612B",
-"h+	c #665320",
-"i+	c #675321",
-"j+	c #785C24",
-"k+	c #684718",
-"l+	c #380B00",
-"m+	c #400000",
-"n+	c #8C0303",
-"o+	c #8D0000",
-"p+	c #780101",
-"q+	c #510808",
-"r+	c #291A16",
-"s+	c #26291C",
-"t+	c #2D2B18",
-"u+	c #321F0E",
-"v+	c #370A02",
-"w+	c #3E0100",
-"x+	c #850202",
-"y+	c #600202",
-"z+	c #331313",
-"A+	c #1E2121",
-"B+	c #1A1E1E",
-"C+	c #270D0D",
-"D+	c #470000",
-"E+	c #7B0404",
-"F+	c #720101",
-"G+	c #4B0D0D",
-"H+	c #2D1717",
-"I+	c #261414",
-"J+	c #380808",
-"K+	c #7E0202",
-"L+	c #5D0606",
-"M+	c #3B0E0E",
-"N+	c #300C0C",
-"O+	c #430303",
-"P+	c #7A0505",
-"Q+	c #7C0000",
-"R+	c #640404",
-"S+	c #430D0D",
-"T+	c #460202",
-"U+	c #610505",
-"V+	c #440E0E",
-"W+	c #390B0B",
-"X+	c #560202",
-"Y+	c #480707",
-"Z+	c #410505",
-"`+	c #4B0101",
-" @	c #480101",
-"                                                                ",
-"                                                                ",
-"                                                                ",
-"          . +                                     @             ",
-"          # $ %                               & * @ =           ",
-"          - # ; > $           , '           ) ! @ * ~           ",
-"          { ] ^ / ( $ _ : < [ } | 1 ) ~ ' 2 2 3 3 4             ",
-"            ] ^ 5 6 . 7 8 9 0 a b c * d 4 e f @ 3 4             ",
-"            g h / i j k l m n o p q r s t u e 3 2 4             ",
-"            8 > v w x y z A B C D E F G H I = @ ' J             ",
-"            K L ^ M N O P Q R S T U V W X Y Z e )               ",
-"              `  ...+.@.#.$.%.&.*.=.-.;.>.,.'.e &               ",
-"              ` . ).!.~.{.].^./.(._.:.<.[.}.|.@ 4               ",
-"                # [ 1.2.3.4.5.6.7.8.9.0.[.}.a.=                 ",
-"                ` b.c.d.e.f.g.h.i.j.k.l.m.,.n.)                 ",
-"                L o.p.q.r.s.t.u.v.w.x.y.z.A.B.~                 ",
-"                ; C.D.E.F.G.H.I.J.K.L.M.N.O.4                   ",
-"                  P.Q.R.S.T.U.V.W.X.Y.Z.`. +2                   ",
-"                  .+++@+#+$+%+&+*+=+-+;+>+,+=                   ",
-"                  '+)+!+~+{+]+^+/+(+_+:+<+[+}+                  ",
-"                  |+1+2+3+z 4+5+6+7+8+9+0+a+                    ",
-"                    b+c+d+e+f+g+h+i+j+k+l+m+                    ",
-"                    n+o+p+q+r+s+t+u+v+w+) )                     ",
-"                      x+` y+z+A+B+C+1 e D+                      ",
-"                      E+# F+G+H+I+J+3 @ ~                       ",
-"                        K+% L+M+N+O+e '                         ",
-"                        P+Q+R+S+I T+@ )                         ",
-"                          9 U+V+W+u 2                           ",
-"                            X+Y+Z+ +                            ",
-"                            * `+ @                              ",
-"                                                                ",
+/* XPM */
+static char * Aethyra_xpm[] = {
+"32 32 277 2",
+"  	c None",
+". 	c #840000",
+"+ 	c #7E0000",
+"@ 	c #4F0000",
+"# 	c #810000",
+"$ 	c #830000",
+"% 	c #7B0000",
+"& 	c #460000",
+"* 	c #4C0000",
+"= 	c #4B0000",
+"- 	c #750000",
+"; 	c #860000",
+"> 	c #850000",
+", 	c #5D0000",
+"' 	c #490000",
+") 	c #450000",
+"! 	c #4A0000",
+"~ 	c #440000",
+"{ 	c #6A0000",
+"] 	c #7A0000",
+"^ 	c #8B0000",
+"/ 	c #990000",
+"( 	c #960000",
+"_ 	c #720000",
+": 	c #6E0000",
+"< 	c #740000",
+"[ 	c #6B0202",
+"} 	c #550505",
+"| 	c #420404",
+"1 	c #440101",
+"2 	c #4D0000",
+"3 	c #4E0000",
+"4 	c #480000",
+"5 	c #9D0000",
+"6 	c #9B0000",
+"7 	c #6F0000",
+"8 	c #710000",
+"9 	c #760000",
+"0 	c #680404",
+"a 	c #4B0C0C",
+"b 	c #3C0909",
+"c 	c #470202",
+"d 	c #450101",
+"e 	c #500000",
+"f 	c #510000",
+"g 	c #790000",
+"h 	c #890000",
+"i 	c #920000",
+"j 	c #710706",
+"k 	c #7D381F",
+"l 	c #934A1A",
+"m 	c #7B1A09",
+"n 	c #6B1609",
+"o 	c #521E13",
+"p 	c #4F2517",
+"q 	c #5D230F",
+"r 	c #4D0F04",
+"s 	c #350A0A",
+"t 	c #360909",
+"u 	c #470303",
+"v 	c #930000",
+"w 	c #840202",
+"x 	c #712C1C",
+"y 	c #A58248",
+"z 	c #866621",
+"A 	c #835819",
+"B 	c #98681F",
+"C 	c #845C1D",
+"D 	c #BB964A",
+"E 	c #856225",
+"F 	c #3D1B0B",
+"G 	c #241818",
+"H 	c #251717",
+"I 	c #360A0A",
+"J 	c #430000",
+"K 	c #6C0000",
+"L 	c #800000",
+"M 	c #730404",
+"N 	c #6A431E",
+"O 	c #473C1C",
+"P 	c #534420",
+"Q 	c #806125",
+"R 	c #53290B",
+"S 	c #461C09",
+"T 	c #BB9432",
+"U 	c #65490F",
+"V 	c #1F1110",
+"W 	c #1A2323",
+"X 	c #1A2222",
+"Y 	c #261212",
+"Z 	c #440202",
+"` 	c #7F0000",
+" .	c #870000",
+"..	c #6D0505",
+"+.	c #422522",
+"@.	c #454434",
+"#.	c #A18744",
+"$.	c #8F7237",
+"%.	c #A37F48",
+"&.	c #AD8847",
+"*.	c #C6A657",
+"=.	c #644C14",
+"-.	c #211615",
+";.	c #1C2626",
+">.	c #1B2323",
+",.	c #231313",
+"'.	c #420202",
+").	c #6C0404",
+"!.	c #532D23",
+"~.	c #A8915B",
+"{.	c #967C37",
+"].	c #6E5926",
+"^.	c #453512",
+"/.	c #473713",
+"(.	c #A4832A",
+"_.	c #594310",
+":.	c #241F1E",
+"<.	c #232828",
+"[.	c #1C2020",
+"}.	c #241111",
+"|.	c #430202",
+"1.	c #7C5030",
+"2.	c #967C3D",
+"3.	c #3E3318",
+"4.	c #3D3930",
+"5.	c #454442",
+"6.	c #524D44",
+"7.	c #C09E45",
+"8.	c #654F17",
+"9.	c #262524",
+"0.	c #252929",
+"a.	c #410202",
+"b.	c #6B0302",
+"c.	c #A78041",
+"d.	c #6A5621",
+"e.	c #414543",
+"f.	c #696B6B",
+"g.	c #747676",
+"h.	c #7B7566",
+"i.	c #C9A84F",
+"j.	c #665017",
+"k.	c #282725",
+"l.	c #252A2A",
+"m.	c #1B2222",
+"n.	c #3D0202",
+"o.	c #750802",
+"p.	c #B48E41",
+"q.	c #564418",
+"r.	c #4A4B4B",
+"s.	c #6D6F6F",
+"t.	c #797A7A",
+"u.	c #867C62",
+"v.	c #AE9040",
+"w.	c #664F12",
+"x.	c #2D2A25",
+"y.	c #242828",
+"z.	c #1E1E1E",
+"A.	c #291010",
+"B.	c #400202",
+"C.	c #860B02",
+"D.	c #B78C32",
+"E.	c #594013",
+"F.	c #433E3E",
+"G.	c #606464",
+"H.	c #74736C",
+"I.	c #7C6D44",
+"J.	c #433719",
+"K.	c #413311",
+"L.	c #322F1E",
+"M.	c #1C2121",
+"N.	c #271212",
+"O.	c #3C0606",
+"P.	c #8C0200",
+"Q.	c #B5771D",
+"R.	c #765513",
+"S.	c #3F3636",
+"T.	c #555B5B",
+"U.	c #686969",
+"V.	c #5A5957",
+"W.	c #3C3832",
+"X.	c #403826",
+"Y.	c #2F3023",
+"Z.	c #1C1F1D",
+"`.	c #2E0A0A",
+" +	c #460101",
+".+	c #8F0101",
+"++	c #A03F0C",
+"@+	c #AC7E19",
+"#+	c #4B3625",
+"$+	c #474747",
+"%+	c #5B5C5A",
+"&+	c #83775A",
+"*+	c #8C7539",
+"=+	c #67541F",
+"-+	c #6B551C",
+";+	c #8C6D24",
+">+	c #4E1C09",
+",+	c #4A0101",
+"'+	c #8A0606",
+")+	c #8D1203",
+"!+	c #A76713",
+"~+	c #87611B",
+"{+	c #453A32",
+"]+	c #52554E",
+"^+	c #A38A45",
+"/+	c #715818",
+"(+	c #7A6424",
+"_+	c #443212",
+":+	c #947026",
+"<+	c #7D4E11",
+"[+	c #490400",
+"}+	c #420000",
+"|+	c #7F0808",
+"1+	c #8B0101",
+"2+	c #800F01",
+"3+	c #915E11",
+"4+	c #504F40",
+"5+	c #4E4834",
+"6+	c #5A4715",
+"7+	c #5B4814",
+"8+	c #382813",
+"9+	c #917035",
+"0+	c #533209",
+"a+	c #3F0400",
+"b+	c #8E0101",
+"c+	c #8A0000",
+"d+	c #671104",
+"e+	c #663D12",
+"f+	c #786023",
+"g+	c #74612B",
+"h+	c #665320",
+"i+	c #675321",
+"j+	c #785C24",
+"k+	c #684718",
+"l+	c #380B00",
+"m+	c #400000",
+"n+	c #8C0303",
+"o+	c #8D0000",
+"p+	c #780101",
+"q+	c #510808",
+"r+	c #291A16",
+"s+	c #26291C",
+"t+	c #2D2B18",
+"u+	c #321F0E",
+"v+	c #370A02",
+"w+	c #3E0100",
+"x+	c #850202",
+"y+	c #600202",
+"z+	c #331313",
+"A+	c #1E2121",
+"B+	c #1A1E1E",
+"C+	c #270D0D",
+"D+	c #470000",
+"E+	c #7B0404",
+"F+	c #720101",
+"G+	c #4B0D0D",
+"H+	c #2D1717",
+"I+	c #261414",
+"J+	c #380808",
+"K+	c #7E0202",
+"L+	c #5D0606",
+"M+	c #3B0E0E",
+"N+	c #300C0C",
+"O+	c #430303",
+"P+	c #7A0505",
+"Q+	c #7C0000",
+"R+	c #640404",
+"S+	c #430D0D",
+"T+	c #460202",
+"U+	c #610505",
+"V+	c #440E0E",
+"W+	c #390B0B",
+"X+	c #560202",
+"Y+	c #480707",
+"Z+	c #410505",
+"`+	c #4B0101",
+" @	c #480101",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"          . +                                     @             ",
+"          # $ %                               & * @ =           ",
+"          - # ; > $           , '           ) ! @ * ~           ",
+"          { ] ^ / ( $ _ : < [ } | 1 ) ~ ' 2 2 3 3 4             ",
+"            ] ^ 5 6 . 7 8 9 0 a b c * d 4 e f @ 3 4             ",
+"            g h / i j k l m n o p q r s t u e 3 2 4             ",
+"            8 > v w x y z A B C D E F G H I = @ ' J             ",
+"            K L ^ M N O P Q R S T U V W X Y Z e )               ",
+"              `  ...+.@.#.$.%.&.*.=.-.;.>.,.'.e &               ",
+"              ` . ).!.~.{.].^./.(._.:.<.[.}.|.@ 4               ",
+"                # [ 1.2.3.4.5.6.7.8.9.0.[.}.a.=                 ",
+"                ` b.c.d.e.f.g.h.i.j.k.l.m.,.n.)                 ",
+"                L o.p.q.r.s.t.u.v.w.x.y.z.A.B.~                 ",
+"                ; C.D.E.F.G.H.I.J.K.L.M.N.O.4                   ",
+"                  P.Q.R.S.T.U.V.W.X.Y.Z.`. +2                   ",
+"                  .+++@+#+$+%+&+*+=+-+;+>+,+=                   ",
+"                  '+)+!+~+{+]+^+/+(+_+:+<+[+}+                  ",
+"                  |+1+2+3+z 4+5+6+7+8+9+0+a+                    ",
+"                    b+c+d+e+f+g+h+i+j+k+l+m+                    ",
+"                    n+o+p+q+r+s+t+u+v+w+) )                     ",
+"                      x+` y+z+A+B+C+1 e D+                      ",
+"                      E+# F+G+H+I+J+3 @ ~                       ",
+"                        K+% L+M+N+O+e '                         ",
+"                        P+Q+R+S+I T+@ )                         ",
+"                          9 U+V+W+u 2                           ",
+"                            X+Y+Z+ +                            ",
+"                            * `+ @                              ",
+"                                                                ",
 "                                                                "};
diff --git a/src/particle.h b/src/particle.h
index 41d7df97..e1ea92d9 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -1,296 +1,296 @@
-/*
- *  The Mana World
- *  Copyright 2006 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _PARTICLE_H
-#define _PARTICLE_H
-
-#include <list>
-#include <string>
-
-#include <guichan/color.hpp>
-
-#include "guichanfwd.h"
-#include "sprite.h"
-#include "vector.h"
-
-class Map;
-class Particle;
-class ParticleEmitter;
-
-typedef std::list<Particle *> Particles;
-typedef Particles::iterator ParticleIterator;
-typedef std::list<ParticleEmitter *> Emitters;
-typedef Emitters::iterator EmitterIterator;
-
-/**
- * A particle spawned by a ParticleEmitter.
- */
-class Particle : public Sprite
-{
-    public:
-        static const float PARTICLE_SKY; /**< Maximum Z position of particles */
-        static int fastPhysics;          /**< Mode of squareroot calculation */
-        static int particleCount;        /**< Current number of particles */
-        static int maxCount;             /**< Maximum number of particles */
-        static int emitterSkip;          /**< Duration of pause between two emitter updates in ticks */
-
-        /**
-         * Constructor.
-         *
-         * @param map the map this particle will add itself to, may be NULL
-         */
-        Particle(Map *map);
-
-        /**
-         * Destructor.
-         */
-        ~Particle();
-
-        /**
-         * Deletes all child particles and emitters.
-         */
-        void clear();
-
-        /**
-         * Gives a particle the properties of an engine root particle and loads
-         * the particle-related config settings.
-         */
-        void setupEngine();
-
-        /**
-         * Updates particle position, returns false when the particle should
-         * be deleted.
-         */
-        virtual bool update();
-
-        /**
-         * Draws the particle image.
-         */
-        virtual void draw(Graphics *graphics, int offsetX, int offsetY) const;
-
-        /**
-         * Necessary for sorting with the other sprites.
-         */
-        virtual int getPixelY() const
-        { return (int) (mPos.y + mPos.z) - 64; }
-
-        /**
-         * Sets the map the particle is on.
-         */
-        void setMap(Map *map);
-
-        /**
-         * Creates a child particle that hosts some emitters described in the
-         * particleEffectFile.
-         */
-        Particle *addEffect(const std::string &particleEffectFile,
-                            int pixelX, int pixelY, int rotation = 0);
-
-        /**
-         * Creates a standalone text particle.
-         */
-        Particle *addTextSplashEffect(const std::string &text,
-                                      int colorR, int colorG, int colorB,
-                                      gcn::Font *font, int x, int y);
-
-        /**
-         * Creates a standalone text particle.
-         */
-        Particle *addTextRiseFadeOutEffect(const std::string &text,
-                                           gcn::Font *font,
-                                           int x, int y);
-
-        /**
-         * Adds an emitter to the particle.
-         */
-        void addEmitter (ParticleEmitter* emitter)
-        { mChildEmitters.push_back(emitter); }
-
-        /**
-         * Sets the position in 3 dimensional space in pixels relative to map.
-         */
-        void moveTo(const Vector &pos)
-        { moveBy (pos - mPos);}
-
-        /**
-         * Sets the position in 2 dimensional space in pixels relative to map.
-         */
-        void moveTo(float x, float y);
-
-        /**
-         * Returns the particle position.
-         */
-        const Vector& getPosition() const
-        { return mPos; }
-
-        /**
-         * Changes the particle position relative
-         */
-        void moveBy (const Vector &change);
-
-        /**
-         * Sets the time in game ticks until the particle is destroyed.
-         */
-        void setLifetime(int lifetime)
-        { mLifetimeLeft = lifetime; mLifetimePast = 0; }
-
-        /**
-         * Sets the age of the pixel in game ticks where the particle has
-         * faded in completely.
-         */
-        void setFadeOut(int fadeOut)
-        { mFadeOut = fadeOut; }
-
-        /**
-         * Sets the remaining particle lifetime where the particle starts to
-         * fade out.
-         */
-        void setFadeIn(int fadeIn)
-        { mFadeIn = fadeIn; }
-
-        /**
-         * Sets the alpha value of the particle
-         */
-        void setAlpha(float alpha)
-        { mAlpha = alpha; }
-
-        /**
-         * Sets the sprite iterator of the particle on the current map to make
-         * it easier to remove the particle from the map when it is destroyed.
-         */
-        void setSpriteIterator(std::list<Sprite*>::iterator spriteIterator)
-        { mSpriteIterator = spriteIterator; }
-
-        /**
-         * Gets the sprite iterator of the particle on the current map.
-         */
-        std::list<Sprite*>::iterator
-        getSpriteIterator() const
-        { return mSpriteIterator; }
-
-        /**
-         * Sets the current velocity in 3 dimensional space.
-         */
-        void setVelocity(float x, float y, float z)
-        { mVelocity.x = x; mVelocity.y = y; mVelocity.z = z; }
-
-        /**
-         * Sets the downward acceleration.
-         */
-        void setGravity(float gravity)
-        { mGravity = gravity; }
-
-        /**
-         * Sets the ammount of random vector changes
-         */
-        void setRandomness(int r)
-        { mRandomness = r; }
-
-        /**
-         * Sets the ammount of velocity particles retain after
-         * hitting the ground.
-         */
-        void setBounce(float bouncieness)
-        { mBounce = bouncieness; }
-
-        /**
-         * Sets the flag if the particle is supposed to be moved by its parent
-         */
-        void setFollow(bool follow)
-        { mFollow = follow; }
-
-        /**
-         * Gets the flag if the particle is supposed to be moved by its parent
-         */
-        bool doesFollow()
-        { return mFollow; }
-
-        /**
-         * Makes the particle move toward another particle with a
-         * given acceleration and momentum
-         */
-        void setDestination(Particle *target, float accel, float moment)
-        { mTarget = target; mAcceleration = accel; mMomentum = moment; }
-
-        /**
-         * Sets the distance in pixel the particle can come near the target
-         * particle before it is destroyed. Does only make sense after a target
-         * particle has been set using setDestination.
-         */
-        void setDieDistance(float dist)
-        { mInvDieDistance = 1.0f / dist; }
-
-        bool isAlive()
-        { return mAlive; }
-
-        /**
-         * Determines whether the particle and its children are all dead
-         */
-        bool isExtinct()
-        { return !isAlive() && mChildParticles.empty(); }
-
-        /**
-         * Manually marks the particle for deletion.
-         */
-        void kill()
-        { mAlive = false; mAutoDelete = true; }
-
-        /**
-         * After calling this function the particle will only request
-         * deletion when kill() is called
-         */
-        void disableAutoDelete()
-        { mAutoDelete = false; }
-
-    protected:
-        bool mAlive;                /**< Is the particle supposed to be drawn and updated?*/
-        Vector mPos;                /**< Position in pixels relative to map. */
-        int mLifetimeLeft;          /**< Lifetime left in game ticks*/
-        int mLifetimePast;          /**< Age of the particle in game ticks*/
-        int mFadeOut;               /**< Lifetime in game ticks left where fading out begins*/
-        int mFadeIn;                /**< Age in game ticks where fading in is finished*/
-        float mAlpha;               /**< Opacity of the graphical representation of the particle */
-
-    private:
-        // generic properties
-        bool mAutoDelete;           /**< May the particle request its deletion by the parent particle? */
-        Map *mMap;                  /**< Map the particle is on. */
-        std::list<Sprite*>::iterator mSpriteIterator;   /**< iterator of the particle on the current map */
-        Emitters mChildEmitters;    /**< List of child emitters. */
-        Particles mChildParticles;  /**< List of particles controlled by this particle */
-
-        // dynamic particle
-        Vector mVelocity;           /**< Speed in pixels per game-tick. */
-        float mGravity;             /**< Downward acceleration in pixels per game-tick. */
-        int mRandomness;            /**< Ammount of random vector change */
-        float mBounce;              /**< How much the particle bounces off when hitting the ground */
-        bool mFollow;               /**< is this particle moved when its parent particle moves? */
-
-        // follow-point particles
-        Particle *mTarget;          /**< The particle that attracts this particle*/
-        float mAcceleration;        /**< Acceleration towards the target particle in pixels per game-tick�*/
-        float mInvDieDistance;      /**< Distance in pixels from the target particle that causes the destruction of the particle*/
-        float mMomentum;            /**< How much speed the particle retains after each game tick*/
-};
-
-extern Particle *particleEngine;
-
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _PARTICLE_H
+#define _PARTICLE_H
+
+#include <list>
+#include <string>
+
+#include <guichan/color.hpp>
+
+#include "guichanfwd.h"
+#include "sprite.h"
+#include "vector.h"
+
+class Map;
+class Particle;
+class ParticleEmitter;
+
+typedef std::list<Particle *> Particles;
+typedef Particles::iterator ParticleIterator;
+typedef std::list<ParticleEmitter *> Emitters;
+typedef Emitters::iterator EmitterIterator;
+
+/**
+ * A particle spawned by a ParticleEmitter.
+ */
+class Particle : public Sprite
+{
+    public:
+        static const float PARTICLE_SKY; /**< Maximum Z position of particles */
+        static int fastPhysics;          /**< Mode of squareroot calculation */
+        static int particleCount;        /**< Current number of particles */
+        static int maxCount;             /**< Maximum number of particles */
+        static int emitterSkip;          /**< Duration of pause between two emitter updates in ticks */
+
+        /**
+         * Constructor.
+         *
+         * @param map the map this particle will add itself to, may be NULL
+         */
+        Particle(Map *map);
+
+        /**
+         * Destructor.
+         */
+        ~Particle();
+
+        /**
+         * Deletes all child particles and emitters.
+         */
+        void clear();
+
+        /**
+         * Gives a particle the properties of an engine root particle and loads
+         * the particle-related config settings.
+         */
+        void setupEngine();
+
+        /**
+         * Updates particle position, returns false when the particle should
+         * be deleted.
+         */
+        virtual bool update();
+
+        /**
+         * Draws the particle image.
+         */
+        virtual void draw(Graphics *graphics, int offsetX, int offsetY) const;
+
+        /**
+         * Necessary for sorting with the other sprites.
+         */
+        virtual int getPixelY() const
+        { return (int) (mPos.y + mPos.z) - 64; }
+
+        /**
+         * Sets the map the particle is on.
+         */
+        void setMap(Map *map);
+
+        /**
+         * Creates a child particle that hosts some emitters described in the
+         * particleEffectFile.
+         */
+        Particle *addEffect(const std::string &particleEffectFile,
+                            int pixelX, int pixelY, int rotation = 0);
+
+        /**
+         * Creates a standalone text particle.
+         */
+        Particle *addTextSplashEffect(const std::string &text,
+                                      int colorR, int colorG, int colorB,
+                                      gcn::Font *font, int x, int y);
+
+        /**
+         * Creates a standalone text particle.
+         */
+        Particle *addTextRiseFadeOutEffect(const std::string &text,
+                                           gcn::Font *font,
+                                           int x, int y);
+
+        /**
+         * Adds an emitter to the particle.
+         */
+        void addEmitter (ParticleEmitter* emitter)
+        { mChildEmitters.push_back(emitter); }
+
+        /**
+         * Sets the position in 3 dimensional space in pixels relative to map.
+         */
+        void moveTo(const Vector &pos)
+        { moveBy (pos - mPos);}
+
+        /**
+         * Sets the position in 2 dimensional space in pixels relative to map.
+         */
+        void moveTo(float x, float y);
+
+        /**
+         * Returns the particle position.
+         */
+        const Vector& getPosition() const
+        { return mPos; }
+
+        /**
+         * Changes the particle position relative
+         */
+        void moveBy (const Vector &change);
+
+        /**
+         * Sets the time in game ticks until the particle is destroyed.
+         */
+        void setLifetime(int lifetime)
+        { mLifetimeLeft = lifetime; mLifetimePast = 0; }
+
+        /**
+         * Sets the age of the pixel in game ticks where the particle has
+         * faded in completely.
+         */
+        void setFadeOut(int fadeOut)
+        { mFadeOut = fadeOut; }
+
+        /**
+         * Sets the remaining particle lifetime where the particle starts to
+         * fade out.
+         */
+        void setFadeIn(int fadeIn)
+        { mFadeIn = fadeIn; }
+
+        /**
+         * Sets the alpha value of the particle
+         */
+        void setAlpha(float alpha)
+        { mAlpha = alpha; }
+
+        /**
+         * Sets the sprite iterator of the particle on the current map to make
+         * it easier to remove the particle from the map when it is destroyed.
+         */
+        void setSpriteIterator(std::list<Sprite*>::iterator spriteIterator)
+        { mSpriteIterator = spriteIterator; }
+
+        /**
+         * Gets the sprite iterator of the particle on the current map.
+         */
+        std::list<Sprite*>::iterator
+        getSpriteIterator() const
+        { return mSpriteIterator; }
+
+        /**
+         * Sets the current velocity in 3 dimensional space.
+         */
+        void setVelocity(float x, float y, float z)
+        { mVelocity.x = x; mVelocity.y = y; mVelocity.z = z; }
+
+        /**
+         * Sets the downward acceleration.
+         */
+        void setGravity(float gravity)
+        { mGravity = gravity; }
+
+        /**
+         * Sets the ammount of random vector changes
+         */
+        void setRandomness(int r)
+        { mRandomness = r; }
+
+        /**
+         * Sets the ammount of velocity particles retain after
+         * hitting the ground.
+         */
+        void setBounce(float bouncieness)
+        { mBounce = bouncieness; }
+
+        /**
+         * Sets the flag if the particle is supposed to be moved by its parent
+         */
+        void setFollow(bool follow)
+        { mFollow = follow; }
+
+        /**
+         * Gets the flag if the particle is supposed to be moved by its parent
+         */
+        bool doesFollow()
+        { return mFollow; }
+
+        /**
+         * Makes the particle move toward another particle with a
+         * given acceleration and momentum
+         */
+        void setDestination(Particle *target, float accel, float moment)
+        { mTarget = target; mAcceleration = accel; mMomentum = moment; }
+
+        /**
+         * Sets the distance in pixel the particle can come near the target
+         * particle before it is destroyed. Does only make sense after a target
+         * particle has been set using setDestination.
+         */
+        void setDieDistance(float dist)
+        { mInvDieDistance = 1.0f / dist; }
+
+        bool isAlive()
+        { return mAlive; }
+
+        /**
+         * Determines whether the particle and its children are all dead
+         */
+        bool isExtinct()
+        { return !isAlive() && mChildParticles.empty(); }
+
+        /**
+         * Manually marks the particle for deletion.
+         */
+        void kill()
+        { mAlive = false; mAutoDelete = true; }
+
+        /**
+         * After calling this function the particle will only request
+         * deletion when kill() is called
+         */
+        void disableAutoDelete()
+        { mAutoDelete = false; }
+
+    protected:
+        bool mAlive;                /**< Is the particle supposed to be drawn and updated?*/
+        Vector mPos;                /**< Position in pixels relative to map. */
+        int mLifetimeLeft;          /**< Lifetime left in game ticks*/
+        int mLifetimePast;          /**< Age of the particle in game ticks*/
+        int mFadeOut;               /**< Lifetime in game ticks left where fading out begins*/
+        int mFadeIn;                /**< Age in game ticks where fading in is finished*/
+        float mAlpha;               /**< Opacity of the graphical representation of the particle */
+
+    private:
+        // generic properties
+        bool mAutoDelete;           /**< May the particle request its deletion by the parent particle? */
+        Map *mMap;                  /**< Map the particle is on. */
+        std::list<Sprite*>::iterator mSpriteIterator;   /**< iterator of the particle on the current map */
+        Emitters mChildEmitters;    /**< List of child emitters. */
+        Particles mChildParticles;  /**< List of particles controlled by this particle */
+
+        // dynamic particle
+        Vector mVelocity;           /**< Speed in pixels per game-tick. */
+        float mGravity;             /**< Downward acceleration in pixels per game-tick. */
+        int mRandomness;            /**< Ammount of random vector change */
+        float mBounce;              /**< How much the particle bounces off when hitting the ground */
+        bool mFollow;               /**< is this particle moved when its parent particle moves? */
+
+        // follow-point particles
+        Particle *mTarget;          /**< The particle that attracts this particle*/
+        float mAcceleration;        /**< Acceleration towards the target particle in pixels per game-tick�*/
+        float mInvDieDistance;      /**< Distance in pixels from the target particle that causes the destruction of the particle*/
+        float mMomentum;            /**< How much speed the particle retains after each game tick*/
+};
+
+extern Particle *particleEngine;
+
 #endif
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index 2a4e4c8a..bdfaa5ba 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -360,9 +360,9 @@ ParticleEmitter::createParticles(int tick)
         {
             newParticle = new Particle(mMap);
         }
-
-        Vector position(mParticlePosX.value(tick),
-                        mParticlePosY.value(tick),
+
+        Vector position(mParticlePosX.value(tick),
+                        mParticlePosY.value(tick),
                         mParticlePosZ.value(tick));
         newParticle->moveTo(position);
 
-- 
cgit v1.2.3-70-g09d2


From c38a213e2a70c00b338d9e3fe284a3e7ed336b44 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 6 Jan 2009 00:20:40 -0700
Subject: Fixed the windows cbp file, deleted some files which we don't use,
 and fixed a few compiler warnings noticed from building in windows.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 aethyra.cbp                            | 377 +++++----------------------------
 src/effectmanager.cpp                  |   2 +-
 src/gui/buddywindow.cpp                |  83 --------
 src/gui/minimap.cpp                    |   4 +-
 src/gui/newskill.cpp                   | 193 -----------------
 src/gui/smileycontainer.h              |   2 +-
 src/gui/smileyshortcutcontainer.h      |   3 +-
 src/gui/viewport.cpp                   |   2 +-
 src/gui/widgets/adjustingcontainer.cpp | 279 ------------------------
 src/gui/widgets/adjustingcontainer.hpp | 235 --------------------
 10 files changed, 64 insertions(+), 1116 deletions(-)
 delete mode 100644 src/gui/buddywindow.cpp
 delete mode 100644 src/gui/newskill.cpp
 delete mode 100644 src/gui/widgets/adjustingcontainer.cpp
 delete mode 100644 src/gui/widgets/adjustingcontainer.hpp

diff --git a/aethyra.cbp b/aethyra.cbp
index efc735c9..f24a28a6 100644
--- a/aethyra.cbp
+++ b/aethyra.cbp
@@ -24,6 +24,7 @@
 					<Add library="SDL_image" />
 					<Add library="SDL_mixer" />
 					<Add library="SDL_net" />
+					<Add library="SDL_ttf" />
 					<Add library="mingw32" />
 					<Add library="SDLmain" />
 					<Add library="SDL.dll" />
@@ -66,315 +67,25 @@
 			<Add alias="All" targets="default;" />
 		</VirtualTargets>
 		<Compiler>
-			<Add directory="..\..\..\..\..\..\mingw\include\SDL" />
+			<Add option="-fexpensive-optimizations" />
+			<Add option="-O3" />
+			<Add option="-O2" />
+			<Add option="-O1" />
+			<Add option="-O" />
+			<Add option="-W" />
+			<Add option="-Wall" />
+			<Add directory="..\aethyra\builds\windows\LinuxXcompileBuildSupport\include\SDL" />
+			<Add directory="..\aethyra\builds\windows\LinuxXcompileBuildSupport\include" />
 		</Compiler>
-<<<<<<< HEAD:aethyra.cbp
-		<Unit filename="src/animatedsprite.cpp" />
-		<Unit filename="src/animatedsprite.h" />
-		<Unit filename="src/animationparticle.cpp" />
-		<Unit filename="src/animationparticle.h" />
-		<Unit filename="src/being.cpp" />
-		<Unit filename="src/being.h" />
-		<Unit filename="src/beingmanager.cpp" />
-		<Unit filename="src/beingmanager.h" />
-		<Unit filename="src/configlistener.h" />
-		<Unit filename="src/configuration.cpp" />
-		<Unit filename="src/configuration.h" />
-		<Unit filename="src/engine.cpp" />
-		<Unit filename="src/engine.h" />
-		<Unit filename="src/equipment.cpp" />
-		<Unit filename="src/equipment.h" />
-		<Unit filename="src/floor_item.cpp" />
-		<Unit filename="src/floor_item.h" />
-		<Unit filename="src/flooritemmanager.cpp" />
-		<Unit filename="src/flooritemmanager.h" />
-		<Unit filename="src/game.cpp" />
-		<Unit filename="src/game.h" />
-		<Unit filename="src/graphics.cpp" />
-		<Unit filename="src/graphics.h" />
-		<Unit filename="src/gui/box.cpp" />
-		<Unit filename="src/gui/box.h" />
-		<Unit filename="src/gui/browserbox.cpp" />
-		<Unit filename="src/gui/browserbox.h" />
-		<Unit filename="src/gui/button.cpp" />
-		<Unit filename="src/gui/button.h" />
-		<Unit filename="src/gui/buy.cpp" />
-		<Unit filename="src/gui/buy.h" />
-		<Unit filename="src/gui/buysell.cpp" />
-		<Unit filename="src/gui/buysell.h" />
-		<Unit filename="src/gui/chargedialog.cpp" />
-		<Unit filename="src/gui/chargedialog.h" />
-		<Unit filename="src/gui/char_select.cpp" />
-		<Unit filename="src/gui/char_select.h" />
-		<Unit filename="src/gui/char_server.cpp" />
-		<Unit filename="src/gui/char_server.h" />
-		<Unit filename="src/gui/chat.cpp" />
-		<Unit filename="src/gui/chat.h" />
-		<Unit filename="src/gui/chatinput.cpp" />
-		<Unit filename="src/gui/chatinput.h" />
-		<Unit filename="src/gui/checkbox.cpp" />
-		<Unit filename="src/gui/checkbox.h" />
-		<Unit filename="src/gui/confirm_dialog.cpp" />
-		<Unit filename="src/gui/confirm_dialog.h" />
-		<Unit filename="src/gui/connection.cpp" />
-		<Unit filename="src/gui/connection.h" />
-		<Unit filename="src/gui/debugwindow.cpp" />
-		<Unit filename="src/gui/debugwindow.h" />
-		<Unit filename="src/gui/equipmentwindow.cpp" />
-		<Unit filename="src/gui/equipmentwindow.h" />
-		<Unit filename="src/gui/focushandler.cpp" />
-		<Unit filename="src/gui/focushandler.h" />
-		<Unit filename="src/gui/gccontainer.cpp" />
-		<Unit filename="src/gui/gccontainer.h" />
-		<Unit filename="src/gui/gui.cpp" />
-		<Unit filename="src/gui/gui.h" />
-		<Unit filename="src/gui/hbox.cpp" />
-		<Unit filename="src/gui/hbox.h" />
-		<Unit filename="src/gui/help.cpp" />
-		<Unit filename="src/gui/help.h" />
-		<Unit filename="src/gui/inttextbox.cpp" />
-		<Unit filename="src/gui/inttextbox.h" />
-		<Unit filename="src/gui/inventorywindow.cpp" />
-		<Unit filename="src/gui/inventorywindow.h" />
-		<Unit filename="src/gui/itemcontainer.cpp" />
-		<Unit filename="src/gui/itemcontainer.h" />
-		<Unit filename="src/gui/itemshortcutcontainer.cpp" />
-		<Unit filename="src/gui/itemshortcutcontainer.h" />
-		<Unit filename="src/gui/itemshortcutwindow.cpp" />
-		<Unit filename="src/gui/itemshortcutwindow.h" />
-		<Unit filename="src/gui/item_amount.cpp" />
-		<Unit filename="src/gui/item_amount.h" />
-		<Unit filename="src/gui/linkhandler.h" />
-		<Unit filename="src/gui/listbox.cpp" />
-		<Unit filename="src/gui/listbox.h" />
-		<Unit filename="src/gui/login.cpp" />
-		<Unit filename="src/gui/login.h" />
-		<Unit filename="src/gui/menuwindow.cpp" />
-		<Unit filename="src/gui/menuwindow.h" />
-		<Unit filename="src/gui/minimap.cpp" />
-		<Unit filename="src/gui/minimap.h" />
-		<Unit filename="src/gui/ministatus.cpp" />
-		<Unit filename="src/gui/ministatus.h" />
-		<Unit filename="src/gui/npc_text.cpp" />
-		<Unit filename="src/gui/npc_text.h" />
-		<Unit filename="src/gui/npclistdialog.cpp" />
-		<Unit filename="src/gui/npclistdialog.h" />
-		<Unit filename="src/gui/ok_dialog.cpp" />
-		<Unit filename="src/gui/ok_dialog.h" />
-		<Unit filename="src/gui/passwordfield.cpp" />
-		<Unit filename="src/gui/passwordfield.h" />
-		<Unit filename="src/gui/playerbox.cpp" />
-		<Unit filename="src/gui/playerbox.h" />
-		<Unit filename="src/gui/popupmenu.cpp" />
-		<Unit filename="src/gui/popupmenu.h" />
-		<Unit filename="src/gui/progressbar.cpp" />
-		<Unit filename="src/gui/progressbar.h" />
-		<Unit filename="src/gui/radiobutton.cpp" />
-		<Unit filename="src/gui/radiobutton.h" />
-		<Unit filename="src/gui/register.cpp" />
-		<Unit filename="src/gui/register.h" />
-		<Unit filename="src/gui/scrollarea.cpp" />
-		<Unit filename="src/gui/scrollarea.h" />
-		<Unit filename="src/gui/sell.cpp" />
-		<Unit filename="src/gui/sell.h" />
-		<Unit filename="src/gui/setup.cpp" />
-		<Unit filename="src/gui/setup.h" />
-		<Unit filename="src/gui/setup_audio.cpp" />
-		<Unit filename="src/gui/setup_audio.h" />
-		<Unit filename="src/gui/setup_joystick.cpp" />
-		<Unit filename="src/gui/setup_joystick.h" />
-		<Unit filename="src/gui/setup_keyboard.cpp" />
-		<Unit filename="src/gui/setup_keyboard.h" />
-		<Unit filename="src/gui/setup_players.cpp" />
-		<Unit filename="src/gui/setup_players.h" />
-		<Unit filename="src/gui/setup_video.cpp" />
-		<Unit filename="src/gui/setup_video.h" />
-		<Unit filename="src/gui/setuptab.h" />
-		<Unit filename="src/gui/shop.cpp" />
-		<Unit filename="src/gui/shop.h" />
-		<Unit filename="src/gui/shoplistbox.cpp" />
-		<Unit filename="src/gui/shoplistbox.h" />
-		<Unit filename="src/gui/skill.cpp" />
-		<Unit filename="src/gui/skill.h" />
-		<Unit filename="src/gui/slider.cpp" />
-		<Unit filename="src/gui/slider.h" />
-		<Unit filename="src/gui/status.cpp" />
-		<Unit filename="src/gui/status.h" />
-		<Unit filename="src/gui/tabbedcontainer.cpp" />
-		<Unit filename="src/gui/tabbedcontainer.h" />
-		<Unit filename="src/gui/table.cpp" />
-		<Unit filename="src/gui/table.h" />
-		<Unit filename="src/gui/table_model.cpp" />
-		<Unit filename="src/gui/table_model.h" />
-		<Unit filename="src/gui/textbox.cpp" />
-		<Unit filename="src/gui/textbox.h" />
-		<Unit filename="src/gui/textfield.cpp" />
-		<Unit filename="src/gui/textfield.h" />
-		<Unit filename="src/gui/trade.cpp" />
-		<Unit filename="src/gui/trade.h" />
-		<Unit filename="src/gui/updatewindow.cpp" />
-		<Unit filename="src/gui/updatewindow.h" />
-		<Unit filename="src/gui/vbox.cpp" />
-		<Unit filename="src/gui/vbox.h" />
-		<Unit filename="src/gui/viewport.cpp" />
-		<Unit filename="src/gui/viewport.h" />
-		<Unit filename="src/gui/widgets/dropdown.cpp"/>
-		<Unit filename="src/gui/widgets/dropdown.h" />
-		<Unit filename="src/gui/widgets/resizegrip.cpp" />
-		<Unit filename="src/gui/widgets/resizegrip.h" />
-		<Unit filename="src/gui/window.cpp" />
-		<Unit filename="src/gui/window.h" />
-		<Unit filename="src/gui/windowcontainer.cpp" />
-		<Unit filename="src/gui/windowcontainer.h" />
-		<Unit filename="src/guichanfwd.h" />
-		<Unit filename="src/imageparticle.cpp" />
-		<Unit filename="src/imageparticle.h" />
-		<Unit filename="src/inventory.cpp" />
-		<Unit filename="src/inventory.h" />
-		<Unit filename="src/item.cpp" />
-		<Unit filename="src/item.h" />
-		<Unit filename="src/itemshortcut.cpp" />
-		<Unit filename="src/itemshortcut.h" />
-		<Unit filename="src/joystick.cpp" />
-		<Unit filename="src/joystick.h" />
-		<Unit filename="src/keyboardconfig.cpp" />
-		<Unit filename="src/keyboardconfig.h" />
-		<Unit filename="src/localplayer.cpp" />
-		<Unit filename="src/localplayer.h" />
-		<Unit filename="src/lockedarray.h" />
-		<Unit filename="src/log.cpp" />
-		<Unit filename="src/log.h" />
-		<Unit filename="src/logindata.h" />
-		<Unit filename="src/main.cpp" />
-		<Unit filename="src/main.h" />
-		<Unit filename="src/map.cpp" />
-		<Unit filename="src/map.h" />
-		<Unit filename="src/monster.cpp" />
-		<Unit filename="src/monster.h" />
-		<Unit filename="src/net/beinghandler.cpp" />
-		<Unit filename="src/net/beinghandler.h" />
-		<Unit filename="src/net/buysellhandler.cpp" />
-		<Unit filename="src/net/buysellhandler.h" />
-		<Unit filename="src/net/charserverhandler.cpp" />
-		<Unit filename="src/net/charserverhandler.h" />
-		<Unit filename="src/net/chathandler.cpp" />
-		<Unit filename="src/net/chathandler.h" />
-		<Unit filename="src/net/equipmenthandler.cpp" />
-		<Unit filename="src/net/equipmenthandler.h" />
-		<Unit filename="src/net/inventoryhandler.cpp" />
-		<Unit filename="src/net/inventoryhandler.h" />
-		<Unit filename="src/net/itemhandler.cpp" />
-		<Unit filename="src/net/itemhandler.h" />
-		<Unit filename="src/net/loginhandler.cpp" />
-		<Unit filename="src/net/loginhandler.h" />
-		<Unit filename="src/net/maploginhandler.cpp" />
-		<Unit filename="src/net/maploginhandler.h" />
-		<Unit filename="src/net/messagehandler.cpp" />
-		<Unit filename="src/net/messagehandler.h" />
-		<Unit filename="src/net/messagein.cpp" />
-		<Unit filename="src/net/messagein.h" />
-		<Unit filename="src/net/messageout.cpp" />
-		<Unit filename="src/net/messageout.h" />
-		<Unit filename="src/net/network.cpp" />
-		<Unit filename="src/net/network.h" />
-		<Unit filename="src/net/npchandler.cpp" />
-		<Unit filename="src/net/npchandler.h" />
-		<Unit filename="src/net/partyhandler.cpp"/>
-		<Unit filename="src/net/partyhandler.h" />
-		<Unit filename="src/net/playerhandler.cpp" />
-		<Unit filename="src/net/playerhandler.h" />
-		<Unit filename="src/net/protocol.cpp" />
-		<Unit filename="src/net/protocol.h" />
-		<Unit filename="src/net/skillhandler.cpp" />
-		<Unit filename="src/net/skillhandler.h" />
-		<Unit filename="src/net/tradehandler.cpp" />
-		<Unit filename="src/net/tradehandler.h" />
-		<Unit filename="src/npc.cpp" />
-		<Unit filename="src/npc.h" />
-		<Unit filename="src/openglgraphics.cpp" />
-		<Unit filename="src/openglgraphics.h" />
-		<Unit filename="src/particle.cpp" />
-		<Unit filename="src/particle.h" />
-		<Unit filename="src/particleemitter.cpp" />
-		<Unit filename="src/particleemitter.h" />
-                <Unit filename="src/party.cpp" />
-		<Unit filename="src/party.h" />
-		<Unit filename="src/player.cpp" />
-		<Unit filename="src/player.h" />
-		<Unit filename="src/player_relations.cpp" />
-		<Unit filename="src/player_relations.h" />
-		<Unit filename="src/properties.h" />
-		<Unit filename="src/recorder.cpp" />
-		<Unit filename="src/recorder.h" />
-		<Unit filename="src/resources/action.cpp" />
-		<Unit filename="src/resources/action.h" />
-		<Unit filename="src/resources/ambientoverlay.cpp" />
-		<Unit filename="src/resources/ambientoverlay.h" />
-		<Unit filename="src/resources/animation.cpp" />
-		<Unit filename="src/resources/animation.h" />
-		<Unit filename="src/resources/buddylist.cpp"/>
-		<Unit filename="src/resources/buddylist.h" />
-		<Unit filename="src/resources/dye.cpp" />
-		<Unit filename="src/resources/dye.h" />
-		<Unit filename="src/resources/image.cpp" />
-		<Unit filename="src/resources/image.h" />
-		<Unit filename="src/resources/imageloader.cpp" />
-		<Unit filename="src/resources/imageloader.h" />
-		<Unit filename="src/resources/imageset.cpp" />
-		<Unit filename="src/resources/imageset.h" />
-		<Unit filename="src/resources/imagewriter.cpp" />
-		<Unit filename="src/resources/imagewriter.h" />
-		<Unit filename="src/resources/itemdb.cpp" />
-		<Unit filename="src/resources/itemdb.h" />
-		<Unit filename="src/resources/iteminfo.cpp" />
-		<Unit filename="src/resources/iteminfo.h" />
-		<Unit filename="src/resources/mapreader.cpp" />
-		<Unit filename="src/resources/mapreader.h" />
-		<Unit filename="src/resources/monsterdb.cpp" />
-		<Unit filename="src/resources/monsterdb.h" />
-		<Unit filename="src/resources/monsterinfo.cpp" />
-		<Unit filename="src/resources/monsterinfo.h" />
-		<Unit filename="src/resources/music.cpp" />
-		<Unit filename="src/resources/music.h" />
-		<Unit filename="src/resources/npcdb.cpp" />
-		<Unit filename="src/resources/npcdb.h" />
-		<Unit filename="src/resources/resource.cpp" />
-		<Unit filename="src/resources/resource.h" />
-		<Unit filename="src/resources/resourcemanager.cpp" />
-		<Unit filename="src/resources/resourcemanager.h" />
-		<Unit filename="src/resources/soundeffect.cpp" />
-		<Unit filename="src/resources/soundeffect.h" />
-		<Unit filename="src/resources/spritedef.cpp" />
-		<Unit filename="src/resources/spritedef.h" />
-		<Unit filename="src/serverinfo.h" />
-		<Unit filename="src/simpleanimation.cpp" />
-		<Unit filename="src/simpleanimation.h" />
-		<Unit filename="src/sound.cpp" />
-		<Unit filename="src/sound.h" />
-		<Unit filename="src/sprite.h" />
-		<Unit filename="src/text.cpp" />
-		<Unit filename="src/text.h" />
-		<Unit filename="src/textmanager.cpp" />
-		<Unit filename="src/textmanager.h" />
-		<Unit filename="src/textparticle.cpp" />
-		<Unit filename="src/textparticle.h" />
-		<Unit filename="src/tileset.h" />
-		<Unit filename="src/aethyra.rc">
+		<Linker>
+			<Add option="-s" />
+			<Add directory="..\aethyra\builds\windows\LinuxXcompileBuildSupport\dll" />
+		</Linker>
+		<Unit filename="src\SDLMain.h" />
+		<Unit filename="src\aethyra.rc">
 			<Option compilerVar="WINDRES" />
-			<Option target="&lt;{~None~}&gt;" />
+			<Option target="default" />
 		</Unit>
-		<Unit filename="src/utils/base64.cpp" />
-		<Unit filename="src/utils/base64.h" />
-		<Unit filename="src/utils/dtor.h" />
-		<Unit filename="src/utils/fastsqrt.h" />
-		<Unit filename="src/utils/strprintf.cpp" />
-		<Unit filename="src/utils/strprintf.h" />
-		<Unit filename="src/utils/tostring.h" />
-		<Unit filename="src/utils/xml.cpp" />
-		<Unit filename="src/utils/xml.h" />
-		<Unit filename="src/winver.h">
-			<Option target="unix" />
-=======
 		<Unit filename="src\animatedsprite.cpp" />
 		<Unit filename="src\animatedsprite.h" />
 		<Unit filename="src\animationparticle.cpp" />
@@ -386,10 +97,13 @@
 		<Unit filename="src\configlistener.h" />
 		<Unit filename="src\configuration.cpp" />
 		<Unit filename="src\configuration.h" />
+		<Unit filename="src\effectmanager.cpp" />
+		<Unit filename="src\effectmanager.h" />
 		<Unit filename="src\engine.cpp" />
 		<Unit filename="src\engine.h" />
 		<Unit filename="src\equipment.cpp" />
 		<Unit filename="src\equipment.h" />
+		<Unit filename="src\extensions.h" />
 		<Unit filename="src\floor_item.cpp" />
 		<Unit filename="src\floor_item.h" />
 		<Unit filename="src\flooritemmanager.cpp" />
@@ -402,10 +116,10 @@
 		<Unit filename="src\gui\box.h" />
 		<Unit filename="src\gui\browserbox.cpp" />
 		<Unit filename="src\gui\browserbox.h" />
-		<Unit filename="src\gui\buddywindow.cpp" />
-		<Unit filename="src\gui\buddywindow.h" />
 		<Unit filename="src\gui\button.cpp" />
 		<Unit filename="src\gui\button.h" />
+		<Unit filename="src\gui\buttonbox.cpp" />
+		<Unit filename="src\gui\buttonbox.h" />
 		<Unit filename="src\gui\buy.cpp" />
 		<Unit filename="src\gui\buy.h" />
 		<Unit filename="src\gui\buysell.cpp" />
@@ -414,14 +128,14 @@
 		<Unit filename="src\gui\char_select.h" />
 		<Unit filename="src\gui\char_server.cpp" />
 		<Unit filename="src\gui\char_server.h" />
-		<Unit filename="src\gui\chargedialog.cpp" />
-		<Unit filename="src\gui\chargedialog.h" />
 		<Unit filename="src\gui\chat.cpp" />
 		<Unit filename="src\gui\chat.h" />
 		<Unit filename="src\gui\chatinput.cpp" />
 		<Unit filename="src\gui\chatinput.h" />
 		<Unit filename="src\gui\checkbox.cpp" />
 		<Unit filename="src\gui\checkbox.h" />
+		<Unit filename="src\gui\colour.cpp" />
+		<Unit filename="src\gui\colour.h" />
 		<Unit filename="src\gui\confirm_dialog.cpp" />
 		<Unit filename="src\gui\confirm_dialog.h" />
 		<Unit filename="src\gui\connection.cpp" />
@@ -463,8 +177,6 @@
 		<Unit filename="src\gui\minimap.h" />
 		<Unit filename="src\gui\ministatus.cpp" />
 		<Unit filename="src\gui\ministatus.h" />
-		<Unit filename="src\gui\newskill.cpp" />
-		<Unit filename="src\gui\newskill.h" />
 		<Unit filename="src\gui\npc_text.cpp" />
 		<Unit filename="src\gui\npc_text.h" />
 		<Unit filename="src\gui\npclistdialog.cpp" />
@@ -485,13 +197,14 @@
 		<Unit filename="src\gui\register.h" />
 		<Unit filename="src\gui\scrollarea.cpp" />
 		<Unit filename="src\gui\scrollarea.h" />
-		<Unit filename="src\gui\selectionlistener.h" />
 		<Unit filename="src\gui\sell.cpp" />
 		<Unit filename="src\gui\sell.h" />
 		<Unit filename="src\gui\setup.cpp" />
 		<Unit filename="src\gui\setup.h" />
 		<Unit filename="src\gui\setup_audio.cpp" />
 		<Unit filename="src\gui\setup_audio.h" />
+		<Unit filename="src\gui\setup_colours.cpp" />
+		<Unit filename="src\gui\setup_colours.h" />
 		<Unit filename="src\gui\setup_joystick.cpp" />
 		<Unit filename="src\gui\setup_joystick.h" />
 		<Unit filename="src\gui\setup_keyboard.cpp" />
@@ -505,10 +218,22 @@
 		<Unit filename="src\gui\shop.h" />
 		<Unit filename="src\gui\shoplistbox.cpp" />
 		<Unit filename="src\gui\shoplistbox.h" />
+		<Unit filename="src\gui\shortcutcontainer.cpp" />
+		<Unit filename="src\gui\shortcutcontainer.h" />
+		<Unit filename="src\gui\shortcutwindow.cpp" />
+		<Unit filename="src\gui\shortcutwindow.h" />
 		<Unit filename="src\gui\skill.cpp" />
 		<Unit filename="src\gui\skill.h" />
 		<Unit filename="src\gui\slider.cpp" />
 		<Unit filename="src\gui\slider.h" />
+		<Unit filename="src\gui\smileycontainer.cpp" />
+		<Unit filename="src\gui\smileycontainer.h" />
+		<Unit filename="src\gui\smileyshortcutcontainer.cpp" />
+		<Unit filename="src\gui\smileyshortcutcontainer.h" />
+		<Unit filename="src\gui\smileywindow.cpp" />
+		<Unit filename="src\gui\smileywindow.h" />
+		<Unit filename="src\gui\speechbubble.cpp" />
+		<Unit filename="src\gui\speechbubble.h" />
 		<Unit filename="src\gui\status.cpp" />
 		<Unit filename="src\gui\status.h" />
 		<Unit filename="src\gui\tabbedcontainer.cpp" />
@@ -523,12 +248,16 @@
 		<Unit filename="src\gui\textfield.h" />
 		<Unit filename="src\gui\trade.cpp" />
 		<Unit filename="src\gui\trade.h" />
+		<Unit filename="src\gui\truetypefont.cpp" />
+		<Unit filename="src\gui\truetypefont.h" />
 		<Unit filename="src\gui\updatewindow.cpp" />
 		<Unit filename="src\gui\updatewindow.h" />
 		<Unit filename="src\gui\vbox.cpp" />
 		<Unit filename="src\gui\vbox.h" />
 		<Unit filename="src\gui\viewport.cpp" />
 		<Unit filename="src\gui\viewport.h" />
+		<Unit filename="src\gui\widgets\dropdown.cpp" />
+		<Unit filename="src\gui\widgets\dropdown.h" />
 		<Unit filename="src\gui\widgets\resizegrip.cpp" />
 		<Unit filename="src\gui\widgets\resizegrip.h" />
 		<Unit filename="src\gui\window.cpp" />
@@ -588,7 +317,8 @@
 		<Unit filename="src\net\network.h" />
 		<Unit filename="src\net\npchandler.cpp" />
 		<Unit filename="src\net\npchandler.h" />
-		<Unit filename="src\net\packet.h" />
+		<Unit filename="src\net\partyhandler.cpp" />
+		<Unit filename="src\net\partyhandler.h" />
 		<Unit filename="src\net\playerhandler.cpp" />
 		<Unit filename="src\net\playerhandler.h" />
 		<Unit filename="src\net\protocol.cpp" />
@@ -603,14 +333,22 @@
 		<Unit filename="src\openglgraphics.h" />
 		<Unit filename="src\particle.cpp" />
 		<Unit filename="src\particle.h" />
+		<Unit filename="src\particlecontainer.cpp" />
+		<Unit filename="src\particlecontainer.h" />
 		<Unit filename="src\particleemitter.cpp" />
 		<Unit filename="src\particleemitter.h" />
 		<Unit filename="src\particleemitterprop.h" />
+		<Unit filename="src\party.cpp" />
+		<Unit filename="src\party.h" />
 		<Unit filename="src\player.cpp" />
 		<Unit filename="src\player.h" />
 		<Unit filename="src\player_relations.cpp" />
 		<Unit filename="src\player_relations.h" />
+		<Unit filename="src\position.cpp" />
+		<Unit filename="src\position.h" />
 		<Unit filename="src\properties.h" />
+		<Unit filename="src\recorder.cpp" />
+		<Unit filename="src\recorder.h" />
 		<Unit filename="src\resources\action.cpp" />
 		<Unit filename="src\resources\action.h" />
 		<Unit filename="src\resources\ambientoverlay.cpp" />
@@ -619,6 +357,8 @@
 		<Unit filename="src\resources\animation.h" />
 		<Unit filename="src\resources\buddylist.cpp" />
 		<Unit filename="src\resources\buddylist.h" />
+		<Unit filename="src\resources\colordb.cpp" />
+		<Unit filename="src\resources\colordb.h" />
 		<Unit filename="src\resources\dye.cpp" />
 		<Unit filename="src\resources\dye.h" />
 		<Unit filename="src\resources\image.cpp" />
@@ -666,28 +406,25 @@
 		<Unit filename="src\textparticle.cpp" />
 		<Unit filename="src\textparticle.h" />
 		<Unit filename="src\tileset.h" />
-		<Unit filename="src\tmw.rc">
-			<Option compilerVar="CPP" />
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:tmw.cbp
-		</Unit>
 		<Unit filename="src\utils\base64.cpp" />
 		<Unit filename="src\utils\base64.h" />
-		<Unit filename="src\utils\colorconversion.cpp" />
-		<Unit filename="src\utils\colorconversion.h" />
 		<Unit filename="src\utils\dtor.h" />
 		<Unit filename="src\utils\fastsqrt.h" />
+		<Unit filename="src\utils\mutex.h" />
 		<Unit filename="src\utils\strprintf.cpp" />
 		<Unit filename="src\utils\strprintf.h" />
 		<Unit filename="src\utils\tostring.h" />
 		<Unit filename="src\utils\trim.h" />
 		<Unit filename="src\utils\xml.cpp" />
 		<Unit filename="src\utils\xml.h" />
+		<Unit filename="src\vector.cpp" />
 		<Unit filename="src\vector.h" />
 		<Unit filename="src\winver.h" />
 		<Extensions>
 			<code_completion />
 			<envvars />
 			<debugger />
+			<lib_finder disable_auto="1" />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp
index 89bbf8f5..1fdf87e8 100644
--- a/src/effectmanager.cpp
+++ b/src/effectmanager.cpp
@@ -44,7 +44,7 @@ EffectManager::EffectManager()
 
     for_each_xml_child_node(node, root)
     {
-        int id;
+        //int id;
 
         if (xmlStrEqual(node->name, BAD_CAST "effect"))
         {
diff --git a/src/gui/buddywindow.cpp b/src/gui/buddywindow.cpp
deleted file mode 100644
index 14a941a5..00000000
--- a/src/gui/buddywindow.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "buddywindow.h"
-
-#include <guichan/widgets/listbox.hpp>
-
-#include "button.h"
-#include "chat.h"
-#include "scrollarea.h"
-
-#include "../resources/buddylist.h"
-
-extern ChatWindow *chatWindow;
-
-BuddyWindow::BuddyWindow():
-    Window("Buddy")
-{
-    setContentSize(124, 202);
-
-    mBuddyList = new BuddyList();
-
-    mListbox = new gcn::ListBox();
-    mListbox->setListModel(mBuddyList);
-
-    ScrollArea *scrollArea = new ScrollArea(mListbox);
-    scrollArea->setDimension(gcn::Rectangle(
-                7, 5, 110, 170));
-    add(scrollArea);
-
-    Button *talk = new Button("Talk", "Talk", this);
-    Button *remove = new Button("Remove", "Remove", this);
-    Button *cancel = new Button("Cancel", "Cancel", this);
-
-    talk->setPosition(2,180);
-    remove->setPosition(talk->getWidth()+2,180);
-    cancel->setPosition(talk->getWidth()+remove->getWidth()+2,180);
-
-    add(talk);
-    add(remove);
-    add(cancel);
-}
-
-void BuddyWindow::action(const gcn::ActionEvent &event)
-{
-    if (event.getId() == "Talk") {
-        int selected = mListbox->getSelected();
-        if ( selected > -1 )
-        {
-            std::string who = mBuddyList->getElementAt(selected);
-            chatWindow->setInputText(who +": ");
-        }
-    }
-    else if (event.getId() == "Remove") {
-        int selected = mListbox->getSelected();
-        if ( selected > -1 )
-        {
-            std::string who = mBuddyList->getElementAt(selected);
-            mBuddyList->removeBuddy(who);
-        }
-    }
-    else if (event.getId() == "Cancel") {
-        setVisible(false);
-    }
-}
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index fc00ad18..fddd5199 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -84,8 +84,8 @@ void Minimap::draw(gcn::Graphics *graphics)
         if (mMapImage->getWidth() > a.width ||
             mMapImage->getHeight() > a.height)
         {
-            mapOriginX = ((a.width) / 2) - (player_node->mX * mProportion);
-            mapOriginY = ((a.height) / 2) - (player_node->mY * mProportion);
+            mapOriginX = (int) (((a.width) / 2) - (player_node->mX * mProportion));
+            mapOriginY = (int) (((a.height) / 2) - (player_node->mY * mProportion));
 
             const int minOriginX = a.width - mMapImage->getWidth();
             const int minOriginY = a.height - mMapImage->getHeight();
diff --git a/src/gui/newskill.cpp b/src/gui/newskill.cpp
deleted file mode 100644
index 20fc01bd..00000000
--- a/src/gui/newskill.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
- /* This file implements the new skill dialog for use under the latest
-  * version of the skill system as of 2005/02/20
-  */
-
-#include "newskill.h"
-
-#include <guichan/widgets/label.hpp>
-
-#include "button.h"
-#include "progressbar.h"
-
-#include "../graphics.h"
-
-const char *skill_name[] = {
-    // 0-99
-    // weapon skills 0-9
-    "Short Blades", "Long Blades", "Hammers", "Archery", "Whip",
-    "Staves", "Throwing", "Piercing", "Hand to Hand", NULL,
-    // magic skills 10-19
-    "Epyri (Fire)", "Merene (Water)", "Geon (Earth)", "Izurial (Air)",
-    "Lumine (Light)", "Tenebrae (Dark)", "Chronos (Time)", "Teless (Space)",
-    "Gen (Mana)", NULL,
-    // craft skills 20-29
-    "Metalworking", "Woodworking", "Jeweler", "Cook", "Tailor",
-    "Alchemist", "Artisan", "Synthesis", NULL, NULL,
-    // general skills 30-39
-    "Running", "Searching", "Sneak", "Trading", "Intimidate",
-    "Athletics", NULL, NULL, NULL,NULL,
-    // combat skills 40-49
-    "Dodge", "Accuracy", "Critical", "Block", "Parry", "Diehard", "Magic Aura",
-    "Counter", NULL, NULL,
-    // resistance skills 50-59
-    "Poison", "Silence", "Petrify", "Paralyze", "Blind", "Slow", "Zombie",
-    "Critical", NULL, NULL,
-    // element reistance 60-69
-    "Heat (Fire)", "Chill (Water)", "Stone (Earth)", "Wind (Air)",
-    "Shine (Light)", "Shadow (Dark)", "Decay (Time)", "Chaos (Space)", NULL,
-    NULL,
-    // hunting skills 70-79
-    "Insects", "Birds", "Lizards", "Amorphs", "Undead", "Machines", "Arcana",
-    "Humanoids", "Plantoids", NULL,
-    // stats 80-89
-    "Strength", "Fortitude", "Vitality", "Menality", "Awareness", "Mana",
-    "Dexterity", NULL, NULL, NULL,
-    // unused (reserved) 90-99
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
-};
-
-
-NewSkillDialog::NewSkillDialog():
-    Window("Skills")
-{
-    startPoint = 0;
-    for (int i = 0; i < N_SKILL_CAT_SIZE; i++)
-    {
-        mSkillLabel[i] = new gcn::Label("Empty               ");
-        mSkillLevel[i] = new gcn::Label("00000");
-        mSkillbar[i] = new ProgressBar(0.0f,100,15,0,0,255);
-        mSkillLevel[i]->setAlignment(Graphics::RIGHT);
-        add(mSkillLabel[i],40,5+i*25);
-        add(mSkillLevel[i],150,5+i*25);
-        add(mSkillbar[i],180,5+i*25);
-    }
-    // initialize the skills
-    for (int i = 0; i < N_SKILL; i++)
-    {
-        mPlayerSkill[i].level = 0;
-        mPlayerSkill[i].exp = 0;
-    }
-    resetNSD();
-
-    // create controls
-    Button *catButton[N_SKILL_CAT];
-    catButton[0] = new Button("Weapons", "g1", this);
-    catButton[1] = new Button("Magic", "g2", this);
-    catButton[2] = new Button("Craft", "g3", this);
-    catButton[3] = new Button("General", "g4", this);
-    catButton[4] = new Button("Combat", "g5", this);
-    catButton[5] = new Button("E. Resist", "g6", this);
-    catButton[6] = new Button("S. Resist", "g7", this);
-    catButton[7] = new Button("Hunting", "g8", this);
-    catButton[8] = new Button("Stat", "g9", this);
-
-    setContentSize(350, 250);
-
-    for (int i = 0; i < 9; ++i) {
-        catButton[i]->setDimension(gcn::Rectangle(0, 0, 60, 20));
-        catButton[i]->setPosition(290, 20 * i);
-        add(catButton[i]);
-    }
-
-    Button *closeButton = new Button("Close", "close", this);
-    closeButton->setDimension(gcn::Rectangle(0,0,60,20));
-    closeButton->setPosition(290, 230);
-    add(closeButton);
-
-    // finsihing touches
-    setLocationRelativeTo(getParent());
-}
-
-void NewSkillDialog::action(const gcn::ActionEvent &event)
-{
-    int osp = startPoint;
-    if (event.getId() == "close")
-    {
-        setVisible(false);
-    }
-    else if (event.getId() == "g1") // weapons group 0-9
-    {
-        startPoint =0;
-    }
-    else if (event.getId() == "g2") // magic group 10-19
-    {
-        startPoint =10;
-    }
-    else if (event.getId() == "g3") // craft group 20-29
-    {
-        startPoint =20;
-    }
-    else if (event.getId() == "g4") // general group 30-39
-    {
-        startPoint =30;
-    }
-    else if (event.getId() == "g5") // combat group 40-49
-    {
-        startPoint =40;
-    }
-    else if (event.getId() == "g6") // e. resist group 50-59
-    {
-        startPoint =50;
-    }
-    else if (event.getId() == "g7") // s resist group 60-69
-    {
-        startPoint =60;
-    }
-    else if (event.getId() == "g8") // hunting group 70-79
-    {
-        startPoint =70;
-    }
-    else if (event.getId() == "g9") // stats group 80-89
-    {
-        startPoint =80;
-    }
-    if (osp != startPoint)
-    {
-        resetNSD();
-    }
-}
-
-void NewSkillDialog::resetNSD()
-{
-     for (int a = 0; a < N_SKILL_CAT_SIZE; a++)
-     {
-         if (skill_name[a + startPoint])
-         {
-             mSkillLabel[a]->setCaption(skill_name[a + startPoint]);
-             mSkillLabel[a]->setVisible(true);
-             char tmp[5];
-             sprintf(tmp, "%d", mPlayerSkill[a+startPoint].level);
-             mSkillLevel[a]->setCaption(tmp);
-             mSkillLevel[a]->setVisible(true);
-             mSkillbar[a]->setProgress(0.0f);
-             mSkillbar[a]->setVisible(true);
-         }
-         else
-         {
-             mSkillLevel[a]->setVisible(false);
-             mSkillLabel[a]->setVisible(false);
-             mSkillbar[a]->setVisible(false);
-         }
-     }
-}
diff --git a/src/gui/smileycontainer.h b/src/gui/smileycontainer.h
index a6dadab6..ddfe9ec5 100644
--- a/src/gui/smileycontainer.h
+++ b/src/gui/smileycontainer.h
@@ -24,11 +24,11 @@
 
 #include <list>
 
-#include <resources/imageset.h>
 #include <guichan/mouselistener.hpp>
 #include <guichan/widget.hpp>
 #include <guichan/widgetlistener.hpp>
 
+#include "../resources/imageset.h"
 #include "../guichanfwd.h"
 
 class Image;
diff --git a/src/gui/smileyshortcutcontainer.h b/src/gui/smileyshortcutcontainer.h
index 72ddd54a..d6bbbc4f 100644
--- a/src/gui/smileyshortcutcontainer.h
+++ b/src/gui/smileyshortcutcontainer.h
@@ -25,9 +25,10 @@
 #include <guichan/mouselistener.hpp>
 #include <guichan/widget.hpp>
 #include <guichan/widgetlistener.hpp>
-#include <resources/imageset.h>
 
+#include "../resources/imageset.h"
 #include "../guichanfwd.h"
+
 #include "shortcutcontainer.h"
 
 class Image;
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 35b5ec88..f6f9bb42 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -201,7 +201,7 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     // Draw text
     if (textManager)
     {
-        textManager->draw(graphics, mPixelViewX, mPixelViewY);
+        textManager->draw(graphics, (int) mPixelViewX, (int) mPixelViewY);
     }
 
     // Draw player names, speech, and emotion sprite as needed
diff --git a/src/gui/widgets/adjustingcontainer.cpp b/src/gui/widgets/adjustingcontainer.cpp
deleted file mode 100644
index 2c613fbe..00000000
--- a/src/gui/widgets/adjustingcontainer.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2007 - 2008 Josh Matthews and Olof Naess�n
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naess�n a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * For comments regarding functions please see the header file.
- */
-
-#include "adjustingcontainer.hpp"
-
-#include <guichan.hpp>
-
-namespace gcn
-{
-    namespace contrib
-    {
-        AdjustingContainer::AdjustingContainer()
-                : mWidth(0),
-                  mHeight(0),
-                  mNumberOfColumns(1),
-                  mNumberOfRows(1),
-                  mPaddingLeft(0),
-                  mPaddingRight(0),
-                  mPaddingTop(0),
-                  mPaddingBottom(0),
-                  mVerticalSpacing(0),
-                  mHorizontalSpacing(0)
-            
-            
-        {
-            mColumnWidths.push_back(0);
-            mRowHeights.push_back(0);
-        }
-    
-        AdjustingContainer::~AdjustingContainer()
-        {
-
-        }
-
-        void AdjustingContainer::setNumberOfColumns(unsigned int numberOfColumns)
-        {
-            mNumberOfColumns = numberOfColumns;
-        
-            if (mColumnAlignment.size() < numberOfColumns)
-            {
-                while (mColumnAlignment.size() < numberOfColumns)
-                {
-                    mColumnAlignment.push_back(LEFT);
-                }
-            }
-            else
-            {
-                while (mColumnAlignment.size() >  numberOfColumns)
-                {
-                    mColumnAlignment.pop_back();
-                }
-            }
-        }
-
-        void AdjustingContainer::setColumnAlignment(unsigned int column,
-                                                    unsigned int alignment)
-        {
-            if (column < mColumnAlignment.size())
-            {
-                mColumnAlignment[column] = alignment;
-            }
-        }
-
-        void AdjustingContainer::setPadding(unsigned int paddingLeft,
-                                            unsigned int paddingRight,
-                                            unsigned int paddingTop,
-                                            unsigned int paddingBottom)
-        {
-            mPaddingLeft = paddingLeft;
-            mPaddingRight = paddingRight;
-            mPaddingTop = paddingTop;
-            mPaddingBottom = paddingBottom;
-        }
-
-        void AdjustingContainer::setVerticalSpacing(unsigned int verticalSpacing)
-        {
-            mVerticalSpacing = verticalSpacing;
-        }
-
-        void AdjustingContainer::setHorizontalSpacing(unsigned int horizontalSpacing)
-        {
-            mHorizontalSpacing = horizontalSpacing;
-        }
-
-        void AdjustingContainer::logic()
-        {
-            Container::logic();
-            adjustContent();
-        }
-    
-        void AdjustingContainer::add(Widget *widget)
-        {
-            Container::add(widget);
-            mContainedWidgets.push_back(widget);
-        }
-    
-        void AdjustingContainer::add(Widget *widget, int x, int y)
-        {
-            add(widget);
-        }
-    
-        void AdjustingContainer::clear()
-        {
-            Container::clear();
-            mContainedWidgets.clear();
-        }
-
-        void AdjustingContainer::remove(Widget *widget)
-        {
-            Container::remove(widget);
-            std::vector<gcn::Widget *>::iterator it;
-            for(it = mContainedWidgets.begin(); it != mContainedWidgets.end(); it++)
-            {
-                if(*it == widget)
-                {
-                    mContainedWidgets.erase(it);
-                    break;
-                }
-            }
-        }
-
-        void AdjustingContainer::adjustSize()
-        {
-            mNumberOfRows = mContainedWidgets.size()
-            / mNumberOfColumns + mContainedWidgets.size() % mNumberOfColumns;
-
-            mColumnWidths.clear();
-
-            unsigned int i;
-            for (i = 0; i < mNumberOfColumns; i++)
-            {
-                mColumnWidths.push_back(0);
-            }
-        
-            mRowHeights.clear();
-
-            for (i = 0; i < mNumberOfRows; i++)
-            {
-                mRowHeights.push_back(0);
-            }
-
-            for (i = 0; i < mNumberOfColumns; i++)
-            {
-                unsigned int j;
-                for (j = 0; j < mNumberOfRows && mNumberOfColumns * j + i < mContainedWidgets.size(); j++)
-                {
-                    if ((unsigned int)mContainedWidgets[mNumberOfColumns * j + i]->getWidth() > mColumnWidths[i])
-                    {
-                        mColumnWidths[i] = mContainedWidgets[mNumberOfColumns * j + i]->getWidth();
-                    }
-                    if ((unsigned int)mContainedWidgets[mNumberOfColumns * j + i]->getHeight() > mRowHeights[j])
-                    {
-                        mRowHeights[j] = mContainedWidgets[mNumberOfColumns * j + i]->getHeight();
-                    }
-                }
-            }
-
-            mWidth = mPaddingLeft;
-
-            for (i = 0; i < mColumnWidths.size(); i++)
-            {
-                mWidth += mColumnWidths[i] + mHorizontalSpacing;
-            }
-
-            mWidth -= mHorizontalSpacing;
-            mWidth += mPaddingRight;
-
-            mHeight = mPaddingTop;
-
-            for (i = 0; i < mRowHeights.size(); i++)
-            {
-                mHeight += mRowHeights[i] + mVerticalSpacing;
-            }
-        
-            mHeight -= mVerticalSpacing;
-            mHeight += mPaddingBottom;
-
-            setHeight(mHeight);
-            setWidth(mWidth);
-        }
-
-        void AdjustingContainer::adjustContent()
-        {
-            adjustSize();
-
-            unsigned int columnCount = 0;
-            unsigned int rowCount = 0;
-            unsigned int y = mPaddingTop;
-
-            for (unsigned int i = 0; i < mContainedWidgets.size(); i++)
-            {
-                unsigned  basex;
-                if (columnCount % mNumberOfColumns)
-                {
-                    basex = mPaddingLeft;
-                    unsigned int j;
-
-                    for (j = 0; j < columnCount; j++)
-                    {
-                        basex += mColumnWidths[j] + mHorizontalSpacing;
-                    }
-                }
-                else
-                {
-                    basex = mPaddingLeft;
-                }
-
-                switch (mColumnAlignment[columnCount])
-                {
-                    case LEFT:
-                        mContainedWidgets[i]->setX(basex);
-                        break;
-                    case CENTER:
-                        mContainedWidgets[i]->setX(basex + (mColumnWidths[columnCount] - mContainedWidgets[i]->getWidth()) / 2);
-                        break;
-                    case RIGHT:
-                        mContainedWidgets[i]->setX(basex + mColumnWidths[columnCount] - mContainedWidgets[i]->getWidth());
-                        break;
-                    default:
-                        throw GCN_EXCEPTION("Unknown alignment.");
-                }
-
-                mContainedWidgets[i]->setY(y);
-                columnCount++;
-
-                if (columnCount == mNumberOfColumns)
-                {
-                    columnCount = 0;
-                    y += mRowHeights[rowCount] + mVerticalSpacing;
-                    rowCount++;
-                }
-            }
-        }
-    }
-}
diff --git a/src/gui/widgets/adjustingcontainer.hpp b/src/gui/widgets/adjustingcontainer.hpp
deleted file mode 100644
index 3227274e..00000000
--- a/src/gui/widgets/adjustingcontainer.hpp
+++ /dev/null
@@ -1,235 +0,0 @@
-/*      _______   __   __   __   ______   __   __   _______   __   __
- *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
- *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
- *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2007 - 2008 Josh Matthews and Olof Naess�n
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naess�n a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_CONTRIB_ADJUSTINGCONTAINER_HPP
-#define GCN_CONTRIB_ADJUSTINGCONTAINER_HPP
-
-#include <vector>
-
-namespace gcn
-{
-    namespace contrib
-    {
-        /**
-         * Self-adjusting Container class. AdjustingContainers are an easy way to
-         * have Guichan position a group of widgets for you. It organizes elements
-         * in a table layout, with fixed columns and variable rows.  The user specifies
-         *
-         * @verbitam
-         * <ul>
-         *   <li>the number of columns</li>
-         *   <li>horizontal spacing between columns</li>
-         *   <li>vertical spacing between rows</li>
-         *   <li>padding around the sides of the container</li>
-         *   <li>each column's alignment</li>
-         * </ul>
-         * @endverbitam
-         *
-         * These properties give the user a lot of flexibility to make the
-         * widgets look just right.
-         * @code
-         * AdjustingContainer *adjust = new AdjustingContainer;
-         * adjust->setPadding(5, 5, 5, 5); //left, right, top, bottom
-         * adjust->setHorizontalSpacing(3);
-         * adjust->setVerticalSpacing(3);
-         * adjust->setColumns(3);
-         * adjust->setColumnAlignment(0, AdjustingContainer::LEFT);
-         * adjust->setColumnAlignment(1, AdjustingContainer::CENTER);
-         * adjust->setColumnAlignment(2, AdjustingContainer::RIGHT);
-         * top->add(adjust);
-         *
-         * for(int j = 0; j < 9; j++)
-         * {
-         *   gcn::Label *l;
-         *   int r = rand() % 3;
-         *   if(r == 0)
-         *     l = new gcn::Label("Short");
-         *   else if(r == 1)
-         *     l = new gcn::Label("A longer phrase");
-         *   else
-         *     l = new gcn::Label("Extravagent and wordy text");
-         *   adjust->add(l);
-         * @endcode
-         *
-         * Output:
-         * @verbitam
-         * <pre>
-         *+---------------------------------------------------------------------------+
-         *|                                                                           |
-         *| A longer phrase              Short             Extravagent and wordy text |
-         *|                                                                           |
-         *| Short             Extravagent and wordy text                        Short |
-         *|                                                                           |
-         *| Short                   A longer phrase                   A longer phrase |
-         *|                                                                           |
-         *+---------------------------------------------------------------------------+
-         * </pre>
-         * @endverbitam
-         * As you can see, each column is only as big as its largest element.
-         * The AdjustingContainer will resize itself and rearrange its contents
-         * based on whatever widgets it contains, allowing dynamic addition and
-         * removal while the program is running.  It also plays nicely with ScrollAreas,
-         * allowing you to show a fixed, maximum size while not limiting the actual
-         * container.
-         *
-         * For more help with using AdjustingContainers, try the Guichan forums
-         * (http://guichan.sourceforge.net/forum/) or email mrlachatte@gmail.com.
-         *
-         * @author Josh Matthews
-         */
-        class AdjustingContainer : public gcn::Container
-        {
-        public:
-            /**
-             * Constructor.
-             */
-            AdjustingContainer();
-        
-            /**
-             * Destructor.
-             */
-            virtual ~AdjustingContainer();
-        
-            /**
-             * Set the number of columns to divide the widgets into.
-             * The number of rows is derived automatically from the number
-             * of widgets based on the number of columns.  Default column
-             * alignment is left.
-             *
-             * @param numberOfColumns the number of columns.
-             */
-            virtual void setNumberOfColumns(unsigned int numberOfColumns);
-        
-            /**
-             * Set a specific column's alignment.
-             *
-             * @param column the column number, starting from 0.
-             * @param alignment the column's alignment. See enum with alignments.
-             */
-            virtual void setColumnAlignment(unsigned int column, unsigned int alignment);
-        
-            /**
-             * Set the padding for the sides of the container.
-             *
-             * @param paddingLeft left padding.
-             * @param paddingRight right padding.
-             * @param paddingTop top padding.
-             * @param paddingBottom bottom padding.
-             */
-            virtual void setPadding(unsigned int paddingLeft,
-                                    unsigned int paddingRight,
-                                    unsigned int paddingTop,
-                                    unsigned int paddingBottom);
-        
-            /**
-             * Set the spacing between rows.
-             *
-             * @param verticalSpacing spacing in pixels.
-             */
-            virtual void setVerticalSpacing(unsigned int verticalSpacing);
-        
-            /**
-             * Set the horizontal spacing between columns.
-             *
-             * @param horizontalSpacing spacing in pixels.
-             */
-            virtual void setHorizontalSpacing(unsigned int horizontalSpacing);
-        
-            /**
-             * Rearrange the widgets and resize the container.
-             */
-            virtual void adjustContent();
-
-
-            // Inherited from Container
-
-            virtual void logic();
-        
-            virtual void add(Widget *widget);
-
-            virtual void add(Widget *widget, int x, int y);
-
-            virtual void remove(Widget *widget);
-
-            virtual void clear();
-               
-            /**
-             * Possible alignment values for each column.
-             *
-             * LEFT   - Align content to the left of the column.
-             * MIDDLE - Align content to the middle of the column.
-             * RIGHT  - Align content to the right of the column.
-             */
-            enum
-            {
-                LEFT = 0,
-                CENTER,
-                RIGHT
-            };
-
-        protected:
-        
-            /**
-             * Adjust the size of the container to fit all the widgets.
-             */
-            virtual void adjustSize();
-
-            std::vector<Widget*> mContainedWidgets;
-            std::vector<unsigned int> mColumnWidths;
-            std::vector<unsigned int> mColumnAlignment;
-            std::vector<unsigned int> mRowHeights;
-            unsigned int mWidth;
-            unsigned int mHeight;
-            unsigned int mNumberOfColumns;
-            unsigned int mNumberOfRows;
-            unsigned int mPaddingLeft;
-            unsigned int mPaddingRight;
-            unsigned int mPaddingTop;
-            unsigned int mPaddingBottom;
-            unsigned int mVerticalSpacing;
-            unsigned int mHorizontalSpacing;
-        };
-    }
-}
-
-#endif
-- 
cgit v1.2.3-70-g09d2


From a570ee66c7cf6ddff7b0c124ad4b633b4651bdb3 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 6 Jan 2009 00:27:11 -0700
Subject: Added sdl_ttf to unix compiling as well.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 aethyra.cbp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aethyra.cbp b/aethyra.cbp
index f24a28a6..8d79b097 100644
--- a/aethyra.cbp
+++ b/aethyra.cbp
@@ -59,6 +59,7 @@
 					<Add library="SDL_mixer" />
 					<Add library="SDL_net" />
 					<Add library="SDL_image" />
+					<Add library="SDL_ttf" />
 					<Add library="png" />
 				</Linker>
 			</Target>
-- 
cgit v1.2.3-70-g09d2


From 2a065b5ef24441b0df2c06fbcae6dcf6fd5f5251 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 6 Jan 2009 10:20:36 -0700
Subject: Added support for internationalization

Merged from the mainline client. Originally implemented by Guillaume
Melquiond, starting with commit 1828eee6a6d91fd385ad1e69d93044516493aa91.

Conflicts:

	INSTALL
	configure.ac
	src/Makefile.am
	src/gui/buy.cpp
	src/gui/confirm_dialog.cpp
	src/gui/inventorywindow.cpp
	src/gui/login.cpp
	src/gui/menuwindow.cpp
	src/gui/minimap.cpp
	src/gui/ok_dialog.cpp
	src/gui/popupmenu.cpp
	src/gui/register.cpp
	src/gui/sell.cpp
	src/gui/setup.cpp
	src/gui/setup_video.cpp

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 ABOUT-NLS                   | 279 +++++++++++++++++++++++++
 INSTALL                     |   4 +-
 Makefile.am                 |   5 +-
 config.rpath                |   0
 configure.ac                |  14 +-
 po/LINGUAS                  |   1 +
 po/Makevars                 |  41 ++++
 po/POTFILES.in              |  26 +++
 po/aethyra.pot              | 486 ++++++++++++++++++++++++++++++++++++++++++++
 src/CMakeLists.txt          |   1 +
 src/Makefile.am             |   6 +-
 src/gui/buy.cpp             |  35 ++--
 src/gui/char_select.cpp     |  63 +++---
 src/gui/char_server.cpp     |   8 +-
 src/gui/confirm_dialog.cpp  |   6 +-
 src/gui/connection.cpp      |   6 +-
 src/gui/equipmentwindow.cpp |   4 +-
 src/gui/inventorywindow.cpp |  43 ++--
 src/gui/item_amount.cpp     |  34 ++--
 src/gui/login.cpp           |  21 +-
 src/gui/menuwindow.cpp      |  38 ++--
 src/gui/minimap.cpp         |   6 +-
 src/gui/npc_text.cpp        |   6 +-
 src/gui/npclistdialog.cpp   |   8 +-
 src/gui/ok_dialog.cpp       |   4 +-
 src/gui/popupmenu.cpp       |  49 ++---
 src/gui/register.cpp        |  58 +++---
 src/gui/sell.cpp            |  40 ++--
 src/gui/setup.cpp           |  27 +--
 src/gui/setup_audio.cpp     |   8 +-
 src/gui/setup_joystick.cpp  |  18 +-
 src/gui/setup_video.cpp     |  77 +++----
 src/gui/trade.cpp           |  43 ++--
 src/main.cpp                |  14 +-
 src/net/playerhandler.cpp   |  69 +++----
 src/resources/itemdb.cpp    |   5 +-
 src/utils/gettext.h         |  44 ++++
 37 files changed, 1270 insertions(+), 327 deletions(-)
 create mode 100644 ABOUT-NLS
 create mode 100644 config.rpath
 create mode 100644 po/LINGUAS
 create mode 100644 po/Makevars
 create mode 100644 po/POTFILES.in
 create mode 100644 po/aethyra.pot
 create mode 100644 src/utils/gettext.h

diff --git a/ABOUT-NLS b/ABOUT-NLS
new file mode 100644
index 00000000..249a4b5b
--- /dev/null
+++ b/ABOUT-NLS
@@ -0,0 +1,279 @@
+Notes on the Free Translation Project
+*************************************
+
+   Free software is going international!  The Free Translation Project
+is a way to get maintainers of free software, translators, and users all
+together, so that will gradually become able to speak many languages.
+A few packages already provide translations for their messages.
+
+   If you found this `ABOUT-NLS' file inside a distribution, you may
+assume that the distributed package does use GNU `gettext' internally,
+itself available at your nearest GNU archive site.  But you do *not*
+need to install GNU `gettext' prior to configuring, installing or using
+this package with messages translated.
+
+   Installers will find here some useful hints.  These notes also
+explain how users should proceed for getting the programs to use the
+available translations.  They tell how people wanting to contribute and
+work at translations should contact the appropriate team.
+
+   When reporting bugs in the `intl/' directory or bugs which may be
+related to internationalization, you should tell about the version of
+`gettext' which is used.  The information can be found in the
+`intl/VERSION' file, in internationalized packages.
+
+One advise in advance
+=====================
+
+   If you want to exploit the full power of internationalization, you
+should configure it using
+
+     ./configure --with-included-gettext
+
+to force usage of internationalizing routines provided within this
+package, despite the existence of internationalizing capabilities in the
+operating system where this package is being installed.  So far, only
+the `gettext' implementation in the GNU C library version 2 provides as
+many features (such as locale alias or message inheritance) as the
+implementation here.  It is also not possible to offer this additional
+functionality on top of a `catgets' implementation.  Future versions of
+GNU `gettext' will very likely convey even more functionality.  So it
+might be a good idea to change to GNU `gettext' as soon as possible.
+
+   So you need not provide this option if you are using GNU libc 2 or
+you have installed a recent copy of the GNU gettext package with the
+included `libintl'.
+
+INSTALL Matters
+===============
+
+   Some packages are "localizable" when properly installed; the
+programs they contain can be made to speak your own native language.
+Most such packages use GNU `gettext'.  Other packages have their own
+ways to internationalization, predating GNU `gettext'.
+
+   By default, this package will be installed to allow translation of
+messages.  It will automatically detect whether the system provides
+usable `catgets' (if using this is selected by the installer) or
+`gettext' functions.  If neither is available, the GNU `gettext' own
+library will be used.  This library is wholly contained within this
+package, usually in the `intl/' subdirectory, so prior installation of
+the GNU `gettext' package is *not* required.  Installers may use
+special options at configuration time for changing the default
+behaviour.  The commands:
+
+     ./configure --with-included-gettext
+     ./configure --with-catgets
+     ./configure --disable-nls
+
+will respectively bypass any pre-existing `catgets' or `gettext' to use
+the internationalizing routines provided within this package, enable
+the use of the `catgets' functions (if found on the locale system), or
+else, *totally* disable translation of messages.
+
+   When you already have GNU `gettext' installed on your system and run
+configure without an option for your new package, `configure' will
+probably detect the previously built and installed `libintl.a' file and
+will decide to use this.  This might be not what is desirable.  You
+should use the more recent version of the GNU `gettext' library.  I.e.
+if the file `intl/VERSION' shows that the library which comes with this
+package is more recent, you should use
+
+     ./configure --with-included-gettext
+
+to prevent auto-detection.
+
+   By default the configuration process will not test for the `catgets'
+function and therefore they will not be used.  The reasons are already
+given above: the emulation on top of `catgets' cannot provide all the
+extensions provided by the GNU `gettext' library.  If you nevertheless
+want to use the `catgets' functions use
+
+     ./configure --with-catgets
+
+to enable the test for `catgets' (this causes no harm if `catgets' is
+not available on your system).  If you really select this option we
+would like to hear about the reasons because we cannot think of any
+good one ourself.
+
+   Internationalized packages have usually many `po/LL.po' files, where
+LL gives an ISO 639 two-letter code identifying the language.  Unless
+translations have been forbidden at `configure' time by using the
+`--disable-nls' switch, all available translations are installed
+together with the package.  However, the environment variable `LINGUAS'
+may be set, prior to configuration, to limit the installed set.
+`LINGUAS' should then contain a space separated list of two-letter
+codes, stating which languages are allowed.
+
+Using This Package
+==================
+
+   As a user, if your language has been installed for this package, you
+only have to set the `LANG' environment variable to the appropriate
+ISO 639 `LL' two-letter code prior to using the programs in the
+package.  For example, let's suppose that you speak German.  At the
+shell prompt, merely execute `setenv LANG de' (in `csh'),
+`export LANG; LANG=de' (in `sh') or `export LANG=de' (in `bash').  This
+can be done from your `.login' or `.profile' file, once and for all.
+
+   An operating system might already offer message localization for
+many of its programs, while other programs have been installed locally
+with the full capabilities of GNU `gettext'.  Just using `gettext'
+extended syntax for `LANG' would break proper localization of already
+available operating system programs.  In this case, users should set
+both `LANGUAGE' and `LANG' variables in their environment, as programs
+using GNU `gettext' give preference to `LANGUAGE'.  For example, some
+Swedish users would rather read translations in German than English for
+when Swedish is not available.  This is easily accomplished by setting
+`LANGUAGE' to `sv:de' while leaving `LANG' to `sv'.
+
+Translating Teams
+=================
+
+   For the Free Translation Project to be a success, we need interested
+people who like their own language and write it well, and who are also
+able to synergize with other translators speaking the same language.
+Each translation team has its own mailing list, courtesy of Linux
+International.  You may reach your translation team at the address
+`LL@li.org', replacing LL by the two-letter ISO 639 code for your
+language.  Language codes are *not* the same as the country codes given
+in ISO 3166.  The following translation teams exist, as of August 1998:
+
+     Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en',
+     Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian
+     `hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja',
+     Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish
+     `pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es',
+     Swedish `sv', and Turkish `tr'.
+
+For example, you may reach the Chinese translation team by writing to
+`zh@li.org'.
+
+   If you'd like to volunteer to *work* at translating messages, you
+should become a member of the translating team for your own language.
+The subscribing address is *not* the same as the list itself, it has
+`-request' appended.  For example, speakers of Swedish can send a
+message to `sv-request@li.org', having this message body:
+
+     subscribe
+
+   Keep in mind that team members are expected to participate
+*actively* in translations, or at solving translational difficulties,
+rather than merely lurking around.  If your team does not exist yet and
+you want to start one, or if you are unsure about what to do or how to
+get started, please write to `translation@iro.umontreal.ca' to reach the
+coordinator for all translator teams.
+
+   The English team is special.  It works at improving and uniformizing
+the terminology in use.  Proven linguistic skill are praised more than
+programming skill, here.
+
+Available Packages
+==================
+
+   Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of August
+1998.  The matrix shows, in regard of each package, for which languages
+PO files have been submitted to translation coordination.
+
+     Ready PO files    cs da de el en es fi fr it
+                     .----------------------------.
+     bash            |       []             []    |
+     bison           |       []             []    |
+     clisp           |       []    [] []    []    |
+     cpio            |       []       []    []    |
+     diffutils       |       []       []    []    |
+     enscript        |       []       [] [] []    |
+     fileutils       | []    []       []    []    |
+     findutils       |       []       []    [] [] |
+     flex            |                []    []    |
+     gcal            |       []             []    |
+     gettext         |    [] [] []    []    []    |
+     grep            |       [] []    []    []    |
+     hello           |    [] []       []    [] [] |
+     id-utils        |       []             []    |
+     indent          |    [] []                   |
+     libc            |       []       []    []    |
+     m4              |       []             []    |
+     make            |       []       []    []    |
+     music           |                      []    |
+     ptx             |       []       []    []    |
+     recode          |    [] []       []    []    |
+     sed             |                            |
+     sh-utils        |       []       []    []    |
+     sharutils       | []    [] []    []    []    |
+     tar             | []    []             [] [] |
+     texinfo         | []    []             []    |
+     textutils       | []    []       []    []    |
+     wdiff           | []    []       []    []    |
+     wget            | []    [] []             [] |
+                     `----------------------------'
+                       cs da de el en es fi fr it
+                        7  4 26  4  1 18  1 26  4
+     
+                       ja ko nl no pl pt ru sl sv
+                     .----------------------------.
+     bash            |       []                   |  3
+     bison           |       []                   |  3
+     clisp           |                            |  4
+     cpio            |    [] []    []             |  6
+     diffutils       |             []          [] |  5
+     enscript        |       []             []    |  6
+     fileutils       |    [] []    [] [] [] [] [] | 11
+     findutils       |    [] []    []    []    [] |  9
+     flex            |    []                   [] |  4
+     gcal            |       []    []          [] |  5
+     gettext         |    [] [] [] [] []    [] [] | 13
+     grep            |    [] [] [] []    [] [] [] | 11
+     hello           |    [] [] [] [] []    [] [] | 12
+     id-utils        |             []             |  3
+     indent          |    []       []    []       |  5
+     libc            |    [] [] [] []          [] |  8
+     m4              | []    []          []    [] |  6
+     make            |    [] []    []             |  6
+     music           |             []             |  2
+     ptx             |       [] [] [] []       [] |  8
+     recode          |       []    [] []    [] [] |  9
+     sed             |                            |  0
+     sh-utils        |       [] [] [] []       [] |  8
+     sharutils       |       []                [] |  7
+     tar             |    [] [] [] [] []    [] [] | 11
+     texinfo         |       []                   |  4
+     textutils       |    [] [] [] []          [] |  9
+     wdiff           |       [] [] []          [] |  8
+     wget            |          []                |  5
+                     `----------------------------'
+       18 teams        ja ko nl no pl pt ru sl sv
+       29 domains       1 12 21 11 19  7  5  7 17  191
+
+   Some counters in the preceding matrix are higher than the number of
+visible blocks let us expect.  This is because a few extra PO files are
+used for implementing regional variants of languages, or language
+dialects.
+
+   For a PO file in the matrix above to be effective, the package to
+which it applies should also have been internationalized and
+distributed as such by its maintainer.  There might be an observable
+lag between the mere existence a PO file and its wide availability in a
+distribution.
+
+   If August 1998 seems to be old, you may fetch a more recent copy of
+this `ABOUT-NLS' file on most GNU archive sites.
+
+Using `gettext' in new packages
+===============================
+
+   If you are writing a freely available program and want to
+internationalize it you are welcome to use GNU `gettext' in your
+package.  Of course the GNU Public License applies to your sources from
+then if you include `gettext' directly in your distribution on but
+since you are writing free software anyway this is no restriction.
+
+   Once the sources are change appropriately and the setup can handle to
+use of `gettext' the only thing missing are the translations.  The Free
+Translation Project is also available for packages which are not
+developed inside the GNU project.  Therefore the information given above
+applies also for every other Free Software Project.  Contact
+`translation@iro.umontreal.ca' to make the `.pot' files available to
+the translation teams.
+
diff --git a/INSTALL b/INSTALL
index 85fe946f..4359d7a8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,7 +12,7 @@ IRC:       irc.freenode.net / #aethyra
 1. Requirements
 ===============
 
-You are expected to have either checked out Aethyra from CVS or you have downloaded
+You are expected to have either checked out Aethyra from git or you have downloaded
 a source release. To get Aethyra to compile, you need a compiler
 (GCC) and some libraries. The required libraries are:
 
@@ -32,6 +32,8 @@ compile:
 
 * GNU automake 1.9  http://www.gnu.org/software/automake/
 * GNU autoconf      http://www.gnu.org/software/autoconf/
+* GNU gettext       http://www.gnu.org/software/gettext/
+* CVS               http://www.nongnu.org/cvs/ (needed to run autopoint)
 
 Installing these dependencies is distributions-specific, and we'll leave it to
 you to figure this out.
diff --git a/Makefile.am b/Makefile.am
index f399eb3c..ae62a99b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # Subdirectories to build
-SUBDIRS = data docs src
+SUBDIRS = data docs po src
 
 desktopdir = $(datadir)/applications
 
@@ -7,3 +7,6 @@ desktop_DATA = aethyra.desktop
 
 # Extra files to include
 EXTRA_DIST = $(desktop_DATA)
+
+# Autopoint m4 stuff
+ACLOCAL_AMFLAGS = -I m4
diff --git a/config.rpath b/config.rpath
new file mode 100644
index 00000000..e69de29b
diff --git a/configure.ac b/configure.ac
index 4424d152..e4acb4df 100755
--- a/configure.ac
+++ b/configure.ac
@@ -6,13 +6,9 @@ AC_LANG_CPLUSPLUS
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_INSTALL
-AC_PROG_MAKE_SET
 
 # Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_STDBOOL
-AC_C_CONST
 AC_HEADER_TIME
-AC_C_VOLATILE
 
 # Checks for library functions.
 AC_FUNC_ERROR_AT_LINE
@@ -22,6 +18,15 @@ AC_FUNC_SELECT_ARGTYPES
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([atexit floor getcwd gethostbyname memset mkdir select socket])
 
+# Checks for internationalization support
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.16.1])
+
+# Search for *-config
+AC_PATH_PROG(SDL_CONFIG, sdl-config)
+AC_PATH_PROG(PKG_CONFIG, pkg-config)
+AC_PATH_PROG(CURL_CONFIG, curl-config)
+
 # Checks for libraries
 AC_CHECK_LIB([pthread], [pthread_create], ,
 AC_MSG_ERROR([ *** Unable to find pthread library]))
@@ -113,6 +118,7 @@ data/graphics/images/Makefile
 data/help/Makefile
 data/icons/Makefile
 docs/Makefile
+po/Makefile.in
 ])
 
 AC_OUTPUT
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 00000000..8bba9bc2
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1 @@
+# Set of available languages.
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 00000000..76e72f50
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = tmw
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = The Mana World Development Team
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 00000000..e66b8f69
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,26 @@
+# List of source files which contain translatable strings.
+
+src/gui/buy.cpp
+src/gui/char_select.cpp
+src/gui/char_server.cpp
+src/gui/confirm_dialog.cpp
+src/gui/connection.cpp
+src/gui/equipmentwindow.cpp
+src/gui/inventorywindow.cpp
+src/gui/item_amount.cpp
+src/gui/login.cpp
+src/gui/menuwindow.cpp
+src/gui/minimap.cpp
+src/gui/npclistdialog.cpp
+src/gui/npc_text.cpp
+src/gui/ok_dialog.cpp
+src/gui/popupmenu.cpp
+src/gui/register.cpp
+src/gui/sell.cpp
+src/gui/setup_audio.cpp
+src/gui/setup.cpp
+src/gui/setup_joystick.cpp
+src/gui/setup_video.cpp
+src/gui/trade.cpp
+src/net/playerhandler.cpp
+src/resources/itemdb.cpp
diff --git a/po/aethyra.pot b/po/aethyra.pot
new file mode 100644
index 00000000..ae49bb32
--- /dev/null
+++ b/po/aethyra.pot
@@ -0,0 +1,486 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The Mana World Development Team
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr ""
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr ""
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr ""
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr ""
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr ""
+
+#: src/gui/char_select.cpp:79
+msgid "Select Character"
+msgstr ""
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr ""
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr ""
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr ""
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr ""
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr ""
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr ""
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, c-format
+msgid "Job Level: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr ""
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr ""
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr ""
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr ""
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr ""
+
+#: src/gui/char_server.cpp:52
+msgid "Select Server"
+msgstr ""
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr ""
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr ""
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr ""
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr ""
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr ""
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr ""
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr ""
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr ""
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr ""
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr ""
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:283
+msgid "@@use|Unequip@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr ""
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr ""
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr ""
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr ""
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr ""
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr ""
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr ""
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr ""
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr ""
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr ""
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr ""
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr ""
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr ""
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr ""
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr ""
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr ""
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr ""
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr ""
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr ""
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr ""
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr ""
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr ""
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6411d19f..7f0560b5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -267,6 +267,7 @@ SET(SRCS
     utils/base64.h
     utils/dtor.h
     utils/fastsqrt.h
+    utils/gettext.h
     utils/strprintf.cpp
     utils/strprintf.h
     utils/tostring.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 9426171d..d59198d1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -233,6 +233,7 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      utils/base64.h \
 	      utils/dtor.h \
 	      utils/fastsqrt.h \
+	      utils/gettext.h \
 	      utils/strprintf.cpp \
 	      utils/strprintf.h \
 	      utils/tostring.h \
@@ -333,8 +334,9 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 
 # set the include path found by configure
 INCLUDES =					\
-	$(all_includes)				\
-	-DAETHYRA_DATADIR=\""$(pkgdatadir)/"\"
+	$(all_includes)		                \
+	-DAETHYRA_DATADIR=\""$(pkgdatadir)/"\"  \
+	-DLOCALEDIR=\""$(localedir)/"\"
 
 # the library search path.
 aethyra_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) `pkg-config --libs libxml-2.0`
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 597a7cad..a3424ab6 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -33,10 +33,11 @@
 #include "../net/messageout.h"
 #include "../net/protocol.h"
 
-#include "../utils/tostring.h"
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
 
 BuyDialog::BuyDialog(Network *network):
-    Window("Buy"), mNetwork(network),
+    Window(_("Buy")), mNetwork(network),
     mMoney(0), mAmountItems(0), mMaxItems(0)
 {
     setWindowName("Buy");
@@ -51,13 +52,13 @@ BuyDialog::BuyDialog(Network *network):
     mScrollArea = new ScrollArea(mShopItemList);
     mSlider = new Slider(1.0);
     mQuantityLabel = new gcn::Label("0");
-    mMoneyLabel = new gcn::Label("Price : 0 GP / 0 GP");
+    mMoneyLabel = new gcn::Label(strprintf(_("Price: %d GP / Total: %d GP"), 0, 0));
     mIncreaseButton = new Button("+", "+", this);
     mDecreaseButton = new Button("-", "-", this);
-    mBuyButton = new Button("Buy", "buy", this);
-    mQuitButton = new Button("Quit", "quit", this);
-    mItemDescLabel = new gcn::Label("Description:");
-    mItemEffectLabel = new gcn::Label("Effect:");
+    mBuyButton = new Button(_("Buy"), "buy", this);
+    mQuitButton = new Button(_("Quit"), "quit", this);
+    mItemDescLabel = new gcn::Label(strprintf(_("Description: %s"), ""));
+    mItemEffectLabel = new gcn::Label(strprintf(_("Effect: %s"), ""));
 
     mIncreaseButton->setSize(20, 20);
     mDecreaseButton->setSize(20, 20);
@@ -156,6 +157,9 @@ void BuyDialog::action(const gcn::ActionEvent &event)
         mSlider->setValue(mAmountItems);
         updateButtonsAndLabels();
     }
+    // TODO: Actually we'd have a bug elsewhere if this check for the number
+    // of items to be bought ever fails, Bertram removed the assertions, is
+    // there a better way to ensure this fails in an _obvious_ way in C++?
     else if (event.getId() == "buy" && mAmountItems > 0 &&
                 mAmountItems <= mMaxItems)
     {
@@ -242,8 +246,10 @@ BuyDialog::updateButtonsAndLabels()
     {
         const ItemInfo &info = mShopItems->at(selectedItem)->getInfo();
 
-        mItemDescLabel->setCaption("Description: " + info.getDescription());
-        mItemEffectLabel->setCaption("Effect: " + info.getEffect());
+        mItemDescLabel->setCaption
+            (strprintf(_("Description: %s"), info.getDescription().c_str()));
+        mItemEffectLabel->setCaption
+            (strprintf(_("Effect: %s"), info.getEffect().c_str()));
 
         int itemPrice = mShopItems->at(selectedItem)->getPrice();
 
@@ -259,8 +265,8 @@ BuyDialog::updateButtonsAndLabels()
     }
     else
     {
-        mItemDescLabel->setCaption("Description:");
-        mItemEffectLabel->setCaption("Effect:");
+        mItemDescLabel->setCaption(strprintf(_("Description: %s"), ""));
+        mItemEffectLabel->setCaption(strprintf(_("Effect: %s"), ""));
         mMaxItems = 0;
         mAmountItems = 0;
     }
@@ -272,8 +278,7 @@ BuyDialog::updateButtonsAndLabels()
     mSlider->setEnabled(mMaxItems > 1);
 
     // Update quantity and money labels
-    mQuantityLabel->setCaption(
-        toString(mAmountItems) + " / " + toString(mMaxItems));
-    mMoneyLabel->setCaption("Price: " + toString(price)  + " GP / "
-                             + toString(mMoney - price) + " GP" );
+    mQuantityLabel->setCaption(strprintf("%d / %d", mAmountItems, mMaxItems));
+    mMoneyLabel->setCaption
+        (strprintf(_("Price: %d GP / Total: %d GP"), price, mMoney - price));
 }
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 6a52a745..c89dadcd 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -37,7 +37,8 @@
 #include "../net/charserverhandler.h"
 #include "../net/messageout.h"
 
-#include "../utils/tostring.h"
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
 #include "../utils/trim.h"
 
 // Defined in main.cpp, used here for setting the char create dialog
@@ -56,8 +57,8 @@ class CharDeleteConfirm : public ConfirmDialog
 };
 
 CharDeleteConfirm::CharDeleteConfirm(CharSelectDialog *m):
-    ConfirmDialog("Confirm", "Are you sure you want to delete this character?",
-            m),
+    ConfirmDialog(_("Confirm Character Delete"),
+                  _("Are you sure you want to delete this character?"), m),
     master(m)
 {
 }
@@ -74,21 +75,23 @@ void CharDeleteConfirm::action(const gcn::ActionEvent &event)
 CharSelectDialog::CharSelectDialog(Network *network,
                                    LockedArray<LocalPlayer*> *charInfo,
                                    Gender gender):
-    Window("Select Character"), mNetwork(network),
+    Window(_("Select Character")), mNetwork(network),
     mCharInfo(charInfo), mGender(gender), mCharSelected(false)
 {
-    mSelectButton = new Button("Ok", "ok", this);
-    mCancelButton = new Button("Cancel", "cancel", this);
-    mNewCharButton = new Button("New", "new", this);
-    mDelCharButton = new Button("Delete", "delete", this);
-    mPreviousButton = new Button("Previous", "previous", this);
-    mNextButton = new Button("Next", "next", this);
-
-    mNameLabel = new gcn::Label("Name");
-    mLevelLabel = new gcn::Label("Level");
-    mJobLevelLabel = new gcn::Label("Job Level");
-    mMoneyLabel = new gcn::Label("Money");
-    mPlayerBox = new PlayerBox();
+    mSelectButton = new Button(_("Ok"), "ok", this);
+    mCancelButton = new Button(_("Cancel"), "cancel", this);
+    mNewCharButton = new Button(_("New"), "new", this);
+    mDelCharButton = new Button(_("Delete"), "delete", this);
+    mPreviousButton = new Button(_("Previous"), "previous", this);
+    mNextButton = new Button(_("Next"), "next", this);
+
+    mNameLabel = new gcn::Label(strprintf(_("Name: %s"), ""));
+    mLevelLabel = new gcn::Label(strprintf(_("Level: %d"), 0));
+    mJobLevelLabel = new gcn::Label(strprintf(_("Job Level: %d"), 0));
+    mMoneyLabel = new gcn::Label(strprintf(_("Money: %d"), 0));
+
+    // Control that shows the Player
+    mPlayerBox = new PlayerBox;
 
     int w = 195;
     int h = 220;
@@ -177,10 +180,10 @@ void CharSelectDialog::updatePlayerInfo()
 
     if (pi)
     {
-        mNameLabel->setCaption(pi->getName());
-        mLevelLabel->setCaption("Lvl: " + toString(pi->mLevel));
-        mJobLevelLabel->setCaption("Job Lvl: " + toString(pi->mJobLevel));
-        mMoneyLabel->setCaption("Gold: " + toString(pi->mGp));
+        mNameLabel->setCaption(strprintf(_("Name: %s"), pi->getName().c_str()));
+        mLevelLabel->setCaption(strprintf(_("Level: %d"), pi->mLevel));
+        mJobLevelLabel->setCaption(strprintf(_("Job Level: %d"), pi->mJobLevel));
+        mMoneyLabel->setCaption(strprintf(_("Gold: %d"), pi->mGp));
         if (!mCharSelected)
         {
             mNewCharButton->setEnabled(false);
@@ -189,10 +192,10 @@ void CharSelectDialog::updatePlayerInfo()
         }
     }
     else {
-        mNameLabel->setCaption("Name");
-        mLevelLabel->setCaption("Level");
-        mJobLevelLabel->setCaption("Job Level");
-        mMoneyLabel->setCaption("Money");
+        mNameLabel->setCaption(strprintf(_("Name: %s"), ""));
+        mLevelLabel->setCaption(strprintf(_("Level: %d"), 0));
+        mJobLevelLabel->setCaption(strprintf(_("Job Level: %d"), 0));
+        mMoneyLabel->setCaption(strprintf(_("Money: %d"), 0));
         mNewCharButton->setEnabled(true);
         mDelCharButton->setEnabled(false);
         mSelectButton->setEnabled(false);
@@ -249,7 +252,7 @@ bool CharSelectDialog::selectByName(const std::string &name)
 
 CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network,
                                    Gender gender):
-    Window("Create Character", true, parent), mNetwork(network), mSlot(slot)
+    Window(_("Create Character"), true, parent), mNetwork(network), mSlot(slot)
 {
     mPlayer = new Player(0, 0, NULL);
     mPlayer->setGender(gender);
@@ -259,15 +262,15 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network,
     mPlayer->setHairStyle(rand() % mPlayer->getNumOfHairstyles(), rand() % numberOfHairColors);
 
     mNameField = new TextField("");
-    mNameLabel = new gcn::Label("Name:");
+    mNameLabel = new gcn::Label(_("Name:"));
     mNextHairColorButton = new Button(">", "nextcolor", this);
     mPrevHairColorButton = new Button("<", "prevcolor", this);
-    mHairColorLabel = new gcn::Label("Hair Color:");
+    mHairColorLabel = new gcn::Label(_("Hair Color:"));
     mNextHairStyleButton = new Button(">", "nextstyle", this);
     mPrevHairStyleButton = new Button("<", "prevstyle", this);
-    mHairStyleLabel = new gcn::Label("Hair Style:");
-    mCreateButton = new Button("Create", "create", this);
-    mCancelButton = new Button("Cancel", "cancel", this);
+    mHairStyleLabel = new gcn::Label(_("Hair Style:"));
+    mCreateButton = new Button(_("Create"), "create", this);
+    mCancelButton = new Button(_("Cancel"), "cancel", this);
     mPlayerBox = new PlayerBox(mPlayer);
 
     mNameField->setActionEventId("create");
diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp
index 054aff84..ff401332 100644
--- a/src/gui/char_server.cpp
+++ b/src/gui/char_server.cpp
@@ -30,6 +30,8 @@
 
 #include "../net/network.h" // TODO this is just for iptostring, move that?
 
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
 #include "../utils/tostring.h"
 
 extern SERVER_INFO **server_info;
@@ -46,15 +48,15 @@ class ServerListModel : public gcn::ListModel {
 };
 
 ServerSelectDialog::ServerSelectDialog(LoginData *loginData, int nextState):
-    Window("Select Server"),
+    Window(_("Select Server")),
     mLoginData(loginData),
     mNextState(nextState)
 {
     mServerListModel = new ServerListModel();
     mServerList = new ListBox(mServerListModel);
     ScrollArea *mScrollArea = new ScrollArea(mServerList);
-    mOkButton = new Button("OK", "ok", this);
-    Button *mCancelButton = new Button("Cancel", "cancel", this);
+    mOkButton = new Button(_("OK"), "ok", this);
+    Button *mCancelButton = new Button(_("Cancel"), "cancel", this);
 
     setContentSize(200, 100);
 
diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp
index 732f5769..72ce3e16 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirm_dialog.cpp
@@ -23,6 +23,8 @@
 
 #include "confirm_dialog.h"
 
+#include "../utils/gettext.h"
+
 ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg,
         Window *parent):
     Window(title, true, parent)
@@ -32,8 +34,8 @@ ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg,
     mTextBox->setOpaque(false);
 
     mTextArea = new ScrollArea(mTextBox);
-    gcn::Button *yesButton = new Button("Yes", "yes", this);
-    gcn::Button *noButton = new Button("No", "no", this);
+    gcn::Button *yesButton = new Button(_("Yes"), "yes", this);
+    gcn::Button *noButton = new Button(_("No"), "no", this);
 
     mTextArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     mTextArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index 1204b203..174d98e7 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.cpp
@@ -29,6 +29,8 @@
 
 #include "../main.h"
 
+#include "../utils/gettext.h"
+
 namespace {
     struct ConnectionActionListener : public gcn::ActionListener
     {
@@ -41,9 +43,9 @@ ConnectionDialog::ConnectionDialog():
 {
     setContentSize(200, 100);
 
-    Button *cancelButton = new Button("Cancel", "cancelButton", &listener);
+    Button *cancelButton = new Button(_("Cancel"), "cancelButton", &listener);
     mProgressBar = new ProgressBar(0.0, 200 - 10, 20, 128, 128, 128);
-    gcn::Label *label = new gcn::Label("Connecting...");
+    gcn::Label *label = new gcn::Label(_("Connecting..."));
 
     cancelButton->setPosition(5, 100 - 5 - cancelButton->getHeight());
     mProgressBar->setPosition(5, cancelButton->getY() - 25);
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index f1cbb0da..47ca61df 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -33,10 +33,12 @@
 #include "../resources/iteminfo.h"
 #include "../resources/resourcemanager.h"
 
+#include "../utils/gettext.h"
 #include "../utils/tostring.h"
 
 EquipmentWindow::EquipmentWindow(Equipment *equipment):
-    Window("Equipment"), mEquipment(equipment)
+    Window(_("Equipment")),
+    mEquipment(equipment)
 {
     setWindowName("Equipment");
     setCloseButton(true);
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 621a85d3..8c5edec4 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -37,10 +37,12 @@
 
 #include "../resources/iteminfo.h"
 
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
 #include "../utils/tostring.h"
 
 InventoryWindow::InventoryWindow():
-    Window("Inventory")
+    Window(_("Inventory"))
 {
     setWindowName("Inventory");
     setResizable(true);
@@ -49,8 +51,8 @@ InventoryWindow::InventoryWindow():
     // If you adjust these defaults, don't forget to adjust the trade window's.
     setDefaultSize(115, 25, 322, 200);
 
-    mUseButton = new Button("Use", "use", this);
-    mDropButton = new Button("Drop", "drop", this);
+    mUseButton = new Button(_("Use"), "use", this);
+    mDropButton = new Button(_("Drop"), "drop", this);
 
     mItems = new ItemContainer(player_node->getInventory(), 2);
     mItems->addSelectionListener(this);
@@ -61,14 +63,14 @@ InventoryWindow::InventoryWindow():
     mTotalWeight = toString(player_node->mTotalWeight);
     mMaxWeight = toString(player_node->mMaxWeight);
 
-    mItemName = "Name:";
+    mItemName = _("Name:");
     mItemNameLabel = new TextBox();
-    mItemDescription = "Description:";
+    mItemDescription = _("Description:");
     mItemDescriptionLabel = new TextBox();
-    mItemEffect = "Effect:";
+    mItemEffect = _("Effect:");
     mItemEffectLabel = new TextBox();
-    mWeight = "Weight: " + mTotalWeight + " g / " +
-              mMaxWeight + " g Slots: " + 
+    mWeight = _("Weight: ") + mTotalWeight + " g / " +
+              mMaxWeight + _(" g Slots: ") + 
               toString(player_node->getInventory()->getNumberOfSlotsUsed()) + 
               "/" + toString(player_node->getInventory()->getInventorySize());
     mWeightLabel = new TextBox();
@@ -105,8 +107,8 @@ void InventoryWindow::logic()
         mMaxWeight = toString(player_node->mMaxWeight);
 
         // Adjust widgets
-        mWeight = "Weight: " + mTotalWeight + " g / " +
-                  mMaxWeight + " g  Slots: " + 
+        mWeight = _("Weight: ") + mTotalWeight + " g / " +
+                  mMaxWeight + _(" g  Slots: ") + 
                  toString(player_node->getInventory()->getNumberOfSlotsUsed()) + 
                  "/" + toString(player_node->getInventory()->getInventorySize());
 
@@ -153,21 +155,21 @@ void InventoryWindow::valueChanged(const gcn::SelectionEvent &event)
     // Update name, effect and description
     if (!item)
     {
-        mItemName = "Name:";
+        mItemName = _("Name:");
         mItemNameLabel->setTextWrapped(mItemName);
-        mItemEffect = "Effect:";
+        mItemEffect = _("Effect:");
         mItemEffectLabel->setTextWrapped(mItemEffect);
-        mItemDescription = "Description:";
+        mItemDescription = _("Description:");
         mItemDescriptionLabel->setTextWrapped(mItemDescription);
     }
     else
     {
         const ItemInfo& itemInfo = item->getInfo();
-        mItemName = "Name: " + itemInfo.getName();
+        mItemName = _("Name: ") + itemInfo.getName();
         mItemNameLabel->setTextWrapped(mItemName);
-        mItemEffect = "Effect: " + itemInfo.getEffect();
+        mItemEffect = _("Effect: ") + itemInfo.getEffect();
         mItemEffectLabel->setTextWrapped(mItemEffect);
-        mItemDescription = "Description: " + itemInfo.getDescription();
+        mItemDescription = _("Description: ") + itemInfo.getDescription();
         mItemDescriptionLabel->setTextWrapped(mItemDescription);
     }
 
@@ -182,7 +184,8 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
     {
         Item *item = mItems->getSelectedItem();
 
-        if (!item) return;
+        if (!item)
+            return;
 
         /* Convert relative to the window coordinates to absolute screen
          * coordinates.
@@ -249,14 +252,14 @@ void InventoryWindow::updateButtons()
     if (selectedItem && selectedItem->isEquipment())
     {
         if (selectedItem->isEquipped()) {
-            mUseButton->setCaption("Unequip");
+            mUseButton->setCaption(_("Unequip"));
         }
         else {
-            mUseButton->setCaption("Equip");
+            mUseButton->setCaption(_("Equip"));
         }
     }
     else {
-        mUseButton->setCaption("Use");
+        mUseButton->setCaption(_("Use"));
     }
 
     mUseButton->setEnabled(selectedItem != 0);
diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp
index 4ce8ac6c..191c7b8b 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.cpp
@@ -28,31 +28,33 @@
 #include "../item.h"
 #include "../localplayer.h"
 
+#include "../utils/gettext.h"
+
 ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
-    Window("Select amount of items to drop.", true, parent),
+    Window("", true, parent),
     mItem(item)
 {
-    // New labels
+    // Integer field
     mItemAmountTextBox = new IntTextBox(1);
-
-    // New buttons
-    Button *minusButton = new Button("-", "Minus", this);
-    Button *plusButton = new Button("+", "Plus", this);
-    Button *okButton = new Button("Okay", "Drop", this);
-    Button *cancelButton = new Button("Cancel", "Cancel", this);
-    mItemAmountSlide = new Slider(1.0, mItem->getQuantity());
-
     mItemAmountTextBox->setRange(1, mItem->getQuantity());
-    mItemAmountSlide->setDimension(gcn::Rectangle(5, 120, 180, 10));
 
-    // Set button events Id
+    // Slider
+    mItemAmountSlide = new Slider(1.0, mItem->getQuantity());
     mItemAmountSlide->setActionEventId("Slide");
+    mItemAmountSlide->addActionListener(this);
+
+    // Buttons
+    Button *minusButton = new Button("-", "Minus", this);
+    Button *plusButton = new Button("+", "Plus", this);
+    Button *okButton = new Button(_("Ok"), "Drop", this);
+    Button *cancelButton = new Button(_("Cancel"), "Cancel", this);
 
-    // Set position
+    // Set positions
     mItemAmountTextBox->setPosition(35, 10);
     mItemAmountTextBox->setSize(24, 16);
     plusButton->setPosition(60, 5);
     minusButton->setPosition(10, 5);
+    mItemAmountSlide->setDimension(gcn::Rectangle(5, 120, 180, 10));
     mItemAmountSlide->setPosition(10, 35);
     okButton->setPosition(10, 50);
     cancelButton->setPosition(60, 50);
@@ -65,17 +67,15 @@ ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
     add(okButton);
     add(cancelButton);
 
-    mItemAmountSlide->addActionListener(this);
-
     resetAmount();
 
     switch (usage) {
         case AMOUNT_TRADE_ADD:
-            setCaption("Select amount of items to trade.");
+            setCaption(_("Select amount of items to trade."));
             okButton->setActionEventId("AddTrade");
             break;
         case AMOUNT_ITEM_DROP:
-            setCaption("Select amount of items to drop.");
+            setCaption(_("Select amount of items to drop."));
             okButton->setActionEventId("Drop");
             break;
         default:
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index fa47af32..8fd77f44 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -35,6 +35,7 @@
 #include "../logindata.h"
 #include "../configuration.h"
 
+#include "../utils/gettext.h"
 #include "../utils/tostring.h"
 
 static const int MAX_SERVER_LIST_SIZE = 5;
@@ -43,13 +44,13 @@ static const int LOGIN_DIALOG_HEIGHT = 140;
 static const int FIELD_WIDTH = LOGIN_DIALOG_WIDTH - 70;
 
 LoginDialog::LoginDialog(LoginData *loginData):
-    Window("Login"), mLoginData(loginData)
+    Window(_("Login")), mLoginData(loginData)
 {
-    gcn::Label *userLabel = new gcn::Label("Name:");
-    gcn::Label *passLabel = new gcn::Label("Password:");
-    gcn::Label *serverLabel = new gcn::Label("Server:");
-    gcn::Label *portLabel = new gcn::Label("Port:");
-    gcn::Label *dropdownLabel = new gcn::Label("Recent:");
+    gcn::Label *userLabel = new gcn::Label(_("Name:"));
+    gcn::Label *passLabel = new gcn::Label(_("Password:"));
+    gcn::Label *serverLabel = new gcn::Label(_("Server:"));
+    gcn::Label *portLabel = new gcn::Label(_("Port:"));
+    gcn::Label *dropdownLabel = new gcn::Label(_("Recent:"));
     std::vector<std::string> dfltServer;
     dfltServer.push_back("www.aethyra.org"); 
     dfltServer.push_back("www.aethyra.org");
@@ -69,10 +70,10 @@ LoginDialog::LoginDialog(LoginData *loginData):
                                    mServerScrollArea,
                                    mServerListBox);
 
-    mKeepCheck = new CheckBox("Keep", mLoginData->remember);
-    mOkButton = new Button("OK", "ok", this);
-    mCancelButton = new Button("Cancel", "cancel", this);
-    mRegisterButton = new Button("Register", "register", this);
+    mKeepCheck = new CheckBox(_("Keep"), mLoginData->remember);
+    mOkButton = new Button(_("OK"), "ok", this);
+    mCancelButton = new Button(_("Cancel"), "cancel", this);
+    mRegisterButton = new Button(_("Register"), "register", this);
 
     setContentSize(LOGIN_DIALOG_WIDTH, LOGIN_DIALOG_HEIGHT);
 
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index 56bc48fd..99eaca34 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -27,6 +27,8 @@
 #include "menuwindow.h"
 #include "windowcontainer.h"
 
+#include "../utils/gettext.h"
+
 extern Window *chatWindow;
 extern Window *equipmentWindow;
 extern Window *inventoryWindow;
@@ -55,23 +57,23 @@ MenuWindow::MenuWindow():
     setTitleBarHeight(0);
 
     // Buttons
-    const char *buttonNames[] =
+    static const char *buttonNames[] =
     {
-        "Chat",
-        "Status",
-        "Equipment",
-        "Inventory",
-        "Skills",
-        "Shortcut",
-        "Emote",
-        "Setup",
+        _("Chat"),
+        _("Status"),
+        _("Equipment"),
+        _("Inventory"),
+        _("Skills"),
+        _("Shortcut"),
+        _("Emote"),
+        _("Setup"),
         0
     };
     int x = 0, h = 0;
 
     for (const char **curBtn = buttonNames; *curBtn; curBtn++)
     {
-        gcn::Button *btn = new Button(*curBtn, *curBtn, &listener);
+        gcn::Button *btn = new Button(gettext(*curBtn), *curBtn, &listener);
         btn->setPosition(x, 0);
         add(btn);
         x += btn->getWidth() + 3;
@@ -92,35 +94,35 @@ void MenuWindowListener::action(const gcn::ActionEvent &event)
 {
     Window *window = NULL;
 
-    if (event.getId() == "Chat")
+    if (event.getId() == _("Chat"))
     {
         window = chatWindow;
     }
-    else if (event.getId() == "Status")
+    else if (event.getId() == _("Status"))
     {
         window = statusWindow;
     }
-    else if (event.getId() == "Equipment")
+    else if (event.getId() == _("Equipment"))
     {
         window = equipmentWindow;
     }
-    else if (event.getId() == "Inventory")
+    else if (event.getId() == _("Inventory"))
     {
         window = inventoryWindow;
     }
-    else if (event.getId() == "Skills")
+    else if (event.getId() == _("Skills"))
     {
         window = skillDialog;
     }
-    else if (event.getId() == "Shortcut")
+    else if (event.getId() == _("Shortcut"))
     {
         window = itemShortcutWindow;
     }
-    else if (event.getId() == "Emote")
+    else if (event.getId() == _("Emote"))
     {
         window = smileyWindow;
     }
-    else if (event.getId() == "Setup")
+    else if (event.getId() == _("Setup"))
     {
         window = setupWindow;
     }
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index fddd5199..8519b985 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -28,13 +28,15 @@
 
 #include "../resources/image.h"
 
+#include "../utils/gettext.h"
+
 Minimap::Minimap():
-    Window("Map"),
+    Window(_("Map")),
     mMapImage(NULL),
     mProportion(0.5)
 {
     setCloseButton(true);
-    setWindowName("MiniMap");
+    setWindowName(_("MiniMap"));
 }
 
 Minimap::~Minimap()
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index b53de828..0570d7a9 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -26,8 +26,10 @@
 
 #include "../npc.h"
 
+#include "../utils/gettext.h"
+
 NpcTextDialog::NpcTextDialog():
-    Window("NPC")
+    Window(_("NPC"))
 {
     setResizable(true);
 
@@ -38,7 +40,7 @@ NpcTextDialog::NpcTextDialog():
     mTextBox->setEditable(false);
 
     scrollArea = new ScrollArea(mTextBox);
-    okButton = new Button("OK", "ok", this);
+    okButton = new Button(_("OK"), "ok", this);
 
     setContentSize(260, 175);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index c17cd4aa..34b5ab41 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -26,8 +26,10 @@
 
 #include "../npc.h"
 
+#include "../utils/gettext.h"
+
 NpcListDialog::NpcListDialog():
-    Window("NPC")
+    Window(_("NPC"))
 {
     setResizable(true);
 
@@ -36,8 +38,8 @@ NpcListDialog::NpcListDialog():
 
     mItemList = new ListBox(this);
     scrollArea = new ScrollArea(mItemList);
-    okButton = new Button("OK", "ok", this);
-    cancelButton = new Button("Cancel", "cancel", this);
+    okButton = new Button(_("OK"), "ok", this);
+    cancelButton = new Button(_("Cancel"), "cancel", this);
 
     setContentSize(260, 175);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index 421c873e..ad7b879c 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -23,6 +23,8 @@
 
 #include <guichan/font.hpp>
 
+#include "../utils/gettext.h"
+
 OkDialog::OkDialog(const std::string &title, const std::string &msg,
         Window *parent):
     Window(title, true, parent)
@@ -32,7 +34,7 @@ OkDialog::OkDialog(const std::string &title, const std::string &msg,
     mTextBox->setOpaque(false);
 
     mTextArea = new ScrollArea(mTextBox);
-    okButton = new Button("Ok", "ok", this);
+    okButton = new Button(_("Ok"), "ok", this);
 
     mTextArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     mTextArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index c0feb68d..2b2eb625 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -43,6 +43,9 @@
 #include "../resources/itemdb.h"
 #include "../resources/iteminfo.h"
 
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
+
 extern std::string tradePartnerName;
 
 PopupMenu::PopupMenu():
@@ -75,35 +78,35 @@ void PopupMenu::showPopup(int x, int y, Being *being)
 		// Players can be traded with. Later also attack, follow and
 		// add as buddy will be options in this menu.
 		const std::string &name = mBeing->getName();
-		mBrowserBox->addRow("@@trade|Trade With " + name + "@@");
-		mBrowserBox->addRow("@@attack|Attack " + name + "@@");
+		mBrowserBox->addRow(_("@@trade|Trade With ") + name + "@@");
+		mBrowserBox->addRow(_("@@attack|Attack ") + name + "@@");
 
 		mBrowserBox->addRow("##3---");
 
 		switch (player_relations.getRelation(name)) {
 		case PlayerRelation::NEUTRAL:
-		    mBrowserBox->addRow("@@friend|Befriend " + name + "@@");
+		    mBrowserBox->addRow(_("@@friend|Befriend ") + name + "@@");
 
 		case PlayerRelation::FRIEND:
-		    mBrowserBox->addRow("@@disregard|Disregard " + name + "@@");
-		    mBrowserBox->addRow("@@ignore|Ignore " + name + "@@");
+		    mBrowserBox->addRow(_("@@disregard|Disregard ") + name + "@@");
+		    mBrowserBox->addRow(_("@@ignore|Ignore ") + name + "@@");
 		    break;
 
 		case PlayerRelation::DISREGARDED:
-		    mBrowserBox->addRow("@@unignore|Un-Ignore " + name + "@@");
-		    mBrowserBox->addRow("@@ignore|Completely ignore " + name + "@@");
+		    mBrowserBox->addRow(_("@@unignore|Un-Ignore ") + name + "@@");
+		    mBrowserBox->addRow(_("@@ignore|Completely ignore ") + name + "@@");
 		    break;
 
 		case PlayerRelation::IGNORED:
-		    mBrowserBox->addRow("@@unignore|Un-Ignore " + name + "@@");
+		    mBrowserBox->addRow(_("@@unignore|Un-Ignore ") + name + "@@");
 		    break;
 		}
 
-		//mBrowserBox->addRow("@@follow|Follow " + name + "@@");
-		//mBrowserBox->addRow("@@buddy|Add " + name + " to Buddy List@@");
+		//mBrowserBox->addRow(_("@@follow|Follow ") + name + "@@");
+		//mBrowserBox->addRow(_("@@buddy|Add ") + name + " to Buddy List@@");
 
 		mBrowserBox->addRow("##3---");
-		mBrowserBox->addRow("@@party-invite|Invite " + name +
+		mBrowserBox->addRow(_("@@party-invite|Invite ") + name +
 				    " to party@@");
 	    }
 	    break;
@@ -111,7 +114,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
 	case Being::NPC:
 	    // NPCs can be talked to (single option, candidate for removal
 	    // unless more options would be added)
-	    mBrowserBox->addRow("@@talk|Talk To NPC@@");
+	    mBrowserBox->addRow(_("@@talk|Talk To NPC@@"));
 	    break;
 
 	default:
@@ -121,7 +124,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
 
     //browserBox->addRow("@@look|Look To@@");
     mBrowserBox->addRow("##3---");
-    mBrowserBox->addRow("@@cancel|Cancel@@");
+    mBrowserBox->addRow(_("@@cancel|Cancel@@"));
 
     showPopup(x, y);
 }
@@ -133,11 +136,11 @@ void PopupMenu::showPopup(int x, int y, FloorItem *floorItem)
 
     // Floor item can be picked up (single option, candidate for removal)
     std::string name = ItemDB::get(mFloorItem->getItemId()).getName();
-    mBrowserBox->addRow("@@pickup|Pick Up " + name + "@@");
+    mBrowserBox->addRow(strprintf(_("@@pickup|Pick Up %s@@"), name.c_str()));
 
     //browserBox->addRow("@@look|Look To@@");
     mBrowserBox->addRow("##3---");
-    mBrowserBox->addRow("@@cancel|Cancel@@");
+    mBrowserBox->addRow(_("@@cancel|Cancel@@"));
 
     showPopup(x, y);
 }
@@ -285,18 +288,18 @@ void PopupMenu::showPopup(int x, int y, Item *item)
 
     if (item->isEquipment())
     {
-	if (item->isEquipped())
-	    mBrowserBox->addRow("@@use|Unequip@@");
-	else
-	    mBrowserBox->addRow("@@use|Equip@@");
+        if (item->isEquipped())
+            mBrowserBox->addRow(_("@@use|Unequip@@"));
+        else
+            mBrowserBox->addRow(_("@@use|Equip@@"));
     }
     else
-	mBrowserBox->addRow("@@use|Use@@");
+        mBrowserBox->addRow(_("@@use|Use@@"));
 
-    mBrowserBox->addRow("@@drop|Drop@@");
-    mBrowserBox->addRow("@@description|Description@@");
+    mBrowserBox->addRow(_("@@drop|Drop@@"));
+    mBrowserBox->addRow(_("@@description|Description@@"));
     mBrowserBox->addRow("##3---");
-    mBrowserBox->addRow("@@cancel|Cancel@@");
+    mBrowserBox->addRow(_("@@cancel|Cancel@@"));
 
     showPopup(x, y);
 }
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index ec6a9756..5d687425 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -40,6 +40,9 @@
 
 #include "../utils/tostring.h"
 
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
+
 void
 WrongDataNoticeListener::setTarget(gcn::TextField *textField)
 {
@@ -56,25 +59,24 @@ WrongDataNoticeListener::action(const gcn::ActionEvent &event)
 }
 
 RegisterDialog::RegisterDialog(LoginData *loginData):
-    Window("Register"),
+    Window(_("Register")),
     mWrongDataNoticeListener(new WrongDataNoticeListener()),
     mLoginData(loginData)
 {
-    gcn::Label *userLabel = new gcn::Label("Name:");
-    gcn::Label *passwordLabel = new gcn::Label("Password:");
-    gcn::Label *confirmLabel = new gcn::Label("Confirm:");
-    gcn::Label *serverLabel = new gcn::Label("Server:");
-    gcn::Label *portLabel = new gcn::Label("Port:");
-
+    gcn::Label *userLabel = new gcn::Label(_("Name:"));
+    gcn::Label *passwordLabel = new gcn::Label(_("Password:"));
+    gcn::Label *confirmLabel = new gcn::Label(_("Confirm:"));
+    gcn::Label *serverLabel = new gcn::Label(_("Server:"));
+    gcn::Label *portLabel = new gcn::Label(_("Port:"));
     mUserField = new TextField(loginData->username);
     mPasswordField = new PasswordField(loginData->password);
     mConfirmField = new PasswordField();
     mServerField = new TextField(loginData->hostname);
     mPortField = new TextField(toString(loginData->port));
-    mMaleButton = new RadioButton("Male", "sex", true);
-    mFemaleButton = new RadioButton("Female", "sex", false);
-    mRegisterButton = new Button("Register", "register", this);
-    mCancelButton = new Button("Cancel", "cancel", this);
+    mMaleButton = new RadioButton(_("Male"), "sex", true);
+    mFemaleButton = new RadioButton(_("Female"), "sex", false);
+    mRegisterButton = new Button(_("Register"), "register", this);
+    mCancelButton = new Button(_("Cancel"), "cancel", this);
 
     const int WIDTH = 220;
     const int HEIGHT = 170;
@@ -181,47 +183,47 @@ RegisterDialog::action(const gcn::ActionEvent &event)
     else if (event.getId() == "register" && canSubmit())
     {
         const std::string user = mUserField->getText();
-        logger->log("RegisterDialog::register Username is %s", user.c_str());
+        logger->log(_("RegisterDialog::register Username is %s"), user.c_str());
 
-        std::stringstream errorMsg;
+        std::string errorMsg;
         int error = 0;
 
         if (user.length() < LEN_MIN_USERNAME)
         {
             // Name too short
-            errorMsg << "The username needs to be at least "
-                     << LEN_MIN_USERNAME
-                     << " characters long.";
+            errorMsg = strprintf
+                (_("The username needs to be at least %d characters long."),
+                 LEN_MIN_USERNAME);
             error = 1;
         }
         else if (user.length() > LEN_MAX_USERNAME - 1 )
         {
             // Name too long
-            errorMsg << "The username needs to be less than "
-                     << LEN_MAX_USERNAME
-                     << " characters long.";
+            errorMsg = strprintf
+                (_("The username needs to be less than %d characters long."),
+                 LEN_MAX_USERNAME);
             error = 1;
         }
         else if (mPasswordField->getText().length() < LEN_MIN_PASSWORD)
         {
             // Pass too short
-            errorMsg << "The password needs to be at least "
-                     << LEN_MIN_PASSWORD
-                     << " characters long.";
+            errorMsg = strprintf
+                (_("The password needs to be at least %d characters long."),
+                 LEN_MIN_PASSWORD);
             error = 2;
         }
         else if (mPasswordField->getText().length() > LEN_MAX_PASSWORD - 1 )
         {
             // Pass too long
-            errorMsg << "The password needs to be less than "
-                     << LEN_MAX_PASSWORD
-                     << " characters long.";
+            errorMsg = strprintf
+                (_("The password needs to be less than %d characters long."),
+                 LEN_MAX_PASSWORD);
             error = 2;
         }
         else if (mPasswordField->getText() != mConfirmField->getText())
         {
             // Password does not match with the confirmation one
-            errorMsg << "Passwords do not match.";
+            errorMsg = _("Passwords do not match.");
             error = 2;
         }
 
@@ -240,8 +242,8 @@ RegisterDialog::action(const gcn::ActionEvent &event)
                 mWrongDataNoticeListener->setTarget(this->mPasswordField);
             }
 
-            OkDialog *mWrongRegisterNotice = new OkDialog("Error",
-                                                          errorMsg.str());
+            OkDialog *mWrongRegisterNotice =
+                new OkDialog(_("Error"), errorMsg);
             mWrongRegisterNotice->addActionListener(mWrongDataNoticeListener);
         }
         else
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 63af1aaa..567fa59c 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -38,10 +38,12 @@
 
 #include "../resources/iteminfo.h"
 
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
 #include "../utils/tostring.h"
 
 SellDialog::SellDialog(Network *network):
-    Window("Sell"),
+    Window(_("Sell")),
     mNetwork(network),
     mMaxItems(0), mAmountItems(0)
 {
@@ -57,13 +59,14 @@ SellDialog::SellDialog(Network *network):
     mScrollArea = new ScrollArea(mShopItemList);
     mSlider = new Slider(1.0);
     mQuantityLabel = new gcn::Label("0");
-    mMoneyLabel = new gcn::Label("Money: 0 GP / Total: 0 GP");
+    mMoneyLabel = new gcn::Label(
+        strprintf(_("Price: %d GP / Total: %d GP"), 0, 0));
     mIncreaseButton = new Button("+", "+", this);
     mDecreaseButton = new Button("-", "-", this);
-    mSellButton = new Button("Sell", "sell", this);
-    mQuitButton = new Button("Quit", "quit", this);
-    mItemDescLabel = new gcn::Label("Description:");
-    mItemEffectLabel = new gcn::Label("Effect:");
+    mSellButton = new Button(_("Sell"), "sell", this);
+    mQuitButton = new Button(_("Quit"), "quit", this);
+    mItemDescLabel = new gcn::Label(strprintf(_("Description: %s"), ""));
+    mItemEffectLabel = new gcn::Label(strprintf(_("Effect: %s"), ""));
 
     mIncreaseButton->setSize(20, 20);
     mDecreaseButton->setSize(20, 20);
@@ -260,14 +263,19 @@ void SellDialog::setMoney(int amount)
     mShopItemList->setPlayersMoney(amount);
 }
 
-void
-SellDialog::updateButtonsAndLabels()
+void SellDialog::updateButtonsAndLabels()
 {
     int selectedItem = mShopItemList->getSelected();
     int income = 0;
 
     if (selectedItem > -1)
     {
+        const ItemInfo &info = mShopItems->at(selectedItem)->getInfo();
+        mItemDescLabel->setCaption
+            (strprintf(_("Description: %s"), info.getDescription().c_str()));
+        mItemEffectLabel->setCaption
+            (strprintf(_("Effect: %s"), info.getEffect().c_str()));
+
         mMaxItems = mShopItems->at(selectedItem)->getQuantity();
         if (mAmountItems > mMaxItems)
         {
@@ -275,17 +283,13 @@ SellDialog::updateButtonsAndLabels()
         }
 
         income = mAmountItems * mShopItems->at(selectedItem)->getPrice();
-
-        const ItemInfo &info = mShopItems->at(selectedItem)->getInfo();
-        mItemDescLabel->setCaption("Description: " + info.getDescription());
-        mItemEffectLabel->setCaption("Effect: " + info.getEffect());
     }
     else
     {
+        mItemDescLabel->setCaption(strprintf(_("Description: %s"), ""));
+        mItemEffectLabel->setCaption(strprintf(_("Effect: %s"), ""));
         mMaxItems = 0;
         mAmountItems = 0;
-        mItemDescLabel->setCaption("Description:");
-        mItemEffectLabel->setCaption("Effect:");
     }
 
     // Update Buttons and slider
@@ -295,8 +299,8 @@ SellDialog::updateButtonsAndLabels()
     mSlider->setEnabled(mMaxItems > 1);
 
     // Update the quantity and money labels
-    mQuantityLabel->setCaption(
-            toString(mAmountItems) + " / " + toString(mMaxItems));
-    mMoneyLabel->setCaption("Money: " + toString(income) + " GP / Total: "
-                            + toString(mPlayerMoney + income) + " GP");
+    mQuantityLabel->setCaption(strprintf("%d / %d", mAmountItems, mMaxItems));
+    mMoneyLabel->setCaption
+        (strprintf(_("Price: %d GP / Total: %d GP"),
+                   income, mPlayerMoney + income));
 }
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index a61d3bb2..73023eba 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -33,6 +33,7 @@
 #include "tabbedcontainer.h"
 
 #include "../utils/dtor.h"
+#include "../utils/gettext.h"
 
 extern Window *chatWindow;
 extern Window *equipmentWindow;
@@ -52,19 +53,19 @@ Setup::Setup():
     int height = 310;
     setContentSize(width, height);
 
-    const char *buttonNames[] = {
-        "Apply", "Cancel", "Reset Windows", 0
+    static const char *buttonNames[] = {
+        N_("Apply"), N_("Cancel"), N_("Reset Windows"), 0
     };
     int x = width;
     for (const char **curBtn = buttonNames; *curBtn; ++curBtn)
     {
-        Button *btn = new Button(*curBtn, *curBtn, this);
+        Button *btn = new Button(gettext(*curBtn), *curBtn, this);
         x -= btn->getWidth() + 5;
         btn->setPosition(x, height - btn->getHeight() - 5);
         add(btn);
 
         // Disable this button when the windows aren't created yet
-        if (!strcmp(*curBtn, "Reset Windows"))
+        if (!strcmp(*curBtn, _("Reset Windows")))
             btn->setEnabled(statusWindow != NULL);
     }
 
@@ -75,27 +76,27 @@ Setup::Setup():
     SetupTab *tab;
 
     tab = new Setup_Video();
-    panel->addTab(tab, "Video");
+    panel->addTab(tab, _("Video"));
     mTabs.push_back(tab);
 
     tab = new Setup_Audio();
-    panel->addTab(tab, "Audio");
+    panel->addTab(tab, _("Audio"));
     mTabs.push_back(tab);
 
     tab = new Setup_Joystick();
-    panel->addTab(tab, "Joystick");
+    panel->addTab(tab, _("Joystick"));
     mTabs.push_back(tab);
 
     tab = new Setup_Keyboard();
-    panel->addTab(tab, "Keyboard");
+    panel->addTab(tab, _("Keyboard"));
     mTabs.push_back(tab);
 
     tab = new Setup_Colours();
-    panel->addTab(tab, "Colours");
+    panel->addTab(tab, _("Colours"));
     mTabs.push_back(tab);
 
     tab = new Setup_Players();
-    panel->addTab(tab, "Players");
+    panel->addTab(tab, _("Players"));
     mTabs.push_back(tab);
 
     add(panel);
@@ -110,17 +111,17 @@ Setup::~Setup()
 
 void Setup::action(const gcn::ActionEvent &event)
 {
-    if (event.getId() == "Apply")
+    if (event.getId() == _("Apply"))
     {
         setVisible(false);
         for_each(mTabs.begin(), mTabs.end(), std::mem_fun(&SetupTab::apply));
     }
-    else if (event.getId() == "Cancel")
+    else if (event.getId() == _("Cancel"))
     {
         setVisible(false);
         for_each(mTabs.begin(), mTabs.end(), std::mem_fun(&SetupTab::cancel));
     }
-    else if (event.getId() == "Reset Windows")
+    else if (event.getId() == _("Reset Windows"))
     {
         // Bail out if this action happens to be activated before the windows
         // are created (though it should be disabled then)
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 70b34a31..bb824f33 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -30,18 +30,20 @@
 #include "../log.h"
 #include "../sound.h"
 
+#include "../utils/gettext.h"
+
 Setup_Audio::Setup_Audio():
     mMusicVolume((int)config.getValue("musicVolume", 60)),
     mSfxVolume((int)config.getValue("sfxVolume", 100)),
     mSoundEnabled(config.getValue("sound", 0)),
-    mSoundCheckBox(new CheckBox("Sound", mSoundEnabled)),
+    mSoundCheckBox(new CheckBox(_("Sound"), mSoundEnabled)),
     mSfxSlider(new Slider(0, 128)),
     mMusicSlider(new Slider(0, 128))
 {
     setOpaque(false);
 
-    gcn::Label *sfxLabel = new gcn::Label("Sfx volume");
-    gcn::Label *musicLabel = new gcn::Label("Music volume");
+    gcn::Label *sfxLabel = new gcn::Label(_("Sfx volume"));
+    gcn::Label *musicLabel = new gcn::Label(_("Music volume"));
 
     mSfxSlider->setActionEventId("sfx");
     mMusicSlider->setActionEventId("music");
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 723d0597..b55ccb7e 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -28,12 +28,14 @@
 #include "../configuration.h"
 #include "../joystick.h"
 
+#include "../utils/gettext.h"
+
 extern Joystick *joystick;
 
 Setup_Joystick::Setup_Joystick():
-    mCalibrateLabel(new gcn::Label("Press the button to start calibration")),
-    mCalibrateButton(new Button("Calibrate", "calibrate", this)),
-    mJoystickEnabled(new CheckBox("Enable joystick"))
+    mCalibrateLabel(new gcn::Label(_("Press the button to start calibration"))),
+    mCalibrateButton(new Button(_("Calibrate"), "calibrate", this)),
+    mJoystickEnabled(new CheckBox(_("Enable joystick")))
 {
     setOpaque(false);
     mJoystickEnabled->setPosition(10, 10);
@@ -63,13 +65,13 @@ void Setup_Joystick::action(const gcn::ActionEvent &event)
     else
     {
         if (joystick->isCalibrating()) {
-            mCalibrateButton->setCaption("Calibrate");
-            mCalibrateLabel->setCaption(
-                    "Press the button to start calibration");
+            mCalibrateButton->setCaption(_("Calibrate"));
+            mCalibrateLabel->setCaption
+                (_("Press the button to start calibration"));
             joystick->finishCalibration();
         } else {
-            mCalibrateButton->setCaption("Stop");
-            mCalibrateLabel->setCaption("Rotate the stick");
+            mCalibrateButton->setCaption(_("Stop"));
+            mCalibrateLabel->setCaption(_("Rotate the stick"));
             joystick->startCalibration();
         }
     }
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 2e620095..f53a9716 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -42,6 +42,7 @@
 #include "../main.h"
 #include "../particle.h"
 
+#include "../utils/gettext.h"
 #include "../utils/tostring.h"
 
 extern Graphics *graphics;
@@ -109,13 +110,13 @@ Setup_Video::Setup_Video():
     mFps((int) config.getValue("fpslimit", 0)),
     mModeListModel(new ModeListModel),
     mModeList(new ListBox(mModeListModel)),
-    mFsCheckBox(new CheckBox("Full screen", mFullScreenEnabled)),
-    mOpenGLCheckBox(new CheckBox("OpenGL", mOpenGLEnabled)),
-    mCustomCursorCheckBox(new CheckBox("Custom cursor", mCustomCursorEnabled)),
-    mParticleEffectsCheckBox(new CheckBox("Particle effects", mParticleEffectsEnabled)),
-    mSpeechBubbleCheckBox(new CheckBox("Speech bubbles", mSpeechBubbleEnabled)),
+    mFsCheckBox(new CheckBox(_("Full screen"), mFullScreenEnabled)),
+    mOpenGLCheckBox(new CheckBox(_("OpenGL"), mOpenGLEnabled)),
+    mCustomCursorCheckBox(new CheckBox(_("Custom cursor"), mCustomCursorEnabled)),
+    mParticleEffectsCheckBox(new CheckBox(_("Particle effects"), mParticleEffectsEnabled)),
+    mSpeechBubbleCheckBox(new CheckBox(_("Speech bubbles"), mSpeechBubbleEnabled)),
     mAlphaSlider(new Slider(0.2, 1.0)),
-    mFpsCheckBox(new CheckBox("FPS Limit: ")),
+    mFpsCheckBox(new CheckBox(_("FPS Limit:"))),
     mFpsSlider(new Slider(10, 200)),
     mFpsField(new TextField),
     mOriginalScrollLaziness((int) config.getValue("ScrollLaziness", 16)),
@@ -134,7 +135,7 @@ Setup_Video::Setup_Video():
     setOpaque(false);
 
     ScrollArea *scrollArea = new ScrollArea(mModeList);
-    gcn::Label *alphaLabel = new gcn::Label("Gui opacity");
+    gcn::Label *alphaLabel = new gcn::Label(_("Gui opacity"));
 
     mModeList->setEnabled(true);
 #ifndef USE_OPENGL
@@ -199,7 +200,7 @@ Setup_Video::Setup_Video():
     mParticleDetailField->addKeyListener(this);
 
     mScrollRadiusSlider->setDimension(gcn::Rectangle(10, 140, 75, 10));
-    gcn::Label *scrollRadiusLabel = new gcn::Label("Scroll radius");
+    gcn::Label *scrollRadiusLabel = new gcn::Label(_("Scroll radius"));
     scrollRadiusLabel->setPosition(90, 140);
     mScrollRadiusField->setPosition(mFpsField->getX(), 140);
     mScrollRadiusField->setWidth(30);
@@ -207,7 +208,7 @@ Setup_Video::Setup_Video():
     mScrollRadiusSlider->setValue(mOriginalScrollRadius);
 
     mScrollLazinessSlider->setDimension(gcn::Rectangle(10, 160, 75, 10));
-    gcn::Label *scrollLazinessLabel = new gcn::Label("Scroll laziness");
+    gcn::Label *scrollLazinessLabel = new gcn::Label(_("Scroll laziness"));
     scrollLazinessLabel->setPosition(90, 160);
     mScrollLazinessField->setPosition(mFpsField->getX(), 160);
     mScrollLazinessField->setWidth(30);
@@ -215,42 +216,42 @@ Setup_Video::Setup_Video():
     mScrollLazinessSlider->setValue(mOriginalScrollLaziness);
 
     mOverlayDetailSlider->setDimension(gcn::Rectangle(10, 180, 75, 10));
-    gcn::Label *overlayDetailLabel = new gcn::Label("Ambient FX");
+    gcn::Label *overlayDetailLabel = new gcn::Label(_("Ambient FX"));
     overlayDetailLabel->setPosition(90, 180);
     mOverlayDetailField->setPosition(180, 180);
     mOverlayDetailField->setWidth(30);
     switch (mOverlayDetail)
     {
         case 0:
-            mOverlayDetailField->setCaption("off");
+            mOverlayDetailField->setCaption(_("off"));
             break;
         case 1:
-            mOverlayDetailField->setCaption("low");
+            mOverlayDetailField->setCaption(_("low"));
             break;
         case 2:
-            mOverlayDetailField->setCaption("high");
+            mOverlayDetailField->setCaption(_("high"));
             break;
     }
     mOverlayDetailSlider->setValue(mOverlayDetail);
 
     mParticleDetailSlider->setDimension(gcn::Rectangle(10, 200, 75, 10));
-    gcn::Label *particleDetailLabel = new gcn::Label("Particle Detail");
+    gcn::Label *particleDetailLabel = new gcn::Label(_("Particle Detail"));
     particleDetailLabel->setPosition(90, 200);
     mParticleDetailField->setPosition(180, 200);
     mParticleDetailField->setWidth(60);
     switch (mParticleDetail)
     {
         case 0:
-            mParticleDetailField->setCaption("low");
+            mParticleDetailField->setCaption(_("low"));
             break;
         case 1:
-            mParticleDetailField->setCaption("medium");
+            mParticleDetailField->setCaption(_("medium"));
             break;
         case 2:
-            mParticleDetailField->setCaption("high");
+            mParticleDetailField->setCaption(_("high"));
             break;
         case 3:
-            mParticleDetailField->setCaption("max");
+            mParticleDetailField->setCaption(_("max"));
             break;
     }
     mParticleDetailSlider->setValue(mParticleDetail);
@@ -309,17 +310,17 @@ void Setup_Video::apply()
                 if (!graphics->setFullscreen(fullscreen))
                 {
                     std::stringstream error;
-                    error << "Failed to switch to " <<
-                        (fullscreen ? "windowed" : "fullscreen") <<
-                        "mode and restoration of old mode also failed!" <<
+                    error << _("Failed to switch to ") <<
+                        (fullscreen ? _("windowed") : _("fullscreen")) <<
+                        _("mode and restoration of old mode also failed!") <<
                         std::endl;
                     logger->error(error.str());
                 }
             }
 #ifdef WIN32
         } else {
-            new OkDialog("Switching to full screen",
-                    "Restart needed for changes to take effect.");
+            new OkDialog(_("Switching to full screen"),
+                    _("Restart needed for changes to take effect."));
         }
 #endif
         config.setValue("screen", fullscreen ? 1 : 0);
@@ -331,8 +332,8 @@ void Setup_Video::apply()
         config.setValue("opengl", mOpenGLCheckBox->isSelected() ? 1 : 0);
 
         // OpenGL can currently only be changed by restarting, notify user.
-        new OkDialog("Changing OpenGL",
-                "Applying change to OpenGL requires restart.");
+        new OkDialog(_("Changing OpenGL"),
+                _("Applying change to OpenGL requires restart."));
     }
 
     // FPS change
@@ -405,8 +406,8 @@ void Setup_Video::action(const gcn::ActionEvent &event)
         // Try to set the desired video mode
         if (!graphics->setVideoMode(width, height, bpp, fullscreen, hwaccel))
         {
-            std::cerr << "Couldn't set "
-                      << width << "x" << height << "x" << bpp << " video mode: "
+            std::cerr << _("Couldn't set ")
+                      << width << "x" << height << "x" << bpp << _(" video mode: ")
                       << SDL_GetError() << std::endl;
             exit(1);
         }
@@ -417,8 +418,8 @@ void Setup_Video::action(const gcn::ActionEvent &event)
         graphics->updateScreen();
 
         // TODO: Find out why the drawing area doesn't resize without a restart.
-        new OkDialog("Screen resolution changed",
-                     "Restart your client for the change to take effect.");
+        new OkDialog(_("Screen resolution changed"),
+                     _("Restart your client for the change to take effect."));
 
         config.setValue("screenwidth", width);
         config.setValue("screenheight", height);
@@ -436,8 +437,8 @@ void Setup_Video::action(const gcn::ActionEvent &event)
     {
         config.setValue("particleeffects",
                 mParticleEffectsCheckBox->isSelected() ? 1 : 0);
-        new OkDialog("Particle effect settings changed",
-                     "Restart your client or change maps for the change to take effect.");
+        new OkDialog(_("Particle effect settings changed"),
+                     _("Restart your client or change maps for the change to take effect."));
     }
     else if (event.getId() == "speechbubble")
     {
@@ -467,13 +468,13 @@ void Setup_Video::action(const gcn::ActionEvent &event)
         switch (val)
         {
             case 0:
-                mOverlayDetailField->setCaption("off");
+                mOverlayDetailField->setCaption(_("off"));
                 break;
             case 1:
-                mOverlayDetailField->setCaption("low");
+                mOverlayDetailField->setCaption(_("low"));
                 break;
             case 2:
-                mOverlayDetailField->setCaption("high");
+                mOverlayDetailField->setCaption(_("high"));
                 break;
         }
         config.setValue("OverlayDetail", val);
@@ -484,16 +485,16 @@ void Setup_Video::action(const gcn::ActionEvent &event)
         switch (val)
         {
             case 0:
-                mParticleDetailField->setCaption("low");
+                mParticleDetailField->setCaption(_("low"));
                 break;
             case 1:
-                mParticleDetailField->setCaption("medium");
+                mParticleDetailField->setCaption(_("medium"));
                 break;
             case 2:
-                mParticleDetailField->setCaption("high");
+                mParticleDetailField->setCaption(_("high"));
                 break;
             case 3:
-                mParticleDetailField->setCaption("max");
+                mParticleDetailField->setCaption(_("max"));
                 break;
         }
         config.setValue("particleEmitterSkip", 3 - val);
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index bae8daa6..4546cd9e 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -41,6 +41,8 @@
 
 #include "../resources/iteminfo.h"
 
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
 #include "../utils/tostring.h"
 
 TradeWindow::TradeWindow(Network *network):
@@ -56,10 +58,10 @@ TradeWindow::TradeWindow(Network *network):
     setMinWidth(342);
     setMinHeight(209);
 
-    mAddButton = new Button("Add", "add", this);
-    mOkButton = new Button("Ok", "ok", this);
-    mCancelButton = new Button("Cancel", "cancel", this);
-    mTradeButton = new Button("Trade", "trade", this);
+    mAddButton = new Button(_("Add"), "add", this);
+    mOkButton = new Button(_("Ok"), "ok", this);
+    mCancelButton = new Button(_("Cancel"), "cancel", this);
+    mTradeButton = new Button(_("Trade"), "trade", this);
 
     mMyItemContainer = new ItemContainer(mMyInventory.get(), 2);
     mMyItemContainer->addSelectionListener(this);
@@ -75,8 +77,8 @@ TradeWindow::TradeWindow(Network *network):
     mPartnerScroll = new ScrollArea(mPartnerItemContainer);
     mPartnerScroll->setPosition(8, 64);
 
-    mMoneyLabel = new gcn::Label("You get: 0 GP");
-    mMoneyLabel2 = new gcn::Label("You give:");
+    mMoneyLabel = new gcn::Label(strprintf(_("You get %d GP."), 0));
+    mMoneyLabel2 = new gcn::Label(_("You give:"));
     mMoneyField = new TextField;
     mMoneyField->setWidth(50);
 
@@ -87,8 +89,9 @@ TradeWindow::TradeWindow(Network *network):
 
     mTradeButton->setEnabled(false);
 
-    mItemNameLabel = new gcn::Label("Name:");
-    mItemDescriptionLabel = new gcn::Label("Description:");
+    mItemNameLabel = new gcn::Label(strprintf(_("Name: %s"), ""));
+    mItemDescriptionLabel = new gcn::Label(
+        strprintf(_("Description: %s"), ""));
 
     add(mMyScroll);
     add(mPartnerScroll);
@@ -150,7 +153,7 @@ void TradeWindow::widgetResized(const gcn::Event &event)
 
 void TradeWindow::addMoney(int amount)
 {
-    mMoneyLabel->setCaption("You get: " + toString(amount) + " GP");
+    mMoneyLabel->setCaption(strprintf(_("You get %d GP."), amount));
     mMoneyLabel->adjustSize();
 }
 
@@ -198,7 +201,7 @@ void TradeWindow::reset()
     mOkButton->setEnabled(true);
     mOkOther = false;
     mOkMe = false;
-    mMoneyLabel->setCaption("You get: 0 GP");
+    mMoneyLabel->setCaption(strprintf(_("You get %d GP."), 0));
     mMoneyField->setEnabled(true);
     mMoneyField->setText("");
 }
@@ -257,21 +260,11 @@ void TradeWindow::valueChanged(const gcn::SelectionEvent &event)
     }
 
     // Update name and description
-    if (!item)
-    {
-        mItemNameLabel->setCaption("Name:");
-        mItemDescriptionLabel->setCaption("Description:");
-    }
-    else
-    {
-        std::string SomeText;
-        SomeText = "Name: " + item->getInfo().getName();
-        mItemNameLabel->setCaption(SomeText);
-        mItemNameLabel->adjustSize();
-        SomeText = "Description: " + item->getInfo().getDescription();
-        mItemDescriptionLabel->setCaption(SomeText);
-        mItemDescriptionLabel->adjustSize();
-    }
+    ItemInfo const *info = item ? &item->getInfo() : NULL;
+    mItemNameLabel->setCaption(strprintf(_("Name: %s"),
+        info ? info->getName().c_str() : ""));
+    mItemDescriptionLabel->setCaption(strprintf(_("Description: %s"),
+        info ? info->getDescription().c_str() : ""));
 }
 
 void TradeWindow::action(const gcn::ActionEvent &event)
diff --git a/src/main.cpp b/src/main.cpp
index 7de3823f..55d295dd 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -80,6 +80,7 @@
 #include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
+#include "utils/gettext.h"
 #include "utils/tostring.h"
 
 #ifdef __APPLE__
@@ -284,7 +285,7 @@ void init_engine(const Options &options)
     // Add the user's homedir to PhysicsFS search path
     resman->addToSearchPath(homeDir, false);
 
-    // Add the main data directory to our PhysicsFS search path
+    // Add the main data directories to our PhysicsFS search path
     if (!options.dataPath.empty()) {
         resman->addToSearchPath(options.dataPath, true);
     }
@@ -679,6 +680,7 @@ void mapLogin(Network *network, LoginData *loginData)
 
 } // namespace
 
+extern "C" char const *_nl_locale_name_default(void);
 
 /** Main */
 int main(int argc, char *argv[])
@@ -699,6 +701,16 @@ int main(int argc, char *argv[])
         printVersion();
         return 0;
     }
+
+#if ENABLE_NLS
+#ifdef WIN32
+        putenv(("LANG=" + std::string(_nl_locale_name_default())).c_str());
+#endif
+        setlocale(LC_MESSAGES, "");
+        bindtextdomain("aethyra", LOCALEDIR);
+        textdomain("aethyra");
+#endif
+
     // Initialize libxml2 and check for potential ABI mismatches between
     // compiled version and the shared library actually used.
     xmlInitParser();
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index a4a2dcc9..83b26743 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -39,6 +39,7 @@
 #include "../gui/viewport.h"
 
 #include "../utils/tostring.h"
+#include "../utils/gettext.h"
 
 // TODO Move somewhere else
 OkDialog *weightNotice = NULL;
@@ -189,10 +190,10 @@ void PlayerHandler::handleMessage(MessageIn *msg)
                                          player_node->mTotalWeight <
                                          player_node->mMaxWeight / 2)
                                  {
-                                     weightNotice = new OkDialog("Message",
-                                             "You are carrying more then half "
-                                             "your weight. You are unable to "
-                                             "regain health.");
+                                     weightNotice = new OkDialog(_("Message"),
+                                             _("You are carrying more then half "
+                                               "your weight. You are unable to "
+                                               "regain health."));
                                      weightNotice->addActionListener(
                                              &weightListener);
                                  }
@@ -214,37 +215,37 @@ void PlayerHandler::handleMessage(MessageIn *msg)
                 {
                     static char const *const deadMsg[] =
                     {
-                        "You are dead.",
-                        "We regret to inform you that your character was killed in battle.",
-                        "You are not that alive anymore.",
-                        "The cold hands of the grim reaper are grabbing for your soul.",
-                        "Game Over!",
-                        "Insert coin to continue",
-                        "No, kids. Your character did not really die. It... err... went to a better place.",
-                        "Your plan of breaking your enemies weapon by bashing it with your throat failed.",
-                        "I guess this did not run too well.",
-                        "Do you want your possessions identified?", // Nethack reference
-                        "Sadly, no trace of you was ever found...", // Secret of Mana reference
-                        "Annihilated.", // Final Fantasy VI reference
-                        "Looks like you got your head handed to you.", //Earthbound reference
-                        "You screwed up again, dump your body down the tubes and get you another one.", // Leisure Suit Larry 1 Reference
-                        "You're not dead yet. You're just resting.", // Monty Python reference from a couple of skits
-                        "You are no more.",  // Monty Python reference from the dead parrot sketch starting now
-                        "You have ceased to be.",
-                        "You've expired and gone to meet your maker.",
-                        "You're a stiff.",
-                        "Bereft of life, you rest in peace.",
-                        "If you weren't so animated, you'd be pushing up the daisies.",
-                        "Your metabolic processes are now history.",
-                        "You're off the twig.",
-                        "You've kicked the bucket.",
-                        "You've shuffled off your mortal coil, run down the curtain and joined the bleedin' choir invisibile.",
-                        "You are an ex-player.",
-                        "You're pining for the fjords." // Monty Python reference from the dead parrot sketch
+                        _("You are dead."),
+                        _("We regret to inform you that your character was killed in battle."),
+                        _("You are not that alive anymore."),
+                        _("The cold hands of the grim reaper are grabbing for your soul."),
+                        _("Game Over!"),
+                        _("Insert coin to continue"),
+                        _("No, kids. Your character did not really die. It... err... went to a better place."),
+                        _("Your plan of breaking your enemies weapon by bashing it with your throat failed."),
+                        _("I guess this did not run too well."),
+                        _("Do you want your possessions identified?"), // Nethack reference
+                        _("Sadly, no trace of you was ever found..."), // Secret of Mana reference
+                        _("Annihilated."), // Final Fantasy VI reference
+                        _("Looks like you got your head handed to you."), //Earthbound reference
+                        _("You screwed up again, dump your body down the tubes and get you another one."), // Leisure Suit Larry 1 Reference
+                        _("You're not dead yet. You're just resting."), // Monty Python reference from a couple of skits
+                        _("You are no more."),  // Monty Python reference from the dead parrot sketch starting now
+                        _("You have ceased to be."),
+                        _("You've expired and gone to meet your maker."),
+                        _("You're a stiff."),
+                        _("Bereft of life, you rest in peace."),
+                        _("If you weren't so animated, you'd be pushing up the daisies."),
+                        _("Your metabolic processes are now history."),
+                        _("You're off the twig."),
+                        _("You've kicked the bucket."),
+                        _("You've shuffled off your mortal coil, run down the curtain and joined the bleedin' choir invisibile."),
+                        _("You are an ex-player."),
+                        _("You're pining for the fjords.") // Monty Python reference from the dead parrot sketch
                     };
                     std::string message(deadMsg[rand()%27]);
 
-                    deathNotice = new OkDialog("Message", message);
+                    deathNotice = new OkDialog(_("Message"), message);
                     deathNotice->addActionListener(&deathListener);
                     player_node->setAction(Being::DEAD);
                 }
@@ -386,11 +387,11 @@ void PlayerHandler::handleMessage(MessageIn *msg)
 
                 switch (type) {
                     case 0:
-                        chatWindow->chatLog("Equip arrows first",
+                        chatWindow->chatLog(_("Equip arrows first"),
                                              BY_SERVER);
                         break;
                     default:
-                        logger->log("0x013b: Unhandled message %i", type);
+                        logger->log(_("0x013b: Unhandled message %i"), type);
                         break;
                 }
             }
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index bca2b030..027b9e16 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -30,6 +30,7 @@
 #include "../log.h"
 
 #include "../utils/dtor.h"
+#include "../utils/gettext.h"
 #include "../utils/xml.h"
 
 namespace
@@ -93,9 +94,9 @@ void ItemDB::load()
 
         if (id)
         {
-            ItemInfo *itemInfo = new ItemInfo();
+            ItemInfo *itemInfo = new ItemInfo;
             itemInfo->setImageName(image);
-            itemInfo->setName((name == "") ? "Unnamed" : name);
+            itemInfo->setName(name.empty() ? _("Unnamed") : name);
             itemInfo->setDescription(description);
             itemInfo->setEffect(effect);
             itemInfo->setType(type);
diff --git a/src/utils/gettext.h b/src/utils/gettext.h
new file mode 100644
index 00000000..0cd9114b
--- /dev/null
+++ b/src/utils/gettext.h
@@ -0,0 +1,44 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _TMW_UTILS_GETTEXT_H
+#define _TMW_UTILS_GETTEXT_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#if ENABLE_NLS
+
+#include <libintl.h>
+
+#define _(s) ((char const *)gettext(s))
+#define N_(s) ((char const *)s)
+
+#else
+
+#define gettext(s) ((char const *)s)
+#define _(s) ((char const *)s)
+#define N_(s) ((char const *)s)
+
+#endif
+
+#endif
-- 
cgit v1.2.3-70-g09d2


From 3e40c30cdd3a7b3942131fc8b72b268aa0e98f77 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 6 Jan 2009 15:56:49 +0100
Subject: Added latest translations from Launchpad

The ones on Launchpad are still geared towards the mainline client.
These files have been updated for the eAthena client.

It will be interesting to see what happens to special characters, since
the client doesn't support unicode yet.
---
 po/LINGUAS  |  24 +++
 po/ar.po    | 582 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/ca.po    | 490 ++++++++++++++++++++++++++++++++++++++++++++++++
 po/cs.po    | 549 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/da.po    | 606 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/de.po    | 608 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/en_GB.po | 582 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/eo.po    | 487 ++++++++++++++++++++++++++++++++++++++++++++++++
 po/es.po    | 582 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/fi.po    | 592 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/fr.po    | 609 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/he.po    | 592 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/hr.po    | 543 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/id.po    | 579 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/it.po    | 584 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/ja.po    | 528 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/nl.po    | 552 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/pl.po    | 588 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/pt.po    | 586 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/pt_BR.po | 606 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/ru.po    | 582 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/sk.po    | 509 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/sv.po    | 582 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/th.po    | 515 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/zh_CN.po | 582 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 25 files changed, 13639 insertions(+)
 create mode 100644 po/ar.po
 create mode 100644 po/ca.po
 create mode 100644 po/cs.po
 create mode 100644 po/da.po
 create mode 100644 po/de.po
 create mode 100644 po/en_GB.po
 create mode 100644 po/eo.po
 create mode 100644 po/es.po
 create mode 100644 po/fi.po
 create mode 100644 po/fr.po
 create mode 100644 po/he.po
 create mode 100644 po/hr.po
 create mode 100644 po/id.po
 create mode 100644 po/it.po
 create mode 100644 po/ja.po
 create mode 100644 po/nl.po
 create mode 100644 po/pl.po
 create mode 100644 po/pt.po
 create mode 100644 po/pt_BR.po
 create mode 100644 po/ru.po
 create mode 100644 po/sk.po
 create mode 100644 po/sv.po
 create mode 100644 po/th.po
 create mode 100644 po/zh_CN.po

diff --git a/po/LINGUAS b/po/LINGUAS
index 8bba9bc2..4959c0de 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1 +1,25 @@
 # Set of available languages.
+ar
+ca
+cs
+da
+de
+en_GB
+eo
+es
+fi
+fr
+he
+hr
+id
+it
+ja
+nl
+pl
+pt
+pt_BR
+ru
+sk
+sv
+th
+zh_CN
diff --git a/po/ar.po b/po/ar.po
new file mode 100644
index 00000000..f8cead32
--- /dev/null
+++ b/po/ar.po
@@ -0,0 +1,582 @@
+# Arabic translation for tmw
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the tmw package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tmw\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-07-16 18:28+0000\n"
+"Last-Translator: صقر بن عبدالله <Unknown>\n"
+"Language-Team: Arabic <ar@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "شراء"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "السعر: %d GP / الإجمالي: %d GP"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "مغادرة"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "الوصف: %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "التأثير: %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr ""
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
+
+#: src/gui/char_select.cpp:79
+msgid "Select Character"
+msgstr "إنتقاء الشخصيّة"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "موافق"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "إلغاء"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "جديد"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "حذف"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "السّابق"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "التّالي"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "الاسم: %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "المستوى: %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "المستوى: %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "النقود: %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "إنشاء شخصيّة"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "الاسم:"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "لون الشعر:"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "قصّة الشعر:"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "إنشاء"
+
+#: src/gui/char_server.cpp:52
+#, fuzzy
+msgid "Select Server"
+msgstr "إنتقاء الشخصيّة"
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "نعم"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "لا"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "جارِ الاتّصال..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr "العتاد"
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr "الجردة"
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "استخدام"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "إسقاط"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr "تجريد من العتاد"
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr "استعمال العتاد"
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr "انتقاء كمّيّة من المواد لإسقاطها."
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "ولوج"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "كلمة السرّ:"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "الخادوم:"
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr ""
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "تسجيل"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "الحالة"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr "مهارات"
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr "اختصار"
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "تثبيت"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr "خارطة صغيرة"
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr "NPC"
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr "@@تجارة|متاجرة مع %s@@"
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr "@@مهاجمة|هاجم %s@@"
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr "@@محادثة|تحدّث مع NPC@@"
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr "@@إلغاء|إلغاء@@"
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr "@@اقتطاف|اقتطاف %s@@"
+
+#: src/gui/popupmenu.cpp:283
+#, fuzzy
+msgid "@@use|Unequip@@"
+msgstr "@@استخدام|استخدام العتاد@@"
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr "@@استخدام|استخدام العتاد@@"
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr "@@استخدم|استخدم@@"
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr "@@إسقاط|إسقاط@@"
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr "@@الوصف|الوصف@@"
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr "تأكيد:"
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr ""
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr ""
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "يجب أن يكون طول اسم المستخدم على الأقل %d محارف."
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "يجب أن يكون طول اسم المستخدم أقل من %d محارف."
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "يجب أن تكون طول كلمة السرّ على الأقل %d محارف."
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محارف."
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "كلمات السرّ غير متطابقة."
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "خطأ"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr "بيع"
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr "صوت"
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr "حجم صوت المؤثرّات"
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr "حجم صوت الموسيقا"
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr "تطبيق"
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr "تصفير النوافذ"
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr "مرئية"
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr "سمعيّ"
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr "عصا الألعاب"
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr "إضغط على الزرّ لبدأ المعايرة"
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr "معايرة"
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr "تفعيل عصا الألعاب"
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr "إيقاف"
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr "تدوير العصا"
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr "ملء الشاشة"
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr "مؤشّر مخصّص"
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr "حدّ FPS:"
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr "عتمة واجهة المستخدم"
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr "نصف قطر اللفّ"
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr "كسل اللفّ"
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr "مؤثّرات محيطة"
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr "واقف"
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr "منخفض"
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr "مرتفع"
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr "جارِ ملء الشاشة"
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr "تغيير OpenGL"
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr "إضافة"
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr "أنت تحصل على %d GP."
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr "أنت تقدّم:"
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Unregister"
+#~ msgstr "إلغاء التسجيل"
+
+#~ msgid "Strength:"
+#~ msgstr "القوّة:"
+
+#~ msgid "Agility:"
+#~ msgstr "خفّة الحركة:"
+
+#~ msgid "Dexterity:"
+#~ msgstr "المهارة:"
+
+#~ msgid "Vitality:"
+#~ msgstr "نشاط:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "ذكاء:"
+
+#~ msgid "Willpower:"
+#~ msgstr "قوّة الذات:"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "رجاء أن توزّع %d نقطة"
+
+#~ msgid "Your name needs to be at least 4 characters."
+#~ msgstr "يجب أن يكون طول اسمك على الأقل 4 محارف."
+
+#~ msgid "Character stats OK"
+#~ msgstr "إحصائيات الشخصيّة جيّدة"
+
+#~ msgid "Please remove %d points"
+#~ msgstr "رجاء حذف %d نقطة"
+
+#~ msgid "Split"
+#~ msgstr "قسم"
+
+#~ msgid "Select amount of items to split."
+#~ msgstr "انتقاء كمّيّة من المواد لقسمها."
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@قسم|قسم@@"
+
+#~ msgid "Switch server"
+#~ msgstr "تبديل الخادوم"
+
+#~ msgid "Switch character"
+#~ msgstr "تبديل الشخصيّة"
+
+#~ msgid "Email:"
+#~ msgstr "البريد الإلكترونيّ:"
+
+#~ msgid "Choose your Mana World Server"
+#~ msgstr "اختار خادومك لـMana World"
+
+#~ msgid "Port:"
+#~ msgstr "المنفذ:"
+
+#~ msgid "Please type both the address and the port of a server."
+#~ msgstr "رجاء طباعة عنوان ومنفذ الخادوم."
+
+#~ msgid "Propose trade"
+#~ msgstr "اقتراح متاجرة"
+
+#~ msgid "Confirm trade"
+#~ msgstr "تأكيد متاجرة"
+
+#~ msgid "Change"
+#~ msgstr "تغيير"
+
+#~ msgid "Attack %+d"
+#~ msgstr "مهاجمة %+d"
+
+#~ msgid "Defense %+d"
+#~ msgstr "دفاع %+d"
+
+#~ msgid "HP %+d"
+#~ msgstr "HP %+d"
+
+#~ msgid "MP %+d"
+#~ msgstr "MP %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "تأكيد"
+
+#~ msgid "Charisma:"
+#~ msgstr "جاذبيّة:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "الوزن الإجماليّ: %d - وزن الحدّ الأقصى: %d"
+
+#~ msgid "Keep"
+#~ msgstr "ترك"
diff --git a/po/ca.po b/po/ca.po
new file mode 100644
index 00000000..97527d96
--- /dev/null
+++ b/po/ca.po
@@ -0,0 +1,490 @@
+# Catalan translation for tmw
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the tmw package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tmw\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-07-03 17:21+0000\n"
+"Last-Translator: Habari <thomas.becerril@gmail.com>\n"
+"Language-Team: Catalan <ca@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr ""
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "preu %d GP / total %d GP"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "sortir"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr ""
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr ""
+
+#: src/gui/char_select.cpp:79
+msgid "Select Character"
+msgstr ""
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "ok"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr ""
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr ""
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr ""
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr ""
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr ""
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, c-format
+msgid "Job Level: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr ""
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "nom"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr ""
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr ""
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr ""
+
+#: src/gui/char_server.cpp:52
+msgid "Select Server"
+msgstr ""
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "si"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "no"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr ""
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr ""
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr ""
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr ""
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr ""
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr ""
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr ""
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr ""
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr ""
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:283
+msgid "@@use|Unequip@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr ""
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr ""
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr ""
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr ""
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr ""
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr ""
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr ""
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr ""
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr ""
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr ""
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr ""
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr ""
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr ""
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr ""
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr ""
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr ""
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr ""
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr ""
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr ""
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr ""
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr ""
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr ""
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Change"
+#~ msgstr "canvi"
diff --git a/po/cs.po b/po/cs.po
new file mode 100644
index 00000000..67a31efc
--- /dev/null
+++ b/po/cs.po
@@ -0,0 +1,549 @@
+# Czech translation for tmw
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the tmw package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tmw\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-12-17 16:31+0000\n"
+"Last-Translator: Lubos <alvinx12@centrum.cz>\n"
+"Language-Team: Czech <cs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "Nákup"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr ""
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr ""
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "Popis: %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr "Potvrďte vymazání postavy"
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
+
+#: src/gui/char_select.cpp:79
+#, fuzzy
+msgid "Select Character"
+msgstr "Vytvořit postavu"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "Nová"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "Odstranit"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "Předchozí"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "Další"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "Jméno: %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "Úroveň: %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "Úroveň: %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "Peníze: %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "Vytvořit postavu"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "Jméno:"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "Barva vlasů:"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "Styl vlasů:"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "Vytvořit"
+
+#: src/gui/char_server.cpp:52
+#, fuzzy
+msgid "Select Server"
+msgstr "Server:"
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "Ano"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "Ne"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "Připojuji se..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr "Vybavení"
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr "Inventář"
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "Upustit"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr "Vybavit"
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr "Vyberte množství zboží, se kterým budete obchodovat."
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr "Vyberte množství zboží, které chcete upustit."
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr ""
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "Heslo:"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr "Zapamatovat uživatelské jméno"
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "Registrace"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "Stav"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr "Dovednosti"
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr "Zkratka"
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "Nastavení"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr "MiniMapa"
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:283
+msgid "@@use|Unequip@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr ""
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr ""
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr "Muž"
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr "Žena"
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "Uživatelské jméno musí být nejméně %d znaků dlouhé."
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "Uživatelské jméno musí být kratší než %d znaků."
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "Heslo musí být kratší než %d znaků."
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "Hesla se neshodují."
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "Chyba"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr "Prodej"
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr "Zvuk"
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr ""
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr ""
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr ""
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr ""
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr "Audio"
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr ""
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr "Klávesnice"
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr "Kalibrovat"
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr ""
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr ""
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr ""
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr ""
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr ""
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr ""
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr ""
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr ""
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr ""
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr ""
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr ""
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Account and Character Management"
+#~ msgstr "Správa účtu a postavy"
+
+#~ msgid "Unregister"
+#~ msgstr "Zrušit registraci"
+
+#~ msgid "Change Password"
+#~ msgstr "Změnit heslo"
+
+#~ msgid "Change Email Address"
+#~ msgstr "Změnit e-mail"
+
+#~ msgid "Account: %s"
+#~ msgstr "Účet: %s"
+
+#~ msgid "Strength:"
+#~ msgstr "Síla:"
+
+#~ msgid "Vitality:"
+#~ msgstr "Vitalita:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "Inteligence:"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "Rozdělte prosím %d bodů"
+
+#~ msgid "Please remove %d points"
+#~ msgstr "Odstraňte prosím %d bodů."
+
+#~ msgid "Split"
+#~ msgstr "Rozdělit"
+
+#~ msgid "Guilds"
+#~ msgstr "Gildy"
+
+#~ msgid "Switch character"
+#~ msgstr "Přepněte postavu"
+
+#~ msgid "Email:"
+#~ msgstr "E-mail:"
+
+#~ msgid "Port:"
+#~ msgstr "Port:"
+
+#~ msgid "Propose trade"
+#~ msgstr "Nabídnout obchod"
+
+#~ msgid "Confirm trade"
+#~ msgstr "Potvrdit obchod"
+
+#~ msgid "Change"
+#~ msgstr "Změnit"
+
+#~ msgid "Attack %+d"
+#~ msgstr "Útok %+d"
+
+#~ msgid "Defense %+d"
+#~ msgstr "Obrana %+d"
diff --git a/po/da.po b/po/da.po
new file mode 100644
index 00000000..ff2506c1
--- /dev/null
+++ b/po/da.po
@@ -0,0 +1,606 @@
+# Danish translation for tmw
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the tmw package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tmw\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-12-28 14:45+0000\n"
+"Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
+"Language-Team: Danish <da@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "Køb"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "Pris: %d GP / Total: %d GP"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "Afslut"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "Beskrivelse: %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "Effekt: %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr "Er du sikker på at du vil slette denne figur?"
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "Er du sikker på at du vil slette denne figur?"
+
+#: src/gui/char_select.cpp:79
+msgid "Select Character"
+msgstr "Vælg Bruger"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "O.k."
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "Fortryd"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "Opret"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "Slet"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "Forrige"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "Næste"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "Navn; %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "Niveau: %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "Niveau: %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "Penge: %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "Lav figur."
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "Navn:"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "Hårfarve:"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "Frisure:"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "Opret"
+
+#: src/gui/char_server.cpp:52
+#, fuzzy
+msgid "Select Server"
+msgstr "Vælg Bruger"
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "Ja"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "Nej"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "Opretter forbindelse..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr "Udstyr"
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr "Inventarliste"
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "Brug"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "Smid"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr "Tag af"
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr "Tag på"
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr "Vælge hvor mange du vil bytte."
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr "Vælg hvor mange du vil smide,"
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "Log Ind"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "Adgangskode:"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr "Husk dette brugernavn."
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "Registrer"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "Status"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr "Færdigheder"
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr "Genvej"
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "Opsætning"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr "MiniKort"
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr "NPC"
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr "@@trade|Byt Med %s@@"
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr "@@attack|Angrib %s@@"
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr "@@talk|Snak med NPC@@"
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr "@@cancel|Annuller@@"
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr "@@pickup|Saml Op %s@@"
+
+#: src/gui/popupmenu.cpp:283
+#, fuzzy
+msgid "@@use|Unequip@@"
+msgstr "@@use|Tag på@@"
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr "@@use|Tag på@@"
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr "@@use|Brug@@"
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr "@@drop|Smid@@"
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr "@@description|Beskrivelse@@"
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr "Bekræft:"
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr "Mand"
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr "Kvinde"
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "Brugernavnet skal mindst være %d bogstaver langt."
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "Brugernavnet skal være mindre end %d bogstaver langt."
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "Adgangskoden skal mindst være %d bogstaver langt."
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "Adgangskoder stemmer ikke overens."
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "Fejl"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr "Sælg"
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr "Lyd"
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr "Lydstyrke på effekter"
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr "Lydstyrke på musik"
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr "Anvend"
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr "Nulstil vinduer"
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr "Video"
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr "Lyd"
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr "Joystick"
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr "Tastatur"
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr "Tryk på knappen for at starte justeringen."
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr "Justering"
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr "Aktiver joystick"
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr "Stop"
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr "Roter joystick"
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr "Fuld Skærm"
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr "Brugerdefineret Musepil"
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr "FPS grænse:"
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr "Gennemsigtighed"
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr "Følsomhed på mus"
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr "Acceleration på mus"
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr "Omgivende FX"
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr "fra"
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr "lav"
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr "høj"
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr "Skifter til fuld skærm"
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr "Ændringerne kræver at du genstarter klienten."
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr "Skrifter til OpenGL"
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr "Tilføj"
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr "Du får %d GP."
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr "Du giver:"
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Account and Character Management"
+#~ msgstr "Ret konto og figurer"
+
+#~ msgid "Unregister"
+#~ msgstr "Frameld"
+
+#~ msgid "Change Password"
+#~ msgstr "Skift adgangskode"
+
+#~ msgid "Change Email Address"
+#~ msgstr "Skift e-mail adresse"
+
+#~ msgid "Account: %s"
+#~ msgstr "Bruger: %s"
+
+#~ msgid "Strength:"
+#~ msgstr "Styrke"
+
+#~ msgid "Agility:"
+#~ msgstr "Adræthed"
+
+#~ msgid "Dexterity:"
+#~ msgstr "Behændighed:"
+
+#~ msgid "Vitality:"
+#~ msgstr "Helbred:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "Intelligens:"
+
+#~ msgid "Willpower:"
+#~ msgstr "Viljestyrke:"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "Du mangler at fordele %d points"
+
+#~ msgid "Your name needs to be at least 4 characters."
+#~ msgstr "Dit navn skal være mindst 4 bogstaver langt."
+
+#~ msgid "Character stats OK"
+#~ msgstr "Du har brugt alle dine points"
+
+#~ msgid "Please remove %d points"
+#~ msgstr "Du skal fjerne %d points"
+
+#~ msgid "Split"
+#~ msgstr "Opdel"
+
+#~ msgid "Select amount of items to split."
+#~ msgstr "Vælg hvor mange du vil opdele."
+
+#~ msgid "Guilds"
+#~ msgstr "Gilder"
+
+#~ msgid "@@guild|Invite %s@@"
+#~ msgstr "@@guild|Inviter %s@@"
+
+#~ msgid "@@party|Invite %s to join your party@@"
+#~ msgstr "@@party|Inviter %s med i dit party@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Opdel@@"
+
+#~ msgid "Switch server"
+#~ msgstr "Skift server"
+
+#~ msgid "Switch character"
+#~ msgstr "Skift figur"
+
+#~ msgid "Email:"
+#~ msgstr "E-mail:"
+
+#~ msgid "Choose your Mana World Server"
+#~ msgstr "Vælg din Mana World Server"
+
+#~ msgid "Port:"
+#~ msgstr "Port:"
+
+#~ msgid "Please type both the address and the port of a server."
+#~ msgstr "Skriv både adressen og porten på serveren."
+
+#~ msgid "Visible names"
+#~ msgstr "Vis navne"
+
+#~ msgid "Propose trade"
+#~ msgstr "Foreslå handel"
+
+#~ msgid "Confirm trade"
+#~ msgstr "Bekræft handel"
+
+#~ msgid "Change"
+#~ msgstr "Ændre"
+
+#~ msgid "Attack %+d"
+#~ msgstr "Angrib %+d"
+
+#~ msgid "Defense %+d"
+#~ msgstr "Forsvar %+d"
+
+#~ msgid "HP %+d"
+#~ msgstr "HP %+d"
+
+#~ msgid "MP %+d"
+#~ msgstr "MP %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Bekræft"
+
+#~ msgid "Charisma:"
+#~ msgstr "Udstråling"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Total Vægt: %d - Maximum Vægt: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Behold"
diff --git a/po/de.po b/po/de.po
new file mode 100644
index 00000000..578ae8b8
--- /dev/null
+++ b/po/de.po
@@ -0,0 +1,608 @@
+# German translation of The Mana World.
+# Copyright (C) 2007 The Mana World Development Team
+# This file is distributed under the same license as the The Mana World package.
+# Matthias Hartmann <hartmann.matthias@gmail.com>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: The Mana World 0.1.0\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-10-13 00:25+0000\n"
+"Last-Translator: Aeneas Jaißle <Unknown>\n"
+"Language-Team: German\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "Kaufen"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "Preis: %d GP / Summe: %d GP"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "Beenden"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "Beschreibung: %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "Effekt: %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr "Bestätige Charakter-Löschung"
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
+
+#: src/gui/char_select.cpp:79
+msgid "Select Character"
+msgstr "Spielfigur auswählen"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "Neu"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "Löschen"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "Zurück"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "Weiter"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "Name : %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "Stufe: %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "Stufe: %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "Geld: %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "Charakter erstellen"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "Name :"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "Haarfarbe"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "Frisur"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "Erstellen"
+
+#: src/gui/char_server.cpp:52
+#, fuzzy
+msgid "Select Server"
+msgstr "Spielfigur auswählen"
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "Ja"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "Nein"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "Verbinde..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr "Ausrüstung"
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr "Inventar"
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "Benutzen"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "Wegwerfen"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr "Ablegen"
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr "Ausrüsten"
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr "Wähle aus, wieviele Gegenstände Du tauschen möchtest."
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr "Wähle aus, wieviele Gegenstände Du wegwerfen möchtest."
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "Anmelden"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "Passwort:"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr "Benutzernamen merken"
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "Registrieren"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "Status"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr "Fertigkeiten"
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr "Tastenkürzel"
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "Einstellungen"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr "Übersichtskarte"
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr "NPC"
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr "@@trade|Mit %s handeln@@"
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr "@@attack|%s angreifen@@"
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr "@@talk|Mit NSC reden@@"
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr "@@cancel|Abbrechen@@"
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr "@@pickup|%s aufheben@@"
+
+#: src/gui/popupmenu.cpp:283
+#, fuzzy
+msgid "@@use|Unequip@@"
+msgstr "@@use|Ausrüsten@@"
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr "@@use|Ausrüsten@@"
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr "@@use|Nutzen@@"
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr "@@drop|Fallen lassen@@"
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr "@@description|Beschreibung@@"
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr "Bestätigen:"
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr "Männlich"
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr "Weiblich"
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "Der Nutzername muss aus mindestens %d Zeichen bestehen."
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "Der Nutzername muss kürzer als %d Zeichen sein."
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "Das Passwort muss aus mindestens %d bestehen."
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "Das Passwort muss kürzer als %d Zeichen sein."
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "Passwörter stimmen nicht überein."
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "Fehler"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr "Verkaufen"
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr "Ton"
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr "Lautstärke der Klangeffekte"
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr "Latustärke der Musik"
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr "Anwenden"
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr "Fenster zurücksetzen"
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr "Video"
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr "Audio"
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr "Joystick"
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr "Tastatur"
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr "Knopf drücken um die Kalibrierung zu starten"
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr "Kalibrieren"
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr "Joystick aktivieren"
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr "Stopp"
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr "Kreise den Steuerknüppel"
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr "Vollbild"
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr "Benutzerdefinierten Zeiger"
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr "FPS-Limit:"
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr "GUI Transparenz"
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr "Scroll-Radius"
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr "Scroll-Trägheit"
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr "Hintergrundeffekte"
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr "Aus"
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr "Niedrig"
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr "Hoch"
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr "Wechsle zum Vollbildmodus"
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr "Ändere OpenGL"
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr ""
+"Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
+"übernommen."
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr "Du erhälst %d GP."
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr "Du gibst:"
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Account and Character Management"
+#~ msgstr "Account- und Charakterverwaltung"
+
+#~ msgid "Unregister"
+#~ msgstr "Abmelden"
+
+#~ msgid "Change Password"
+#~ msgstr "Kennwort ändern"
+
+#~ msgid "Change Email Address"
+#~ msgstr "Email-Adresse ändern"
+
+#~ msgid "Account: %s"
+#~ msgstr "Account: %s"
+
+#~ msgid "Strength:"
+#~ msgstr "Stärke:"
+
+#~ msgid "Agility:"
+#~ msgstr "Agilität:"
+
+#~ msgid "Dexterity:"
+#~ msgstr "Geschicklichkeit:"
+
+#~ msgid "Vitality:"
+#~ msgstr "Vitalität:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "Intelligenz:"
+
+#~ msgid "Willpower:"
+#~ msgstr "Willenskraft:"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "Bitte verteile %d Punkte"
+
+#~ msgid "Your name needs to be at least 4 characters."
+#~ msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
+
+#~ msgid "Character stats OK"
+#~ msgstr "Spielfigurattribute OK"
+
+#~ msgid "Please remove %d points"
+#~ msgstr "Bitte entferne %d Punkte"
+
+#~ msgid "Split"
+#~ msgstr "Aufteilen"
+
+#~ msgid "Select amount of items to split."
+#~ msgstr "Wähle aus, wieviel Gegenstände Du aufteilen möchtest."
+
+#~ msgid "Guilds"
+#~ msgstr "Gilden"
+
+#~ msgid "@@guild|Invite %s@@"
+#~ msgstr "@@guild|%s einladen@@"
+
+#~ msgid "@@party|Invite %s to join your party@@"
+#~ msgstr "@@party|%s in deine Gruppe einladen@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Aufteilen@@"
+
+#~ msgid "Switch server"
+#~ msgstr "Server wechseln"
+
+#~ msgid "Switch character"
+#~ msgstr "Spielfigur wechseln"
+
+#~ msgid "Email:"
+#~ msgstr "E-Mail:"
+
+#~ msgid "Choose your Mana World Server"
+#~ msgstr "Wähle Deinen Mana World Spielserver"
+
+#~ msgid "Port:"
+#~ msgstr "Port:"
+
+#~ msgid "Please type both the address and the port of a server."
+#~ msgstr "Bitte die Adresse und den Port eines Servers eingeben"
+
+#~ msgid "Visible names"
+#~ msgstr "Sichtbare Namen"
+
+#~ msgid "Propose trade"
+#~ msgstr "Handel vorschlagen"
+
+#~ msgid "Confirm trade"
+#~ msgstr "Handel bestätigen"
+
+#~ msgid "Change"
+#~ msgstr "Ändern"
+
+#~ msgid "Attack %+d"
+#~ msgstr "Angriff %+d"
+
+#~ msgid "Defense %+d"
+#~ msgstr "Verteidigung %+d"
+
+#~ msgid "HP %+d"
+#~ msgstr "HP %+d"
+
+#~ msgid "MP %+d"
+#~ msgstr "MP %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Bestätigen"
+
+#~ msgid "Charisma:"
+#~ msgstr "Charisma:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Gesamtgewicht : %d - Maximales Gewicht : %d"
+
+#~ msgid "Keep"
+#~ msgstr "Erinnern"
diff --git a/po/en_GB.po b/po/en_GB.po
new file mode 100644
index 00000000..c17c3ad7
--- /dev/null
+++ b/po/en_GB.po
@@ -0,0 +1,582 @@
+# English (United Kingdom) translation for tmw
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the tmw package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tmw\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-05-10 16:51+0000\n"
+"Last-Translator: Me <Glich.Glich@googlemail.com>\n"
+"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "Buy"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "Price: %d GP / Total: %d GP"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "Exit"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "Description: %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "Effect: %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr ""
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "Are you sure you want to delete this character?"
+
+#: src/gui/char_select.cpp:79
+msgid "Select Character"
+msgstr "Select Character"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "Cancel"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "New"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "Delete"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "Previous"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "Next"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "Name: %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "Level: %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "Level: %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "Money: %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "Create Character"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "Name:"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "Hair Colour:"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "Hair Style:"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "Create"
+
+#: src/gui/char_server.cpp:52
+#, fuzzy
+msgid "Select Server"
+msgstr "Select Character"
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "Yes"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "No"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "Connecting..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr "Equipment"
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr "Inventory"
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "Use"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "Drop"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr "Unequip"
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr "Equip"
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr "Select amount of items to trade."
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr "Select amount of items to drop."
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "Login"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "Password:"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr ""
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "Register"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "Status"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr "Skills"
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr "Shortcut"
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "Setup"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr "MiniMap"
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr "NPC"
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr "@@trade|Trade With %s@@"
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr "@@attack|Attack %s@@"
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr "@@talk|Talk To NPC@@"
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr "@@cancel|Cancel@@"
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr "@@pickup|Pick Up %s@@"
+
+#: src/gui/popupmenu.cpp:283
+#, fuzzy
+msgid "@@use|Unequip@@"
+msgstr "@@use|Equip@@"
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr "@@use|Equip@@"
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr "@@use|Use@@"
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr "@@drop|Drop@@"
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr "@@description|Description@@"
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr "Confirm:"
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr ""
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr ""
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "The username needs to be at least %d characters long."
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "The username needs to be less than %d characters long."
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "The password needs to be at least %d characters long."
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "The password needs to be less than %d characters long."
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "Passwords do not match."
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "Error"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr "Sell"
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr "Sound"
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr "Sfx volume"
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr "Music volume"
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr "Apply"
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr "Reset Windows"
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr "Video"
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr "Audio"
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr "Joystick"
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr "Press the button to start calibration"
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr "Calibrate"
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr "Enable joystick"
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr "Stop"
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr "Rotate the stick"
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr "Full screen"
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr "Custom cursor"
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr "FPS Limit:"
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr "Gui opacity"
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr "Scroll radius"
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr "Scroll laziness"
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr "Ambient FX"
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr "off"
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr "low"
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr "high"
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr "Switching to full screen"
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr "Restart needed for changes to take effect."
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr "Changing OpenGL"
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr "Applying change to OpenGL requires restart."
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr "Add"
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr "You get %d GP."
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr "You give:"
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Unregister"
+#~ msgstr "Unregister"
+
+#~ msgid "Strength:"
+#~ msgstr "Strength:"
+
+#~ msgid "Agility:"
+#~ msgstr "Agility:"
+
+#~ msgid "Dexterity:"
+#~ msgstr "Dexterity:"
+
+#~ msgid "Vitality:"
+#~ msgstr "Vitality:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "Intelligence:"
+
+#~ msgid "Willpower:"
+#~ msgstr "Willpower:"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "Please distribute %d points"
+
+#~ msgid "Your name needs to be at least 4 characters."
+#~ msgstr "Your name needs to be at least 4 characters."
+
+#~ msgid "Character stats OK"
+#~ msgstr "Character stats OK"
+
+#~ msgid "Please remove %d points"
+#~ msgstr "Please remove %d points"
+
+#~ msgid "Split"
+#~ msgstr "Split"
+
+#~ msgid "Select amount of items to split."
+#~ msgstr "Select amount of items to split."
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Split@@"
+
+#~ msgid "Switch server"
+#~ msgstr "Switch server"
+
+#~ msgid "Switch character"
+#~ msgstr "Switch character"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Choose your Mana World Server"
+#~ msgstr "Choose your Mana World Server"
+
+#~ msgid "Port:"
+#~ msgstr "Port:"
+
+#~ msgid "Please type both the address and the port of a server."
+#~ msgstr "Please type both the address and the port of a server."
+
+#~ msgid "Propose trade"
+#~ msgstr "Propose trade"
+
+#~ msgid "Confirm trade"
+#~ msgstr "Confirm trade"
+
+#~ msgid "Change"
+#~ msgstr "Change"
+
+#~ msgid "Attack %+d"
+#~ msgstr "Attack %+d"
+
+#~ msgid "Defense %+d"
+#~ msgstr "Defense %+d"
+
+#~ msgid "HP %+d"
+#~ msgstr "HP %+d"
+
+#~ msgid "MP %+d"
+#~ msgstr "MP %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Confirm"
+
+#~ msgid "Charisma:"
+#~ msgstr "Charisma:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Total Weight: %d - Maximum Weight: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Keep"
diff --git a/po/eo.po b/po/eo.po
new file mode 100644
index 00000000..ad4bcdca
--- /dev/null
+++ b/po/eo.po
@@ -0,0 +1,487 @@
+# Esperanto translation for tmw
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the tmw package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tmw\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-11-10 22:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Esperanto <eo@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr ""
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr ""
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr ""
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr ""
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr ""
+
+#: src/gui/char_select.cpp:79
+msgid "Select Character"
+msgstr ""
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr ""
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr ""
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr ""
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr ""
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr ""
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr ""
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, c-format
+msgid "Job Level: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr ""
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr ""
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr ""
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr ""
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr ""
+
+#: src/gui/char_server.cpp:52
+msgid "Select Server"
+msgstr ""
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr ""
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr ""
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr ""
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr ""
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr ""
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr ""
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr ""
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr ""
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr ""
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr ""
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:283
+msgid "@@use|Unequip@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr ""
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr ""
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr ""
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr ""
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr ""
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr ""
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr ""
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr ""
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr ""
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr ""
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr ""
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr ""
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr ""
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr ""
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr ""
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr ""
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr ""
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr ""
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr ""
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr ""
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr ""
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr ""
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
diff --git a/po/es.po b/po/es.po
new file mode 100644
index 00000000..e544ff86
--- /dev/null
+++ b/po/es.po
@@ -0,0 +1,582 @@
+# Spanish translation for tmw
+# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
+# This file is distributed under the same license as the tmw package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tmw\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-10-15 01:37+0000\n"
+"Last-Translator: catalania <Unknown>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "Comprar"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "Precio: %d GP / Total: %d GP"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "Salir"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "Descripción: %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "Efecto: %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr ""
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "¿Seguro que quieres borrar este personaje?"
+
+#: src/gui/char_select.cpp:79
+msgid "Select Character"
+msgstr "Seleccionar personaje"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Aceptar"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "Nuevo"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "Eliminar"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "Anterior"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "Siguiente"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "Nombre: %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "Nivel: %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "Nivel: %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "Dinero: %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "Crear Personaje"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "Nombre:"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "Color de pelo:"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "corte de pelo"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "Crear"
+
+#: src/gui/char_server.cpp:52
+#, fuzzy
+msgid "Select Server"
+msgstr "Seleccionar personaje"
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "Sí"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "No"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "Conectando…"
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr "Equipo"
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr "Inventario"
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "Usar"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "tirar"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr "quitarselo"
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr "Equipar"
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr "Seleccione objetos para comerciar."
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr "Seleccione objetos para soltar."
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "conectarse"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "Contraseña:"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Servidor:"
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr ""
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "Registrar"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "Estado"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr "Habilidades"
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr "Atajos"
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "Configuración"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr "Minimapa"
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr "NPC"
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr "@@trade|Comerciar con %s@@"
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr "@@attack|Atacar a %s@@"
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr "@@talk|Hablar al NPC@@"
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr "@@cancel|Cancelar@@"
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr "@@pickup|Recoger %s@@"
+
+#: src/gui/popupmenu.cpp:283
+#, fuzzy
+msgid "@@use|Unequip@@"
+msgstr "@@use|Equipar@@"
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr "@@use|Equipar@@"
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr "@@use|Usar@@"
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr "@@drop|Tirar@@"
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr "@@description|Descripción@@"
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr "Confirmar:"
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr ""
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr ""
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "El nombre de usuario debe tener al menos %d caracteres."
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "El nombre de usuario puede tener como máximo %d caracteres."
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "La contraseña debe tener al menos %d caracteres."
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "La contraseña puede tener como máximo %d caracteres."
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "Las contraseñas no coinciden."
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "Error"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr "Vender"
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr "Sonido"
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr "Volumen efectos"
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr "Volumen musica"
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr "Aplicar"
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr "Reiniciar ventanas"
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr "Vídeo"
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr "Audio"
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr "Joystick"
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr "Teclado"
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr "Presione el botón para comenzar la calibración"
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr "Calibrar"
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr "Activar joystick"
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr "Detener"
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr "Gire el stick"
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr "Pantalla completa"
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr "Cursor propio"
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr "Límite de FPS:"
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr "Transparencia menus"
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr "Ratio de scroll"
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr "Velocidad de scroll"
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr "Efectos ambientales"
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr "desactivado"
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr "bajo"
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr "alto"
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr "Cambiar a pantalla completa"
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr "Se necesita reiniciar para aplicar los cambios."
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr "Cambiar a OpenGL"
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr "Se necesita reiniciar para aplicar los cambios hechos a OpenGL."
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr "Añadir"
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr "Tu consigues %d GP."
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr "Tu das:"
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Unregister"
+#~ msgstr "Cancelar Cuenta"
+
+#~ msgid "Strength:"
+#~ msgstr "Fuerza:"
+
+#~ msgid "Agility:"
+#~ msgstr "Agilidad:"
+
+#~ msgid "Dexterity:"
+#~ msgstr "Destreza:"
+
+#~ msgid "Vitality:"
+#~ msgstr "Vitalidad:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "Inteligencia:"
+
+#~ msgid "Willpower:"
+#~ msgstr "Fuerza de voluntad:"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "Distribuya %d puntos"
+
+#~ msgid "Your name needs to be at least 4 characters."
+#~ msgstr "El nombre debe tener al menos 4 caracteres."
+
+#~ msgid "Character stats OK"
+#~ msgstr "Estatus personaje OK"
+
+#~ msgid "Please remove %d points"
+#~ msgstr "por favor quita %d puntos"
+
+#~ msgid "Split"
+#~ msgstr "Dividir"
+
+#~ msgid "Select amount of items to split."
+#~ msgstr "Seleccione objetos para dividir."
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Dividir@@"
+
+#~ msgid "Switch server"
+#~ msgstr "Cambiar servidor"
+
+#~ msgid "Switch character"
+#~ msgstr "Cambiar personaje"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Choose your Mana World Server"
+#~ msgstr "Elija su servidor de Mana World"
+
+#~ msgid "Port:"
+#~ msgstr "Puerto:"
+
+#~ msgid "Please type both the address and the port of a server."
+#~ msgstr "Escriba la dirección y el puerto de un servidor."
+
+#~ msgid "Propose trade"
+#~ msgstr "Proponer"
+
+#~ msgid "Confirm trade"
+#~ msgstr "Confirmar"
+
+#~ msgid "Change"
+#~ msgstr "Modificar"
+
+#~ msgid "Attack %+d"
+#~ msgstr "Ataque %+d"
+
+#~ msgid "Defense %+d"
+#~ msgstr "Defensa %+d"
+
+#~ msgid "HP %+d"
+#~ msgstr "HP %+d"
+
+#~ msgid "MP %+d"
+#~ msgstr "MP %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Confirmar"
+
+#~ msgid "Charisma:"
+#~ msgstr "Carisma:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Peso Total: %d - Peso Máximo: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Mantener"
diff --git a/po/fi.po b/po/fi.po
new file mode 100644
index 00000000..e4b01584
--- /dev/null
+++ b/po/fi.po
@@ -0,0 +1,592 @@
+# Finnish translation for tmw
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the tmw package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tmw\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-12-30 10:23+0000\n"
+"Last-Translator: ville-v <villev90@gmail.com>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "Osta"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "Kappalehinta: %d GP / Yhteensä: %d GP"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "Sulje"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "Kuvaus: %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "Vaikutus: %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr "Vahvista hahmon poistopyyntö"
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
+
+#: src/gui/char_select.cpp:79
+#, fuzzy
+msgid "Select Character"
+msgstr "Luo hahmo"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "Peru"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "Uusi"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "Poista"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "Edellinen"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "Seuraava"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "Nimi: %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "Taso: %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "Taso: %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "Rahatilanne: %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "Luo hahmo"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "Nimi:"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "Hiusten väri:"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "Hiustyyli:"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "Luo"
+
+#: src/gui/char_server.cpp:52
+#, fuzzy
+msgid "Select Server"
+msgstr "Vaihda palvelinta"
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "Kyllä"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "Ei"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "Yhdistetään..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr "Varusteet"
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr "Tavaraluettelo"
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "Käytä"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "Pudota"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr "Poista varuste käytöstä"
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr "Ota käyttöön"
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr "Anna vaihdettavien tavaroiden määrä."
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr "Anna pudotettavien tavaroiden määrä."
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "Kirjaudu sisään"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "Salasana:"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Palvelin:"
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr "Muista käyttäjätunnus"
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "Rekisteröidy"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "Hahmon tiedot"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr "Taidot"
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr "Pikavalinnat"
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "Asetukset"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr "Apukartta"
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr "Epäpelattava hahmo"
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr "@@trade|Vaihda tavaroita %s kanssa@@"
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr "@@attack|Hyökkää %s kimppuun@@"
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr "@@talk|Puhu epäpelattavalle hahmolle@@"
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr "@@cancel|Peruuta@@"
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr "@@pickup|Poimi %s@@"
+
+#: src/gui/popupmenu.cpp:283
+#, fuzzy
+msgid "@@use|Unequip@@"
+msgstr "@@use|Ota varuste käyttöön@@"
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr "@@use|Ota varuste käyttöön@@"
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr "@@use|Käytä@@"
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr "@@drop|Pudota maahan@@"
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr "@@description|Kuvaus@@"
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr "Vahvista:"
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr "Miespuolinen"
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr "Naispuolinen"
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "Käyttäjänimen tulee olla vähintään %d merkkiä pitkä"
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "Käyttäjänimen tulee olla alle %d merkkiä pitkä."
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "Salasanan tulee olla vähintään %d merkkiä pitkä"
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "Salasanat eivät täsmää."
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "Virhe"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr "Myy"
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr "Ääni"
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr "Äänitehosteiden voimakkuus"
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr "Musiikin voimakkuus"
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr "Käytä"
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr "Palauta ikkunoiden oletusasetukset"
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr "Kuva"
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr "Ääni"
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr "Peliohjain"
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr "Näppäimistö"
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr "Kalibroi"
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr "Peliohjaintuki päälle"
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr "Lopeta"
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr "Käytä ohjain ääriasennoissaan pyörittämällä"
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr "Kokoruututila"
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr "Tyylitelty hiiren osoitin"
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr "Piirtonopeusrajoitin (kuvaa / sekunti)"
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr "Käyttöliittymän läpinäkyvyys"
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr "Kameran perässälaahaus"
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr "Kameran perässälaahauksen tiukkuus"
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr "Taustaäänet"
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr "pois päältä"
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr "matala"
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr "korkea"
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr "Kokoruututilaan siirtyminen"
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr "Vaihdetaan OpenGL -toimintatilaan"
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr "OpenGL -asetusten muutokset vaativat ohjelman uudelleenkäynnistyksen"
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr "Lisää"
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr "Sait %d GP"
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr "Annat:"
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Account and Character Management"
+#~ msgstr "Tilin ja hahmojen hallinta"
+
+#~ msgid "Unregister"
+#~ msgstr "Poista palvelimelta"
+
+#~ msgid "Change Password"
+#~ msgstr "Vaihda salasana"
+
+#~ msgid "Change Email Address"
+#~ msgstr "Vaihda sähköpostiosoite"
+
+#~ msgid "Account: %s"
+#~ msgstr "Tili: %s"
+
+#~ msgid "Strength:"
+#~ msgstr "Voima:"
+
+#~ msgid "Agility:"
+#~ msgstr "Ketteryys:"
+
+#~ msgid "Dexterity:"
+#~ msgstr "Näppäryys:"
+
+#~ msgid "Vitality:"
+#~ msgstr "Elinvoima:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "Älykkyys:"
+
+#~ msgid "Willpower:"
+#~ msgstr "Tahdonvoima:"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "Jaa %d pistettä"
+
+#~ msgid "Your name needs to be at least 4 characters."
+#~ msgstr "Nimessäsi täytyy olla ainakin 4 merkkiä."
+
+#~ msgid "Character stats OK"
+#~ msgstr "Hahmon pistejako OK"
+
+#~ msgid "Please remove %d points"
+#~ msgstr "%d pistettä liikaa"
+
+#~ msgid "Split"
+#~ msgstr "Jaa"
+
+#~ msgid "Select amount of items to split."
+#~ msgstr "Anna eri pinoon jaettavien tavaroiden määrä."
+
+#~ msgid "Guilds"
+#~ msgstr "Kiltatoiminta"
+
+#~ msgid "@@guild|Invite %s@@"
+#~ msgstr "@@guild|Kutsu %s mukaan kiltaan@@"
+
+#~ msgid "@@party|Invite %s to join your party@@"
+#~ msgstr "@@party|Kutsu %s mukaan ryhmääsi@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Pinon jako@@"
+
+#~ msgid "Switch character"
+#~ msgstr "Vaihda hahmoa"
+
+#~ msgid "Email:"
+#~ msgstr "Sähköpostiosoite:"
+
+#~ msgid "Choose your Mana World Server"
+#~ msgstr "Valitse Mana World -palvelimesi"
+
+#~ msgid "Port:"
+#~ msgstr "Portti:"
+
+#~ msgid "Please type both the address and the port of a server."
+#~ msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti"
+
+#~ msgid "Visible names"
+#~ msgstr "Näytä nimet"
+
+#~ msgid "Propose trade"
+#~ msgstr "Ehdota vaihtokauppaa"
+
+#~ msgid "Confirm trade"
+#~ msgstr "Suostu vaihtokauppaan"
+
+#~ msgid "Change"
+#~ msgstr "Muuta"
+
+#~ msgid "Attack %+d"
+#~ msgstr "Hyökkäys %+d"
+
+#~ msgid "Defense %+d"
+#~ msgstr "Puolustus %+d"
+
+#~ msgid "HP %+d"
+#~ msgstr "Iskupisteet %+d"
+
+#~ msgid "MP %+d"
+#~ msgstr "Taikapisteet %+d"
diff --git a/po/fr.po b/po/fr.po
new file mode 100644
index 00000000..ed1340d3
--- /dev/null
+++ b/po/fr.po
@@ -0,0 +1,609 @@
+# French translation of The Mana World.
+# Copyright (C) 2007 The Mana World Development Team
+# This file is distributed under the same license as the The Mana World package.
+# Guillaume Melquiond <guillaume.melquiond@gmail.com>, 2007.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: The Mana World 0.1.0\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-12-26 10:43+0000\n"
+"Last-Translator: Johan Serre <Unknown>\n"
+"Language-Team: French\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "Acheter"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "Prix : %d PO / Total : %d PO"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "Quitter"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "Description : %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "Effet : %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr "Confirmer la suppression du personnage"
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
+
+#: src/gui/char_select.cpp:79
+msgid "Select Character"
+msgstr "Choix du personnage"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "Annuler"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "Nouveau"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "Supprimer"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "Précédent"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "Suivant"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "Nom : %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "Niveau : %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "Niveau : %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "Argent : %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "Création du personnage"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "Nom :"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "Couleur des cheveux"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "Coiffure :"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "Créer"
+
+#: src/gui/char_server.cpp:52
+#, fuzzy
+msgid "Select Server"
+msgstr "Choix du personnage"
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "Oui"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "Non"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "Connexion..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr "Équipement"
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr "Inventaire"
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "Utiliser"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "Lâcher"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr "Retirer"
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr "Équiper"
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr "Choisissez le nombre d'objets à troquer."
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr "Choisissez le nombre d'objets à lâcher."
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "Connexion"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "Mot de passe :"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Serveur :"
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr "Se souvenir du nom d'utilisateur"
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "S'inscrire"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "Statut"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr "Compétences"
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr "Raccourci"
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "Configuration"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr "Plan"
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr "PNJ"
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr "@@trade|Troquer avec %s@@"
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr "@@attack|Attaquer %s@@"
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr "@@talk|Parler au PNJ@@"
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr "@@cancel|Annuler@@"
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr "@@pickup|Ramasser %s@@"
+
+#: src/gui/popupmenu.cpp:283
+#, fuzzy
+msgid "@@use|Unequip@@"
+msgstr "@@use|Équiper@@"
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr "@@use|Équiper@@"
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr "@@use|Utiliser@@"
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr "@@drop|Lâcher@@"
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr "@@description|Description@@"
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr "Vérification :"
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr "Masculin"
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr "Féminin"
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "Le nom d'utilisateur doit faire au moins %d caractères."
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "Le nom d'utilisateur doit faire moins de %d caractères."
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "Le mot de passe doit faire au moins %d caractères."
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "Le mot de passe doit faire moins de %d caractères."
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "Les deux mots de passe ne correspondent pas."
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "Erreur"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr "Vendre"
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr "Son"
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr "Volume des effets sonores"
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr "Volume de la musique"
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr "Appliquer"
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr "Rétablir les fenêtres"
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr "Vidéo"
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr "Audio"
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr "Joystick"
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr "Clavier"
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr "Presser le bouton pour démarrer la calibration"
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr "Calibrer"
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr "Activer le joystick"
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr "Stop"
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr "Tourner le joystick"
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr "Plein écran"
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr "Curseur personnalisé"
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr "Limite FPS :"
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr "Opacité de l'interface"
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr "Rayon du scrolling"
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr "Paresse du scrolling"
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr "Effets ambiants"
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr "aucun"
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr "léger"
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr "complet"
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr "Passage en plein écran"
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr ""
+"Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr "Changement OpenGL"
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr ""
+"Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr "Ajouter"
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr "Vous obtenez %d PO."
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr "Vous donnez :"
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Account and Character Management"
+#~ msgstr "Gestion du compte et du personnage"
+
+#~ msgid "Unregister"
+#~ msgstr "Se désinscrire"
+
+#~ msgid "Change Password"
+#~ msgstr "Changer le mot de passe"
+
+#~ msgid "Change Email Address"
+#~ msgstr "Changer l'adresse email"
+
+#~ msgid "Account: %s"
+#~ msgstr "Compte: %s"
+
+#~ msgid "Strength:"
+#~ msgstr "Force :"
+
+#~ msgid "Agility:"
+#~ msgstr "Agilité :"
+
+#~ msgid "Dexterity:"
+#~ msgstr "Dextérité :"
+
+#~ msgid "Vitality:"
+#~ msgstr "Vitalité :"
+
+#~ msgid "Intelligence:"
+#~ msgstr "Intelligence :"
+
+#~ msgid "Willpower:"
+#~ msgstr "Volonté :"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "Veuillez distribuer %d points"
+
+#~ msgid "Your name needs to be at least 4 characters."
+#~ msgstr "Votre nom doit comporter un minimum de 4 caractères"
+
+#~ msgid "Character stats OK"
+#~ msgstr "Caractéristiques Ok"
+
+#~ msgid "Please remove %d points"
+#~ msgstr "Veuillez retirer %d points"
+
+#~ msgid "Split"
+#~ msgstr "Partager"
+
+#~ msgid "Select amount of items to split."
+#~ msgstr "Choisissez le nombre d'objets à déplacer."
+
+#~ msgid "Guilds"
+#~ msgstr "Guildes"
+
+#~ msgid "@@guild|Invite %s@@"
+#~ msgstr "@@guilde|Invite %s@@"
+
+#~ msgid "@@party|Invite %s to join your party@@"
+#~ msgstr "@@partie| Invitation de %s à joindre votre partie @@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Partager@@"
+
+#~ msgid "Switch server"
+#~ msgstr "Changer de serveur"
+
+#~ msgid "Switch character"
+#~ msgstr "Changer de personnage"
+
+#~ msgid "Email:"
+#~ msgstr "Email :"
+
+#~ msgid "Choose your Mana World Server"
+#~ msgstr "Choisissez votre serveur The Mana World"
+
+#~ msgid "Port:"
+#~ msgstr "Port :"
+
+#~ msgid "Please type both the address and the port of a server."
+#~ msgstr "Veuillez entrer l'adresse et le port du serveur."
+
+#~ msgid "Visible names"
+#~ msgstr "Afficher les noms"
+
+#~ msgid "Propose trade"
+#~ msgstr "Proposer ce troc"
+
+#~ msgid "Confirm trade"
+#~ msgstr "Confirmer ce troc"
+
+#~ msgid "Change"
+#~ msgstr "Changer"
+
+#~ msgid "Attack %+d"
+#~ msgstr "Attaque %+d"
+
+#~ msgid "Defense %+d"
+#~ msgstr "Défense %+d"
+
+#~ msgid "HP %+d"
+#~ msgstr "PV %+d"
+
+#~ msgid "MP %+d"
+#~ msgstr "PM %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Confirmer"
+
+#~ msgid "Charisma:"
+#~ msgstr "Charisme :"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Poids total : %d - Poids maximal : %d"
+
+#~ msgid "Keep"
+#~ msgstr "Conserver"
diff --git a/po/he.po b/po/he.po
new file mode 100644
index 00000000..0b78dda9
--- /dev/null
+++ b/po/he.po
@@ -0,0 +1,592 @@
+# Hebrew translation for tmw
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the tmw package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tmw\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-10-20 00:23+0000\n"
+"Last-Translator: Ddorda <d.dorda@gmail.com>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "קנה"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "מחיר: %d זהב / סה\"כ %d זהב"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "יציאה"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "תיאור: %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "השפעה: %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr "אשר מחיקת שחקן"
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
+
+#: src/gui/char_select.cpp:79
+#, fuzzy
+msgid "Select Character"
+msgstr "צור שחקן"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "אישור"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "ביטול"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "חדש"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "מחק"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "הקודם"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "הבא"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "שם: %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "רמה: %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "רמה: %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "זהב: %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "צור שחקן"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "שם:"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "צבע שיער:"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "תיספורת:"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "צור"
+
+#: src/gui/char_server.cpp:52
+#, fuzzy
+msgid "Select Server"
+msgstr "החלף שרת"
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "כן"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "לא"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "מתחבר..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr "ציוד"
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr "ציוד"
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "השתמש"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "השלך"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr "הורד"
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr "החזק"
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr "בחר כמות חפצים לסחור."
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr "בחר כמות חפצים להשליך."
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "התחברות"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "סיסמה:"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "שרת:"
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr "זכור שם משתמש"
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "הרשם"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "מצב"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr "כישורים"
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr "קיצור-דרך"
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "הגדרות"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr "מיני-מפה"
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr "NPC"
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr "@@trade|סחור עם %s@@"
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr "@@attack|תקוף את %s@@"
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr "@@talk|דבר אל NPC@@"
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr "@@cancel|ביטול@@"
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr "@@pickup|הרם %s@@"
+
+#: src/gui/popupmenu.cpp:283
+#, fuzzy
+msgid "@@use|Unequip@@"
+msgstr "@@use|החזק@@"
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr "@@use|החזק@@"
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr "@@use|Use@@"
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr "@@drop|השלך@@"
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr "@@description|תיאור@@"
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr "אשר:"
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr "זכר"
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr "נקבה"
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "שם המשתמש חייב להכיל לפחות %d תוים."
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "שם המשתמש חייב להכיל פחות מ-%d תוים."
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "הסיסמה חייבת להכיל לפחות %d תוים."
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "הסיסמה חייבת להכיל פחות מ-%d תוים."
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "הסיסמאות אינן תואמות."
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "שגיאה"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr "מכר"
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr "צליל"
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr "עוצמת SFX"
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr "עוצמת מוזיקה"
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr "אשר"
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr "אתחל חלונות"
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr "וידאו"
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr "שמע"
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr "ג'ויסטיק"
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr "מקלדת"
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr "לחץ על הכפתור בכדי להתחיל בכיול"
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr "כייל"
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr "אפשר ג'ויסטיק"
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr "עצור"
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr "סובב את המקל"
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr "מסך מלא"
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr "‏OpenGL"
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr "סמן-עכבר מותאם"
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr "הגבלת FPS:"
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr "אטימות Gui"
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr "תווך גלילה"
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr "עצלנות גלילה"
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr "אופף FX"
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr "כבוי"
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr "נמוך"
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr "גבוה"
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr "מחליף למסך מלא"
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr "משנה OpenGL"
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr "אישור שינויים עבור OpenGL דורש איתחול."
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr "הוסף"
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr "אתה מקבל %d זהב."
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr "אתה נותן:"
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Account and Character Management"
+#~ msgstr "ניהול משתמש ושחקן"
+
+#~ msgid "Unregister"
+#~ msgstr "בטל רישום"
+
+#~ msgid "Change Password"
+#~ msgstr "שנה סיסמה"
+
+#~ msgid "Change Email Address"
+#~ msgstr "שנה כתובת דואר אלקטרוני"
+
+#~ msgid "Account: %s"
+#~ msgstr "משתמש: %s"
+
+#~ msgid "Strength:"
+#~ msgstr "עוצמה:"
+
+#~ msgid "Agility:"
+#~ msgstr "זריזות:"
+
+#~ msgid "Dexterity:"
+#~ msgstr "מיומנות:"
+
+#~ msgid "Vitality:"
+#~ msgstr "חיוניות:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "תבונה:"
+
+#~ msgid "Willpower:"
+#~ msgstr "כח רצון:"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "אנא חלק %d נקודות"
+
+#~ msgid "Your name needs to be at least 4 characters."
+#~ msgstr "יש להכניס לפחות 4 תוים בשם."
+
+#~ msgid "Character stats OK"
+#~ msgstr "נתוני שחקן - אישור"
+
+#~ msgid "Please remove %d points"
+#~ msgstr "אנא הסר %d נקודות"
+
+#~ msgid "Split"
+#~ msgstr "פצל"
+
+#~ msgid "Select amount of items to split."
+#~ msgstr "בחר כמות חפצים לפצל."
+
+#~ msgid "Guilds"
+#~ msgstr "גילדות"
+
+#~ msgid "@@guild|Invite %s@@"
+#~ msgstr "@@guild|הזמן את %s@@"
+
+#~ msgid "@@party|Invite %s to join your party@@"
+#~ msgstr "@@party|הזמן את %s להצטרף למסיבה@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|פצל@@"
+
+#~ msgid "Switch character"
+#~ msgstr "החלף שחקן"
+
+#~ msgid "Email:"
+#~ msgstr "דוא\"ל:"
+
+#~ msgid "Choose your Mana World Server"
+#~ msgstr "בחר את שרת ה-Mana World"
+
+#~ msgid "Port:"
+#~ msgstr "פורט:"
+
+#~ msgid "Please type both the address and the port of a server."
+#~ msgstr "אנא הכנס גם את כתובת וגם את פורט השרת."
+
+#~ msgid "Visible names"
+#~ msgstr "שמות גלויים"
+
+#~ msgid "Propose trade"
+#~ msgstr "מציע לחור"
+
+#~ msgid "Confirm trade"
+#~ msgstr "אשר מסחר"
+
+#~ msgid "Change"
+#~ msgstr "שנה"
+
+#~ msgid "Attack %+d"
+#~ msgstr "התקפה %+d"
+
+#~ msgid "Defense %+d"
+#~ msgstr "הגנה %+d"
+
+#~ msgid "HP %+d"
+#~ msgstr "HP %+d"
+
+#~ msgid "MP %+d"
+#~ msgstr "MP %+d"
diff --git a/po/hr.po b/po/hr.po
new file mode 100644
index 00000000..70fabbce
--- /dev/null
+++ b/po/hr.po
@@ -0,0 +1,543 @@
+# Croatian translation for tmw
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the tmw package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tmw\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-12-28 23:36+0000\n"
+"Last-Translator: Dino Paskvan <dpaskvan@gmail.com>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "Kupi"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "Cijena: %d zlatnika / Ukupno: %d zlatnika"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "Izlaz"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "Opis: %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "Učinak: %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr "Potvrdi Brisanje Lika"
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "Da li ste sigurni da želite obrisati ovog lika?"
+
+#: src/gui/char_select.cpp:79
+#, fuzzy
+msgid "Select Character"
+msgstr "Stvori Lika"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "U redu"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "Poništi"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "Novi"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "Obriši"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "Prethodni"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "Slijedeći"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "Ime: %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "Nivo: %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "Nivo: %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "Novac: %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "Stvori Lika"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "Ime:"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "Boja kose:"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "Frizura:"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "Stvori"
+
+#: src/gui/char_server.cpp:52
+msgid "Select Server"
+msgstr ""
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "Da"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "Ne"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "Spajanje..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr "Oprema"
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr "Zalihe"
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "Upotrijebi"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "Ispusti"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr "Skini opremu"
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr "Opremi"
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr "Odaberi količinu predmeta za razmjenu."
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr "Odaberi količinu predmeta za ispuštanje."
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "Korisničko ime"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "Lozinka"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr ""
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr "Zapamti korisničko ime"
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "Registriraj se"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "Stanje"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr "Vještine"
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr "Kratica"
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "Podešavanje"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr "Karta"
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:283
+#, fuzzy
+msgid "@@use|Unequip@@"
+msgstr "Skini opremu"
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr ""
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr ""
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr "Muško"
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr "Žensko"
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr ""
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "Greška"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr ""
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr ""
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr ""
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr ""
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr ""
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr ""
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr ""
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr ""
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr ""
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr ""
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr ""
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr ""
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr ""
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr ""
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr ""
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr ""
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Account and Character Management"
+#~ msgstr "Upravljanje Računom i Likovima"
+
+#~ msgid "Unregister"
+#~ msgstr "Odjavi"
+
+#~ msgid "Change Password"
+#~ msgstr "Promijeni Lozinku"
+
+#~ msgid "Change Email Address"
+#~ msgstr "Promijeni Email Adresu"
+
+#~ msgid "Account: %s"
+#~ msgstr "Korisnički račun: %s"
+
+#~ msgid "Strength:"
+#~ msgstr "Snaga:"
+
+#~ msgid "Agility:"
+#~ msgstr "Okretnost:"
+
+#~ msgid "Dexterity:"
+#~ msgstr "Spretnost:"
+
+#~ msgid "Vitality:"
+#~ msgstr "Vitalnost:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "Inteligencija:"
+
+#~ msgid "Willpower:"
+#~ msgstr "Snaga volje:"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "Molimo, rasporedi %d bodova"
+
+#~ msgid "Your name needs to be at least 4 characters."
+#~ msgstr "Ime mora imati barem 4 znaka."
+
+#~ msgid "Character stats OK"
+#~ msgstr "Podaci lika su u redu"
+
+#~ msgid "Please remove %d points"
+#~ msgstr "Molimo, oduzmi %d bodova"
+
+#~ msgid "Split"
+#~ msgstr "Razdvoji"
+
+#~ msgid "Select amount of items to split."
+#~ msgstr "Odaberi količinu predmeta za razdvajanje."
+
+#~ msgid "Guilds"
+#~ msgstr "Cehovi"
diff --git a/po/id.po b/po/id.po
new file mode 100644
index 00000000..c470df15
--- /dev/null
+++ b/po/id.po
@@ -0,0 +1,579 @@
+# Indonesian translation for tmw
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the tmw package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tmw\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-03-26 09:11+0000\n"
+"Last-Translator: ActiveFile <activefile@gmail.com>\n"
+"Language-Team: Indonesian <id@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "Beli"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "Harga: %d GP / Jumlah: %d GP"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "Keluar"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "Deskripsi: %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "Efek: %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr ""
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
+
+#: src/gui/char_select.cpp:79
+msgid "Select Character"
+msgstr "Pilih Karakter"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "Batal"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "Buat baru"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "Hapus"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "Sebelumnya"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "Berikutnya"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "Nama: %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "Tingkatan: %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "Tingkatan: %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "Uang: %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "Buat Karakter"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "Nama:"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "Warna Rambut:"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "Gaya Rambut:"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "Buat"
+
+#: src/gui/char_server.cpp:52
+#, fuzzy
+msgid "Select Server"
+msgstr "Pilih Karakter"
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "Ya"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "Tidak"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "Menyambung..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr "Perlengkapan"
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr "Inventaris"
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "Gunakan"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "Jatuh"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr ""
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr "Pilih jumlah item yang mau di perdagangkan"
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr "Pilih jumlah item yang mau di buang"
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "Login"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "Kata Sandi:"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr ""
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "Mendaftar"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "Status"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr "Keahlian"
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr "Tombol Singkat"
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "Atur"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr "MiniMap"
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr "NPC"
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr "@@trade|Dagang Dengan %s@@"
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr "@@attack|Serang%s@@"
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr "@@talk|Bicara dengan NPC@@"
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr "@@cancel|Batal@@"
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr "@@pickup|Ambil %s@@"
+
+#: src/gui/popupmenu.cpp:283
+#, fuzzy
+msgid "@@use|Unequip@@"
+msgstr "@@use|Melengkapi@@"
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr "@@use|Melengkapi@@"
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr "@@use|Gunakan@@"
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr "@@drop|Buang@@"
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr "@@description|Deskripsi@@"
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr "Konfirmasi:"
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr ""
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr ""
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "Panjang username setidak-tidaknya %d karakter"
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "Panjang kata-sandi setidak-tidaknya %d karakter"
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "Kata sandi tidak sama."
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "Kesalahan"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr "Jual"
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr "Suara"
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr "Volume sfx"
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr "Volume Musik"
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr "Terapkan"
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr ""
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr "Video"
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr "Suara"
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr ""
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr "Tekan tombol untuk memulai kalibrasi"
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr "Kalibrasi"
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr "Membolehkan joistik"
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr "Berhenti"
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr "Memutar tongkat"
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr "Layar penuh"
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr ""
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr "Batas FPS"
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr ""
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr "Radius gulungan"
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr ""
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr "mati"
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr "rendah"
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr "tinggi"
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr "Mengganti ke layar penuh"
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr "Memulai dari awal di butuhkan untuk melihat efek"
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr "Mengubah OpenGL"
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr "Tambah"
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr "Anda mendapatkan %d GP."
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr "Anda memberikan:"
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Unregister"
+#~ msgstr "Tidak terdaftar"
+
+#~ msgid "Strength:"
+#~ msgstr "Kekuatan"
+
+#~ msgid "Dexterity:"
+#~ msgstr "Ketangkasan"
+
+#~ msgid "Vitality:"
+#~ msgstr "Daya/Tenaga Hidup"
+
+#~ msgid "Intelligence:"
+#~ msgstr "Kecerdasan"
+
+#~ msgid "Willpower:"
+#~ msgstr "Ketekunan"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "Tolong distribusikan %d point"
+
+#~ msgid "Your name needs to be at least 4 characters."
+#~ msgstr "Nama anda sekurang-kurangnya harus 4 karakter"
+
+#~ msgid "Character stats OK"
+#~ msgstr "Stats Karakter OK"
+
+#~ msgid "Please remove %d points"
+#~ msgstr "Tolong hilangkan %d point"
+
+#~ msgid "Split"
+#~ msgstr "Pecah"
+
+#~ msgid "Select amount of items to split."
+#~ msgstr "Pilih jumlah item yang mau di pisahkan"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Pisah@@"
+
+#~ msgid "Switch server"
+#~ msgstr "Ganti Server"
+
+#~ msgid "Switch character"
+#~ msgstr "Ganti Karakter"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Choose your Mana World Server"
+#~ msgstr "Pilih Server Mana World"
+
+#~ msgid "Port:"
+#~ msgstr "Port:"
+
+#~ msgid "Please type both the address and the port of a server."
+#~ msgstr "Tolong tulis address dan port dari server"
+
+#~ msgid "Propose trade"
+#~ msgstr "Menawarkan tukar menukar"
+
+#~ msgid "Confirm trade"
+#~ msgstr "Konfirmasi tukar menukar"
+
+#~ msgid "Change"
+#~ msgstr "Ubah"
+
+#~ msgid "Attack %+d"
+#~ msgstr "Serangan %+d"
+
+#~ msgid "Defense %+d"
+#~ msgstr "Pertahanan %+d"
+
+#~ msgid "HP %+d"
+#~ msgstr "HP %+d"
+
+#~ msgid "MP %+d"
+#~ msgstr "MP %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Konfirmasi"
+
+#~ msgid "Charisma:"
+#~ msgstr "Karisma"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Jumlah Berat: %d - Berat Maksimum: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Pertahankan"
diff --git a/po/it.po b/po/it.po
new file mode 100644
index 00000000..3f3cd860
--- /dev/null
+++ b/po/it.po
@@ -0,0 +1,584 @@
+# Italian translation of The Mana World.
+# Copyright (C) 2007 The Mana World Development Team
+# This file is distributed under the same license as the The Mana World package.
+# Eugenio Favalli <eugeniofavalli@gmail.com>, 2007.
+# , fuzzy
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: The Mana World 0.1.0\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2007-12-03 01:45+0000\n"
+"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
+"Language-Team: Italian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "Compra"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "Prezzo: %d GP / Totale: %d GP"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "Esci"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "Descrizione : %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "Effetto : %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr ""
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "Sei sicuro di voler cancellare questo personaggio?"
+
+#: src/gui/char_select.cpp:79
+msgid "Select Character"
+msgstr "Scelta Personaggio"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "Cancella"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "Nuovo"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "Elimina"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "Precedente"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "Prossimo"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "Nome : %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "Livello: %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "Livello: %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "Monete: %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "Crea Personaggio"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "Nome :"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "Colore Capelli"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "Stile Capelli:"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "Create"
+
+#: src/gui/char_server.cpp:52
+#, fuzzy
+msgid "Select Server"
+msgstr "Scelta Personaggio"
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "Si"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "No"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "Connessione..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr "Equipaggiamento"
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr "Inventario"
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "Usa"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "Lascia"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr "Rimuovi"
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr "Equipaggia"
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr "Seleziona la quantità di oggetti da scambiare."
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr "Seleziona la quantità di oggetti da lasciare."
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "Autenticazione"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "Password:"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr ""
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "Registra"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "Stato"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr "Abilità"
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr "Scorciatoia"
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "Impostazioni"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr "Mini mappa"
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr "NPC"
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr "@@trade|Scambia Con %s@@"
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr "@@attack|Attacca %s@@"
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr "@@talk|Parla con NPC@@"
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr "@@cancel|Cancella@@"
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr "@@pickup|Raccogli %s@@"
+
+#: src/gui/popupmenu.cpp:283
+#, fuzzy
+msgid "@@use|Unequip@@"
+msgstr "@@use|Equipaggia@@"
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr "@@use|Equipaggia@@"
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr "@@usa|Usa@@"
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr "@@drop|Lascia@@"
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr "@@description|Descrizione@@"
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr "Conferma:"
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr ""
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr ""
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "Il nome utente deve contenere almeno %d caratteri."
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "Il nome utente deve avere meno di %d caratteri."
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "La password deve essere lunga almeno %d caratteri."
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "La password deve contenere meno di %d caratteri."
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "Le password non corrispondono."
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "Errore"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr "Vendi"
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr "Suono"
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr "Volume effetti sonori"
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr "Volume musica"
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr "Applica"
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr "Resetta finestre"
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr "Video"
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr "Audio"
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr "Joystick"
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr "Premi il pulsante per cominciare la calibrazione"
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr "Calibra"
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr "Abilita joystick"
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr "Ferma"
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr "Ruota la manopola"
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr "Schermo intero"
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr "Cursore personalizzato"
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr "Limita FPS:"
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr "Opacità IU"
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr "Raggio dello scroll"
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr "Lentezza dello scroll"
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr "Suoni ambientali"
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr "Spento"
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr "Basso"
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr "Alto"
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr "Modalità a schermo intero"
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr "Modifica OpenGL"
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr "Aggiungi"
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr "Ottieni %d GP."
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr "Dai:"
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Unregister"
+#~ msgstr "Cancella registrazione"
+
+#~ msgid "Strength:"
+#~ msgstr "Forza:"
+
+#~ msgid "Agility:"
+#~ msgstr "Agilità:"
+
+#~ msgid "Dexterity:"
+#~ msgstr "Destrezza:"
+
+#~ msgid "Vitality:"
+#~ msgstr "Vitalità:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "Intelligenza:"
+
+#~ msgid "Willpower:"
+#~ msgstr "Volontà:"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "Prego distribuisci %d points"
+
+#~ msgid "Your name needs to be at least 4 characters."
+#~ msgstr "Il tuo nome deve contenere almeno 4 caratteri."
+
+#~ msgid "Character stats OK"
+#~ msgstr "Statistiche personaggio OK"
+
+#~ msgid "Please remove %d points"
+#~ msgstr "Prego rimuovi %d punti"
+
+#~ msgid "Split"
+#~ msgstr "Lascia"
+
+#~ msgid "Select amount of items to split."
+#~ msgstr "Seleziona la quantità di oggetti da lasciare."
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Lascia@@"
+
+#~ msgid "Switch server"
+#~ msgstr "Cambia server"
+
+#~ msgid "Switch character"
+#~ msgstr "Cambia personaggio"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Choose your Mana World Server"
+#~ msgstr "Scegli il tuo server Mana World"
+
+#~ msgid "Port:"
+#~ msgstr "Porta:"
+
+#~ msgid "Please type both the address and the port of a server."
+#~ msgstr "Per favore inserisci l'indirizzo e la porta del server."
+
+#~ msgid "Propose trade"
+#~ msgstr "Inizia uno scambio"
+
+#~ msgid "Confirm trade"
+#~ msgstr "Conferma scambio"
+
+#~ msgid "Change"
+#~ msgstr "Cambia"
+
+#~ msgid "Attack %+d"
+#~ msgstr "Attacco %+d"
+
+#~ msgid "Defense %+d"
+#~ msgstr "Difesa %+d"
+
+#~ msgid "HP %+d"
+#~ msgstr "PF %+d"
+
+#~ msgid "MP %+d"
+#~ msgstr "PM %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Conferma"
+
+#~ msgid "Charisma:"
+#~ msgstr "Carisma:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Peso totale : %d - Peso massimo : %d"
+
+#~ msgid "Keep"
+#~ msgstr "Mantieni"
diff --git a/po/ja.po b/po/ja.po
new file mode 100644
index 00000000..9f3ee5a3
--- /dev/null
+++ b/po/ja.po
@@ -0,0 +1,528 @@
+# Japanese translation for tmw
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the tmw package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tmw\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-06-28 16:27+0000\n"
+"Last-Translator: fate <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "買う"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "価格: %d GP / 合計: %d GP"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "終了"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "名状: %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "効用: %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr ""
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "このキャラは消してもいいですか?"
+
+#: src/gui/char_select.cpp:79
+msgid "Select Character"
+msgstr "キャラを選択"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "了解"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "取消"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "新規"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "削除"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "前へ"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "次へ"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "名前: %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "レベル: %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "レベル: %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "GP: %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "キャラを作成"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "名前:"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "髪の色："
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "髪型："
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "作成"
+
+#: src/gui/char_server.cpp:52
+#, fuzzy
+msgid "Select Server"
+msgstr "キャラを選択"
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "はい"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "いいえ"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "接続しています..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "使う"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr ""
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr ""
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr ""
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "ログイン"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "パスワード:"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "サーバ:"
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr ""
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "状態"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "セットアップ"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr ""
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr "@@attack|%sを攻撃する@@"
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr "@@talk|NPCを喋る@@"
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:283
+#, fuzzy
+msgid "@@use|Unequip@@"
+msgstr "@@use|使う@@"
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr "@@use|使う@@"
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr ""
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr ""
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr ""
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr ""
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "パスワードが一致していません。"
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "エラー"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr ""
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr ""
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr ""
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr ""
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr "音声"
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr ""
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr ""
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr ""
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr ""
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr ""
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr ""
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr ""
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr ""
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr ""
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr ""
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr ""
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr ""
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Unregister"
+#~ msgstr "登録削除"
+
+#~ msgid "Strength:"
+#~ msgstr "筋力:"
+
+#~ msgid "Agility:"
+#~ msgstr "素早さ:"
+
+#~ msgid "Dexterity:"
+#~ msgstr "敏捷:"
+
+#~ msgid "Vitality:"
+#~ msgstr "体力:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "知性:"
+
+#~ msgid "Willpower:"
+#~ msgstr "精神:"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "%d ポイントを取り分けください"
+
+#~ msgid "Split"
+#~ msgstr "分割"
+
+#~ msgid "Email:"
+#~ msgstr "Eメール："
+
+#~ msgid "Port:"
+#~ msgstr "ポート:"
+
+#~ msgid "Confirm"
+#~ msgstr "確認"
+
+#~ msgid "Charisma:"
+#~ msgstr "魅力:"
diff --git a/po/nl.po b/po/nl.po
new file mode 100644
index 00000000..3d8aaf75
--- /dev/null
+++ b/po/nl.po
@@ -0,0 +1,552 @@
+# Dutch translation of The Mana World.
+# Copyright (c) 2007 The Mana World Development Team
+# This file is distributed under the same license as the The Mana World package.
+# Bjørn Lindeijer <bjorn@lindeijer.nl>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: The Mana World 0.1.0\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-10-10 00:04+0000\n"
+"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
+"Language-Team: Dutch\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "Kopen"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr ""
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "Afsluiten"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "Beschrijving: %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "Effect: %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr ""
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
+
+#: src/gui/char_select.cpp:79
+msgid "Select Character"
+msgstr "Kies Personage"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Oké"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "Nieuw"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "Vorige"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "Volgende"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "Naam: %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "Level: %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "Level: %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "Geld: %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "Personage Aanmaken"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "Naam:"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "Haarkleur:"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "Haarstijl:"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "Aanmaken"
+
+#: src/gui/char_server.cpp:52
+#, fuzzy
+msgid "Select Server"
+msgstr "Kies Personage"
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "Ja"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "Nee"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "Verbinden..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr "Uitrusting"
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr "Inventaris"
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "Gebruiken"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "Neerleggen"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr "Afdoen"
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr "Uitrusten"
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr "Selecteer het aantal exemplaren om te verhandelen"
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr "Selecteer het aantal exemplaren om neer te leggen"
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "Inloggen"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "Wachtword:"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr ""
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "Aanmelden"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "Status"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr "Vaardigheden"
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "Configureren"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr "Kaartje"
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr "NPC"
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr "@@trade|Handelen met %s@@"
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr "@@attack|%s aanvallen@@"
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr "@@talk|Praat met NPC@@"
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr "@@cancel|Annuleren@@"
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr "@@pickup|%s oppakken@@"
+
+#: src/gui/popupmenu.cpp:283
+#, fuzzy
+msgid "@@use|Unequip@@"
+msgstr "@@use|Uitrusten@@"
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr "@@use|Uitrusten@@"
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr "@@use|Gebruiken@@"
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr "@@drop|Neerleggen@@"
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr "@@description|Beschrijving@@"
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr "Bevestigen:"
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr ""
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr ""
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "De gebruikersnaam moet uit ten minste %d tekens bestaan."
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "De gebruikersnaam moet uit minder dan %d tekens bestaan."
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "Het wachtwoord moet uit ten minste %d tekens bestaan."
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "Wachtwoorden komen niet overeen."
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "Fout"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr "Geluid"
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr "Volume van geluiden"
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr "Muziek volume"
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr "Toepassen"
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr "Vensters in beginstand"
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr "Video"
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr "Audio"
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr "Joystick"
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr "Druk op de knop om het kalibreren te starten"
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr "Kalibreren"
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr "Joystick activeren"
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr "Stoppen"
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr "Maak rondjes met de stick"
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr "Volledig scherm"
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr "Aangepaste cursor"
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr "FPS limiet:"
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr "Dekking van de GUI"
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr "Scroll radius"
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr "Scroll vertraging"
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr "Omgevingseffecten"
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr "uit"
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr "laag"
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr "hoog"
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr "Overgaan naar volledig scherm"
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr "De veranderingen worden pas actief na opnieuw opstarten"
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr "Veranderen van OpenGL"
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr ""
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr ""
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr "Je geeft:"
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Unregister"
+#~ msgstr "Registreren"
+
+#~ msgid "Strength:"
+#~ msgstr "Sterkte:"
+
+#~ msgid "Agility:"
+#~ msgstr "Agiliteit:"
+
+#~ msgid "Dexterity:"
+#~ msgstr "Dexteriteit:"
+
+#~ msgid "Vitality:"
+#~ msgstr "Vitaliteit:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "Intelligentie:"
+
+#~ msgid "Willpower:"
+#~ msgstr "Wilskracht:"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "Nog %d punten te verdelen"
+
+#~ msgid "Your name needs to be at least 4 characters."
+#~ msgstr "Je naam moet uit tenminste 4 tekens bestaan"
+
+#~ msgid "Character stats OK"
+#~ msgstr "Attributen van personage OK"
+
+#~ msgid "Please remove %d points"
+#~ msgstr "Verwijder alstublieft %d punten"
+
+#~ msgid "Split"
+#~ msgstr "Splitsen"
+
+#~ msgid "Switch server"
+#~ msgstr "Van server wisselen"
+
+#~ msgid "Switch character"
+#~ msgstr "Van personage wisselen"
+
+#~ msgid "Email:"
+#~ msgstr "E-mail:"
+
+#~ msgid "Choose your Mana World Server"
+#~ msgstr "Kies uw Mana World server"
+
+#~ msgid "Port:"
+#~ msgstr "Poort:"
+
+#~ msgid "Confirm"
+#~ msgstr "Bevestigen"
+
+#~ msgid "Charisma:"
+#~ msgstr "Charisma:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Totaal gewicht: %d - Maximum gewicht: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Behouden"
diff --git a/po/pl.po b/po/pl.po
new file mode 100644
index 00000000..114ba4fa
--- /dev/null
+++ b/po/pl.po
@@ -0,0 +1,588 @@
+# Polish translation of The Mana World.
+# Copyright (C) 2007 The Mana World Development Team
+# This file is distributed under the same license as the The Mana World package.
+# Mateusz Jedrasik <m.jedrasik@gmail.com>, 2007.
+# Zuzanna K. Filutowska <platyna@platinum.linux.pl>, 2007.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: The Mana World 0.1.0\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-10-10 05:26+0000\n"
+"Last-Translator: Michał Trzebiatowski <Unknown>\n"
+"Language-Team: <pl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "Kup"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "Cena: %d GP / Razem: %d GP"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "Wyjdź"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "Opis: %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "Efekt: %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr ""
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
+
+#: src/gui/char_select.cpp:79
+msgid "Select Character"
+msgstr "Wybierz postać"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "Nowa"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "Usuń"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "Poprzedni"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "Następny"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "Imię: %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "Poziom: %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "Poziom: %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "Pieniądze: %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "Stwórz postać"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "Imię:"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "Kolor włosów:"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "Fryzura:"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "Stwórz"
+
+#: src/gui/char_server.cpp:52
+#, fuzzy
+msgid "Select Server"
+msgstr "Wybierz postać"
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "Tak"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "Nie"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "Łączenie..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr "Ekwipunek"
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr "Inwentarz"
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "Użyj"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "Upuść"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr "Zdejmij"
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr "Załóż"
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr "Wybierz ilość przedmiotów do wymiany."
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr "Wybierz ilość przedmiotów do upuszczenia."
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "Użytkownik"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "Hasło:"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Serwer:"
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr ""
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "Rejestruj"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "Stan"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr "Zdolności"
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr "Skrót"
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "Konfiguracja"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr "MiniMapa"
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr "NPC"
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr "@@trade|Targ z %s@@"
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr "@@attack|Atakuj %s@@"
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr "@@talk|Rozmawiaj z NPC@@"
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr "@@cancel|Anuluj@@"
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr "@@pickup|Podnieś %s@@"
+
+#: src/gui/popupmenu.cpp:283
+#, fuzzy
+msgid "@@use|Unequip@@"
+msgstr "@@use|Załóż@@"
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr "@@use|Załóż@@"
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr "@@use|Użyj@@"
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr "@@drop|Upuść@@"
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr "@@description|Opis@@"
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr "Potwierdź:"
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr "Mężczyzna"
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr "Kobieta"
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "Nazwa użytkownika musi być długa na conajmniej %d znaków."
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "Nazwa użytkownika musi mieć mniej niż %d znaków."
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "Hasło musi mieć conajmniej %d znaków."
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "Hasło nie może mieć więcej jak %d znaków."
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "Hasła nie zgadzają się."
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "Błąd"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr "Sprzedaj"
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr "Dźwięk"
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr "Głośność efektów dźwiękowych"
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr "Głośność muzyki"
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr "Zastosuj"
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr "Zresetuj okna"
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr "Obraz"
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr "Dźwięk"
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr "Joystick"
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr "Wciśnij przycisk aby rozpocząć kalibrację"
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr "Kalibruj"
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr "Włącz joystick"
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr "Zatrzymaj"
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr "Obróć drążek"
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr "Pełen ekran"
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr "Własny kursor"
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr "Limit FPS:"
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr "Przezroczystość GUI"
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr "Skok przy przewijaniu ekranu"
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr "Opóźnienie przy przewijaniu ekranu"
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr "Dźwięki otoczenia"
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr "wyłączone"
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr "niskie"
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr "wysokie"
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr "Przełączanie na pełen ekran"
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr "Zmień ustawienia OpenGL"
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr ""
+"Zastosowywanie zmian w konfiguracji OpenGL wymaga ponownego uruchomienia."
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr "Dodaj"
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr "Otrzymujesz %d GP"
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr "Dajesz:"
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Unregister"
+#~ msgstr "Wyrejestruj"
+
+#~ msgid "Change Password"
+#~ msgstr "Zmień hasło"
+
+#~ msgid "Strength:"
+#~ msgstr "Siła:"
+
+#~ msgid "Agility:"
+#~ msgstr "Zwinność:"
+
+#~ msgid "Dexterity:"
+#~ msgstr "Zręczność:"
+
+#~ msgid "Vitality:"
+#~ msgstr "Witalność:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "Inteligencja:"
+
+#~ msgid "Willpower:"
+#~ msgstr "Siła woli:"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "Proszę wykorzystać %d punktów"
+
+#~ msgid "Your name needs to be at least 4 characters."
+#~ msgstr "Twoje imię musi mieć conajmniej 4 znaki."
+
+#~ msgid "Character stats OK"
+#~ msgstr "Statystyki postaci w porządku."
+
+#~ msgid "Please remove %d points"
+#~ msgstr "Proszę usunąć %d punktów"
+
+#~ msgid "Split"
+#~ msgstr "Podziel"
+
+#~ msgid "Select amount of items to split."
+#~ msgstr "Wybierz ilość przedmiotów do podziału."
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Rozdziel@@"
+
+#~ msgid "Switch server"
+#~ msgstr "Zmień serwer"
+
+#~ msgid "Switch character"
+#~ msgstr "Zmień postać"
+
+#~ msgid "Email:"
+#~ msgstr "Adres e-mail:"
+
+#~ msgid "Choose your Mana World Server"
+#~ msgstr "Wybierz serwer Mana World"
+
+#~ msgid "Port:"
+#~ msgstr "Port:"
+
+#~ msgid "Please type both the address and the port of a server."
+#~ msgstr "Proszę wpisać adres i port serwera"
+
+#~ msgid "Propose trade"
+#~ msgstr "Oferuj handel"
+
+#~ msgid "Confirm trade"
+#~ msgstr "Potwierdź handel"
+
+#~ msgid "Change"
+#~ msgstr "Zmień"
+
+#~ msgid "Attack %+d"
+#~ msgstr "Atak %+d"
+
+#~ msgid "Defense %+d"
+#~ msgstr "Obrona %+d"
+
+#~ msgid "HP %+d"
+#~ msgstr "PŻ %+d"
+
+#~ msgid "MP %+d"
+#~ msgstr "PM %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Potwierdź"
+
+#~ msgid "Charisma:"
+#~ msgstr "Charyzma:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Całkowita waga: %d - Maksymalna waga: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Zachowaj"
diff --git a/po/pt.po b/po/pt.po
new file mode 100644
index 00000000..a49fcaec
--- /dev/null
+++ b/po/pt.po
@@ -0,0 +1,586 @@
+# Portuguese translation for tmw
+# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
+# This file is distributed under the same license as the tmw package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tmw\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-02-03 10:14+0000\n"
+"Last-Translator: Tiago Silva <Unknown>\n"
+"Language-Team: Portuguese <pt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "Comprar"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "Preço: %d GP / Total: %d GP"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "Sair"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "Descrição: %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "Efeito: %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr ""
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "Tem a certeza que quer apagar este personagem"
+
+#: src/gui/char_select.cpp:79
+msgid "Select Character"
+msgstr "Seleccione um Personagem"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "Novo"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "Eliminar"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "Anterior"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "Seguinte"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "Nome: %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "Nível: %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "Nível: %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "Dinheiro: %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "Criar Personagem"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "Nome:"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "Cor de Cabelo:"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "Estilo do Cabelo:"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "Criar"
+
+#: src/gui/char_server.cpp:52
+#, fuzzy
+msgid "Select Server"
+msgstr "Seleccione um Personagem"
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "Sim"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "Não"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "Conectando..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr "Equipamento"
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr "Inventário"
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "Usar"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "Largar"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr "Desequipar"
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr "Equipar"
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr "Seleccionar a quantidade de itens a negociar."
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr "Seleccionar a quantidade de itens a largar."
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "Autenticar"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "Senha:"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Servidor:"
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr ""
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "Registo"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "Estado"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr "Competências"
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr "Atalho"
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "Configuração"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr "MiniMapa"
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr "NPC"
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr "@@trade|Negociar com %s@@"
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr "@@attack|Atacar %s@@"
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr "@@talk|Falar com o NPC@@"
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr "@@cancel|Cancelar@@"
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr "@@pickup|Apanhar %s@@"
+
+#: src/gui/popupmenu.cpp:283
+#, fuzzy
+msgid "@@use|Unequip@@"
+msgstr "@@use|Equipar@@"
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr "@@use|Equipar@@"
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr "@@use|Usar@@"
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr "@@drop|Largar@@"
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr "@@descrição|Descrição@@"
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr "Confirmar:"
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr ""
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr ""
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "O nome de utilizador necessita de pelo menos %d caracteres."
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "O nome de utilizador só pode ter %d caracteres."
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "A password necessita de pelo menos %d caracteres."
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "A password só pode ter até %d caracteres."
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "As senhas não coincidem."
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "Erro"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr "Vender"
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr "Som"
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr "Volume dos Efeitos"
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr "Volume da Música"
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr "Aplicar"
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr "Reiniciar Janelas"
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr "Vídeo"
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr "Áudio"
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr "Joystick"
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr "Pressione o botão para começar a calibragem"
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr "Calibrar"
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr "Habilitar Joystick"
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr "Parar"
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr "Rode o manipulo"
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr "Ecrã completo"
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr "Cursor personalizado"
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr "Limite de FPS:"
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr "Opacidade do Interface"
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr "Efeitos Ambientais"
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr "desligado"
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr "baixo"
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr "elevado"
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr "Mudar para ecrã completo"
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr "É necessário reiniciar para as alterações terem efeito."
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr "Mudando OpenGL"
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr "É necessário reiniciar para as alterações ao OpenGl terem efeito."
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr "Adicionar"
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr "Recebe %d GP."
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr "Dá:"
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Unregister"
+#~ msgstr "Remover o Registo"
+
+#~ msgid "Strength:"
+#~ msgstr "Força:"
+
+#~ msgid "Agility:"
+#~ msgstr "Agilidade:"
+
+#~ msgid "Dexterity:"
+#~ msgstr "Destreza:"
+
+#~ msgid "Vitality:"
+#~ msgstr "Vitalidade:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "Inteligência:"
+
+#~ msgid "Willpower:"
+#~ msgstr "Força de Vontade:"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "Por favor distribua %d potos"
+
+#~ msgid "Your name needs to be at least 4 characters."
+#~ msgstr "O seu nome necessita de pelo menos 4 caracteres"
+
+#~ msgid "Character stats OK"
+#~ msgstr "Estatisticas da personagem OK"
+
+#~ msgid "Please remove %d points"
+#~ msgstr "Por favor remova %d pontos"
+
+#~ msgid "Split"
+#~ msgstr "Dividir"
+
+#~ msgid "Select amount of items to split."
+#~ msgstr "Seleccionar a quantidade de itens a dividir."
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Dividir@@"
+
+#~ msgid "Switch server"
+#~ msgstr "Mudar de servidor"
+
+#~ msgid "Switch character"
+#~ msgstr "Mudar de personagem"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Choose your Mana World Server"
+#~ msgstr "Escolha o seu Servidor de Mana World"
+
+#~ msgid "Port:"
+#~ msgstr "Porta:"
+
+#~ msgid "Please type both the address and the port of a server."
+#~ msgstr "Por favor escreva o endereço e a porta do servidor."
+
+#~ msgid "Propose trade"
+#~ msgstr "Propor Negócio"
+
+#~ msgid "Confirm trade"
+#~ msgstr "Confirmar negócio"
+
+#~ msgid "Change"
+#~ msgstr "Modificar"
+
+#~ msgid "Attack %+d"
+#~ msgstr ""
+#~ "Copy text   \t\r\n"
+#~ "Ataque %+d"
+
+#~ msgid "Defense %+d"
+#~ msgstr ""
+#~ "Copy text   \t\r\n"
+#~ "Defesa %+d"
+
+#~ msgid "HP %+d"
+#~ msgstr "HP %+d"
+
+#~ msgid "MP %+d"
+#~ msgstr "MP %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Confirmar"
+
+#~ msgid "Charisma:"
+#~ msgstr "Carisma:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Peso Total: %d - Peso Máximo: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Manter"
diff --git a/po/pt_BR.po b/po/pt_BR.po
new file mode 100644
index 00000000..b9bc6820
--- /dev/null
+++ b/po/pt_BR.po
@@ -0,0 +1,606 @@
+# Brazilian Portuguese translation for tmw
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the tmw package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tmw\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-12-14 21:37+0000\n"
+"Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "Comprar"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "Preço: %d GP / Total: %d GP"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "Sair"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "Descrição: %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "Efeito: %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr "Confimar exclusão do personagem"
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "Tem certeza de que deseja excluir este personagem?"
+
+#: src/gui/char_select.cpp:79
+msgid "Select Character"
+msgstr "Selecionar personagem"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "Novo"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "Excluir"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "Anterior"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "Próximo"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "Nome: %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "Nível: %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "Nível: %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "Dinheiro: %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "Criar Personagem"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "Nome:"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "Cor do Cabelo:"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "Estilo do Cabelo:"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "Criar"
+
+#: src/gui/char_server.cpp:52
+#, fuzzy
+msgid "Select Server"
+msgstr "Selecionar personagem"
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "Sim"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "Não"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "Conectando..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr "Equipamento"
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr "Inventório"
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "Usar"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "Descartar"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr "Desequipar"
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr "Equipar"
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr "Selecionar montante de itens para negociar."
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr "Selecionar montante de itens para descartar."
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "Login"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "Senha:"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Servidor:"
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr "Lembrar nome de usuário"
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "Registrar"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "Status"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr "Habilidades"
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr "Atalho"
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "Configurar"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr "MiniMapa"
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr "NPC"
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr "@@Negociar|Negociar com %s@@"
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr "@@atacar|Atacar %s@@"
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr "@@falar|Falar com NPC@@"
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr "@@cancelar|Cancelar@@"
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr "@@pegar|Pegar %s@@"
+
+#: src/gui/popupmenu.cpp:283
+#, fuzzy
+msgid "@@use|Unequip@@"
+msgstr "@@usar|Equipar@@"
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr "@@usar|Equipar@@"
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr "@@usar|Usar@@"
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr "@@descartar|Descartar@@"
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr "@@descrição|Descrição@@"
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr "Confirmar:"
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr "Homem"
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr "Mulher"
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "O nome do usuário precisa ter pelo menos %d caracteres."
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "O nome do usuário tem que ser inferior a %d caracteres."
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "A senha deve ter pelo menos %d caracteres."
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "A senha deve ser menor que %d caracteres."
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "Senhas não conferem."
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "Erro"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr "Vender"
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr "Som"
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr "Volume Sfx"
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr "Volume da Música"
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr "Aplicar"
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr "Restaurar janelas"
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr "Vídeo"
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr "Áudio"
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr "Joystick"
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr "Teclado"
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr "Aperto o botão para começar a calibração"
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr "Calibrar"
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr "Habilitar joystick"
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr "Parar"
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr ""
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr "Tela cheia"
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr "Cursor customizado"
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr "Limite FPS:"
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr "Opacidade da GUI"
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr "Ambiente FX"
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr "desligado"
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr "baixo"
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr "alto"
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr "Mudando para Tela cheia"
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr "É preciso reiniciar para as mudanças terem efeito."
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr "Trocando OpenGL"
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr "Aplicando mudança a OpenGL requer reiniciar o jogo."
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr "Adicionar"
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr "Voc pegou %d GP."
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr "Você dá:"
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Account and Character Management"
+#~ msgstr "Gerenciamento de Conta e Personagem"
+
+#~ msgid "Unregister"
+#~ msgstr "Cancelar Registro"
+
+#~ msgid "Change Password"
+#~ msgstr "Alterar senha"
+
+#~ msgid "Change Email Address"
+#~ msgstr "Alterar e-mail"
+
+#~ msgid "Account: %s"
+#~ msgstr "Conta: %s"
+
+#~ msgid "Strength:"
+#~ msgstr "Força:"
+
+#~ msgid "Agility:"
+#~ msgstr "Agilidade:"
+
+#~ msgid "Dexterity:"
+#~ msgstr "Destreza:"
+
+#~ msgid "Vitality:"
+#~ msgstr "Vitalidade:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "Inteligência:"
+
+#~ msgid "Willpower:"
+#~ msgstr "Força de Vontade:"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "Por favor distribua %d pontos"
+
+#~ msgid "Your name needs to be at least 4 characters."
+#~ msgstr "Seu nome precisa ter no mínimo 4 caracteres."
+
+#~ msgid "Character stats OK"
+#~ msgstr "Status do personagem OK"
+
+#~ msgid "Please remove %d points"
+#~ msgstr "Por favor remova %d pontos"
+
+#~ msgid "Split"
+#~ msgstr "Dividir"
+
+#~ msgid "Select amount of items to split."
+#~ msgstr "Selecionar montante de itens para dividir."
+
+#~ msgid "Guilds"
+#~ msgstr "Guildas"
+
+#~ msgid "@@guild|Invite %s@@"
+#~ msgstr "@@guilda|convidar %s@@"
+
+#~ msgid "@@party|Invite %s to join your party@@"
+#~ msgstr "@@grupo|Convidar %s para entrar para o seu grupo"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@dividir|Dividir@@"
+
+#~ msgid "Switch server"
+#~ msgstr "Trocar servidor"
+
+#~ msgid "Switch character"
+#~ msgstr "Trocar de Personagem"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Choose your Mana World Server"
+#~ msgstr "Escolha seu Servidor de Mana World"
+
+#~ msgid "Port:"
+#~ msgstr "Porta:"
+
+#~ msgid "Please type both the address and the port of a server."
+#~ msgstr "Por favor especifique ambos os Endereços e a Porta do servidor"
+
+#~ msgid "Visible names"
+#~ msgstr "Nomes visíveis"
+
+#~ msgid "Propose trade"
+#~ msgstr "Propor negócio"
+
+#~ msgid "Confirm trade"
+#~ msgstr "Confirmar negócio"
+
+#~ msgid "Change"
+#~ msgstr "Mudar"
+
+#~ msgid "Attack %+d"
+#~ msgstr "Ataque %+d"
+
+#~ msgid "Defense %+d"
+#~ msgstr "Defesa %+d"
+
+#~ msgid "HP %+d"
+#~ msgstr "HP %+d"
+
+#~ msgid "MP %+d"
+#~ msgstr "MP %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Confirmar"
+
+#~ msgid "Charisma:"
+#~ msgstr "Carisma:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Peso Total: %d - Peso Máximo: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Manter"
diff --git a/po/ru.po b/po/ru.po
new file mode 100644
index 00000000..2eaa1a05
--- /dev/null
+++ b/po/ru.po
@@ -0,0 +1,582 @@
+# Russian translation for tmw
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the tmw package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tmw\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-01-08 11:50+0000\n"
+"Last-Translator: idle sign <Unknown>\n"
+"Language-Team: Russian <ru@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "Купить"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "Стоимость: %d GP / Всегоl: %d GP"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "Выход"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "Описание: %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "Эффект: %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr ""
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "Вы уверены, что хотите удалить этого персонажа?"
+
+#: src/gui/char_select.cpp:79
+msgid "Select Character"
+msgstr "Выбор персонажа"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "Отмена"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "Новый"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "Удалить"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "Предыдущий"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "Следующий"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "Имя: %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "Уровень: %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "Уровень: %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "Деньги: %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "Создать персонажа"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "Имя:"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "Цвет волос:"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "Стрижка:"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "Создать"
+
+#: src/gui/char_server.cpp:52
+#, fuzzy
+msgid "Select Server"
+msgstr "Выбор персонажа"
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "Да"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "Нет"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "Соединение..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr "Снаряжение"
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr "Инвентарь"
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "Использовать"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "Сбросить"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr "Снять"
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr "Надеть"
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr "Сколько предметов продать."
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr "Сколько предметов сбросить."
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "Вход"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "Пароль:"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Сервер:"
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr ""
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "Зарегистрироваться"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "Состояние"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr "Умения"
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr "Клавиша"
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "Настройка"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr "МиниКарта"
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr "NPC"
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr "@@trade|Торговать с %s@@"
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr "@@attack|Атаковать %s@@"
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr "@@talk|Говорить с NPC@@"
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr "@@cancelОтмена@@"
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr "@@pickup|Подобрать %s@@"
+
+#: src/gui/popupmenu.cpp:283
+#, fuzzy
+msgid "@@use|Unequip@@"
+msgstr "@@use|Надеть@@"
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr "@@use|Надеть@@"
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr "@@use|Использовать@@"
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr "@@drop|Сбросить@@"
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr "@@description|Описание@@"
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr "Подтвердите:"
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr ""
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr ""
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "Имя пользователя должно содержать не менее %d символов."
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "Имя пользователя не должно содержать более %d символов."
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "Пароль должен содержать не менее %d символов."
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "Пароль не должен содержать более %d символов."
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "Пароли не совпадают."
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "Ошибка"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr "Продать"
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr "Звук"
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr "Громкость эффектов"
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr "Громкость музыки"
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr "Применить"
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr "Восстановить расположение окон"
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr "Видео"
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr "Аудио"
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr "Джойстик"
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr "Нажмите кнопку, чтобы начать калибровку"
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr "Калибровать"
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr "Использовать джойстик"
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr "Стоп"
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr "Вращайте рукоять"
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr "На полный экран"
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr "Выборочный курсор"
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr "Ограничение кадр/с:"
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr "Прозрачность интерфейса"
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr "Радиус прокрутки"
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr "Заторможенность прокрутки"
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr "Эффекты окружающей среды"
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr "выкл"
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr "низ."
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr "выс."
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr "Переключение в полноэкранный режим"
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr "Переключение на OpenGL"
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr "Переход к OpenGL требует перезагрузки игры."
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr "Добавить"
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr "Вы получили %d GP."
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr "Вы отдаете:"
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Unregister"
+#~ msgstr "Удалить регистрацию"
+
+#~ msgid "Strength:"
+#~ msgstr "Сила:"
+
+#~ msgid "Agility:"
+#~ msgstr "Выносливость:"
+
+#~ msgid "Dexterity:"
+#~ msgstr "Ловкость:"
+
+#~ msgid "Vitality:"
+#~ msgstr "Живучесть:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "Интеллект:"
+
+#~ msgid "Willpower:"
+#~ msgstr "Сила волиr:"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "Распределите очки (%d)"
+
+#~ msgid "Your name needs to be at least 4 characters."
+#~ msgstr "Имя должно содержать не менее четырех символов."
+
+#~ msgid "Character stats OK"
+#~ msgstr "Данные персонажа в порядке"
+
+#~ msgid "Please remove %d points"
+#~ msgstr "Снимите очки (%d)"
+
+#~ msgid "Split"
+#~ msgstr "Разделить"
+
+#~ msgid "Select amount of items to split."
+#~ msgstr "Сколько предметов разделить."
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Разделить@@"
+
+#~ msgid "Switch server"
+#~ msgstr "Сменить сервер"
+
+#~ msgid "Switch character"
+#~ msgstr "Сменить персонажа"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Choose your Mana World Server"
+#~ msgstr "Выберите сервер Mana World"
+
+#~ msgid "Port:"
+#~ msgstr "Порт:"
+
+#~ msgid "Please type both the address and the port of a server."
+#~ msgstr "Следует указать адрес и порт сервера."
+
+#~ msgid "Propose trade"
+#~ msgstr "Предложить торговлю"
+
+#~ msgid "Confirm trade"
+#~ msgstr "Принять предложение торговли"
+
+#~ msgid "Change"
+#~ msgstr "Сменить"
+
+#~ msgid "Attack %+d"
+#~ msgstr "Атака %+d"
+
+#~ msgid "Defense %+d"
+#~ msgstr "Защита %+d"
+
+#~ msgid "HP %+d"
+#~ msgstr "HP %+d"
+
+#~ msgid "MP %+d"
+#~ msgstr "Мана %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Подтвердить"
+
+#~ msgid "Charisma:"
+#~ msgstr "Харизма:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Суммарный вес: %d - Макс. вес: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Оставить"
diff --git a/po/sk.po b/po/sk.po
new file mode 100644
index 00000000..682fa81a
--- /dev/null
+++ b/po/sk.po
@@ -0,0 +1,509 @@
+# Slovak translation for tmw
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the tmw package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tmw\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-12-30 14:07+0000\n"
+"Last-Translator: TomasKovacik <nail@nodomain.sk>\n"
+"Language-Team: Slovak <sk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "Kúpiť"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "Cena: %d GP / Spolu: %d GP"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "Ukončiť"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "Popis: %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "Effekt: %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr "Potvrdte zmazanie postavy"
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "Naozaj chcete odstrániť túto postavu?"
+
+#: src/gui/char_select.cpp:79
+#, fuzzy
+msgid "Select Character"
+msgstr "Vytvoriť postavu"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ano"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "Zrušiť"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "Nový"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "Vymazať"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "Predchádzajúci"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "Nasledujúci"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "Level: %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "Level: %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "Peniaze: %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "Vytvoriť postavu"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "Meno"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "Farba vlasov:"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "Štýl vlasov:"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "Vytvoriť"
+
+#: src/gui/char_server.cpp:52
+msgid "Select Server"
+msgstr ""
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr ""
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr ""
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr ""
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr ""
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr ""
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr ""
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr ""
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr ""
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr ""
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr ""
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:283
+msgid "@@use|Unequip@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr ""
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr ""
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr "Muž"
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr "Žena"
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr ""
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr ""
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr ""
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr ""
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr ""
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr ""
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr ""
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr ""
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr ""
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr ""
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr ""
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr ""
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr ""
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr ""
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr ""
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr ""
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr ""
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr ""
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Account and Character Management"
+#~ msgstr "Účet a správa postáv"
+
+#~ msgid "Unregister"
+#~ msgstr "Zrušiť registráciu"
+
+#~ msgid "Change Password"
+#~ msgstr "Zmeniť heslo"
+
+#~ msgid "Change Email Address"
+#~ msgstr "Zmeniť Emailovú adresu"
+
+#~ msgid "Account: %s"
+#~ msgstr "Účet: %s"
+
+#~ msgid "Strength:"
+#~ msgstr "Sila:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "Inteligencia:"
diff --git a/po/sv.po b/po/sv.po
new file mode 100644
index 00000000..0d029cf5
--- /dev/null
+++ b/po/sv.po
@@ -0,0 +1,582 @@
+# Swedish translation for tmw
+# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
+# This file is distributed under the same license as the tmw package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tmw\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-05-07 19:04+0000\n"
+"Last-Translator: Kess Vargavind <Unknown>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "Köp"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "Pris: %d GP / Totalt: %d GP"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "Avsluta"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "Beskrivning: %s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "Effekt: %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr ""
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "Är du säker på att du vill ta bort den här karaktären?"
+
+#: src/gui/char_select.cpp:79
+msgid "Select Character"
+msgstr "Välj karaktär"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "Ny"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "Ta bort"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "Föregående"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "Nästa"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "Namn: %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "Nivå: %d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "Nivå: %d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "Pengar: %d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "Skapa karaktär"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "Namn:"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "Hårfärg:"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "Frisyr:"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "Skapa"
+
+#: src/gui/char_server.cpp:52
+#, fuzzy
+msgid "Select Server"
+msgstr "Välj karaktär"
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "Ja"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "Nej"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "Ansluter..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr "Utrustning"
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr "Inventarium"
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "Använd"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "Släpp"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr "Avrusta"
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr "Utrusta"
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr "Välj antal föremål att handla med."
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr "Välj antal föremål att släppa."
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "Användarnamn"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "Lösenord:"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr ""
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "Registrera"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "Status"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr "Färdigheter"
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr "Genväg"
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "Inställningar"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr "Minikarta"
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr "NPC"
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr "@@trade|Handla med %s@@"
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr "@@attack|Attackera %s@@"
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr "@@talk|Prata med NPC@@"
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr "@@cancel|Avbryt@@"
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr "@@pickup|Plocka upp %s@@"
+
+#: src/gui/popupmenu.cpp:283
+#, fuzzy
+msgid "@@use|Unequip@@"
+msgstr "@@use|Utrusta@@"
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr "@@use|Utrusta@@"
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr "@@use|Använd@@"
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr "@@drop|Släpp@@"
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr "@@description|Beskrivning@@"
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr "Bekräfta:"
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr ""
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr ""
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "Användarnamnet måste vara minst %d tecken långt."
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "Användarnamnet måste vara kortare än %d tecken."
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "Lösenordet måste vara minst %d tecken långt."
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "Lösenordet måste vara kortare än %d tecken."
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "Lösenorden stämmer inte överens."
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "Fel"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr "Sälj"
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr "Ljud"
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr "Volym för ljudeffekter"
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr "Musikvolym"
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr "Verkställ"
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr "Återställ fönster"
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr "Video"
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr "Ljud"
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr "Joystick"
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr "Klicka på knappen för att starta kalibreringen"
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr "Kalibrera"
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr "Aktivera joystick"
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr "Stopp"
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr "Rotera spaken"
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr "Helskärm"
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr "Särskild muspekare"
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr "FPS-gräns:"
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr "Genomskinlighet"
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr "Rullningsradie"
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr "Tröghet för rullning"
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr "Omgivande FX"
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr "av"
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr "låg"
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr "hög"
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr "Byte till helskärm"
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr "Omstart krävs för att ändringarna ska synas."
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr "Ändrar OpenGL"
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr "Ändringar i OpenGL kräver omstart."
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr "Lägg till"
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr "Du får %d GP."
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr "Du ger:"
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Unregister"
+#~ msgstr "Avregistrera"
+
+#~ msgid "Strength:"
+#~ msgstr "Styrka:"
+
+#~ msgid "Agility:"
+#~ msgstr "Smidighet:"
+
+#~ msgid "Dexterity:"
+#~ msgstr "Skicklighet:"
+
+#~ msgid "Vitality:"
+#~ msgstr "Hälsa:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "Intelligens:"
+
+#~ msgid "Willpower:"
+#~ msgstr "Viljestyrka:"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "Var vänlig fördela %d poäng"
+
+#~ msgid "Your name needs to be at least 4 characters."
+#~ msgstr "Ditt namn måste vara minst 4 tecken långt."
+
+#~ msgid "Character stats OK"
+#~ msgstr "Karaktärens värden OK"
+
+#~ msgid "Please remove %d points"
+#~ msgstr "Var vänlig ta bort %d poäng"
+
+#~ msgid "Split"
+#~ msgstr "Dela"
+
+#~ msgid "Select amount of items to split."
+#~ msgstr "Välj antal föremål att dela."
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Dela@@"
+
+#~ msgid "Switch server"
+#~ msgstr "Byt server"
+
+#~ msgid "Switch character"
+#~ msgstr "Byt karaktär"
+
+#~ msgid "Email:"
+#~ msgstr "E-post:"
+
+#~ msgid "Choose your Mana World Server"
+#~ msgstr "Välj din Mana World-server"
+
+#~ msgid "Port:"
+#~ msgstr "Port:"
+
+#~ msgid "Please type both the address and the port of a server."
+#~ msgstr "Var vänlig skriv både adressen och porten till en server."
+
+#~ msgid "Propose trade"
+#~ msgstr "Föreslå handel"
+
+#~ msgid "Confirm trade"
+#~ msgstr "Bekräfta handel"
+
+#~ msgid "Change"
+#~ msgstr "Ändra"
+
+#~ msgid "Attack %+d"
+#~ msgstr "Attack %+d"
+
+#~ msgid "Defense %+d"
+#~ msgstr "Försvar %+d"
+
+#~ msgid "HP %+d"
+#~ msgstr "Hälsa %+d"
+
+#~ msgid "MP %+d"
+#~ msgstr "Mana %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Bekräfta"
+
+#~ msgid "Charisma:"
+#~ msgstr "Karisma:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Nuvarande vikt: %d - Maxvikt: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Behåll"
diff --git a/po/th.po b/po/th.po
new file mode 100644
index 00000000..beaa5a31
--- /dev/null
+++ b/po/th.po
@@ -0,0 +1,515 @@
+# Thai translation for tmw
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the tmw package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tmw\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-11-25 06:16+0000\n"
+"Last-Translator: Tharawut Paripaiboon <Unknown>\n"
+"Language-Team: Thai <th@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "ซื้อ"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "ราคา: %d GP / ทั้งหมด: %d GP"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "ออก"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr "ยืนยันการลบตัวละคร"
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
+
+#: src/gui/char_select.cpp:79
+#, fuzzy
+msgid "Select Character"
+msgstr "สร้างตัวละคร"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "ตกลง"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "ยกเลิก"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "สร้างใหม่"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "ลบทิ้ง"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "ก่อนหน้า"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "ถัดไป"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "ชื่อ: %s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, c-format
+msgid "Job Level: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "สร้างตัวละคร"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "ชื่อ:"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "สีผม:"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "ทรงผม:"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "สร้าง"
+
+#: src/gui/char_server.cpp:52
+msgid "Select Server"
+msgstr ""
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "ใช่"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "ไม่"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "กำลังเชื่อมต่อ..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "ใช้"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "ทิ้ง"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr ""
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr ""
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr ""
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "เข้าระบบ"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "รหัสผ่าน:"
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr ""
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr ""
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "สมัครสมาชิก"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "สถานะ"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "ตั้งค่า"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr ""
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr "NPC"
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:283
+msgid "@@use|Unequip@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr ""
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr "ยืนยัน:"
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr "ชาย"
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr "หญิง"
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr ""
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "ผิดพลาด"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr ""
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr ""
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr ""
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr ""
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr ""
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr ""
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr ""
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr ""
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr ""
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr ""
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr ""
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr ""
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr ""
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr ""
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr ""
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr ""
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Change Password"
+#~ msgstr "เปลี่ยนรหัสผ่าน"
+
+#~ msgid "Change Email Address"
+#~ msgstr "เปลี่ยนที่อยู่ Email"
+
+#~ msgid "Strength:"
+#~ msgstr "Strength:"
+
+#~ msgid "Agility:"
+#~ msgstr "Agility:"
+
+#~ msgid "Dexterity:"
+#~ msgstr "Dexterity:"
+
+#~ msgid "Vitality:"
+#~ msgstr "Vitality:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "Intelligence:"
+
+#~ msgid "Willpower:"
+#~ msgstr "Willpower:"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
diff --git a/po/zh_CN.po b/po/zh_CN.po
new file mode 100644
index 00000000..1dc7a3f0
--- /dev/null
+++ b/po/zh_CN.po
@@ -0,0 +1,582 @@
+# Simplified Chinese translation for tmw
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the tmw package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tmw\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"PO-Revision-Date: 2008-09-17 14:41+0000\n"
+"Last-Translator: luojie-dune <Unknown>\n"
+"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+msgid "Buy"
+msgstr "买"
+
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
+#: src/gui/sell.cpp:304
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr "价格：%d GP/总数：%d GP"
+
+#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+msgid "Quit"
+msgstr "退出"
+
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
+#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#, c-format
+msgid "Description: %s"
+msgstr "描述：%s"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
+#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#, c-format
+msgid "Effect: %s"
+msgstr "影响: %s"
+
+#: src/gui/char_select.cpp:61
+msgid "Confirm Character Delete"
+msgstr ""
+
+#: src/gui/char_select.cpp:62
+msgid "Are you sure you want to delete this character?"
+msgstr "你确定想删除这个较色"
+
+#: src/gui/char_select.cpp:79
+msgid "Select Character"
+msgstr "选择较色"
+
+#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "OK"
+
+#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
+#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
+#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63
+msgid "Cancel"
+msgstr "取消"
+
+#: src/gui/char_select.cpp:84
+msgid "New"
+msgstr "新建"
+
+#: src/gui/char_select.cpp:85
+msgid "Delete"
+msgstr "删除"
+
+#: src/gui/char_select.cpp:86
+msgid "Previous"
+msgstr "上一页"
+
+#: src/gui/char_select.cpp:87
+msgid "Next"
+msgstr "下一页"
+
+#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
+#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
+msgstr "名字：%s"
+
+#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
+#: src/gui/char_select.cpp:197
+#, c-format
+msgid "Level: %d"
+msgstr "等级：%d"
+
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
+#: src/gui/char_select.cpp:198
+#, fuzzy, c-format
+msgid "Job Level: %d"
+msgstr "等级：%d"
+
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#, c-format
+msgid "Money: %d"
+msgstr "金钱：%d"
+
+#: src/gui/char_select.cpp:187
+#, c-format
+msgid "Gold: %d"
+msgstr ""
+
+#: src/gui/char_select.cpp:256
+msgid "Create Character"
+msgstr "创建角色"
+
+#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+msgid "Name:"
+msgstr "名称"
+
+#: src/gui/char_select.cpp:266
+msgid "Hair Color:"
+msgstr "头发颜色"
+
+#: src/gui/char_select.cpp:269
+msgid "Hair Style:"
+msgstr "发型"
+
+#: src/gui/char_select.cpp:270
+msgid "Create"
+msgstr "建立"
+
+#: src/gui/char_server.cpp:52
+#, fuzzy
+msgid "Select Server"
+msgstr "选择较色"
+
+#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
+#: src/gui/npc_text.cpp:46
+msgid "OK"
+msgstr ""
+
+#: src/gui/confirm_dialog.cpp:35
+msgid "Yes"
+msgstr "是"
+
+#: src/gui/confirm_dialog.cpp:36
+msgid "No"
+msgstr "否"
+
+#: src/gui/connection.cpp:49
+msgid "Connecting..."
+msgstr "连接中..."
+
+#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+msgid "Equipment"
+msgstr "装备"
+
+#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+msgid "Inventory"
+msgstr "清单"
+
+#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+msgid "Use"
+msgstr "使用"
+
+#: src/gui/inventorywindow.cpp:57
+msgid "Drop"
+msgstr "丢弃"
+
+#: src/gui/inventorywindow.cpp:99
+#, c-format
+msgid "Weight: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:104
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:225
+msgid "Unequip"
+msgstr "卸下装备"
+
+#: src/gui/inventorywindow.cpp:228
+msgid "Equip"
+msgstr "装备"
+
+#: src/gui/item_amount.cpp:75
+msgid "Select amount of items to trade."
+msgstr "请选择交易的物品数量"
+
+#: src/gui/item_amount.cpp:79
+msgid "Select amount of items to drop."
+msgstr "请选择丢弃的物品数量"
+
+#: src/gui/login.cpp:40
+msgid "Login"
+msgstr "登陆"
+
+#: src/gui/login.cpp:43 src/gui/register.cpp:66
+msgid "Password:"
+msgstr "密码："
+
+#: src/gui/login.cpp:44 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "服务器："
+
+#: src/gui/login.cpp:48
+msgid "Remember Username"
+msgstr ""
+
+#: src/gui/login.cpp:51 src/gui/register.cpp:75
+msgid "Register"
+msgstr "注册"
+
+#: src/gui/menuwindow.cpp:61
+msgid "Status"
+msgstr "状态"
+
+#: src/gui/menuwindow.cpp:64
+msgid "Skills"
+msgstr "技能"
+
+#: src/gui/menuwindow.cpp:65
+msgid "Shortcut"
+msgstr "快捷键"
+
+#: src/gui/menuwindow.cpp:66
+msgid "Setup"
+msgstr "安装"
+
+#: src/gui/minimap.cpp:34
+msgid "MiniMap"
+msgstr "小地图"
+
+#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+msgid "NPC"
+msgstr "NPC"
+
+#: src/gui/popupmenu.cpp:81
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr "@@交易|与%s交易@@"
+
+#: src/gui/popupmenu.cpp:83
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr "@@攻击|攻击%s@@"
+
+#: src/gui/popupmenu.cpp:114
+msgid "@@talk|Talk To NPC@@"
+msgstr "@@谈话|和NPC谈话@@"
+
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
+#: src/gui/popupmenu.cpp:293
+msgid "@@cancel|Cancel@@"
+msgstr "@@取消|取消@@"
+
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "@@pickup|Pick Up %s@@"
+msgstr "@@捡起|捡起%s@@"
+
+#: src/gui/popupmenu.cpp:283
+#, fuzzy
+msgid "@@use|Unequip@@"
+msgstr "@@使用|装备@@"
+
+#: src/gui/popupmenu.cpp:285
+msgid "@@use|Equip@@"
+msgstr "@@使用|装备@@"
+
+#: src/gui/popupmenu.cpp:288
+msgid "@@use|Use@@"
+msgstr "@@使用|使用@@"
+
+#: src/gui/popupmenu.cpp:290
+msgid "@@drop|Drop@@"
+msgstr "@@丢弃|丢弃@@"
+
+#: src/gui/popupmenu.cpp:291
+msgid "@@description|Description@@"
+msgstr "@@描述|描述@@"
+
+#: src/gui/register.cpp:67
+msgid "Confirm:"
+msgstr "确定"
+
+#: src/gui/register.cpp:73
+msgid "Male"
+msgstr ""
+
+#: src/gui/register.cpp:74
+msgid "Female"
+msgstr ""
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "用户名至少需要%d个字符"
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "用户名不能少于%d个字符"
+
+#: src/gui/register.cpp:192
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "密码需要至少%d个字符"
+
+#: src/gui/register.cpp:200
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "密码不能少于%d个字符"
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "密码不一致."
+
+#: src/gui/register.cpp:227
+msgid "Error"
+msgstr "错误"
+
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
+msgid "Sell"
+msgstr "出售"
+
+#: src/gui/setup_audio.cpp:40
+msgid "Sound"
+msgstr "声音"
+
+#: src/gui/setup_audio.cpp:46
+msgid "Sfx volume"
+msgstr "音效声量"
+
+#: src/gui/setup_audio.cpp:47
+msgid "Music volume"
+msgstr "音乐声量"
+
+#: src/gui/setup.cpp:58
+msgid "Apply"
+msgstr "应用"
+
+#: src/gui/setup.cpp:58
+msgid "Reset Windows"
+msgstr "重置窗口"
+
+#: src/gui/setup.cpp:79
+msgid "Video"
+msgstr "视频"
+
+#: src/gui/setup.cpp:83
+msgid "Audio"
+msgstr "音频"
+
+#: src/gui/setup.cpp:87
+msgid "Joystick"
+msgstr "游戏杆"
+
+#: src/gui/setup.cpp:91
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup.cpp:95
+msgid "Players"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+msgid "Press the button to start calibration"
+msgstr "按下开始校准按钮"
+
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+msgid "Calibrate"
+msgstr "校准"
+
+#: src/gui/setup_joystick.cpp:38
+msgid "Enable joystick"
+msgstr "启用游戏杆"
+
+#: src/gui/setup_joystick.cpp:73
+msgid "Stop"
+msgstr "停止"
+
+#: src/gui/setup_joystick.cpp:74
+msgid "Rotate the stick"
+msgstr "旋转手柄"
+
+#: src/gui/setup_video.cpp:112
+msgid "Full screen"
+msgstr "全屏"
+
+#: src/gui/setup_video.cpp:113
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/gui/setup_video.cpp:114
+msgid "Custom cursor"
+msgstr "通常的光标"
+
+#: src/gui/setup_video.cpp:116
+msgid "FPS Limit:"
+msgstr "FPS限制"
+
+#: src/gui/setup_video.cpp:135
+msgid "Gui opacity"
+msgstr "Gui 透明度"
+
+#: src/gui/setup_video.cpp:192
+msgid "Scroll radius"
+msgstr "滚动半径"
+
+#: src/gui/setup_video.cpp:200
+msgid "Scroll laziness"
+msgstr "拉动极限"
+
+#: src/gui/setup_video.cpp:208
+msgid "Ambient FX"
+msgstr "环境音效"
+
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+msgid "off"
+msgstr "离线"
+
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+msgid "low"
+msgstr "低"
+
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
+#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+msgid "high"
+msgstr "高"
+
+#: src/gui/setup_video.cpp:227
+msgid "Particle Detail"
+msgstr ""
+
+#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:309
+msgid "Switching to full screen"
+msgstr "切换到全屏"
+
+#: src/gui/setup_video.cpp:310
+msgid "Restart needed for changes to take effect."
+msgstr "只有改变生效后才能重启"
+
+#: src/gui/setup_video.cpp:322
+msgid "Changing OpenGL"
+msgstr "改变成OpenGL"
+
+#: src/gui/setup_video.cpp:323
+msgid "Applying change to OpenGL requires restart."
+msgstr "运用改变为OpenGL需要重新开始"
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr "添加"
+
+#: src/gui/trade.cpp:64
+msgid "Trade"
+msgstr ""
+
+#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#, c-format
+msgid "You get %d GP."
+msgstr "你得到%d GP."
+
+#: src/gui/trade.cpp:81
+msgid "You give:"
+msgstr "你得到："
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Unregister"
+#~ msgstr "注销"
+
+#~ msgid "Strength:"
+#~ msgstr "力量"
+
+#~ msgid "Agility:"
+#~ msgstr "敏捷:"
+
+#~ msgid "Dexterity:"
+#~ msgstr "智慧:"
+
+#~ msgid "Vitality:"
+#~ msgstr "体力:"
+
+#~ msgid "Intelligence:"
+#~ msgstr "智力:"
+
+#~ msgid "Willpower:"
+#~ msgstr "意志力:"
+
+#~ msgid "Please distribute %d points"
+#~ msgstr "请分发%d点数"
+
+#~ msgid "Your name needs to be at least 4 characters."
+#~ msgstr "你的名字需要至少4个字符"
+
+#~ msgid "Character stats OK"
+#~ msgstr "角色状态可以"
+
+#~ msgid "Please remove %d points"
+#~ msgstr "请删除%d点数"
+
+#~ msgid "Split"
+#~ msgstr "分离"
+
+#~ msgid "Select amount of items to split."
+#~ msgstr "请选择你分离的物品的数量"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@分离|分离@@"
+
+#~ msgid "Switch server"
+#~ msgstr "交换服务器"
+
+#~ msgid "Switch character"
+#~ msgstr "交换角色"
+
+#~ msgid "Email:"
+#~ msgstr "电子邮件"
+
+#~ msgid "Choose your Mana World Server"
+#~ msgstr "请选择你的魔法世界服务器"
+
+#~ msgid "Port:"
+#~ msgstr "端口："
+
+#~ msgid "Please type both the address and the port of a server."
+#~ msgstr "请输入服务器的IP地址和端口"
+
+#~ msgid "Propose trade"
+#~ msgstr "打算交易"
+
+#~ msgid "Confirm trade"
+#~ msgstr "决定交易"
+
+#~ msgid "Change"
+#~ msgstr "改变"
+
+#~ msgid "Attack %+d"
+#~ msgstr "攻击 %+d"
+
+#~ msgid "Defense %+d"
+#~ msgstr "防护 %+d"
+
+#~ msgid "HP %+d"
+#~ msgstr "HP %+d"
+
+#~ msgid "MP %+d"
+#~ msgstr "MP %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "确定"
+
+#~ msgid "Charisma:"
+#~ msgstr "魅力:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "总的力量：%d - 最大力量：%d"
+
+#~ msgid "Keep"
+#~ msgstr "保持"
-- 
cgit v1.2.3-70-g09d2


From 394989d94081cbc462ba7d567fc88d0c4dff8134 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <crush@themanaworld.org>
Date: Tue, 6 Jan 2009 14:33:20 +0100
Subject: Added support for animated tiles.

---
 src/map.cpp                 | 51 +++++++++++++++++++++++++-
 src/map.h                   | 40 +++++++++++++++++++--
 src/resources/mapreader.cpp | 88 +++++++++++++++++++++++++++++++++------------
 3 files changed, 153 insertions(+), 26 deletions(-)

diff --git a/src/map.cpp b/src/map.cpp
index 217a14e3..5d36d772 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -62,6 +62,34 @@ struct Location
     MetaTile *tile;
 };
 
+TileAnimation::TileAnimation(Animation *ani):
+    mAnimation(ani),
+    mLastUpdate(tick_time),
+    mLastImage(NULL)
+{
+}
+
+void TileAnimation::update()
+{
+    //update animation
+    mAnimation.update(tick_time - mLastUpdate);
+    mLastUpdate = tick_time;
+
+    // exchange images
+    Image *img = mAnimation.getCurrentImage();
+    if (img != mLastImage)
+    {
+        for (std::list<std::pair<MapLayer*, int> >::iterator i = mAffected.begin();
+             i != mAffected.end();
+             i++)
+        {
+            i->first->setTile(i->second, img);
+        }
+        mLastImage = img;
+    }
+
+}
+
 MapLayer::MapLayer(int x, int y, int width, int height, bool isFringeLayer):
     mX(x), mY(y),
     mWidth(width), mHeight(height),
@@ -79,7 +107,7 @@ MapLayer::~MapLayer()
 
 void MapLayer::setTile(int x, int y, Image *img)
 {
-    mTiles[x + y * mWidth] = img;
+    setTile(x + y * mWidth, img);
 }
 
 Image* MapLayer::getTile(int x, int y) const
@@ -156,6 +184,7 @@ Map::~Map()
     delete_all(mLayers);
     delete_all(mTilesets);
     delete_all(mOverlays);
+    delete_all(mTileAnimations);
 }
 
 void Map::initializeOverlays()
@@ -217,6 +246,15 @@ void Map::draw(Graphics *graphics, int scrollX, int scrollY)
     // Make sure sprites are sorted
     mSprites.sort(spriteCompare);
 
+    //update animated tiles
+    for (std::map<int, TileAnimation*>::iterator iAni = mTileAnimations.begin();
+         iAni != mTileAnimations.end();
+         iAni++)
+    {
+        iAni->second->update();
+    }
+
+    // draw the game world
     Layers::const_iterator layeri = mLayers.begin();
     for (; layeri != mLayers.end(); ++layeri)
     {
@@ -514,3 +552,14 @@ void Map::initializeParticleEffects(Particle* particleEngine)
         }
     }
 }
+
+TileAnimation* Map::getAnimationForGid(int gid)
+{
+    std::map<int, TileAnimation*>::iterator i = mTileAnimations.find(gid);
+    if (i == mTileAnimations.end())
+    {
+        return NULL;
+    } else {
+        return i->second;
+    }
+}
diff --git a/src/map.h b/src/map.h
index 56183abf..81d0b629 100644
--- a/src/map.h
+++ b/src/map.h
@@ -28,6 +28,8 @@
 #include "position.h"
 #include "properties.h"
 
+#include "simpleanimation.h"
+
 class AmbientOverlay;
 class Graphics;
 class Image;
@@ -63,6 +65,23 @@ struct MetaTile
     bool walkable;           /**< Can beings walk on this tile */
 };
 
+/**
+ * Animation cycle of a tile image which changes the map accordingly.
+ */
+class TileAnimation
+{
+    public:
+        TileAnimation(Animation *ani);
+        void update();
+        void addAffectedTile(MapLayer *layer, int index)
+        { mAffected.push_back(std::make_pair(layer, index)); }
+    private:
+        std::list<std::pair<MapLayer*, int> > mAffected;
+        SimpleAnimation mAnimation;
+        int mLastUpdate;
+        Image* mLastImage;
+};
+
 /**
  * A map layer. Stores a grid of tiles and their offset, and implements layer
  * rendering.
@@ -87,6 +106,11 @@ class MapLayer
          */
         void setTile(int x, int y, Image *img);
 
+        /**
+         * Set tile image with x + y * width already known.
+         */
+        void setTile(int index, Image *img) { mTiles[index] = img; }
+
         /**
          * Get tile image, with x and y in layer coordinates.
          */
@@ -225,8 +249,18 @@ class Map : public Properties
         /**
          * Initializes all added particle effects
          */
-        void
-        initializeParticleEffects(Particle* particleEngine);
+        void initializeParticleEffects(Particle* particleEngine);
+
+        /**
+         * Adds a tile animation to the map
+         */
+        void addAnimation(int gid, TileAnimation *animation)
+        { mTileAnimations[gid] = animation; }
+
+        /**
+         * Gets the tile animation for a specific gid
+         */
+        TileAnimation *getAnimationForGid(int gid);
 
     private:
         /**
@@ -270,6 +304,8 @@ class Map : public Properties
             int y;
         };
         std::list<ParticleEffectData> particleEffects;
+
+        std::map<int, TileAnimation*> mTileAnimations;
 };
 
 #endif
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index c6b6d1cd..04019d32 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -300,7 +300,8 @@ void MapReader::readProperties(xmlNodePtr node, Properties *props)
 static void setTile(Map *map, MapLayer *layer, int x, int y, int gid)
 {
     const Tileset * const set = map->getTilesetWithGid(gid);
-    if (layer) {
+    if (layer)
+    {
         // Set regular tile on a layer
         Image * const img = set ? set->get(gid - set->getFirstGid()) : 0;
         layer->setTile(x, y, img);
@@ -403,6 +404,12 @@ void MapReader::readLayer(xmlNodePtr node, Map *map)
 
                     setTile(map, layer, x, y, gid);
 
+                    TileAnimation* ani = map->getAnimationForGid(gid);
+                    if (ani)
+                    {
+                        ani->addAffectedTile(layer, x + y * w);
+                    }
+
                     x++;
                     if (x == w) {
                         x = 0; y++;
@@ -450,6 +457,7 @@ Tileset *MapReader::readTileset(xmlNodePtr node,
 {
     int firstGid = XML::getProperty(node, "firstgid", 0);
     XML::Document* doc = NULL;
+    Tileset *set = NULL;
 
     if (xmlHasProp(node, BAD_CAST "source"))
     {
@@ -466,37 +474,71 @@ Tileset *MapReader::readTileset(xmlNodePtr node,
 
     for_each_xml_child_node(childNode, node)
     {
-        if (!xmlStrEqual(childNode->name, BAD_CAST "image"))
-            continue;
+        if (xmlStrEqual(childNode->name, BAD_CAST "image"))
+        {
+            const std::string source = XML::getProperty(childNode, "source", "");
+
+            if (!source.empty())
+            {
+                std::string sourceStr = source;
+                sourceStr.erase(0, 3);  // Remove "../"
 
-        const std::string source = XML::getProperty(childNode, "source", "");
+                ResourceManager *resman = ResourceManager::getInstance();
+                Image* tilebmp = resman->getImage(sourceStr);
 
-        if (!source.empty())
+                if (tilebmp)
+                {
+                    set = new Tileset(tilebmp, tw, th, firstGid);
+                    tilebmp->decRef();
+                }
+                else {
+                    logger->log("Warning: Failed to load tileset (%s)",
+                            source.c_str());
+                }
+            }
+        }
+        else if (xmlStrEqual(childNode->name, BAD_CAST "tile"))
         {
-            std::string sourceStr = source;
-            while (sourceStr.substr(0, 3) == "../")
-                   sourceStr.erase(0, 3);  // Remove "../"
+            for_each_xml_child_node(tileNode, childNode)
+            {
+                if (!xmlStrEqual(tileNode->name, BAD_CAST "properties")) continue;
 
-            ResourceManager *resman = ResourceManager::getInstance();
-            Image* tilebmp = resman->getImage(sourceStr);
+                int tileGID = firstGid + XML::getProperty(childNode, "id", 0);
 
-            if (tilebmp)
-            {
-                Tileset *set = new Tileset(tilebmp, tw, th, firstGid);
-                tilebmp->decRef();
-                delete doc;
-                return set;
-            }
-            else {
-                logger->log("Warning: Failed to load tileset (%s)", source.c_str());
+                // read tile properties to a map for simpler handling
+                std::map<std::string, int> tileProperties;
+                for_each_xml_child_node(propertyNode, tileNode)
+                {
+                    if (!xmlStrEqual(propertyNode->name, BAD_CAST "property")) continue;
+                    std::string name = XML::getProperty(propertyNode, "name", "");
+                    int value = XML::getProperty(propertyNode, "value", 0);
+                    tileProperties[name] = value;
+                    logger->log("Tile Prop of %d \"%s\" = \"%d\"", tileGID, name.c_str(), value);
+                }
+
+                // create animation
+                if (!set) continue;
+
+                Animation *ani = new Animation();
+                for (int i = 0; ;i++)
+                {
+                    std::map<std::string, int>::iterator iFrame, iDelay;
+                    iFrame = tileProperties.find("animation-frame" + toString(i));
+                    iDelay = tileProperties.find("animation-delay" + toString(i));
+                    if (iFrame != tileProperties.end() && iDelay != tileProperties.end())
+                    {
+                        ani->addFrame(set->get(iFrame->second), iDelay->second, 0, 0);
+                    } else {
+                        break;
+                    }
+                }
+                map->addAnimation(tileGID, new TileAnimation(ani));
+                logger->log("Animation length: %d", ani->getLength());
             }
         }
-
-        // Only one image element expected
-        break;
     }
 
     delete doc;
 
-    return NULL;
+    return set;
 }
-- 
cgit v1.2.3-70-g09d2


From 14a12cbe586f88ace6d90d9ca5b802edfb546768 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 6 Jan 2009 17:50:52 +0100
Subject: Merged layout handler from mainline

Also fixed login dialog layout. This is the layout handler by Guillaume
Melquiond, which he started in commit 59472ef68fdef3f7e8858a81a46e28c127119c58.
---
 src/CMakeLists.txt         |   2 +
 src/Makefile.am            |   2 +
 src/gui/login.cpp          |  77 +++--------
 src/gui/popupmenu.cpp      |   2 +-
 src/gui/widgets/layout.cpp | 327 +++++++++++++++++++++++++++++++++++++++++++++
 src/gui/widgets/layout.h   | 320 ++++++++++++++++++++++++++++++++++++++++++++
 src/gui/window.cpp         |  83 +++++++-----
 src/gui/window.h           |  62 ++++++---
 8 files changed, 762 insertions(+), 113 deletions(-)
 create mode 100644 src/gui/widgets/layout.cpp
 create mode 100644 src/gui/widgets/layout.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7f0560b5..f270f35c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -53,6 +53,8 @@ SET(SRCS
     gui/widgets/dropdown.h
     gui/widgets/resizegrip.cpp
     gui/widgets/resizegrip.h
+    gui/widgets/layout.cpp
+    gui/widgets/layout.h
     gui/box.cpp
     gui/box.h
     gui/browserbox.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index d59198d1..ded201b7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,8 @@
 bin_PROGRAMS = aethyra
 aethyra_SOURCES = gui/widgets/dropdown.cpp \
               gui/widgets/dropdown.h \
+	      gui/widgets/layout.cpp \
+	      gui/widgets/layout.h \
               gui/widgets/resizegrip.cpp \
 	      gui/widgets/resizegrip.h \
 	      gui/box.cpp \
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 8fd77f44..18976b46 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -31,6 +31,8 @@
 #include "passwordfield.h"
 #include "textfield.h"
 
+#include "widgets/layout.h"
+
 #include "../main.h"
 #include "../logindata.h"
 #include "../configuration.h"
@@ -75,43 +77,6 @@ LoginDialog::LoginDialog(LoginData *loginData):
     mCancelButton = new Button(_("Cancel"), "cancel", this);
     mRegisterButton = new Button(_("Register"), "register", this);
 
-    setContentSize(LOGIN_DIALOG_WIDTH, LOGIN_DIALOG_HEIGHT);
-
-    const int USER_TOP = 5;
-    userLabel->setPosition(5, USER_TOP);
-    mUserField->setPosition(65, USER_TOP);
-    mUserField->setWidth(FIELD_WIDTH);
-
-    const int PASS_TOP = 9 + USER_TOP + userLabel->getHeight();
-    passLabel->setPosition(5, PASS_TOP);
-    mPassField->setPosition(65, PASS_TOP);
-    mPassField->setWidth(FIELD_WIDTH);
-
-    const int SERVER_TOP = 9 + PASS_TOP + passLabel->getHeight();
-    serverLabel->setPosition(5, SERVER_TOP);
-    mServerField->setPosition(65, SERVER_TOP);
-    mServerField->setWidth(FIELD_WIDTH);
-
-    const int PORT_TOP = 9 + SERVER_TOP + serverLabel->getHeight();
-    portLabel->setPosition(5, PORT_TOP);
-    mPortField->setPosition(65, PORT_TOP);
-    mPortField->setWidth(FIELD_WIDTH);
-
-    const int DROP_DOWN_TOP = 9 + PORT_TOP + serverLabel->getHeight();
-    dropdownLabel->setPosition(5, DROP_DOWN_TOP);
-    mServerDropDown->setPosition(65, DROP_DOWN_TOP);
-    mServerDropDown->setWidth(FIELD_WIDTH);
-
-    const int REST_TOP = LOGIN_DIALOG_HEIGHT - mCancelButton->getHeight() - 5;
-
-    mKeepCheck->setPosition(4, REST_TOP);
-    mCancelButton->setPosition(
-            LOGIN_DIALOG_WIDTH - mCancelButton->getWidth() - 5, REST_TOP);
-    mOkButton->setPosition(
-            mCancelButton->getX() - mOkButton->getWidth() - 5, REST_TOP);
-    mRegisterButton->setPosition(
-            mKeepCheck->getX() + mKeepCheck->getWidth() + 10, REST_TOP);
-
     mUserField->setActionEventId("ok");
     mPassField->setActionEventId("ok");
     mServerField->setActionEventId("ok");
@@ -129,20 +94,21 @@ LoginDialog::LoginDialog(LoginData *loginData):
     mServerDropDown->addActionListener(this);
     mKeepCheck->addActionListener(this);
 
-    add(userLabel);
-    add(passLabel);
-    add(serverLabel);
-    add(portLabel);
-    add(dropdownLabel);
-    add(mUserField);
-    add(mPassField);
-    add(mServerField);
-    add(mPortField);
-    add(mServerDropDown);
-    add(mKeepCheck);
-    add(mOkButton);
-    add(mCancelButton);
-    add(mRegisterButton);
+    place(0, 0, userLabel);
+    place(0, 1, passLabel);
+    place(0, 2, serverLabel);
+    place(0, 3, portLabel);
+    place(0, 4, dropdownLabel);
+    place(1, 0, mUserField, 3).setPadding(2);
+    place(1, 1, mPassField, 3).setPadding(2);
+    place(1, 2, mServerField, 3).setPadding(2);
+    place(1, 3, mPortField, 3).setPadding(2);
+    place(1, 4, mServerDropDown, 3).setPadding(2);
+    place(0, 5, mKeepCheck, 4);
+    place(0, 6, mRegisterButton).setHAlign(LayoutCell::LEFT);
+    place(2, 6, mOkButton);
+    place(3, 6, mCancelButton);
+    reflowLayout(250, 0);
 
     setLocationRelativeTo(getParent());
     setVisible(true);
@@ -163,8 +129,7 @@ LoginDialog::~LoginDialog()
     delete mServerScrollArea;
 }
 
-void
-LoginDialog::action(const gcn::ActionEvent &event)
+void LoginDialog::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "ok" && canSubmit())
     {
@@ -209,14 +174,12 @@ LoginDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-void
-LoginDialog::keyPressed(gcn::KeyEvent &keyEvent)
+void LoginDialog::keyPressed(gcn::KeyEvent &keyEvent)
 {
     mOkButton->setEnabled(canSubmit());
 }
 
-bool
-LoginDialog::canSubmit()
+bool LoginDialog::canSubmit()
 {
     return !mUserField->getText().empty() &&
            !mPassField->getText().empty() &&
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 2b2eb625..a02a9eae 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -56,7 +56,7 @@ PopupMenu::PopupMenu():
 {
     setResizable(false);
     setTitleBarHeight(0);
-    mShowTitle = false;
+    setShowTitle(false);
 
     mBrowserBox = new BrowserBox();
     mBrowserBox->setPosition(4, 4);
diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp
new file mode 100644
index 00000000..bcc54cf7
--- /dev/null
+++ b/src/gui/widgets/layout.cpp
@@ -0,0 +1,327 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <cassert>
+
+#include "layout.h"
+
+ContainerPlacer ContainerPlacer::at(int x, int y)
+{
+    return ContainerPlacer(mContainer, &mCell->at(x, y));
+}
+
+LayoutCell &ContainerPlacer::operator()
+    (int x, int y, gcn::Widget *wg, int w, int h)
+{
+    mContainer->add(wg);
+    return mCell->place(wg, x, y, w, h);
+}
+
+LayoutCell::~LayoutCell()
+{
+    if (mType == ARRAY) delete mArray;
+}
+
+LayoutArray &LayoutCell::getArray()
+{
+    assert(mType != WIDGET);
+    if (mType == ARRAY) return *mArray;
+    mArray = new LayoutArray;
+    mType = ARRAY;
+    mExtent[0] = 1;
+    mExtent[1] = 1;
+    mPadding = 0;
+    mAlign[0] = FILL;
+    mAlign[1] = FILL;
+    return *mArray;
+}
+
+void LayoutCell::reflow(int nx, int ny, int nw, int nh)
+{
+    assert(mType != NONE);
+    nx += mPadding;
+    ny += mPadding;
+    nw -= 2 * mPadding;
+    nh -= 2 * mPadding;
+    if (mType == ARRAY)
+        mArray->reflow(nx, ny, nw, nh);
+    else
+        mWidget->setDimension(gcn::Rectangle(nx, ny, nw, nh));
+}
+
+void LayoutCell::computeSizes()
+{
+    assert(mType == ARRAY);
+
+    for (std::vector< std::vector< LayoutCell * > >::iterator
+         i = mArray->mCells.begin(), i_end = mArray->mCells.end();
+         i != i_end; ++i)
+    {
+        for (std::vector< LayoutCell * >::iterator
+             j = i->begin(), j_end = i->end(); j != j_end; ++j)
+        {
+            LayoutCell *cell = *j;
+            if (cell && cell->mType == ARRAY) cell->computeSizes();
+        }
+    }
+
+    mSize[0] = mArray->getSize(0);
+    mSize[1] = mArray->getSize(1);
+}
+
+LayoutArray::LayoutArray(): mSpacing(4)
+{
+}
+
+LayoutArray::~LayoutArray()
+{
+    for (std::vector< std::vector< LayoutCell * > >::iterator
+         i = mCells.begin(), i_end = mCells.end(); i != i_end; ++i)
+    {
+        for (std::vector< LayoutCell * >::iterator
+             j = i->begin(), j_end = i->end(); j != j_end; ++j)
+        {
+            delete *j;
+        }
+    }
+}
+
+LayoutCell &LayoutArray::at(int x, int y, int w, int h)
+{
+    resizeGrid(x + w, y + h);
+    LayoutCell *&cell = mCells[y][x];
+    if (!cell)
+    {
+        cell = new LayoutCell;
+    }
+    return *cell;
+}
+
+void LayoutArray::resizeGrid(int w, int h)
+{
+    bool extW = w && w > (int)mSizes[0].size(),
+         extH = h && h > (int)mSizes[1].size();
+    if (!extW && !extH) return;
+
+    if (extH)
+    {
+        mSizes[1].resize(h, Layout::AUTO_DEF);
+        mCells.resize(h);
+        if (!extW) w = mSizes[0].size();
+    }
+
+    if (extW)
+    {
+        mSizes[0].resize(w, Layout::AUTO_DEF);
+    }
+
+    for (std::vector< std::vector< LayoutCell * > >::iterator
+         i = mCells.begin(), i_end = mCells.end(); i != i_end; ++i)
+    {
+        i->resize(w, NULL);
+    }
+}
+
+void LayoutArray::setColWidth(int n, int w)
+{
+    resizeGrid(n + 1, 0);
+    mSizes[0][n] = w;
+}
+
+void LayoutArray::setRowHeight(int n, int h)
+{
+    resizeGrid(0, n + 1);
+    mSizes[1][n] = h;
+}
+
+void LayoutArray::matchColWidth(int n1, int n2)
+{
+    resizeGrid(std::max(n1, n2) + 1, 0);
+    std::vector< short > widths = getSizes(0, Layout::AUTO_DEF);
+    int s = std::max(widths[n1], widths[n2]);
+    mSizes[0][n1] = s;
+    mSizes[0][n2] = s;
+}
+
+void LayoutArray::extend(int x, int y, int w, int h)
+{
+    LayoutCell &cell = at(x, y, w, h);
+    cell.mExtent[0] = w;
+    cell.mExtent[1] = h;
+}
+
+LayoutCell &LayoutArray::place(gcn::Widget *widget, int x, int y, int w, int h)
+{
+    LayoutCell &cell = at(x, y, w, h);
+    assert(cell.mType == LayoutCell::NONE);
+    cell.mType = LayoutCell::WIDGET;
+    cell.mWidget = widget;
+    cell.mSize[0] = w == 1 ? widget->getWidth() : 0;
+    cell.mSize[1] = h == 1 ? widget->getHeight() : 0;
+    cell.mExtent[0] = w;
+    cell.mExtent[1] = h;
+    cell.mPadding = 0;
+    cell.mAlign[0] = LayoutCell::FILL;
+    cell.mAlign[1] = LayoutCell::FILL;
+    short &cs = mSizes[0][x], &rs = mSizes[1][y];
+    if (cs == Layout::AUTO_DEF && w == 1) cs = 0;
+    if (rs == Layout::AUTO_DEF && h == 1) rs = 0;
+    return cell;
+}
+
+void LayoutArray::align(int &pos, int &size, int dim,
+                        LayoutCell const &cell, short *sizes) const
+{
+    int size_max = sizes[0];
+    for (int i = 1; i < cell.mExtent[dim]; ++i)
+        size_max += sizes[i] + mSpacing;
+    size = std::min<int>(cell.mSize[dim], size_max);
+
+    switch (cell.mAlign[dim])
+    {
+        case LayoutCell::LEFT:
+            return;
+        case LayoutCell::RIGHT:
+            pos += size_max - size;
+            return;
+        case LayoutCell::CENTER:
+            pos += (size_max - size) / 2;
+            return;
+        case LayoutCell::FILL:
+            size = size_max;
+            return;
+    }
+}
+
+std::vector< short > LayoutArray::getSizes(int dim, int upp) const
+{
+    int gridW = mSizes[0].size(), gridH = mSizes[1].size();
+    std::vector< short > sizes = mSizes[dim];
+
+    // Compute minimum sizes.
+    for (int gridY = 0; gridY < gridH; ++gridY)
+    {
+        for (int gridX = 0; gridX < gridW; ++gridX)
+        {
+            LayoutCell const *cell = mCells[gridY][gridX];
+            if (!cell || cell->mType == LayoutCell::NONE) continue;
+
+            if (cell->mExtent[dim] == 1)
+            {
+                int n = dim == 0 ? gridX : gridY;
+                int s = cell->mSize[dim] + cell->mPadding * 2;
+                if (s > sizes[n]) sizes[n] = s;
+            }
+        }
+    }
+
+    if (upp == Layout::AUTO_DEF) return sizes;
+
+    // Compute the FILL sizes.
+    int nb = sizes.size();
+    int nbFill = 0;
+    for (int i = 0; i < nb; ++i)
+    {
+        if (mSizes[dim][i] <= Layout::AUTO_DEF)
+        {
+            ++nbFill;
+            if (mSizes[dim][i] == Layout::AUTO_SET ||
+                sizes[i] <= Layout::AUTO_DEF)
+            {
+                sizes[i] = 0;
+            }
+        }
+        upp -= sizes[i] + mSpacing;
+    }
+    upp = upp + mSpacing;
+
+    if (nbFill == 0) return sizes;
+
+    for (int i = 0; i < nb; ++i)
+    {
+        if (mSizes[dim][i] > Layout::AUTO_DEF) continue;
+        int s = upp / nbFill;
+        sizes[i] += s;
+        upp -= s;
+        --nbFill;
+    }
+
+    return sizes;
+}
+
+int LayoutArray::getSize(int dim) const
+{
+    std::vector< short > sizes = getSizes(dim, Layout::AUTO_DEF);
+    int size = 0;
+    int nb = sizes.size();
+    for (int i = 0; i < nb; ++i)
+    {
+        if (sizes[i] > Layout::AUTO_DEF) size += sizes[i];
+        size += mSpacing;
+    }
+    return size - mSpacing;
+}
+
+void LayoutArray::reflow(int nx, int ny, int nw, int nh)
+{
+    int gridW = mSizes[0].size(), gridH = mSizes[1].size();
+
+    std::vector< short > widths  = getSizes(0, nw);
+    std::vector< short > heights = getSizes(1, nh);
+
+    int y = ny;
+    for (int gridY = 0; gridY < gridH; ++gridY)
+    {
+        int x = nx;
+        for (int gridX = 0; gridX < gridW; ++gridX)
+        {
+            LayoutCell *cell = mCells[gridY][gridX];
+            if (cell && cell->mType != LayoutCell::NONE)
+            {
+                int dx = x, dy = y, dw, dh;
+                align(dx, dw, 0, *cell, &widths[gridX]);
+                align(dy, dh, 1, *cell, &heights[gridY]);
+                cell->reflow(dx, dy, dw, dh);
+            }
+            x += widths[gridX] + mSpacing;
+        }
+        y += heights[gridY] + mSpacing;
+    }
+}
+
+Layout::Layout(): mComputed(false)
+{
+    getArray();
+    setPadding(6);
+}
+
+void Layout::reflow(int &nw, int &nh)
+{
+    if (!mComputed)
+    {
+        computeSizes();
+        mComputed = true;
+    }
+
+    nw = nw == 0 ? mSize[0] + 2 * mPadding : nw;
+    nh = nh == 0 ? mSize[1] + 2 * mPadding : nh;
+    LayoutCell::reflow(0, 0, nw, nh);
+}
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
new file mode 100644
index 00000000..d631c154
--- /dev/null
+++ b/src/gui/widgets/layout.h
@@ -0,0 +1,320 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _TMW_WIDGET_LAYOUT_H__
+#define _TMW_WIDGET_LAYOUT_H__
+
+#include <vector>
+
+#include <guichan/widgets/container.hpp>
+
+class LayoutCell;
+
+/**
+ * This class is a helper for adding widgets to nested tables in a window.
+ */
+class ContainerPlacer
+{
+    public:
+
+        ContainerPlacer(gcn::Container *c = NULL, LayoutCell *l = NULL):
+            mContainer(c), mCell(l)
+        {}
+
+        /**
+         * Gets the pointed cell.
+         */
+        LayoutCell &getCell()
+        { return *mCell; }
+
+        /**
+         * Returns a placer for the same container but to an inner cell.
+         */
+        ContainerPlacer at(int x, int y);
+
+        /**
+         * Adds the given widget to the container and places it in the layout.
+         * @see LayoutArray::place
+         */
+        LayoutCell &operator()
+            (int x, int y, gcn::Widget *, int w = 1, int h = 1);
+
+    private:
+
+        gcn::Container *mContainer;
+        LayoutCell *mCell;
+};
+
+/**
+ * This class contains a rectangular array of cells.
+ */
+class LayoutArray
+{
+    friend class LayoutCell;
+
+    public:
+
+        LayoutArray();
+
+        ~LayoutArray();
+
+        /**
+         * Returns a reference on the cell at given position.
+         */
+        LayoutCell &at(int x, int y, int w = 1, int h = 1);
+
+        /**
+         * Places a widget in a given cell.
+         * @param w number of columns the widget spawns.
+         * @param h number of rows the widget spawns.
+         * @note When @a w is 1, the width of column @a x is reset to zero if
+         *       it was AUTO_DEF. Similarly for @a h.
+         */
+        LayoutCell &place(gcn::Widget *, int x, int y, int w = 1, int h = 1);
+
+        /**
+         * Sets the minimum width of a column.
+         */
+        void setColWidth(int n, int w);
+
+        /**
+         * Sets the minimum height of a row.
+         */
+        void setRowHeight(int n, int h);
+
+        /**
+         * Sets the widths of two columns to the maximum of their widths.
+         */
+        void matchColWidth(int n1, int n2);
+
+        /**
+         * Spawns a cell over several columns/rows.
+         */
+        void extend(int x, int y, int w, int h);
+
+        /**
+         * Computes and sets the positions of all the widgets.
+         * @param nW width of the array, used to resize the AUTO_ columns.
+         * @param nH height of the array, used to resize the AUTO_ rows.
+         */
+        void reflow(int nX, int nY, int nW, int nH);
+
+    private:
+
+        // Copy not allowed, as the array owns all its cells.
+        LayoutArray(LayoutArray const &);
+        LayoutArray &operator=(LayoutArray const &);
+
+        /**
+         * Gets the position and size of a widget along a given axis
+         */
+        void align(int &pos, int &size, int dim,
+                   LayoutCell const &cell, short *sizes) const;
+
+        /**
+         * Ensures the private vectors are large enough.
+         */
+        void resizeGrid(int w, int h);
+
+        /**
+         * Gets the column/row sizes along a given axis.
+         * @param upp target size for the array. Ignored if AUTO_DEF.
+         */
+        std::vector< short > getSizes(int dim, int upp) const;
+
+        /**
+         * Gets the total size along a given axis.
+         */
+        int getSize(int dim) const;
+
+        std::vector< short > mSizes[2];
+        std::vector< std::vector < LayoutCell * > > mCells;
+
+        char mSpacing;
+};
+
+/**
+ * This class describes the formatting of a widget in the cell of a layout
+ * table. Horizontally, a widget can either fill the width of the cell (minus
+ * the cell padding), or it can retain its size and be flushed left, or flush
+ * right, or centered in the cell. The process is similar for the vertical
+ * alignment, except that top is represented by LEFT and bottom by RIGHT.
+ */
+class LayoutCell
+{
+    friend class Layout;
+    friend class LayoutArray;
+
+    public:
+
+        enum Alignment
+        {
+            LEFT, RIGHT, CENTER, FILL
+        };
+
+        LayoutCell(): mType(NONE) {}
+
+        ~LayoutCell();
+
+        /**
+         * Sets the padding around the cell content.
+         */
+        LayoutCell &setPadding(int p)
+        { mPadding = p; return *this; }
+
+        /**
+         * Sets the horizontal alignment of the cell content.
+         */
+        LayoutCell &setHAlign(Alignment a)
+        { mAlign[0] = a; return *this; }
+
+        /**
+         * Sets the vertical alignment of the cell content.
+         */
+        LayoutCell &setVAlign(Alignment a)
+        { mAlign[1] = a; return *this; }
+
+        /**
+         * @see LayoutArray::at
+         */
+        LayoutCell &at(int x, int y)
+        { return getArray().at(x, y); }
+
+        /**
+         * @see LayoutArray::place
+         */
+        LayoutCell &place(gcn::Widget *wg, int x, int y, int w = 1, int h = 1)
+        { return getArray().place(wg, x, y, w, h); }
+
+        /**
+         * @see LayoutArray::matchColWidth
+         */
+        void matchColWidth(int n1, int n2)
+        { getArray().matchColWidth(n1, n2); }
+
+        /**
+         * @see LayoutArray::setColWidth
+         */
+        void setColWidth(int n, int w)
+        { getArray().setColWidth(n, w); }
+
+        /**
+         * @see LayoutArray::setRowHeight
+         */
+        void setRowHeight(int n, int h)
+        { getArray().setRowHeight(n, h); }
+
+        /**
+         * @see LayoutArray::extend.
+         */
+        void extend(int x, int y, int w, int h)
+        { getArray().extend(x, y, w, h); }
+
+        /**
+         * Sets the minimum widths and heights of this cell and of all the
+         * inner cells.
+         */
+        void computeSizes();
+
+    private:
+
+        // Copy not allowed, as the cell may own an array.
+        LayoutCell(LayoutCell const &);
+        LayoutCell &operator=(LayoutCell const &);
+
+        union
+        {
+            gcn::Widget *mWidget;
+            LayoutArray *mArray;
+        };
+
+        enum
+        {
+            NONE, WIDGET, ARRAY
+        };
+
+        /**
+         * Returns the embedded array. Creates it if the cell does not contain
+         * anything yet. Aborts if it contains a widget.
+         */
+        LayoutArray &getArray();
+
+        /**
+         * @see LayoutArray::reflow
+         */
+        void reflow(int nx, int ny, int nw, int nh);
+
+        short mSize[2];
+        char mPadding;
+        char mExtent[2];
+        char mAlign[2];
+        char mNbFill[2];
+        char mType;
+};
+
+/**
+ * This class is an helper for setting the position of widgets. They are
+ * positioned along the cells of some rectangular tables. The layout may either
+ * be a single table or a tree of nested tables.
+ *
+ * The size of a given table column can either be set manually or be chosen
+ * from the widest widget of the column. An empty column has a AUTO_DEF width,
+ * which means it will be extended so that the layout fits its minimum width.
+ *
+ * The process is similar for table rows. By default, there is a spacing of 4
+ * pixels between rows and between columns, and a margin of 6 pixels around the
+ * whole layout.
+ */
+class Layout: public LayoutCell
+{
+    public:
+
+        Layout();
+
+        /**
+         * Sets the margin around the layout.
+         */
+        void setMargin(int m)
+        { setPadding(m); }
+
+        /**
+         * Sets the positions of all the widgets.
+         * @see LayoutArray::reflow
+         */
+        void reflow(int &nW, int &nH);
+
+        /**
+         * When the minimum size of the layout is less than the available size,
+         * the remaining pixels are equally split amongst the FILL items.
+         */
+        enum
+        {
+            AUTO_DEF = -42, /**< Default value, behaves like AUTO_ADD. */
+            AUTO_SET = -43, /**< Uses the share as the new size. */
+            AUTO_ADD = -44  /**< Adds the share to the current size. */
+        };
+
+    private:
+
+        bool mComputed;
+};
+
+#endif
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index dee5832a..e82a370e 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -22,7 +22,6 @@
 #include <algorithm>
 #include <cassert>
 #include <climits>
-#include <cassert>
 
 #include <guichan/exception.hpp>
 
@@ -33,6 +32,7 @@
 #include "window.h"
 #include "windowcontainer.h"
 
+#include "widgets/layout.h"
 #include "widgets/resizegrip.h"
 
 #include "../configlistener.h"
@@ -68,6 +68,7 @@ Window::Window(const std::string& caption, bool modal, Window *parent, const std
     gcn::Window(caption),
     mGrip(0),
     mParent(parent),
+    mLayout(NULL),
     mWindowName("window"),
     mShowTitle(true),
     mModal(modal),
@@ -82,7 +83,7 @@ Window::Window(const std::string& caption, bool modal, Window *parent, const std
     logger->log("Window::Window(\"%s\")", caption.c_str());
 
     if (!windowContainer) {
-        throw GCN_EXCEPTION("Window::Window. no windowContainer set");
+        throw GCN_EXCEPTION("Window::Window(): no windowContainer set");
     }
 
     // Loads the skin
@@ -104,11 +105,6 @@ Window::Window(const std::string& caption, bool modal, Window *parent, const std
     setPadding(3);
     setTitleBarHeight(20);
 
-    // Add chrome
-    mChrome = new GCContainer();
-    mChrome->setOpaque(false);
-    gcn::Window::add(mChrome);
-
     // Add this window to the window container
     windowContainer->add(this);
 
@@ -141,6 +137,15 @@ Window::~Window()
         }
     }
 
+    delete mLayout;
+
+    while (!mWidgets.empty())
+    {
+        gcn::Widget *w = mWidgets.front();
+        remove(w);
+        delete(w);
+    }
+
     instances--;
 
     // Clean up static resources
@@ -158,9 +163,6 @@ Window::~Window()
 
         closeImage->decRef();
     }
-
-    delete mChrome;
-    delete mGrip;
 }
 
 void Window::setWindowContainer(WindowContainer *wc)
@@ -195,7 +197,6 @@ void Window::draw(gcn::Graphics *graphics)
 
 void Window::setContentSize(int width, int height)
 {
-    mChrome->setSize(width, height);
     setSize(width + 2 * getPadding(),
             height + getPadding() + getTitleBarHeight());
 }
@@ -241,10 +242,11 @@ void Window::setResizable(bool r)
         mGrip = new ResizeGrip();
         mGrip->setX(getWidth() - mGrip->getWidth() - getChildrenArea().x);
         mGrip->setY(getHeight() - mGrip->getHeight() - getChildrenArea().y);
-        gcn::Window::add(mGrip);
+        add(mGrip);
     }
     else
     {
+        remove(mGrip);
         delete mGrip;
         mGrip = 0;
     }
@@ -252,15 +254,19 @@ void Window::setResizable(bool r)
 
 void Window::widgetResized(const gcn::Event &event)
 {
-    const gcn::Rectangle area = getChildrenArea();
-
-    mChrome->setSize(area.width, area.height);
-
     if (mGrip)
     {
+        const gcn::Rectangle area = getChildrenArea();
         mGrip->setPosition(getWidth() - mGrip->getWidth() - area.x,
                            getHeight() - mGrip->getHeight() - area.y);
     }
+
+    if (mLayout)
+    {
+        int w = getWidth() - 2 * getPadding();
+        int h = getHeight() - getPadding() - getTitleBarHeight();
+        mLayout->reflow(w, h);
+    }
 }
 
 void Window::setCloseButton(bool flag)
@@ -285,14 +291,7 @@ bool Window::isSticky()
 
 void Window::setVisible(bool visible)
 {
-    if (isSticky())
-    {
-        gcn::Window::setVisible(true);
-    }
-    else
-    {
-        gcn::Window::setVisible(visible);
-    }
+    gcn::Window::setVisible(isSticky() || visible);
 }
 
 void Window::scheduleDelete()
@@ -300,16 +299,6 @@ void Window::scheduleDelete()
     windowContainer->scheduleDelete(this);
 }
 
-void Window::add(gcn::Widget *w)
-{
-    mChrome->add(w);
-}
-
-void Window::add(gcn::Widget *w, int x, int y)
-{
-    mChrome->add(w, x, y);
-}
-
 void Window::mousePressed(gcn::MouseEvent &event)
 {
     // Let Guichan move window to top and figure out title bar drag
@@ -710,3 +699,29 @@ void Window::loadSkin(const std::string filename)
     closeImage = resman->getImage("graphics/gui/close_button.png");
 }
 
+Layout &Window::getLayout()
+{
+    if (!mLayout) mLayout = new Layout;
+    return *mLayout;
+}
+
+LayoutCell &Window::place(int x, int y, gcn::Widget *wg, int w, int h)
+{
+    add(wg);
+    return getLayout().place(wg, x, y, w, h);
+}
+
+ContainerPlacer Window::getPlacer(int x, int y)
+{
+    return ContainerPlacer(this, &getLayout().at(x, y));
+}
+
+void Window::reflowLayout(int w, int h)
+{
+    assert(mLayout);
+    mLayout->reflow(w, h);
+    delete mLayout;
+    mLayout = NULL;
+    setContentSize(w, h);
+}
+
diff --git a/src/gui/window.h b/src/gui/window.h
index 9380fc88..89cc75a5 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -31,6 +31,11 @@
 
 class ConfigListener;
 class GCContainer;
+class ContainerPlacer;
+class Image;
+class ImageRect;
+class Layout;
+class LayoutCell;
 class ResizeGrip;
 class WindowContainer;
 
@@ -60,7 +65,7 @@ class Window : public gcn::Window, gcn::WidgetListener
                 Window *parent = NULL, const std::string &skin = "graphics/gui/gui.xml");
 
         /**
-         * Destructor.
+         * Destructor. Deletes all the added widgets.
          */
         ~Window();
 
@@ -74,18 +79,6 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         void draw(gcn::Graphics *graphics);
 
-        /**
-         * Adds a widget to the window. The widget will be deleted by the
-         * window.
-         */
-        void add(gcn::Widget *w);
-
-        /**
-         * Adds a widget to the window and also specifices its position. The
-         * widget will be deleted by the window.
-         */
-        void add(gcn::Widget *w, int x, int y);
-
         /**
          * Sets the size of this window.
          */
@@ -221,26 +214,56 @@ class Window : public gcn::Window, gcn::WidgetListener
          * Don't forget to set these default values and resizable before
          * calling this function.
          */
-        virtual void loadWindowState();
+        void loadWindowState();
 
         /**
          * Set the default win pos and size.
          * (which can be different of the actual ones.)
          */
-        virtual void setDefaultSize(int defaultX, int defaultY,
-                                    int defaultWidth, int defaultHeight);
+        void setDefaultSize(int defaultX, int defaultY,
+                            int defaultWidth, int defaultHeight);
 
         /**
          * Reset the win pos and size to default. Don't forget to set defaults
          * first.
          */
-        virtual void resetToDefaultSize();
+        void resetToDefaultSize();
+
+        /**
+         * Gets the layout handler for this window.
+         */
+        Layout &getLayout();
+
+        /**
+         * Computes the position of the widgets according to the current
+         * layout. Resizes the window so that the layout fits. Deletes the
+         * layout.
+         * @param w if non-zero, force the window to this width.
+         * @param h if non-zero, force the window to this height.
+         * @note This function is meant to be called with fixed-size windows.
+         */
+        void reflowLayout(int w = 0, int h = 0);
 
         /**
          * Loads a window skin
          */
         void loadSkin(const std::string filename);
 
+        /**
+         * Adds a widget to the window and sets it at given cell.
+         */
+        LayoutCell &place(int x, int y, gcn::Widget *, int w = 1, int h = 1);
+
+        /**
+         * Returns a proxy for adding widgets in an inner table of the layout.
+         */
+        ContainerPlacer getPlacer(int x, int y);
+
+    protected:
+        /** The window container windows add themselves to. */
+        static WindowContainer *windowContainer;
+
+    private:
         enum ResizeHandles
         {
             TOP    = 0x01,
@@ -249,7 +272,6 @@ class Window : public gcn::Window, gcn::WidgetListener
             LEFT   = 0x08
         };
 
-    protected:
         /**
          * Determines if the mouse is in a resize area and returns appropriate
          * resize handles. Also initializes drag offset in case the resize
@@ -264,6 +286,7 @@ class Window : public gcn::Window, gcn::WidgetListener
         GCContainer *mChrome;      /**< Contained container */
         ResizeGrip *mGrip;         /**< Resize grip */
         Window *mParent;           /**< The parent window */
+        Layout *mLayout;           /**< Layout handler */
         std::string mWindowName;   /**< Name of the window */
         bool mShowTitle;           /**< Window has a title bar */
         bool mModal;               /**< Window is modal */
@@ -280,9 +303,6 @@ class Window : public gcn::Window, gcn::WidgetListener
         int mDefaultHeight;        /**< Default window height */
         std::string mSkin;         /**< Name of the skin to use */
 
-        /** The window container windows add themselves to. */
-        static WindowContainer *windowContainer;
-
         /**
          * The config listener that listens to changes relevant to all windows.
          */
-- 
cgit v1.2.3-70-g09d2


From 6ee1046233bfa2218eff1ffa45e31821b3559ea0 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 6 Jan 2009 12:36:59 -0700
Subject: Removed a windows newline.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 packaging/debian/aethyra.xpm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/debian/aethyra.xpm b/packaging/debian/aethyra.xpm
index 25d3dc73..8d8550bd 100644
--- a/packaging/debian/aethyra.xpm
+++ b/packaging/debian/aethyra.xpm
@@ -309,4 +309,4 @@ static char * Aethyra_xpm[] = {
 "                            X+Y+Z+ +                            ",
 "                            * `+ @                              ",
 "                                                                ",
-"                                                                "};
+"                                                                "};
-- 
cgit v1.2.3-70-g09d2


From ea50de0b56063f3e7c6436422d275ac6e71d0072 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 6 Jan 2009 21:35:19 +0100
Subject: Used layout for buy, sell and item amount dialogs

(changes by Guillaume Melquiond, merged from the mainline client)
---
 src/gui/buy.cpp         | 77 ++++++++++---------------------------------------
 src/gui/buy.h           |  8 +----
 src/gui/item_amount.cpp | 59 +++++++++++++++++++------------------
 src/gui/sell.cpp        | 75 ++++++++++-------------------------------------
 src/gui/sell.h          |  5 ----
 5 files changed, 61 insertions(+), 163 deletions(-)

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index a3424ab6..0717efa6 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -28,6 +28,8 @@
 #include "shoplistbox.h"
 #include "slider.h"
 
+#include "widgets/layout.h"
+
 #include "../npc.h"
 
 #include "../net/messageout.h"
@@ -62,7 +64,6 @@ BuyDialog::BuyDialog(Network *network):
 
     mIncreaseButton->setSize(20, 20);
     mDecreaseButton->setSize(20, 20);
-    mQuantityLabel->setWidth(60);
 
     mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     mIncreaseButton->setEnabled(false);
@@ -70,22 +71,22 @@ BuyDialog::BuyDialog(Network *network):
     mBuyButton->setEnabled(false);
     mSlider->setEnabled(false);
 
-    mShopItemList->setActionEventId("item");
     mSlider->setActionEventId("slider");
-
-    mShopItemList->addSelectionListener(this);
     mSlider->addActionListener(this);
+    mShopItemList->addSelectionListener(this);
 
-    add(mScrollArea);
-    add(mSlider);
-    add(mQuantityLabel);
-    add(mBuyButton);
-    add(mQuitButton);
-    add(mIncreaseButton);
-    add(mDecreaseButton);
-    add(mMoneyLabel);
-    add(mItemDescLabel);
-    add(mItemEffectLabel);
+    place(0, 0, mScrollArea, 5).setPadding(3);
+    place(0, 1, mQuantityLabel, 2);
+    place(2, 1, mSlider, 3);
+    place(0, 2, mMoneyLabel, 5);
+    place(0, 3, mItemEffectLabel, 5);
+    place(0, 4, mItemDescLabel, 5);
+    place(0, 5, mDecreaseButton);
+    place(1, 5, mIncreaseButton);
+    place(3, 5, mBuyButton);
+    place(4, 5, mQuitButton);
+    Layout &layout = getLayout();
+    layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
     setLocationRelativeTo(getParent());
@@ -191,53 +192,7 @@ void BuyDialog::valueChanged(const gcn::SelectionEvent &event)
     mSlider->gcn::Slider::setScale(1, mMaxItems);
 }
 
-void BuyDialog::widgetResized(const gcn::Event &event)
-{
-    Window::widgetResized(event);
-
-    const gcn::Rectangle &area = getChildrenArea();
-    const int width = area.width;
-    const int height = area.height;
-
-    mDecreaseButton->setPosition(8, height - 8 - mDecreaseButton->getHeight());
-    mIncreaseButton->setPosition(
-            mDecreaseButton->getX() + mDecreaseButton->getWidth() + 5,
-            mDecreaseButton->getY());
-
-    mQuitButton->setPosition(
-            width - 8 - mQuitButton->getWidth(),
-            height - 8 - mQuitButton->getHeight());
-    mBuyButton->setPosition(
-            mQuitButton->getX() - 5 - mBuyButton->getWidth(),
-            mQuitButton->getY());
-
-    mItemDescLabel->setDimension(gcn::Rectangle(8,
-                mBuyButton->getY() - 5 - mItemDescLabel->getHeight(),
-                width - 16,
-                mItemDescLabel->getHeight()));
-    mItemEffectLabel->setDimension(gcn::Rectangle(8,
-                mItemDescLabel->getY() - 5 - mItemEffectLabel->getHeight(),
-                width - 16,
-                mItemEffectLabel->getHeight()));
-    mMoneyLabel->setDimension(gcn::Rectangle(8,
-                mItemEffectLabel->getY() - 5 - mMoneyLabel->getHeight(),
-                width - 16,
-                mMoneyLabel->getHeight()));
-
-    mQuantityLabel->setPosition(
-            width - mQuantityLabel->getWidth() - 8,
-            mMoneyLabel->getY() - 5 - mQuantityLabel->getHeight());
-    mSlider->setDimension(gcn::Rectangle(8,
-                mQuantityLabel->getY(),
-                mQuantityLabel->getX() - 8 - 8,
-                10));
-
-    mScrollArea->setDimension(gcn::Rectangle(8, 8, width - 16,
-                mSlider->getY() - 5 - 8));
-}
-
-void
-BuyDialog::updateButtonsAndLabels()
+void BuyDialog::updateButtonsAndLabels()
 {
     const int selectedItem = mShopItemList->getSelected();
     int price = 0;
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 3b94bbaa..7f0f04ac 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -93,13 +93,7 @@ class BuyDialog : public Window, public gcn::ActionListener,
         /**
          * Updates the state of buttons and labels.
          */
-        void
-        updateButtonsAndLabels();
-
-        /**
-         * Called whenever the widget changes size.
-         */
-        void widgetResized(const gcn::Event &event);
+        void updateButtonsAndLabels();
 
     private:
         Network *mNetwork;
diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp
index 191c7b8b..48b0e601 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.cpp
@@ -25,6 +25,8 @@
 #include "slider.h"
 #include "trade.h"
 
+#include "widgets/layout.h"
+
 #include "../item.h"
 #include "../localplayer.h"
 
@@ -34,38 +36,37 @@ ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
     Window("", true, parent),
     mItem(item)
 {
+    const int maxRange = mItem->getQuantity();
+
     // Integer field
     mItemAmountTextBox = new IntTextBox(1);
-    mItemAmountTextBox->setRange(1, mItem->getQuantity());
+    mItemAmountTextBox->setRange(1, maxRange);
+    mItemAmountTextBox->setWidth(30);
+    mItemAmountTextBox->setActionEventId("Dummy");
+    mItemAmountTextBox->addActionListener(this);
 
     // Slider
-    mItemAmountSlide = new Slider(1.0, mItem->getQuantity());
+    mItemAmountSlide = new Slider(1.0, maxRange);
+    mItemAmountSlide->setHeight(10);
     mItemAmountSlide->setActionEventId("Slide");
     mItemAmountSlide->addActionListener(this);
 
     // Buttons
     Button *minusButton = new Button("-", "Minus", this);
+    minusButton->setSize(20, 20);
     Button *plusButton = new Button("+", "Plus", this);
+    plusButton->setSize(20, 20);
     Button *okButton = new Button(_("Ok"), "Drop", this);
     Button *cancelButton = new Button(_("Cancel"), "Cancel", this);
 
     // Set positions
-    mItemAmountTextBox->setPosition(35, 10);
-    mItemAmountTextBox->setSize(24, 16);
-    plusButton->setPosition(60, 5);
-    minusButton->setPosition(10, 5);
-    mItemAmountSlide->setDimension(gcn::Rectangle(5, 120, 180, 10));
-    mItemAmountSlide->setPosition(10, 35);
-    okButton->setPosition(10, 50);
-    cancelButton->setPosition(60, 50);
-
-    // Assemble
-    add(mItemAmountTextBox);
-    add(plusButton);
-    add(minusButton);
-    add(mItemAmountSlide);
-    add(okButton);
-    add(cancelButton);
+    place(0, 0, minusButton);
+    place(1, 0, mItemAmountTextBox).setPadding(2);
+    place(2, 0, plusButton);
+    place(0, 1, mItemAmountSlide, 6);
+    place(4, 2, okButton);
+    place(5, 2, cancelButton);
+    reflowLayout(250, 0);
 
     resetAmount();
 
@@ -82,7 +83,6 @@ ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
             break;
     }
 
-    setContentSize(200, 80);
     setLocationRelativeTo(getParentWindow());
     setVisible(true);
 }
@@ -100,16 +100,6 @@ void ItemAmountWindow::action(const gcn::ActionEvent &event)
     {
         scheduleDelete();
     }
-    else if (event.getId() == "Drop")
-    {
-        player_node->dropItem(mItem, mItemAmountTextBox->getInt());
-        scheduleDelete();
-    }
-    else if (event.getId() == "AddTrade")
-    {
-        tradeWindow->tradeItem(mItem, mItemAmountTextBox->getInt());
-        scheduleDelete();
-    }
     else if (event.getId() == "Plus")
     {
         amount++;
@@ -122,7 +112,16 @@ void ItemAmountWindow::action(const gcn::ActionEvent &event)
     {
         amount = static_cast<int>(mItemAmountSlide->getValue());
     }
+    else if (event.getId() == "Drop")
+    {
+        player_node->dropItem(mItem, mItemAmountTextBox->getInt());
+        scheduleDelete();
+    }
+    else if (event.getId() == "AddTrade")
+    {
+        tradeWindow->tradeItem(mItem, mItemAmountTextBox->getInt());
+        scheduleDelete();
+    }
     mItemAmountTextBox->setInt(amount);
     mItemAmountSlide->setValue(amount);
 }
-
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 567fa59c..fac0a0b8 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -30,6 +30,8 @@
 #include "shop.h"
 #include "slider.h"
 
+#include "widgets/layout.h"
+
 #include "../item.h"
 #include "../npc.h"
 
@@ -70,7 +72,6 @@ SellDialog::SellDialog(Network *network):
 
     mIncreaseButton->setSize(20, 20);
     mDecreaseButton->setSize(20, 20);
-    mQuantityLabel->setWidth(60);
 
     mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     mIncreaseButton->setEnabled(false);
@@ -79,23 +80,22 @@ SellDialog::SellDialog(Network *network):
     mSlider->setEnabled(false);
 
     mShopItemList->setPriceCheck(false);
-    mShopItemList->setActionEventId("item");
-    mSlider->setActionEventId("slider");
-
-    mShopItemList->addActionListener(this);
     mShopItemList->addSelectionListener(this);
+    mSlider->setActionEventId("slider");
     mSlider->addActionListener(this);
 
-    add(mScrollArea);
-    add(mSlider);
-    add(mQuantityLabel);
-    add(mMoneyLabel);
-    add(mItemEffectLabel);
-    add(mItemDescLabel);
-    add(mIncreaseButton);
-    add(mDecreaseButton);
-    add(mSellButton);
-    add(mQuitButton);
+    place(0, 0, mScrollArea, 5).setPadding(3);
+    place(0, 1, mQuantityLabel, 2);
+    place(2, 1, mSlider, 3);
+    place(0, 2, mMoneyLabel, 5);
+    place(0, 3, mItemEffectLabel, 5);
+    place(0, 4, mItemDescLabel, 5);
+    place(0, 5, mDecreaseButton);
+    place(1, 5, mIncreaseButton);
+    place(3, 5, mSellButton);
+    place(4, 5, mQuitButton);
+    Layout &layout = getLayout();
+    layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
     setLocationRelativeTo(getParent());
@@ -212,51 +212,6 @@ void SellDialog::valueChanged(const gcn::SelectionEvent &event)
     mSlider->gcn::Slider::setScale(1, mMaxItems);
 }
 
-void SellDialog::widgetResized(const gcn::Event &event)
-{
-    Window::widgetResized(event);
-
-    gcn::Rectangle area = getChildrenArea();
-    int width = area.width;
-    int height = area.height;
-
-    mDecreaseButton->setPosition(8, height - 8 - mDecreaseButton->getHeight());
-    mIncreaseButton->setPosition(
-            mDecreaseButton->getX() + mDecreaseButton->getWidth() + 5,
-            mDecreaseButton->getY());
-
-    mQuitButton->setPosition(
-            width - 8 - mQuitButton->getWidth(),
-            height - 8 - mQuitButton->getHeight());
-    mSellButton->setPosition(
-            mQuitButton->getX() - 5 - mSellButton->getWidth(),
-            mQuitButton->getY());
-
-    mItemDescLabel->setDimension(gcn::Rectangle(8,
-                mSellButton->getY() - 5 - mItemDescLabel->getHeight(),
-                width - 16,
-                mItemDescLabel->getHeight()));
-    mItemEffectLabel->setDimension(gcn::Rectangle(8,
-                mItemDescLabel->getY() - 5 - mItemEffectLabel->getHeight(),
-                width - 16,
-                mItemEffectLabel->getHeight()));
-    mMoneyLabel->setDimension(gcn::Rectangle(8,
-                mItemEffectLabel->getY() - 5 - mMoneyLabel->getHeight(),
-                width - 16,
-                mMoneyLabel->getHeight()));
-
-    mQuantityLabel->setPosition(
-            width - mQuantityLabel->getWidth() - 8,
-            mMoneyLabel->getY() - 5 - mQuantityLabel->getHeight());
-    mSlider->setDimension(gcn::Rectangle(8,
-                mQuantityLabel->getY(),
-                mQuantityLabel->getX() - 8 - 8,
-                10));
-
-    mScrollArea->setDimension(gcn::Rectangle(8, 8, width - 16,
-                mSlider->getY() - 5 - 8));
-}
-
 void SellDialog::setMoney(int amount)
 {
     mPlayerMoney = amount;
diff --git a/src/gui/sell.h b/src/gui/sell.h
index 48961efc..0bf8b5a6 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -76,11 +76,6 @@ class SellDialog : public Window, gcn::ActionListener, gcn::SelectionListener
          */
         void valueChanged(const gcn::SelectionEvent &event);
 
-        /**
-         * Called whenever the widget changes size.
-         */
-        void widgetResized(const gcn::Event &event);
-
         /**
          * Gives Player's Money amount
          */
-- 
cgit v1.2.3-70-g09d2


From 57b4d184f8c47c853ca49ffb56f99c0533c71d07 Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@gmail.com>
Date: Thu, 20 Sep 2007 22:17:21 +0000
Subject: Added support for unicode charset in textfields and chat.

Conflicts:

    src/Makefile.am
    src/game.cpp
    src/gui/browserbox.cpp
    src/gui/gui.cpp
    src/gui/textfield.cpp
    src/main.cpp

(cherry picked from mainline commit 7b67e852086ad3ccd98a622f890b245ab6a0a321)
---
 src/CMakeLists.txt    |   2 +
 src/Makefile.am       |   2 +
 src/game.cpp          |   2 +-
 src/gui/gui.cpp       |   8 +-
 src/gui/gui.h         |   3 +-
 src/gui/sdlinput.cpp  | 429 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/gui/sdlinput.h    | 188 ++++++++++++++++++++++
 src/gui/textfield.cpp | 129 +++++++++++----
 src/gui/textfield.h   |   2 +-
 src/gui/viewport.cpp  |   2 -
 src/keyboardconfig.h  |   1 +
 src/main.cpp          |   2 +-
 12 files changed, 731 insertions(+), 39 deletions(-)
 create mode 100644 src/gui/sdlinput.cpp
 create mode 100644 src/gui/sdlinput.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f270f35c..072e141e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -138,6 +138,8 @@ SET(SRCS
     gui/register.h
     gui/scrollarea.cpp
     gui/scrollarea.h
+    gui/sdlinput.cpp
+    gui/sdlinput.h
     gui/sell.cpp
     gui/sell.h
     gui/setup_audio.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index ded201b7..1d325a84 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -100,6 +100,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/register.h \
 	      gui/scrollarea.cpp \
 	      gui/scrollarea.h \
+	      gui/sdlinput.cpp \
+	      gui/sdlinput.h \
 	      gui/sell.cpp \
 	      gui/sell.h \
 	      gui/setup.cpp \
diff --git a/src/game.cpp b/src/game.cpp
index 666820f5..2c7dd9e3 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -64,6 +64,7 @@
 #include "gui/npclistdialog.h"
 #include "gui/npc_text.h"
 #include "gui/ok_dialog.h"
+#include "gui/sdlinput.h"
 #include "gui/sell.h"
 #include "gui/setup.h"
 #include "gui/skill.h"
@@ -90,7 +91,6 @@
 #include "resources/imagewriter.h"
 
 extern Graphics *graphics;
-extern gcn::SDLInput *guiInput;
 
 class Map;
 
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index f33d9495..7cf1881c 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -24,11 +24,9 @@
 #include <guichan/imagefont.hpp>
 #include <SDL/SDL_ttf.h>
 
-// Should stay here because of Guichan being sensitive to headers order
-#include <guichan/sdl/sdlinput.hpp>
-
 #include "focushandler.h"
 #include "gui.h"
+#include "sdlinput.h"
 #include "truetypefont.h"
 #include "viewport.h"
 #include "window.h"
@@ -47,7 +45,7 @@
 // Guichan stuff
 Gui *gui;
 Viewport *viewport;                    /**< Viewport on the map. */
-gcn::SDLInput *guiInput;               /**< GUI input. */
+SDLInput *guiInput;                    /**< GUI input. */
 
 // Fonts used in showing hits
 gcn::Font *hitRedFont;
@@ -97,7 +95,7 @@ Gui::Gui(Graphics *graphics):
     gcn::Image::setImageLoader(&imageLoader);
 
     // Set input
-    guiInput = new gcn::SDLInput();
+    guiInput = new SDLInput;
     setInput(guiInput);
 
     // Set focus handler
diff --git a/src/gui/gui.h b/src/gui/gui.h
index f56b1dbf..eb81b87c 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -29,6 +29,7 @@
 class Graphics;
 class GuiConfigListener;
 class ImageSet;
+class SDLInput;
 class Viewport;
 
 /**
@@ -115,7 +116,7 @@ class Gui : public gcn::Gui
 
 extern Gui *gui;                              /**< The GUI system */
 extern Viewport *viewport;                    /**< The viewport */
-extern gcn::SDLInput *guiInput;               /**< GUI input */
+extern SDLInput *guiInput;                    /**< GUI input */
 
 /**
  * Fonts used in showing hits
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
new file mode 100644
index 00000000..ee94b2c6
--- /dev/null
+++ b/src/gui/sdlinput.cpp
@@ -0,0 +1,429 @@
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004, 2005, 2006, 2007 Olof Naess�n and Per Larsson
+ * Copyright 2007 The Mana World Development Team
+ *
+ *                                                         Js_./
+ * Per Larsson a.k.a finalman                          _RqZ{a<^_aa
+ * Olof Naess�n a.k.a jansem/yakslem                _asww7!uY`>  )\a//
+ *                                                 _Qhm`] _f "'c  1!5m
+ * Visit: http://guichan.darkbits.org             )Qk<P ` _: :+' .'  "{[
+ *                                               .)j(] .d_/ '-(  P .   S
+ * License: (BSD)                                <Td/Z <fP"5(\"??"\a.  .L
+ * Redistribution and use in source and          _dV>ws?a-?'      ._/L  #'
+ * binary forms, with or without                 )4d[#7r, .   '     )d`)[
+ * modification, are permitted provided         _Q-5'5W..j/?'   -?!\)cam'
+ * that the following conditions are met:       j<<WP+k/);.        _W=j f
+ * 1. Redistributions of source code must       .$%w\/]Q  . ."'  .  mj$
+ *    retain the above copyright notice,        ]E.pYY(Q]>.   a     J@\
+ *    this list of conditions and the           j(]1u<sE"L,. .   ./^ ]{a
+ *    following disclaimer.                     4'_uomm\.  )L);-4     (3=
+ * 2. Redistributions in binary form must        )_]X{Z('a_"a7'<a"a,  ]"[
+ *    reproduce the above copyright notice,       #}<]m7`Za??4,P-"'7. ).m
+ *    this list of conditions and the            ]d2e)Q(<Q(  ?94   b-  LQ/
+ *    following disclaimer in the                <B!</]C)d_, '(<' .f. =C+m
+ *    documentation and/or other materials      .Z!=J ]e []('-4f _ ) -.)m]'
+ *    provided with the distribution.          .w[5]' _[ /.)_-"+?   _/ <W"
+ * 3. Neither the name of Guichan nor the      :$we` _! + _/ .        j?
+ *    names of its contributors may be used     =3)= _f  (_yQmWW$#(    "
+ *    to endorse or promote products derived     -   W,  sQQQQmZQ#Wwa]..
+ *    from this software without specific        (js, \[QQW$QWW#?!V"".
+ *    prior written permission.                    ]y:.<\..          .
+ *                                                 -]n w/ '         [.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT       )/ )/           !
+ * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY         <  (; sac    ,    '
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING,               ]^ .-  %
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF            c <   r
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR            aga<  <La
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE          5%  )P'-3L
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR        _bQf` y`..)a
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,          ,J?4P'.P"_(\?d'.,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES               _Pa,)!f/<[]/  ?"
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT      _2-..:. .r+_,.. .
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,     ?a.<%"'  " -'.a_ _,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION)                     ^
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "sdlinput.h"
+
+#include <guichan/exception.hpp>
+
+SDLInput::SDLInput()
+{
+    mMouseInWindow = true;
+    mMouseDown = false;
+}
+
+bool SDLInput::isKeyQueueEmpty()
+{
+    return mKeyInputQueue.empty();
+}
+
+gcn::KeyInput SDLInput::dequeueKeyInput()
+{
+    gcn::KeyInput keyInput;
+
+    if (mKeyInputQueue.empty())
+    {
+        throw GCN_EXCEPTION("The queue is empty.");
+    }
+
+    keyInput = mKeyInputQueue.front();
+    mKeyInputQueue.pop();
+
+    return keyInput;
+}
+
+bool SDLInput::isMouseQueueEmpty()
+{
+    return mMouseInputQueue.empty();
+}
+
+gcn::MouseInput SDLInput::dequeueMouseInput()
+{
+    gcn::MouseInput mouseInput;
+
+    if (mMouseInputQueue.empty())
+    {
+        throw GCN_EXCEPTION("The queue is empty.");
+    }
+
+    mouseInput = mMouseInputQueue.front();
+    mMouseInputQueue.pop();
+
+    return mouseInput;
+}
+
+void SDLInput::pushInput(SDL_Event event)
+{
+    gcn::KeyInput keyInput;
+    gcn::MouseInput mouseInput;
+
+    switch (event.type)
+    {
+      case SDL_KEYDOWN:
+          keyInput.setKey(gcn::Key(convertKeyCharacter(event)));
+          keyInput.setType(gcn::KeyInput::PRESSED);
+          keyInput.setShiftPressed(event.key.keysym.mod & KMOD_SHIFT);
+          keyInput.setControlPressed(event.key.keysym.mod & KMOD_CTRL);
+          keyInput.setAltPressed(event.key.keysym.mod & KMOD_ALT);
+          keyInput.setMetaPressed(event.key.keysym.mod & KMOD_META);
+          keyInput.setNumericPad(event.key.keysym.sym >= SDLK_KP0
+                                 && event.key.keysym.sym <= SDLK_KP_EQUALS);
+
+          mKeyInputQueue.push(keyInput);
+          break;
+
+      case SDL_KEYUP:
+          keyInput.setKey(gcn::Key(convertKeyCharacter(event)));
+          keyInput.setType(gcn::KeyInput::RELEASED);
+          keyInput.setShiftPressed(event.key.keysym.mod & KMOD_SHIFT);
+          keyInput.setControlPressed(event.key.keysym.mod & KMOD_CTRL);
+          keyInput.setAltPressed(event.key.keysym.mod & KMOD_ALT);
+          keyInput.setMetaPressed(event.key.keysym.mod & KMOD_META);
+          keyInput.setNumericPad(event.key.keysym.sym >= SDLK_KP0
+                                 && event.key.keysym.sym <= SDLK_KP_EQUALS);
+
+          mKeyInputQueue.push(keyInput);
+          break;
+
+      case SDL_MOUSEBUTTONDOWN:
+          mMouseDown = true;
+          mouseInput.setX(event.button.x);
+          mouseInput.setY(event.button.y);
+          mouseInput.setButton(convertMouseButton(event.button.button));
+
+          if (event.button.button == SDL_BUTTON_WHEELDOWN)
+          {
+              mouseInput.setType(gcn::MouseInput::WHEEL_MOVED_DOWN);
+          }
+          else if (event.button.button == SDL_BUTTON_WHEELUP)
+          {
+              mouseInput.setType(gcn::MouseInput::WHEEL_MOVED_UP);
+          }
+          else
+          {
+              mouseInput.setType(gcn::MouseInput::PRESSED);
+          }
+          mouseInput.setTimeStamp(SDL_GetTicks());
+          mMouseInputQueue.push(mouseInput);
+          break;
+
+      case SDL_MOUSEBUTTONUP:
+          mMouseDown = false;
+          mouseInput.setX(event.button.x);
+          mouseInput.setY(event.button.y);
+          mouseInput.setButton(convertMouseButton(event.button.button));
+          mouseInput.setType(gcn::MouseInput::RELEASED);
+          mouseInput.setTimeStamp(SDL_GetTicks());
+          mMouseInputQueue.push(mouseInput);
+          break;
+
+      case SDL_MOUSEMOTION:
+          mouseInput.setX(event.button.x);
+          mouseInput.setY(event.button.y);
+          mouseInput.setButton(gcn::MouseInput::EMPTY);
+          mouseInput.setType(gcn::MouseInput::MOVED);
+          mouseInput.setTimeStamp(SDL_GetTicks());
+          mMouseInputQueue.push(mouseInput);
+          break;
+
+      case SDL_ACTIVEEVENT:
+          /*
+           * This occurs when the mouse leaves the window and the Gui-chan
+           * application loses its mousefocus.
+           */
+          if ((event.active.state & SDL_APPMOUSEFOCUS)
+              && !event.active.gain)
+          {
+              mMouseInWindow = false;
+
+              if (!mMouseDown)
+              {
+                  mouseInput.setX(-1);
+                  mouseInput.setY(-1);
+                  mouseInput.setButton(gcn::MouseInput::EMPTY);
+                  mouseInput.setType(gcn::MouseInput::MOVED);
+                  mMouseInputQueue.push(mouseInput);
+              }
+          }
+
+          if ((event.active.state & SDL_APPMOUSEFOCUS)
+              && event.active.gain)
+          {
+              mMouseInWindow = true;
+          }
+          break;
+
+    } // end switch
+}
+
+int SDLInput::convertMouseButton(int button)
+{
+    switch (button)
+    {
+      case SDL_BUTTON_LEFT:
+          return gcn::MouseInput::LEFT;
+      case SDL_BUTTON_RIGHT:
+          return gcn::MouseInput::RIGHT;
+      case SDL_BUTTON_MIDDLE:
+          return gcn::MouseInput::MIDDLE;
+      default:
+          // We have an unknown mouse type which is ignored.
+          return button;
+    }
+}
+
+int SDLInput::convertKeyCharacter(SDL_Event event)
+{
+    SDL_keysym keysym = event.key.keysym;
+    
+    int value = keysym.unicode;
+
+    switch (keysym.sym)
+    {
+      case SDLK_TAB:
+          value = Key::TAB;
+          break;
+      case SDLK_LALT:
+          value = Key::LEFT_ALT;
+          break;
+      case SDLK_RALT:
+          value = Key::RIGHT_ALT;
+          break;
+      case SDLK_LSHIFT:
+          value = Key::LEFT_SHIFT;
+          break;
+      case SDLK_RSHIFT:
+          value = Key::RIGHT_SHIFT;
+          break;
+      case SDLK_LCTRL:
+          value = Key::LEFT_CONTROL;
+          break;
+      case SDLK_RCTRL:
+          value = Key::RIGHT_CONTROL;
+          break;
+      case SDLK_BACKSPACE:
+          value = Key::BACKSPACE;
+          break;
+      case SDLK_PAUSE:
+          value = Key::PAUSE;
+          break;
+      case SDLK_SPACE:
+          // Special characters like ~ (tilde) ends up
+          // with the keysym.sym SDLK_SPACE which
+          // without this check would be lost. The check
+          // is only valid on key down events in SDL.
+          if (event.type == SDL_KEYUP || keysym.unicode == ' ')
+          {
+              value = Key::SPACE;
+          }
+          break;
+      case SDLK_ESCAPE:
+          value = Key::ESCAPE;
+          break;
+      case SDLK_DELETE:
+          value = Key::DELETE;
+          break;
+      case SDLK_INSERT:
+          value = Key::INSERT;
+          break;
+      case SDLK_HOME:
+          value = Key::HOME;
+          break;
+      case SDLK_END:
+          value = Key::END;
+          break;
+      case SDLK_PAGEUP:
+          value = Key::PAGE_UP;
+          break;
+      case SDLK_PRINT:
+          value = Key::PRINT_SCREEN;
+          break;
+      case SDLK_PAGEDOWN:
+          value = Key::PAGE_DOWN;
+          break;
+      case SDLK_F1:
+          value = Key::F1;
+          break;
+      case SDLK_F2:
+          value = Key::F2;
+          break;
+      case SDLK_F3:
+          value = Key::F3;
+          break;
+      case SDLK_F4:
+          value = Key::F4;
+          break;
+      case SDLK_F5:
+          value = Key::F5;
+          break;
+      case SDLK_F6:
+          value = Key::F6;
+          break;
+      case SDLK_F7:
+          value = Key::F7;
+          break;
+      case SDLK_F8:
+          value = Key::F8;
+          break;
+      case SDLK_F9:
+          value = Key::F9;
+          break;
+      case SDLK_F10:
+          value = Key::F10;
+          break;
+      case SDLK_F11:
+          value = Key::F11;
+          break;
+      case SDLK_F12:
+          value = Key::F12;
+          break;
+      case SDLK_F13:
+          value = Key::F13;
+          break;
+      case SDLK_F14:
+          value = Key::F14;
+          break;
+      case SDLK_F15:
+          value = Key::F15;
+          break;
+      case SDLK_NUMLOCK:
+          value = Key::NUM_LOCK;
+          break;
+      case SDLK_CAPSLOCK:
+          value = Key::CAPS_LOCK;
+          break;
+      case SDLK_SCROLLOCK:
+          value = Key::SCROLL_LOCK;
+          break;
+      case SDLK_RMETA:
+          value = Key::RIGHT_META;
+          break;
+      case SDLK_LMETA:
+          value = Key::LEFT_META;
+          break;
+      case SDLK_LSUPER:
+          value = Key::LEFT_SUPER;
+          break;
+      case SDLK_RSUPER:
+          value = Key::RIGHT_SUPER;
+          break;
+      case SDLK_MODE:
+          value = Key::ALT_GR;
+          break;
+      case SDLK_UP:
+          value = Key::UP;
+          break;
+      case SDLK_DOWN:
+          value = Key::DOWN;
+          break;
+      case SDLK_LEFT:
+          value = Key::LEFT;
+          break;
+      case SDLK_RIGHT:
+          value = Key::RIGHT;
+          break;
+      case SDLK_RETURN:
+          value = Key::ENTER;
+          break;
+      case SDLK_KP_ENTER:
+          value = Key::ENTER;
+          break;
+
+      default:
+          break;
+    }
+
+    if (!(keysym.mod & KMOD_NUM))
+    {
+        switch (keysym.sym)
+        {
+          case SDLK_KP0:
+              value = Key::INSERT;
+              break;
+          case SDLK_KP1:
+              value = Key::END;
+              break;
+          case SDLK_KP2:
+              value = Key::DOWN;
+              break;
+          case SDLK_KP3:
+              value = Key::PAGE_DOWN;
+              break;
+          case SDLK_KP4:
+              value = Key::LEFT;
+              break;
+          case SDLK_KP5:
+              value = 0;
+              break;
+          case SDLK_KP6:
+              value = Key::RIGHT;
+              break;
+          case SDLK_KP7:
+              value = Key::HOME;
+              break;
+          case SDLK_KP8:
+              value = Key::UP;
+              break;
+          case SDLK_KP9:
+              value = Key::PAGE_UP;
+              break;
+          default:
+              break;
+        }
+    }
+
+    return value;
+}
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
new file mode 100644
index 00000000..72d949e1
--- /dev/null
+++ b/src/gui/sdlinput.h
@@ -0,0 +1,188 @@
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004, 2005, 2006, 2007 Olof Naess�n and Per Larsson
+ * Copyright 2007 The Mana World Development Team
+ *
+ *                                                         Js_./
+ * Per Larsson a.k.a finalman                          _RqZ{a<^_aa
+ * Olof Naess�n a.k.a jansem/yakslem                _asww7!uY`>  )\a//
+ *                                                 _Qhm`] _f "'c  1!5m
+ * Visit: http://guichan.darkbits.org             )Qk<P ` _: :+' .'  "{[
+ *                                               .)j(] .d_/ '-(  P .   S
+ * License: (BSD)                                <Td/Z <fP"5(\"??"\a.  .L
+ * Redistribution and use in source and          _dV>ws?a-?'      ._/L  #'
+ * binary forms, with or without                 )4d[#7r, .   '     )d`)[
+ * modification, are permitted provided         _Q-5'5W..j/?'   -?!\)cam'
+ * that the following conditions are met:       j<<WP+k/);.        _W=j f
+ * 1. Redistributions of source code must       .$%w\/]Q  . ."'  .  mj$
+ *    retain the above copyright notice,        ]E.pYY(Q]>.   a     J@\
+ *    this list of conditions and the           j(]1u<sE"L,. .   ./^ ]{a
+ *    following disclaimer.                     4'_uomm\.  )L);-4     (3=
+ * 2. Redistributions in binary form must        )_]X{Z('a_"a7'<a"a,  ]"[
+ *    reproduce the above copyright notice,       #}<]m7`Za??4,P-"'7. ).m
+ *    this list of conditions and the            ]d2e)Q(<Q(  ?94   b-  LQ/
+ *    following disclaimer in the                <B!</]C)d_, '(<' .f. =C+m
+ *    documentation and/or other materials      .Z!=J ]e []('-4f _ ) -.)m]'
+ *    provided with the distribution.          .w[5]' _[ /.)_-"+?   _/ <W"
+ * 3. Neither the name of Guichan nor the      :$we` _! + _/ .        j?
+ *    names of its contributors may be used     =3)= _f  (_yQmWW$#(    "
+ *    to endorse or promote products derived     -   W,  sQQQQmZQ#Wwa]..
+ *    from this software without specific        (js, \[QQW$QWW#?!V"".
+ *    prior written permission.                    ]y:.<\..          .
+ *                                                 -]n w/ '         [.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT       )/ )/           !
+ * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY         <  (; sac    ,    '
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING,               ]^ .-  %
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF            c <   r
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR            aga<  <La
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE          5%  )P'-3L
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR        _bQf` y`..)a
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,          ,J?4P'.P"_(\?d'.,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES               _Pa,)!f/<[]/  ?"
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT      _2-..:. .r+_,.. .
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,     ?a.<%"'  " -'.a_ _,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION)                     ^
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _TMW_SDLINPUT_
+#define _TMW_SDLINPUT_
+
+#include <queue>
+
+#include <SDL/SDL.h>
+
+#include <guichan/input.hpp>
+#include <guichan/keyinput.hpp>
+#include <guichan/mouseinput.hpp>
+#include <guichan/platform.hpp>
+
+namespace Key
+{
+    enum
+    {
+        SPACE              = ' ',
+        TAB                = '\t',
+        ENTER              = '\n',
+        // Negative values, to avoid conflicts with higher character codes.
+        LEFT_ALT           = -1000,
+        RIGHT_ALT,
+        LEFT_SHIFT,
+        RIGHT_SHIFT,
+        LEFT_CONTROL,
+        RIGHT_CONTROL,
+        LEFT_META,
+        RIGHT_META,
+        LEFT_SUPER,
+        RIGHT_SUPER,
+        INSERT,
+        HOME,
+        PAGE_UP,
+        DELETE,
+        END,
+        PAGE_DOWN,
+        ESCAPE,
+        CAPS_LOCK,
+        BACKSPACE,
+        F1,
+        F2,
+        F3,
+        F4,
+        F5,
+        F6,
+        F7,
+        F8,
+        F9,
+        F10,
+        F11,
+        F12,
+        F13,
+        F14,
+        F15,
+        PRINT_SCREEN,
+        SCROLL_LOCK,
+        PAUSE,
+        NUM_LOCK,
+        ALT_GR,
+        LEFT,
+        RIGHT,
+        UP,
+        DOWN
+    };
+}
+
+/**
+ * SDL implementation of Input.
+ */
+class SDLInput : public gcn::Input
+{
+public:
+
+    /**
+     * Constructor.
+     */
+    SDLInput();
+
+    /**
+     * Pushes an SDL event. It should be called at least once per frame to
+     * update input with user input.
+     *
+     * @param event an event from SDL.
+     */
+    virtual void pushInput(SDL_Event event);
+
+    /**
+     * Polls all input. It exists for input driver compatibility. If you
+     * only use SDL and plan sticking with SDL you can safely ignore this
+     * function as it in the SDL case does nothing.
+     */
+    virtual void _pollInput() { }
+
+
+    // Inherited from Input
+
+    virtual bool isKeyQueueEmpty();
+
+    virtual gcn::KeyInput dequeueKeyInput();
+
+    virtual bool isMouseQueueEmpty();
+
+    virtual gcn::MouseInput dequeueMouseInput();
+
+protected:
+    /**
+     * Converts a mouse button from SDL to a Guichan mouse button
+     * representation.
+     *
+     * @param button an SDL mouse button.
+     * @return a Guichan mouse button.
+     */
+    int convertMouseButton(int button);
+
+    /**
+     * Converts an SDL event key to a key value.
+     *
+     * @param event an SDL event with a key to convert.
+     * @return a key value.
+     * @see Key
+     */
+    int convertKeyCharacter(SDL_Event event);
+
+    std::queue<gcn::KeyInput> mKeyInputQueue;
+    std::queue<gcn::MouseInput> mMouseInputQueue;
+
+    bool mMouseDown;
+    bool mMouseInWindow;
+};
+
+#endif
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index bd016a8d..d4709d3f 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -19,12 +19,15 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "textfield.h"
+
 #include <algorithm>
 
 #include <guichan/font.hpp>
 
 #include <guichan/sdl/sdlinput.hpp>
 
+#include "sdlinput.h"
 #include "textfield.h"
 
 #include "../graphics.h"
@@ -34,6 +37,8 @@
 
 #include "../utils/dtor.h"
 
+#undef DELETE //Win32 compatibility hack
+
 int TextField::instances = 0;
 ImageRect TextField::skin;
 
@@ -123,34 +128,6 @@ void TextField::setNumeric(bool numeric)
     }
 }
 
-void TextField::keyPressed(gcn::KeyEvent &keyEvent)
-{
-    if (mNumeric)
-    {
-        while (true)
-        {
-            const gcn::Key &key = keyEvent.getKey();
-            if (key.isNumber())
-            {
-                break;
-            }
-            int value = key.getValue();
-            if (value == SDLK_LEFT || value == SDLK_RIGHT ||
-                value == SDLK_HOME || value == SDLK_END ||
-                value == SDLK_BACKSPACE || value == SDLK_DELETE)
-            {
-                break;
-            }
-            return;
-        }
-    }
-    gcn::TextField::keyPressed(keyEvent);
-    if (mListener)
-    {
-        mListener->listen(this);
-    }
-}
-
 int TextField::getValue() const
 {
     if (!mNumeric)
@@ -168,3 +145,99 @@ int TextField::getValue() const
     }
     return value;
 }
+
+void TextField::keyPressed(gcn::KeyEvent &keyEvent)
+{
+    int val = keyEvent.getKey().getValue();
+
+    if (val >= 32)
+    {
+        int l;
+        if (val < 128) l = 1;            // 0xxxxxxx
+        else if (val < 0x800) l = 2;     // 110xxxxx 10xxxxxx
+        else if (val < 0x10000) l = 3;   // 1110xxxx 10xxxxxx 10xxxxxx
+        else l = 4;                      // 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+
+        char buf[4];
+        for (int i = 0; i < l; ++i)
+        {
+            buf[i] = val >> (6 * (l - i - 1));
+            if (i > 0) buf[i] = (buf[i] & 63) | 128;
+        }
+
+        if (l > 1) buf[0] |= 255 << (8 - l);
+
+        mText.insert(mCaretPosition, std::string(buf, buf + l));
+        mCaretPosition += l;
+    }
+
+    /* In UTF-8, 10xxxxxx is only used for inner parts of characters. So skip
+       them when processing key presses. */
+
+    switch (val)
+    {
+        case Key::LEFT:
+        {
+            while (mCaretPosition > 0)
+            {
+                --mCaretPosition;
+                if ((mText[mCaretPosition] & 192) != 128)
+                    break;
+            }
+        } break;
+
+        case Key::RIGHT:
+        {
+            unsigned sz = mText.size();
+            while (mCaretPosition < sz)
+            {
+                ++mCaretPosition;
+                if (mCaretPosition == sz ||
+                    (mText[mCaretPosition] & 192) != 128)
+                    break;
+            }
+        } break;
+
+        case Key::DELETE:
+        {
+            unsigned sz = mText.size();
+            while (mCaretPosition < sz)
+            {
+                --sz;
+                mText.erase(mCaretPosition, 1);
+                if (mCaretPosition == sz ||
+                    (mText[mCaretPosition] & 192) != 128)
+                    break;
+            }
+        } break;
+
+        case Key::BACKSPACE:
+        {
+            while (mCaretPosition > 0)
+            {
+                --mCaretPosition;
+                int v = mText[mCaretPosition];
+                mText.erase(mCaretPosition, 1);
+                if ((v & 192) != 128) break;
+            }
+        } break;
+
+        case Key::ENTER:
+            distributeActionEvent();
+            break;
+
+        case Key::HOME:
+            mCaretPosition = 0;
+            break;
+
+        case Key::END:
+            mCaretPosition = mText.size();
+            break;
+
+        case Key::TAB:
+            return;
+    }
+
+    keyEvent.consume();
+    fixScroll();
+}
diff --git a/src/gui/textfield.h b/src/gui/textfield.h
index 6def784d..38150b83 100644
--- a/src/gui/textfield.h
+++ b/src/gui/textfield.h
@@ -74,7 +74,7 @@ class TextField : public gcn::TextField {
         void setRange(int min, int max) {mMinimum = min; mMaximum = max; }
 
         /**
-         * Restrict keyboard input if numeric
+         * Processes one keypress.
          */
         void keyPressed(gcn::KeyEvent &keyEvent);
 
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index f6f9bb42..080ebddc 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -21,8 +21,6 @@
 
 #include <cassert>
 
-#include <guichan/sdl/sdlinput.hpp>
-
 #include "gui.h"
 #include "popupmenu.h"
 #include "viewport.h"
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index a0b67f5d..f6439795 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -26,6 +26,7 @@
 
 #include <guichan/sdl/sdlinput.hpp>
 
+#include "gui/sdlinput.h"
 #include "gui/setup_keyboard.h"
 
 /**
diff --git a/src/main.cpp b/src/main.cpp
index 55d295dd..c85b5aa3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -61,8 +61,8 @@
 #include "gui/ok_dialog.h"
 #include "gui/progressbar.h"
 #include "gui/register.h"
+#include "gui/sdlinput.h"
 #include "gui/setup.h"
-#include "gui/updatewindow.h"
 #include "gui/textfield.h"
 #include "gui/updatewindow.h"
 
-- 
cgit v1.2.3-70-g09d2


From f4a0cc34922e7c94e4bc2fce80fa6ab748854e58 Mon Sep 17 00:00:00 2001
From: Björn Steinbrink <B.Steinbrink@gmx.de>
Date: Tue, 6 Jan 2009 22:43:06 +0100
Subject: Fix wrapping of UTF-8 multi-byte characters.

(cherry picked from commit 82182aeb9eacb3a6e10e34b34b46ef63222ecd7d)
---
 src/gui/browserbox.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index ebd92e5a..8b222810 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -366,7 +366,10 @@ BrowserBox::draw(gcn::Graphics *graphics)
                         continue;
                     }
 
-                    end--;
+                    // Skip to the start of the current character
+                    while ((row[end] & 192) == 128)
+                        end--;
+                    end--; // And then to the last byte of the previous one
 
                     part = row.substr(start, end - start + 1);
                 } while ((x + font->getWidth(part.c_str()) + 10) > getWidth());
-- 
cgit v1.2.3-70-g09d2


From bd28cda98c51df0ef09ebaa638db43788e1855c5 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 6 Jan 2009 22:56:43 +0100
Subject: Fixed the true type font to render unicode now

---
 src/gui/gui.cpp          | 14 +++++---------
 src/gui/truetypefont.cpp |  4 ++--
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 7cf1881c..6a399548 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -22,7 +22,6 @@
 #include <guichan/exception.hpp>
 #include <guichan/image.hpp>
 #include <guichan/imagefont.hpp>
-#include <SDL/SDL_ttf.h>
 
 #include "focushandler.h"
 #include "gui.h"
@@ -45,7 +44,7 @@
 // Guichan stuff
 Gui *gui;
 Viewport *viewport;                    /**< Viewport on the map. */
-SDLInput *guiInput;                    /**< GUI input. */
+SDLInput *guiInput;
 
 // Fonts used in showing hits
 gcn::Font *hitRedFont;
@@ -110,20 +109,17 @@ Gui::Gui(Graphics *graphics):
     Window::setWindowContainer(guiTop);
     setTop(guiTop);
 
+    ResourceManager *resman = ResourceManager::getInstance();
+
     // Set global font
+    std::string path = resman->getPath("fonts/dejavusans.ttf");
     try {
-        mGuiFont = new TrueTypeFont("/usr/local/share/aethyra/data/fonts/dejavusans.ttf", 10);
+        mGuiFont = new TrueTypeFont(path, 11);
     }
     catch (gcn::Exception e)
     {
-        try {
-            mGuiFont = new TrueTypeFont("data/fonts/dejavusans.ttf", 10);
-        }
-        catch (gcn::Exception e)
-        {
         logger->error(std::string("Unable to load dejavusans.ttf: ")
             + e.getMessage());
-        }
     }
 
     // Set speech font
diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index f81ea9c2..7f9abd3a 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.cpp
@@ -58,7 +58,7 @@ class TextChunk
             sdlCol.r = color.r;
             sdlCol.g = color.g;
 
-            SDL_Surface *surface = TTF_RenderText_Blended(
+            SDL_Surface *surface = TTF_RenderUTF8_Blended(
                     font, text.c_str(), sdlCol);
 
             if (!surface)
@@ -170,7 +170,7 @@ void TrueTypeFont::drawString(gcn::Graphics *graphics,
 int TrueTypeFont::getWidth(const std::string& text) const
 {
     int w, h;
-    TTF_SizeText(mFont, text.c_str(), &w, &h);
+    TTF_SizeUTF8(mFont, text.c_str(), &w, &h);
     return w;
 }
 
-- 
cgit v1.2.3-70-g09d2


From 8cb177d47fb23408d9b964b4c5fd24782c242401 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 6 Jan 2009 23:15:48 +0100
Subject: Correct the codeset for translations to be UTF-8

As on the mainline client
---
 src/main.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main.cpp b/src/main.cpp
index c85b5aa3..ea1f6422 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -708,6 +708,7 @@ int main(int argc, char *argv[])
 #endif
         setlocale(LC_MESSAGES, "");
         bindtextdomain("aethyra", LOCALEDIR);
+        bind_textdomain_codeset("aethyra", "UTF-8");
         textdomain("aethyra");
 #endif
 
-- 
cgit v1.2.3-70-g09d2


From b57cc8e3e29cb7c1004fdbd041173fcd4a2c1782 Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@gmail.com>
Date: Wed, 14 Nov 2007 09:26:03 +0000
Subject: Fixed up and down arrows in chat box.

(cherry picked from commit cb04d148c9aed572fe6e66313100e2cd9b66f5d5)

Conflicts:

	src/gui/chat.cpp
---
 src/gui/chat.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 34e7b04b..71954601 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -23,12 +23,12 @@
 #include <fstream>
 
 #include <guichan/focushandler.hpp>
-#include <guichan/key.hpp>
 
 #include "browserbox.h"
 #include "chat.h"
 #include "chatinput.h"
 #include "scrollarea.h"
+#include "sdlinput.h"
 #include "windowcontainer.h"
 
 #include "../beingmanager.h"
@@ -584,8 +584,10 @@ void ChatWindow::scroll(int amount)
 
 void ChatWindow::keyPressed(gcn::KeyEvent & event)
 {
-    if (event.getKey().getValue() == gcn::Key::DOWN &&
-        mCurHist != mHistory.end()) {
+
+    if (event.getKey().getValue() == Key::DOWN &&
+            mCurHist != mHistory.end())
+    {
         // Move forward through the history
         HistoryIterator prevHist = mCurHist++;
         if (mCurHist != mHistory.end()) {
@@ -594,8 +596,10 @@ void ChatWindow::keyPressed(gcn::KeyEvent & event)
         } else {
             mCurHist = prevHist;
         }
-    } else if (event.getKey().getValue() == gcn::Key::UP &&
-               mCurHist != mHistory.begin() && mHistory.size() > 0) {
+    }
+    else if (event.getKey().getValue() == Key::UP &&
+            mCurHist != mHistory.begin() && mHistory.size() > 0)
+    {
         // Move backward through the history
         mCurHist--;
         mChatInput->setText(*mCurHist);
-- 
cgit v1.2.3-70-g09d2


From c9b6f0a5f7b0bb38ed5c052c92e0f4cf474e1fc0 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 6 Jan 2009 16:04:39 -0700
Subject: Converted the character selection dialog to use the layout widget.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/char_select.cpp | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index c89dadcd..2d1dbf11 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -30,6 +30,8 @@
 #include "playerbox.h"
 #include "textfield.h"
 
+#include "widgets/layout.h"
+
 #include "../game.h"
 #include "../localplayer.h"
 #include "../main.h"
@@ -114,17 +116,20 @@ CharSelectDialog::CharSelectDialog(Network *network,
             mCancelButton->getX() - 5 - mSelectButton->getWidth(),
             mNewCharButton->getY());
 
-    add(mPlayerBox);
-    add(mSelectButton);
-    add(mCancelButton);
-    add(mNewCharButton);
-    add(mDelCharButton);
-    add(mPreviousButton);
-    add(mNextButton);
-    add(mNameLabel);
-    add(mLevelLabel);
-    add(mJobLevelLabel);
-    add(mMoneyLabel);
+    place(0, 0, mPlayerBox, 5).setPadding(3);
+    place(0, 1, mNameLabel, 2);
+    place(0, 2, mLevelLabel, 2);
+    place(0, 3, mJobLevelLabel, 2);
+    place(0, 4, mMoneyLabel, 2);
+    place(0, 5, mPreviousButton);
+    place(1, 5, mNextButton);
+    place(0, 6, mNewCharButton);
+    place(1, 6, mDelCharButton);
+    place(3, 6, mSelectButton);
+    place(4, 6, mCancelButton);
+
+    Layout &layout = getLayout();
+    layout.setRowHeight(0, Layout::AUTO_SET);
 
     setLocationRelativeTo(getParent());
     setVisible(true);
-- 
cgit v1.2.3-70-g09d2


From 98f1fdf1463af85008def73a49258df684667ac4 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 6 Jan 2009 17:00:44 -0700
Subject: Fixed the previous commit to actually use the layout engine.
 Signed-off-by: Ira Rice <irarice@gmail.com>

---
 src/gui/char_select.cpp | 67 ++++++++++++++++++-------------------------------
 1 file changed, 24 insertions(+), 43 deletions(-)

diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 2d1dbf11..08fcd2b2 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -80,56 +80,37 @@ CharSelectDialog::CharSelectDialog(Network *network,
     Window(_("Select Character")), mNetwork(network),
     mCharInfo(charInfo), mGender(gender), mCharSelected(false)
 {
-    mSelectButton = new Button(_("Ok"), "ok", this);
-    mCancelButton = new Button(_("Cancel"), "cancel", this);
-    mNewCharButton = new Button(_("New"), "new", this);
-    mDelCharButton = new Button(_("Delete"), "delete", this);
-    mPreviousButton = new Button(_("Previous"), "previous", this);
-    mNextButton = new Button(_("Next"), "next", this);
+    // Control that shows the Player
+    mPlayerBox = new PlayerBox;
 
     mNameLabel = new gcn::Label(strprintf(_("Name: %s"), ""));
     mLevelLabel = new gcn::Label(strprintf(_("Level: %d"), 0));
     mJobLevelLabel = new gcn::Label(strprintf(_("Job Level: %d"), 0));
     mMoneyLabel = new gcn::Label(strprintf(_("Money: %d"), 0));
 
-    // Control that shows the Player
-    mPlayerBox = new PlayerBox;
+    mPreviousButton = new Button(_("Previous"), "previous", this);
+    mNextButton = new Button(_("Next"), "next", this);
+    mNewCharButton = new Button(_("New"), "new", this);
+    mDelCharButton = new Button(_("Delete"), "delete", this);
+    mSelectButton = new Button(_("Ok"), "ok", this);
+    mCancelButton = new Button(_("Cancel"), "cancel", this);
 
-    int w = 195;
-    int h = 220;
-    setContentSize(w, h);
-    mPlayerBox->setDimension(gcn::Rectangle(5, 5, w - 10, 90));
-    mNameLabel->setDimension(gcn::Rectangle(10, 100, 128, 16));
-    mLevelLabel->setDimension(gcn::Rectangle(10, 116, 128, 16));
-    mJobLevelLabel->setDimension(gcn::Rectangle(10, 132, 128, 16));
-    mMoneyLabel->setDimension(gcn::Rectangle(10, 148, 128, 16));
-    mPreviousButton->setPosition(5, 170);
-    mNextButton->setPosition(mPreviousButton->getWidth() + 10, 170);
-    mNewCharButton->setPosition(5, h - 5 - mNewCharButton->getHeight());
-    mDelCharButton->setPosition(
-            5 + mNewCharButton->getWidth() + 5,
-            mNewCharButton->getY());
-    mCancelButton->setPosition(
-            w - 5 - mCancelButton->getWidth(),
-            mNewCharButton->getY());
-    mSelectButton->setPosition(
-            mCancelButton->getX() - 5 - mSelectButton->getWidth(),
-            mNewCharButton->getY());
-
-    place(0, 0, mPlayerBox, 5).setPadding(3);
-    place(0, 1, mNameLabel, 2);
-    place(0, 2, mLevelLabel, 2);
-    place(0, 3, mJobLevelLabel, 2);
-    place(0, 4, mMoneyLabel, 2);
-    place(0, 5, mPreviousButton);
-    place(1, 5, mNextButton);
-    place(0, 6, mNewCharButton);
-    place(1, 6, mDelCharButton);
-    place(3, 6, mSelectButton);
-    place(4, 6, mCancelButton);
-
-    Layout &layout = getLayout();
-    layout.setRowHeight(0, Layout::AUTO_SET);
+    ContainerPlacer place;
+    place = getPlacer(0, 0);
+
+    place(0, 0, mPlayerBox, 6, 3);
+    place(0, 3, mNameLabel, 2);
+    place(0, 4, mLevelLabel, 2);
+    place(0, 5, mJobLevelLabel, 2);
+    place(0, 6, mMoneyLabel, 2);
+    place(0, 7, mPreviousButton);
+    place(1, 7, mNextButton);
+    place(0, 8, mNewCharButton);
+    place(1, 8, mDelCharButton);
+    place(3, 8, mSelectButton);
+    place(4, 8, mCancelButton);
+
+    reflowLayout(195, 220);
 
     setLocationRelativeTo(getParent());
     setVisible(true);
-- 
cgit v1.2.3-70-g09d2


From 83f00d36e4f768893f0f0c8ae6ee5de50fce17d8 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 6 Jan 2009 17:05:48 -0700
Subject: Removed the now unnecessary SDL_TTF initializations. Signed-off-by:
 Ira Rice <irarice@gmail.com>

---
 src/main.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index ea1f6422..4a3acce8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -402,7 +402,6 @@ void init_engine(const Options &options)
     // Initialize the item shortcuts.
     itemShortcut = new ItemShortcut();
 
-    TTF_Init();
     gui = new Gui(graphics);
     state = LOGIN_STATE; /**< Initial game state */
 
@@ -1070,7 +1069,6 @@ int main(int argc, char *argv[])
 
     delete network;
     SDLNet_Quit();
-    TTF_Quit();
 
     if (nullFile)
     {
-- 
cgit v1.2.3-70-g09d2


From 6f954aa5ed76baabf45248a91fa378552be425c0 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 6 Jan 2009 17:24:00 -0700
Subject: Adapted the update window to use the layout widget.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/updatewindow.cpp | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 36d00bec..e0a9da2e 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -32,6 +32,8 @@
 #include "scrollarea.h"
 #include "updatewindow.h"
 
+#include "widgets/layout.h"
+
 // Curl should be included after Guichan to avoid Windows redefinitions
 #include <curl/curl.h>
 
@@ -105,34 +107,29 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost,
 {
     mCurlError[0] = 0;
 
-    const int h = 240;
-    const int w = 320;
-    setContentSize(w, h);
-
     mBrowserBox = new BrowserBox();
     mScrollArea = new ScrollArea(mBrowserBox);
     mLabel = new gcn::Label("Connecting...");
-    mProgressBar = new ProgressBar(0.0, w - 10, 20, 168, 116, 31);
+    mProgressBar = new ProgressBar(0.0, 310, 20, 168, 116, 31);
     mCancelButton = new Button("Cancel", "cancel", this);
     mPlayButton = new Button("Play", "play", this);
 
     mBrowserBox->setOpaque(false);
     mPlayButton->setEnabled(false);
 
-    mCancelButton->setPosition(5, h - 5 - mCancelButton->getHeight());
-    mPlayButton->setPosition(
-            mCancelButton->getX() + mCancelButton->getWidth() + 5,
-            h - 5 - mPlayButton->getHeight());
-    mProgressBar->setPosition(5, mCancelButton->getY() - 20 - 5);
-    mLabel->setPosition(5, mProgressBar->getY() - mLabel->getHeight() - 5);
+    ContainerPlacer place;
+    place = getPlacer(0, 0);
+
+    place(0, 0, mScrollArea, 5, 3).setPadding(3);
+    place(0, 3, mLabel, 5);
+    place(0, 4, mProgressBar, 5);
+    place(0, 5, mCancelButton);
+    place(1, 5, mPlayButton);
 
-    mScrollArea->setDimension(gcn::Rectangle(5, 5, 310, mLabel->getY() - 12));
+    reflowLayout(320, 240);
 
-    add(mScrollArea);
-    add(mLabel);
-    add(mProgressBar);
-    add(mCancelButton);
-    add(mPlayButton);
+    Layout &layout = getLayout();
+    layout.setRowHeight(0, Layout::AUTO_SET);
 
     setLocationRelativeTo(getParent());
     setVisible(true);
-- 
cgit v1.2.3-70-g09d2


From 6c20e3e7dc031955d30d0edd313254976c36f0d4 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <crush@themanaworld.org>
Date: Thu, 8 Jan 2009 11:31:49 +0100
Subject: Fixed segvault when exiting with logToChat enabled

---
 src/game.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/game.cpp b/src/game.cpp
index 2c7dd9e3..76eb6b82 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -246,6 +246,7 @@ void createGuiWindows(Network *network)
  */
 void destroyGuiWindows()
 {
+    logger->setChatWindow(NULL);
     delete chatWindow;
     delete statusWindow;
     delete miniStatusWindow;
-- 
cgit v1.2.3-70-g09d2


From 3f8387402ee7b528026450232cb457c8ae1cf4e2 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 8 Jan 2009 20:38:41 +0100
Subject: Removed the unused Box, VBox and HBox classes

They were once meant for doing layout, but never used and the way
they're implemented they would be relayouting with every draw, which
isn't really nice.
---
 aethyra.cbp        |  6 ------
 po/Makevars        |  2 +-
 src/CMakeLists.txt |  6 ------
 src/Makefile.am    |  6 ------
 src/gui/box.cpp    | 42 ---------------------------------------
 src/gui/box.h      | 58 ------------------------------------------------------
 src/gui/hbox.cpp   | 39 ------------------------------------
 src/gui/hbox.h     | 35 --------------------------------
 src/gui/vbox.cpp   | 43 ----------------------------------------
 src/gui/vbox.h     | 35 --------------------------------
 10 files changed, 1 insertion(+), 271 deletions(-)
 delete mode 100644 src/gui/box.cpp
 delete mode 100644 src/gui/box.h
 delete mode 100644 src/gui/hbox.cpp
 delete mode 100644 src/gui/hbox.h
 delete mode 100644 src/gui/vbox.cpp
 delete mode 100644 src/gui/vbox.h

diff --git a/aethyra.cbp b/aethyra.cbp
index 8d79b097..0ede5d07 100644
--- a/aethyra.cbp
+++ b/aethyra.cbp
@@ -113,8 +113,6 @@
 		<Unit filename="src\game.h" />
 		<Unit filename="src\graphics.cpp" />
 		<Unit filename="src\graphics.h" />
-		<Unit filename="src\gui\box.cpp" />
-		<Unit filename="src\gui\box.h" />
 		<Unit filename="src\gui\browserbox.cpp" />
 		<Unit filename="src\gui\browserbox.h" />
 		<Unit filename="src\gui\button.cpp" />
@@ -151,8 +149,6 @@
 		<Unit filename="src\gui\gccontainer.h" />
 		<Unit filename="src\gui\gui.cpp" />
 		<Unit filename="src\gui\gui.h" />
-		<Unit filename="src\gui\hbox.cpp" />
-		<Unit filename="src\gui\hbox.h" />
 		<Unit filename="src\gui\help.cpp" />
 		<Unit filename="src\gui\help.h" />
 		<Unit filename="src\gui\inttextbox.cpp" />
@@ -253,8 +249,6 @@
 		<Unit filename="src\gui\truetypefont.h" />
 		<Unit filename="src\gui\updatewindow.cpp" />
 		<Unit filename="src\gui\updatewindow.h" />
-		<Unit filename="src\gui\vbox.cpp" />
-		<Unit filename="src\gui\vbox.h" />
 		<Unit filename="src\gui\viewport.cpp" />
 		<Unit filename="src\gui\viewport.h" />
 		<Unit filename="src\gui\widgets\dropdown.cpp" />
diff --git a/po/Makevars b/po/Makevars
index 76e72f50..73f2a51b 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,7 +1,7 @@
 # Makefile variables for PO directory in any package using GNU gettext.
 
 # Usually the message domain is the same as the package name.
-DOMAIN = tmw
+DOMAIN = aethyra
 
 # These two variables depend on the location of this directory.
 subdir = po
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 072e141e..9875257d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -55,8 +55,6 @@ SET(SRCS
     gui/widgets/resizegrip.h
     gui/widgets/layout.cpp
     gui/widgets/layout.h
-    gui/box.cpp
-    gui/box.h
     gui/browserbox.cpp
     gui/browserbox.h
     gui/buddywindow.cpp
@@ -91,8 +89,6 @@ SET(SRCS
     gui/gccontainer.h
     gui/gui.cpp
     gui/gui.h
-    gui/hbox.cpp
-    gui/hbox.h
     gui/help.cpp
     gui/help.h
     gui/inttextbox.cpp
@@ -181,8 +177,6 @@ SET(SRCS
     gui/trade.h
     gui/updatewindow.h
     gui/updatewindow.cpp
-    gui/vbox.h
-    gui/vbox.cpp
     gui/viewport.cpp
     gui/viewport.h
     gui/window.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 1d325a84..9d95488d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,8 +5,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/widgets/layout.h \
               gui/widgets/resizegrip.cpp \
 	      gui/widgets/resizegrip.h \
-	      gui/box.cpp \
-	      gui/box.h \
 	      gui/browserbox.cpp \
 	      gui/browserbox.h \
 	      gui/button.cpp \
@@ -43,8 +41,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/gccontainer.h \
 	      gui/gui.cpp \
 	      gui/gui.h \
-	      gui/hbox.cpp \
-	      gui/hbox.h \
 	      gui/help.cpp \
 	      gui/help.h \
 	      gui/inttextbox.h \
@@ -145,8 +141,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/trade.h \
 	      gui/updatewindow.h \
 	      gui/updatewindow.cpp \
-	      gui/vbox.h \
-	      gui/vbox.cpp \
 	      gui/viewport.cpp \
 	      gui/viewport.h \
 	      gui/window.cpp \
diff --git a/src/gui/box.cpp b/src/gui/box.cpp
deleted file mode 100644
index 59d8c135..00000000
--- a/src/gui/box.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "box.h"
-
-Box::Box():
-    padding(0)
-{
-    setOpaque(false);
-}
-
-Box::~Box()
-{
-}
-
-unsigned int Box::getPadding()
-{
-    return padding;
-}
-
-void Box::setPadding(unsigned int p)
-{
-    padding = p;
-}
diff --git a/src/gui/box.h b/src/gui/box.h
deleted file mode 100644
index 46654b48..00000000
--- a/src/gui/box.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-
-#ifndef BOX_H
-#define BOX_H
-
-#include <guichan/widgets/container.hpp>
-
-#include "../guichanfwd.h"
-
-class Box : public gcn::Container
-{
-    public:
-        /**
-         * Returns padding.
-         */
-        unsigned int getPadding();
-
-        /**
-         * Sets padding between widgets.
-         */
-        void setPadding(unsigned int);
-
-    protected:
-        Box();
-        virtual ~Box();
-
-        /**
-         * Spacing between client widgets.
-         */
-        unsigned int padding;
-
-        virtual void draw(gcn::Graphics *) = 0;
-
-        typedef std::list<gcn::Widget*> Widgets;
-        typedef Widgets::iterator WidgetIterator;
-};
-
-#endif
diff --git a/src/gui/hbox.cpp b/src/gui/hbox.cpp
deleted file mode 100644
index 020e85c6..00000000
--- a/src/gui/hbox.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "hbox.h"
-
-void HBox::draw(gcn::Graphics *graphics)
-{
-    int widgetCount = mWidgets.size();
-    int childHeight = getHeight();
-    if (widgetCount == 0)
-        return;
-    int childWidth = getWidth() / widgetCount;
-
-    int i = 0;
-    for (WidgetIterator w = mWidgets.begin(); w != mWidgets.end(); w++) {
-        (*w)->setPosition(childWidth * i - padding, 0);
-        (*w)->setSize(childWidth, childHeight);
-        i++;
-    }
-    gcn::Container::draw(graphics);
-}
diff --git a/src/gui/hbox.h b/src/gui/hbox.h
deleted file mode 100644
index da70a53c..00000000
--- a/src/gui/hbox.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef HBOX_H
-#define HBOX_H
-
-#include "box.h"
-
-#include "../guichanfwd.h"
-
-class HBox : public Box
-{
- public:
-    void draw(gcn::Graphics *);
-};
-
-#endif
diff --git a/src/gui/vbox.cpp b/src/gui/vbox.cpp
deleted file mode 100644
index 2ec1112d..00000000
--- a/src/gui/vbox.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "vbox.h"
-
-void VBox::draw(gcn::Graphics *graphics)
-{
-    if (mWidgets.empty())
-    {
-        return;
-    }
-
-    int childWidth = getWidth();
-    int childHeight = getHeight() / mWidgets.size();
-    int i = 0;
-
-    for (WidgetIterator w = mWidgets.begin(); w != mWidgets.end(); w++)
-    {
-        (*w)->setPosition(0, childHeight * i - padding);
-        (*w)->setSize(childWidth, childHeight);
-        i++;
-    }
-
-    gcn::Container::draw(graphics);
-}
diff --git a/src/gui/vbox.h b/src/gui/vbox.h
deleted file mode 100644
index 4538338f..00000000
--- a/src/gui/vbox.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef VBOX_H
-#define VBOX_H
-
-#include "box.h"
-
-#include "../guichanfwd.h"
-
-class VBox : public Box
-{
-    public:
-        void draw(gcn::Graphics *);
-};
-
-#endif
-- 
cgit v1.2.3-70-g09d2


From 0b2e6c53a158b820a3e3610372c98185a4dce30a Mon Sep 17 00:00:00 2001
From: Forge <jgrimbert@free.fr>
Date: Thu, 8 Jan 2009 23:57:34 +0100
Subject: Smiley shortcut 2.0: Final stage

The copyright issue is left opened, all other items on the TODO list
have been done.

Signed-off-by: Forge <jgrimbert@free.fr>
---
 src/smileyshortcut.cpp |  76 +++++++++++++++++++++++++++++
 src/smileyshortcut.h   | 127 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 203 insertions(+)
 create mode 100644 src/smileyshortcut.cpp
 create mode 100644 src/smileyshortcut.h

diff --git a/src/smileyshortcut.cpp b/src/smileyshortcut.cpp
new file mode 100644
index 00000000..adc7d9c3
--- /dev/null
+++ b/src/smileyshortcut.cpp
@@ -0,0 +1,76 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "configuration.h"
+#include "smileyshortcut.h"
+#include "localplayer.h"
+
+#include "utils/tostring.h"
+
+SmileyShortcut::SmileyShortcut *smileyShortcut;
+
+SmileyShortcut::SmileyShortcut():
+    mSmileySelected(0)
+{
+    for (int i = 0; i < SHORTCUT_SMILEYS; i++)
+    {
+        mSmileys[i] = i+1;
+    }
+    load();
+}
+
+SmileyShortcut::~SmileyShortcut()
+{
+    save();
+}
+
+void SmileyShortcut::load()
+{
+    for (int i = 0; i < SHORTCUT_SMILEYS; i++)
+    {
+        int smileyId = (int) config.getValue("Smileyshortcut" + toString(i), i+1);
+
+        if (smileyId)
+        {
+            mSmileys[i] = smileyId;
+        }
+    }
+}
+
+void SmileyShortcut::save()
+{
+    for (int i = 0; i < SHORTCUT_SMILEYS; i++)
+    {
+        const int smileyId = mSmileys[i] ? mSmileys[i] : 0;
+        config.setValue("Smileyshortcut" + toString(i), smileyId);
+    }
+}
+
+void SmileyShortcut::useSmiley(int index)
+{
+    if ((index>0)&&(index<=SHORTCUT_SMILEYS))
+    {
+       if (mSmileys[index-1]>0)
+       {
+          player_node->emote(mSmileys[index-1]);
+       }
+    }
+}
diff --git a/src/smileyshortcut.h b/src/smileyshortcut.h
new file mode 100644
index 00000000..9960d8cf
--- /dev/null
+++ b/src/smileyshortcut.h
@@ -0,0 +1,127 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _TMW_SMILEYSHORTCUT_H__
+#define _TMW_ITEMSHORTCUT_H__
+
+#define SHORTCUT_SMILEYS 12
+
+class Item;
+
+/**
+ * The class which keeps track of the item shortcuts.
+ */
+class SmileyShortcut
+{
+    public:
+        /**
+         * Constructor.
+         */
+        SmileyShortcut();
+
+        /**
+         * Destructor.
+         */
+        ~SmileyShortcut();
+
+        /**
+         * Load the configuration information.
+         */
+        void load();
+
+        /**
+         * Returns the shortcut smiley ID specified by the index.
+         *
+         * @param index Index of the shortcut smiley.
+         */
+        int getSmiley(int index) const
+        { return mSmileys[index]; }
+
+        /**
+         * Returns the amount of shortcut smileys.
+         */
+        int getSmileyCount() const
+        { return SHORTCUT_SMILEYS; }
+
+        /**
+         * Returns the item ID that is currently selected.
+         */
+        int getSmileySelected() const
+        { return mSmileySelected; }
+
+        /**
+         * Adds the selected item ID to the items specified by the index.
+         *
+         * @param index Index of the items.
+         */
+        void setSmiley(int index)
+        { mSmileys[index] = mSmileySelected; }
+
+        /**
+         * Adds a smiley to the smileys store specified by the index.
+         *
+         * @param index Index of the smiley.
+         * @param smileyId ID of the smiley.
+         */
+        void setSmileys(int index, int smileyId)
+        { mSmileys[index] = smileyId; }
+
+        /**
+         * Set the smiley that is selected.
+         *
+         * @param smileyId The ID of the smiley that is to be assigned.
+         */
+        void setSmileySelected(int smileyId)
+        { mSmileySelected = smileyId; }
+
+        /**
+         * A flag to check if the smiley is selected.
+         */
+        bool isSmileySelected()
+        { return mSmileySelected; }
+
+        /**
+         * Remove a smiley from the shortcut.
+         */
+        void removeSmiley(int index)
+        { mSmileys[index] = 0; }
+
+        /**
+         * Try to use the smiley specified by the index.
+         *
+         * @param index Index of the smiley shortcut.
+         */
+        void useSmiley(int index);
+
+    private:
+        /**
+         * Save the configuration information.
+         */
+        void save();
+
+        int mSmileys[SHORTCUT_SMILEYS]; /**< The smiley stored. */
+        int mSmileySelected;            /**< The smiley held by cursor. */
+
+};
+
+extern SmileyShortcut *smileyShortcut;
+
+#endif
-- 
cgit v1.2.3-70-g09d2


From 611210b1e0fd9cbaed38b229462e109d8f4be385 Mon Sep 17 00:00:00 2001
From: Forge <jgrimbert@free.fr>
Date: Fri, 9 Jan 2009 00:03:53 +0100
Subject: Now, the real stage 2.0 of smiley window. All is done, and all files
 are now in the tree. (ok, copyright of new files is still opened... do as you
 want, if you care)

Signed-off-by: Forge <jgrimbert@free.fr>
---
 src/Makefile.am                     |   2 +
 src/game.cpp                        |  10 +-
 src/gui/itemshortcutcontainer.cpp   |  36 +------
 src/gui/itemshortcutcontainer.h     |  31 ------
 src/gui/shortcutcontainer.cpp       | 165 +-----------------------------
 src/gui/shortcutcontainer.h         |  17 +---
 src/gui/smileycontainer.cpp         |   9 +-
 src/gui/smileyshortcutcontainer.cpp | 195 ++++++++++++------------------------
 src/gui/smileyshortcutcontainer.h   |  34 +------
 src/main.cpp                        |   6 ++
 src/smileyshortcut.h                |   2 +-
 11 files changed, 94 insertions(+), 413 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 1d325a84..d3a9571b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -278,6 +278,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      inventory.h \
 	      item.cpp \
 	      item.h \
+	      smileyshortcut.cpp \
+	      smileyshortcut.h \
 	      itemshortcut.cpp \
 	      itemshortcut.h \
 	      joystick.cpp \
diff --git a/src/game.cpp b/src/game.cpp
index 76eb6b82..da733fe3 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -36,6 +36,7 @@
 #include "flooritemmanager.h"
 #include "graphics.h"
 #include "itemshortcut.h"
+#include "smileyshortcut.h"
 #include "joystick.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
@@ -556,15 +557,10 @@ void Game::handleInput()
 	    if (keyboard.isKeyActive(keyboard.KEY_SMILIE))
 	    {
 		// Emotions
-		Uint8 emotion=keyboard.getKeySmilieOffset(event.key.keysym.sym);
-		/**
-		 * Later here: increase the size of emotion, 
-		 * and get the entry from the smiley
-		 * shortcut object
-		 */
+		int emotion=keyboard.getKeySmilieOffset(event.key.keysym.sym);
 		if (emotion)
 		{
-		    player_node->emote(emotion);
+		    smileyShortcut->useSmiley(emotion);
 		    used = true;
                     return;
 		}
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index 77657169..f0ab8274 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -34,11 +34,11 @@
 #include "../utils/tostring.h"
 
 ItemShortcutContainer::ItemShortcutContainer():
-    mGridWidth(1),
-    mGridHeight(1),
     mItemClicked(false),
     mItemMoved(NULL)
 {
+    mGridWidth=1;
+    mGridHeight=1;
     addMouseListener(this);
     addWidgetListener(this);
 
@@ -131,22 +131,6 @@ ItemShortcutContainer::draw(gcn::Graphics *graphics)
     }
 }
 
-void ItemShortcutContainer::widgetResized(const gcn::Event &event)
-{
-    mGridWidth = getWidth() / mBoxWidth;
-    if (mGridWidth < 1) {
-        mGridWidth = 1;
-    }
-
-    setHeight((mMaxItems / mGridWidth +
-                (mMaxItems % mGridWidth > 0 ? 1 : 0)) * mBoxHeight);
-
-    mGridHeight = getHeight() / mBoxHeight;
-    if (mGridHeight < 1) {
-        mGridHeight = 1;
-    }
-}
-
 void
 ItemShortcutContainer::mouseDragged(gcn::MouseEvent &event)
 {
@@ -219,19 +203,3 @@ ItemShortcutContainer::mouseReleased(gcn::MouseEvent &event)
     }
 }
 
-int
-ItemShortcutContainer::getIndexFromGrid(int pointX, int pointY) const
-{
-    const gcn::Rectangle tRect = gcn::Rectangle(
-        0, 0, mGridWidth * mBoxWidth, mGridHeight * mBoxHeight);
-    if (!tRect.isPointInRect(pointX, pointY)) {
-        return -1;
-    }
-    const int index = ((pointY / mBoxHeight) * mGridWidth) +
-        pointX / mBoxWidth;
-    if (index >= mMaxItems)
-    {
-        return -1;
-    }
-    return index;
-}
diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h
index 92b9b968..37c61e07 100644
--- a/src/gui/itemshortcutcontainer.h
+++ b/src/gui/itemshortcutcontainer.h
@@ -60,12 +60,6 @@ class ItemShortcutContainer : public ShortcutContainer
          */
         void draw(gcn::Graphics *graphics);
 
-        /**
-         * Invoked when a widget changes its size. This is used to determine
-         * the new height of the container.
-         */
-        void widgetResized(const gcn::Event &event);
-
         /**
          * Handles mouse when dragged.
          */
@@ -81,32 +75,7 @@ class ItemShortcutContainer : public ShortcutContainer
          */
         void mouseReleased(gcn::MouseEvent &event);
 
-        int getMaxItems()
-        { return mMaxItems; }
-
-        int getBoxWidth()
-        { return mBoxWidth; }
-
-        int getBoxHeight()
-        { return mBoxHeight; }
-
     private:
-        /**
-         * Gets the index from the grid provided the point is in an item box.
-         *
-         * @param pointX X coordinate of the point.
-         * @param pointY Y coordinate of the point.
-         * @return index on success, -1 on failure.
-         */
-        int getIndexFromGrid(int pointX, int pointY) const;
-
-        Image *mBackgroundImg;
-
-        int mMaxItems;
-        int mBoxWidth;
-        int mBoxHeight;
-        int mCursorPosX, mCursorPosY;
-        int mGridWidth, mGridHeight;
         bool mItemClicked;
         Item *mItemMoved;
 };
diff --git a/src/gui/shortcutcontainer.cpp b/src/gui/shortcutcontainer.cpp
index f1a60189..32d7c6af 100644
--- a/src/gui/shortcutcontainer.cpp
+++ b/src/gui/shortcutcontainer.cpp
@@ -35,101 +35,10 @@
 
 ShortcutContainer::ShortcutContainer():
     mGridWidth(1),
-    mGridHeight(1),
-    mItemClicked(false),
-    mItemMoved(NULL)
+    mGridHeight(1)
 {
-    addMouseListener(this);
-    addWidgetListener(this);
-
-    ResourceManager *resman = ResourceManager::getInstance();
-
-    mBackgroundImg = resman->getImage("graphics/gui/item_shortcut_bgr.png");
-    mMaxItems = itemShortcut->getItemCount();
-
-    mBoxHeight = 42;
-    mBoxWidth = 36;
-}
-
-ShortcutContainer::~ShortcutContainer()
-{
-    mBackgroundImg->decRef();
 }
 
-void
-ShortcutContainer::logic()
-{
-    gcn::Widget::logic();
-
-    int i = itemShortcut->getItemCount();
-
-    if (i != mMaxItems)
-    {
-        mMaxItems = i;
-        setWidth(getWidth());
-    }
-}
-
-void
-ShortcutContainer::draw(gcn::Graphics *graphics)
-{
-    Graphics *g = static_cast<Graphics*>(graphics);
-
-    graphics->setFont(getFont());
-
-    for (int i = 0; i < mMaxItems; i++)
-    {
-        const int itemX = (i % mGridWidth) * mBoxWidth;
-        const int itemY = (i / mGridWidth) * mBoxHeight;
-
-        g->drawImage(mBackgroundImg, itemX, itemY);
-
-        // Draw item keyboard shortcut.
-        const char *key = SDL_GetKeyName(
-            (SDLKey) keyboard.getKeyValue(keyboard.KEY_SHORTCUT_0 + i));
-        graphics->setColor(0x000000);
-        g->drawText(key, itemX + 2, itemY + 2, gcn::Graphics::LEFT);
-
-        if (itemShortcut->getItem(i) < 0)
-            continue;
-
-        Item *item =
-            player_node->getInventory()->findItem(itemShortcut->getItem(i));
-        if (item) {
-            // Draw item icon.
-            const std::string label =
-                item->isEquipped() ? "Eq." : toString(item->getQuantity());
-            Image* image = item->getImage();
-            if (image) {
-                const std::string label =
-                    item->isEquipped() ? "Eq." : toString(item->getQuantity());
-                g->drawImage(image, itemX, itemY);
-                g->drawText(
-                        label,
-                        itemX + mBoxWidth / 2,
-                        itemY + mBoxHeight - 14,
-                        gcn::Graphics::CENTER);
-            }
-        }
-    }
-    if (mItemMoved)
-    {
-        // Draw the item image being dragged by the cursor.
-        Image* image = mItemMoved->getImage();
-        if (image)
-        {
-            const int tPosX = mCursorPosX - (image->getWidth() / 2);
-            const int tPosY = mCursorPosY - (image->getHeight() / 2);
-
-            g->drawImage(image, tPosX, tPosY);
-            g->drawText(
-                    toString(mItemMoved->getQuantity()),
-                    tPosX + mBoxWidth / 2,
-                    tPosY + mBoxHeight - 14,
-                    gcn::Graphics::CENTER);
-        }
-    }
-}
 
 void ShortcutContainer::widgetResized(const gcn::Event &event)
 {
@@ -147,78 +56,6 @@ void ShortcutContainer::widgetResized(const gcn::Event &event)
     }
 }
 
-void
-ShortcutContainer::mouseDragged(gcn::MouseEvent &event)
-{
-    if (event.getButton() == gcn::MouseEvent::LEFT) {
-        if (!mItemMoved && mItemClicked) {
-            const int index = getIndexFromGrid(event.getX(), event.getY());
-            if (index == -1) {
-                return;
-            }
-            const int itemId = itemShortcut->getItem(index);
-            if (itemId < 0)
-                return;
-            Item *item = player_node->getInventory()->findItem(itemId);
-            if (item)
-            {
-                mItemMoved = item;
-                itemShortcut->removeItem(index);
-            }
-        }
-        if (mItemMoved) {
-            mCursorPosX = event.getX();
-            mCursorPosY = event.getY();
-        }
-    }
-}
-
-void
-ShortcutContainer::mousePressed(gcn::MouseEvent &event)
-{
-    const int index = getIndexFromGrid(event.getX(), event.getY());
-    if (index == -1) {
-        return;
-    }
-
-    // Stores the selected item if theirs one.
-    if (itemShortcut->isItemSelected()) {
-        itemShortcut->setItem(index);
-        itemShortcut->setItemSelected(-1);
-    }
-    else if (itemShortcut->getItem(index)) {
-        mItemClicked = true;
-    }
-}
-
-void
-ShortcutContainer::mouseReleased(gcn::MouseEvent &event)
-{
-    if (event.getButton() == gcn::MouseEvent::LEFT)
-    {
-        if (itemShortcut->isItemSelected())
-        {
-            itemShortcut->setItemSelected(-1);
-        }
-        const int index = getIndexFromGrid(event.getX(), event.getY());
-        if (index == -1) {
-            mItemMoved = NULL;
-            return;
-        }
-        if (mItemMoved) {
-            itemShortcut->setItems(index, mItemMoved->getId());
-            mItemMoved = NULL;
-        }
-        else if (itemShortcut->getItem(index) && mItemClicked)
-        {
-            itemShortcut->useItem(index);
-        }
-        if (mItemClicked) {
-            mItemClicked = false;
-        }
-    }
-}
-
 int
 ShortcutContainer::getIndexFromGrid(int pointX, int pointY) const
 {
diff --git a/src/gui/shortcutcontainer.h b/src/gui/shortcutcontainer.h
index 5ca56899..ebc0a9fc 100644
--- a/src/gui/shortcutcontainer.h
+++ b/src/gui/shortcutcontainer.h
@@ -49,17 +49,12 @@ class ShortcutContainer : public gcn::Widget,
         /**
          * Destructor.
          */
-        virtual ~ShortcutContainer();
-
-        /**
-         * Handles the logic of the ItemContainer
-         */
-        virtual void logic();
+        ~ShortcutContainer(){}
 
         /**
          * Draws the items.
          */
-        virtual void draw(gcn::Graphics *graphics);
+        virtual void draw(gcn::Graphics *graphics)=0;
 
         /**
          * Invoked when a widget changes its size. This is used to determine
@@ -70,17 +65,17 @@ class ShortcutContainer : public gcn::Widget,
         /**
          * Handles mouse when dragged.
          */
-        virtual void mouseDragged(gcn::MouseEvent &event);
+        virtual void mouseDragged(gcn::MouseEvent &event)=0;
 
         /**
          * Handles mouse when pressed.
          */
-        virtual void mousePressed(gcn::MouseEvent &event);
+        virtual void mousePressed(gcn::MouseEvent &event)=0;
 
         /**
          * Handles mouse release.
          */
-        virtual void mouseReleased(gcn::MouseEvent &event);
+        virtual void mouseReleased(gcn::MouseEvent &event)=0;
 
         virtual int getMaxItems()
         { return mMaxItems; }
@@ -108,8 +103,6 @@ class ShortcutContainer : public gcn::Widget,
         int mBoxHeight;
         int mCursorPosX, mCursorPosY;
         int mGridWidth, mGridHeight;
-        bool mItemClicked;
-        Item *mItemMoved;
 };
 
 #endif
diff --git a/src/gui/smileycontainer.cpp b/src/gui/smileycontainer.cpp
index 5eb99723..55f8f11b 100644
--- a/src/gui/smileycontainer.cpp
+++ b/src/gui/smileycontainer.cpp
@@ -31,6 +31,8 @@
 #include "../resources/iteminfo.h"
 #include "../resources/resourcemanager.h"
 
+#include "../smileyshortcut.h"
+
 #include "../utils/tostring.h"
 
 const int SmileyContainer::gridWidth = 34;  // item icon width + 4
@@ -158,7 +160,10 @@ void SmileyContainer::mousePressed(gcn::MouseEvent &event)
         int mx = event.getX();
         int my = event.getY();
         int index = mx / gridWidth + ((my / gridHeight) * columns);
-
-        setSelectedItemIndex(index);
+        if (index <mMaxSmiley)
+        {
+           setSelectedItemIndex(index);
+           smileyShortcut->setSmileySelected(index+1);
+        }
     }
 }
diff --git a/src/gui/smileyshortcutcontainer.cpp b/src/gui/smileyshortcutcontainer.cpp
index 5a9c3036..03b343e4 100644
--- a/src/gui/smileyshortcutcontainer.cpp
+++ b/src/gui/smileyshortcutcontainer.cpp
@@ -25,6 +25,7 @@
 #include "../inventory.h"
 #include "../item.h"
 #include "../itemshortcut.h"
+#include "../smileyshortcut.h"
 #include "../keyboardconfig.h"
 #include "../localplayer.h"
 #include "../log.h"
@@ -36,11 +37,11 @@
 #include "../utils/tostring.h"
 
 SmileyShortcutContainer::SmileyShortcutContainer():
-    mGridWidth(1),
-    mGridHeight(1),
-    mItemClicked(false),
-    mItemMoved(NULL)
+    mSmileyClicked(false),
+    mSmileyMoved(0)
 {
+    mGridWidth=1,
+    mGridHeight=1,
     addMouseListener(this);
     addWidgetListener(this);
 
@@ -50,7 +51,7 @@ SmileyShortcutContainer::SmileyShortcutContainer():
     mSmileyImg = resman->getImageSet("graphics/gui/emotions.png",30,32);
     if (!mSmileyImg) logger->error("Unable to load emotions");
 
-    mMaxItems = 12; 
+    mMaxItems = smileyShortcut->getSmileyCount(); 
 
     mBoxHeight = 42;
     mBoxWidth = 36;
@@ -86,158 +87,92 @@ SmileyShortcutContainer::draw(gcn::Graphics *graphics)
             (SDLKey) keyboard.getKeyValue(keyboard.KEY_SMILEY_1 + i));
         graphics->setColor(0x000000);
         g->drawText(key, itemX + 2, itemY + 2, gcn::Graphics::LEFT);
+        if (smileyShortcut->getSmiley(i))
+        {
         static_cast<Graphics*>(graphics)->drawImage(
-                    mSmileyImg->get(i), itemX+2, itemY+10);
-
-#if 0
-        if (itemShortcut->getItem(i) < 0)
-            continue;
-
-        Item *item =
-            player_node->getInventory()->findItem(itemShortcut->getItem(i));
-        if (item) {
-            // Draw item icon.
-            const std::string label =
-                item->isEquipped() ? "Eq." : toString(item->getQuantity());
-            Image* image = item->getImage();
-            if (image) {
-                const std::string label =
-                    item->isEquipped() ? "Eq." : toString(item->getQuantity());
-                g->drawImage(image, itemX, itemY);
-                g->drawText(
-                        label,
-                        itemX + mBoxWidth / 2,
-                        itemY + mBoxHeight - 14,
-                        gcn::Graphics::CENTER);
-            }
+                    mSmileyImg->get(smileyShortcut->getSmiley(i)-1), itemX+2, itemY+10);
         }
-#endif
+
     }
-    if (mItemMoved)
+    if (mSmileyMoved)
     {
         // Draw the item image being dragged by the cursor.
-        Image* image = mItemMoved->getImage();
+        Image* image = mSmileyImg->get(mSmileyMoved-1);
         if (image)
         {
             const int tPosX = mCursorPosX - (image->getWidth() / 2);
             const int tPosY = mCursorPosY - (image->getHeight() / 2);
 
             g->drawImage(image, tPosX, tPosY);
-            g->drawText(
-                    toString(mItemMoved->getQuantity()),
-                    tPosX + mBoxWidth / 2,
-                    tPosY + mBoxHeight - 14,
-                    gcn::Graphics::CENTER);
         }
     }
 }
 
-void SmileyShortcutContainer::widgetResized(const gcn::Event &event)
-{
-    mGridWidth = getWidth() / mBoxWidth;
-    if (mGridWidth < 1) {
-        mGridWidth = 1;
-    }
-
-    setHeight((mMaxItems / mGridWidth +
-                (mMaxItems % mGridWidth > 0 ? 1 : 0)) * mBoxHeight);
-
-    mGridHeight = getHeight() / mBoxHeight;
-    if (mGridHeight < 1) {
-        mGridHeight = 1;
-    }
-}
-
 void
 SmileyShortcutContainer::mouseDragged(gcn::MouseEvent &event)
 {
-    if (event.getButton() == gcn::MouseEvent::LEFT) {
-        if (!mItemMoved && mItemClicked) {
-            const int index = getIndexFromGrid(event.getX(), event.getY());
-            if (index == -1) {
-                return;
-            }
-#if 0
-            const int itemId = itemShortcut->getItem(index);
-            if (itemId < 0)
-                return;
-            Item *item = player_node->getInventory()->findItem(itemId);
-            if (item)
-            {
-                mItemMoved = item;
-                itemShortcut->removeItem(index);
-            }
-#endif
-        }
-        if (mItemMoved) {
-            mCursorPosX = event.getX();
-            mCursorPosY = event.getY();
-        }
-    }
+   if (event.getButton() == gcn::MouseEvent::LEFT) {
+      if (!mSmileyMoved && mSmileyClicked) {
+         const int index = getIndexFromGrid(event.getX(), event.getY());
+         if (index == -1) {
+            return;
+         }
+         const int smileyId = smileyShortcut->getSmiley(index);
+         if (smileyId)
+         {
+            mSmileyMoved = smileyId;
+            smileyShortcut->removeSmiley(index);
+         }
+      }
+      if (mSmileyMoved) {
+         mCursorPosX = event.getX();
+         mCursorPosY = event.getY();
+      }
+   }
 }
 
 void
 SmileyShortcutContainer::mousePressed(gcn::MouseEvent &event)
 {
-    const int index = getIndexFromGrid(event.getX(), event.getY());
-    if (index == -1) {
-        return;
-    }
-#if 0
-    // Stores the selected item if theirs one.
-    if (itemShortcut->isItemSelected()) {
-        itemShortcut->setItem(index);
-        itemShortcut->setItemSelected(-1);
-    }
-    else if (itemShortcut->getItem(index)) {
-        mItemClicked = true;
-    }
-#endif
+   const int index = getIndexFromGrid(event.getX(), event.getY());
+   if (index == -1) {
+      return;
+   }
+   // Stores the selected item if theirs one.
+   if (smileyShortcut->isSmileySelected()) {
+      smileyShortcut->setSmiley(index);
+      smileyShortcut->setSmileySelected(0);
+   }
+   else if (smileyShortcut->getSmiley(index)) {
+      mSmileyClicked = true;
+   }
 }
 
 void
 SmileyShortcutContainer::mouseReleased(gcn::MouseEvent &event)
 {
-    if (event.getButton() == gcn::MouseEvent::LEFT)
-    {
-#if 0
-        if (itemShortcut->isItemSelected())
-        {
-            itemShortcut->setItemSelected(-1);
-        }
-        const int index = getIndexFromGrid(event.getX(), event.getY());
-        if (index == -1) {
-            mItemMoved = NULL;
-            return;
-        }
-        if (mItemMoved) {
-            itemShortcut->setItems(index, mItemMoved->getId());
-            mItemMoved = NULL;
-        }
-        else if (itemShortcut->getItem(index) && mItemClicked)
-        {
-            itemShortcut->useItem(index);
-        }
-        if (mItemClicked) {
-            mItemClicked = false;
-        }
-#endif
-    }
+   if (event.getButton() == gcn::MouseEvent::LEFT)
+   {
+      if (smileyShortcut->isSmileySelected())
+      {
+         smileyShortcut->setSmileySelected(0);
+      }
+      const int index = getIndexFromGrid(event.getX(), event.getY());
+      if (index == -1) {
+         mSmileyMoved = 0;
+         return;
+      }
+      if (mSmileyMoved) {
+         smileyShortcut->setSmileys(index, mSmileyMoved);
+         mSmileyMoved = 0;
+      }
+      else if (smileyShortcut->getSmiley(index) && mSmileyClicked)
+      {
+         smileyShortcut->useSmiley(index+1);
+      }
+      if (mSmileyClicked) {
+         mSmileyClicked = false;
+      }
+   }
 }
 
-int
-SmileyShortcutContainer::getIndexFromGrid(int pointX, int pointY) const
-{
-    const gcn::Rectangle tRect = gcn::Rectangle(
-        0, 0, mGridWidth * mBoxWidth, mGridHeight * mBoxHeight);
-    if (!tRect.isPointInRect(pointX, pointY)) {
-        return -1;
-    }
-    const int index = ((pointY / mBoxHeight) * mGridWidth) +
-        pointX / mBoxWidth;
-    if (index >= mMaxItems)
-    {
-        return -1;
-    }
-    return index;
-}
diff --git a/src/gui/smileyshortcutcontainer.h b/src/gui/smileyshortcutcontainer.h
index d6bbbc4f..55df6124 100644
--- a/src/gui/smileyshortcutcontainer.h
+++ b/src/gui/smileyshortcutcontainer.h
@@ -57,12 +57,6 @@ class SmileyShortcutContainer : public ShortcutContainer
          */
         void draw(gcn::Graphics *graphics);
 
-        /**
-         * Invoked when a widget changes its size. This is used to determine
-         * the new height of the container.
-         */
-        void widgetResized(const gcn::Event &event);
-
         /**
          * Handles mouse when dragged.
          */
@@ -78,35 +72,11 @@ class SmileyShortcutContainer : public ShortcutContainer
          */
         void mouseReleased(gcn::MouseEvent &event);
 
-        int getMaxItems()
-        { return mMaxItems; }
-
-        int getBoxWidth()
-        { return mBoxWidth; }
-
-        int getBoxHeight()
-        { return mBoxHeight; }
-
     private:
-        /**
-         * Gets the index from the grid provided the point is in an item box.
-         *
-         * @param pointX X coordinate of the point.
-         * @param pointY Y coordinate of the point.
-         * @return index on success, -1 on failure.
-         */
-        int getIndexFromGrid(int pointX, int pointY) const;
-
-        Image *mBackgroundImg;
         ImageSet *mSmileyImg;
 
-        int mMaxItems;
-        int mBoxWidth;
-        int mBoxHeight;
-        int mCursorPosX, mCursorPosY;
-        int mGridWidth, mGridHeight;
-        bool mItemClicked;
-        Item *mItemMoved;
+        bool mSmileyClicked;
+        int mSmileyMoved;
 };
 
 #endif
diff --git a/src/main.cpp b/src/main.cpp
index 4a3acce8..09004a50 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -40,6 +40,7 @@
 #include "game.h"
 #include "graphics.h"
 #include "itemshortcut.h"
+#include "smileyshortcut.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
 #include "lockedarray.h"
@@ -401,6 +402,9 @@ void init_engine(const Options &options)
 
     // Initialize the item shortcuts.
     itemShortcut = new ItemShortcut();
+      
+    // Initialize the smiley shortcuts.
+    smileyShortcut = new SmileyShortcut();
 
     gui = new Gui(graphics);
     state = LOGIN_STATE; /**< Initial game state */
@@ -433,6 +437,8 @@ void exit_engine()
 {
     // Before config.write() since it writes the shortcuts to the config
     delete itemShortcut;
+    
+    delete smileyShortcut;
 
     config.write();
 
diff --git a/src/smileyshortcut.h b/src/smileyshortcut.h
index 9960d8cf..c4fb9280 100644
--- a/src/smileyshortcut.h
+++ b/src/smileyshortcut.h
@@ -20,7 +20,7 @@
  */
 
 #ifndef _TMW_SMILEYSHORTCUT_H__
-#define _TMW_ITEMSHORTCUT_H__
+#define _TMW_SMILEYSHORTCUT_H__
 
 #define SHORTCUT_SMILEYS 12
 
-- 
cgit v1.2.3-70-g09d2


From 193ccbdba8031a351ea622f8842b6d9a0b6cfd43 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 8 Jan 2009 22:03:33 +0100
Subject: Made remaining dialogs translatable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Most strings are now translatable. Please do report any missing ones.
Strings excluded from translation are anything that gets written to the
log file or is otherwise not shown in the GUI.

Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
---
 po/POTFILES.in                      |  15 +++
 src/gui/buysell.cpp                 |  10 +-
 src/gui/chat.cpp                    | 192 +++++++++++++++++++-----------------
 src/gui/colour.cpp                  |  20 ++--
 src/gui/help.cpp                    |   6 +-
 src/gui/setup_colours.cpp           |   4 +-
 src/gui/setup_keyboard.cpp          |  12 ++-
 src/gui/setup_players.cpp           |  62 +++++++-----
 src/gui/setup_video.cpp             |   4 +-
 src/gui/skill.cpp                   |  34 +++----
 src/gui/smileycontainer.cpp         |   5 +-
 src/gui/smileyshortcutcontainer.cpp |   3 +-
 src/gui/smileywindow.cpp            |  11 ++-
 src/gui/speechbubble.cpp            |   4 +-
 src/gui/status.cpp                  |  90 ++++++++---------
 src/gui/trade.cpp                   |   4 +-
 src/gui/updatewindow.cpp            |  31 +++---
 src/main.cpp                        |  90 ++++++++---------
 18 files changed, 327 insertions(+), 270 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index e66b8f69..1005e363 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,11 +1,15 @@
 # List of source files which contain translatable strings.
 
 src/gui/buy.cpp
+src/gui/buysell.cpp
 src/gui/char_select.cpp
 src/gui/char_server.cpp
+src/gui/chat.cpp
+src/gui/colour.cpp
 src/gui/confirm_dialog.cpp
 src/gui/connection.cpp
 src/gui/equipmentwindow.cpp
+src/gui/help.cpp
 src/gui/inventorywindow.cpp
 src/gui/item_amount.cpp
 src/gui/login.cpp
@@ -19,8 +23,19 @@ src/gui/register.cpp
 src/gui/sell.cpp
 src/gui/setup_audio.cpp
 src/gui/setup.cpp
+src/gui/setup_colours.cpp
 src/gui/setup_joystick.cpp
+src/gui/setup_keyboard.cpp
+src/gui/setup_players.cpp
 src/gui/setup_video.cpp
+src/gui/skill.cpp
+src/gui/smileycontainer.cpp
+src/gui/smileyshortcutcontainer.cpp
+src/gui/smileywindow.cpp
+src/gui/speechbubble.cpp
+src/gui/status.cpp
 src/gui/trade.cpp
+src/gui/updatewindow.cpp
 src/net/playerhandler.cpp
 src/resources/itemdb.cpp
+src/main.cpp
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index 57c95841..724ae8a1 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -24,18 +24,20 @@
 
 #include "../npc.h"
 
+#include "../utils/gettext.h"
+
 BuySellDialog::BuySellDialog():
-    Window("Shop")
+    Window(_("Shop"))
 {
     Button *buyButton = 0;
-    const char *buttonNames[] = {
-        "Buy", "Sell", "Cancel", 0
+    static const char *buttonNames[] = {
+        N_("Buy"), N_("Sell"), N_("Cancel"), 0
     };
     int x = 10, y = 10;
 
     for (const char **curBtn = buttonNames; *curBtn; curBtn++)
     {
-        Button *btn = new Button(*curBtn, *curBtn, this);
+        Button *btn = new Button(gettext(*curBtn), *curBtn, this);
         if (!buyButton) buyButton = btn; // For focus request
         btn->setPosition(x, y);
         add(btn);
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 71954601..35976963 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -42,12 +42,14 @@
 #include "../net/messageout.h"
 #include "../net/protocol.h"
 
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
 #include "../utils/trim.h"
 
 ChatWindow::ChatWindow(Network * network):
 Window(""), mNetwork(network), mTmpVisible(false)
 {
-    setWindowName("Chat");
+    setWindowName(_("Chat"));
 
     setResizable(true);
     setDefaultSize(0, windowContainer->getHeight() - 123, 600, 123);
@@ -127,7 +129,7 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
         tmp.text = line.substr(pos + 3);
     } else {
         // Fix the owner of welcome message.
-        if (line.substr(0, 7) == "Welcome")
+        if (line.substr(0, 7) == _("Welcome"))
         {
             own = BY_SERVER;
         }
@@ -138,12 +140,12 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
         case BY_GM:
             if (tmp.nick.empty())
             {
-                tmp.nick = std::string("Global announcement: ");
+                tmp.nick = std::string(_("Global announcement: "));
                 lineColor = "##G";
             }
             else
             {
-                tmp.nick = std::string("Global announcement from " + tmp.nick
+                tmp.nick = std::string(_("Global announcement from ") + tmp.nick
                         + std::string(": "));
                 lineColor = "##1"; // Equiv. to BrowserBox::RED
             }
@@ -157,7 +159,8 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
             lineColor = "##C";
             break;
         case BY_SERVER:
-            tmp.nick = "Server: ";
+            tmp.nick = _("Server:");
+            tmp.nick += " ";
             tmp.text = line;
             lineColor = "##S";
             break;
@@ -281,7 +284,7 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
         std::size_t length = msg.length() + 1;
 
         if (length == 0) {
-            chatLog("Trying to send a blank party message.", BY_SERVER);
+            chatLog(_("Trying to send a blank party message."), BY_SERVER);
             return;
         }
         MessageOut outMsg(mNetwork);
@@ -383,7 +386,7 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
         outMsg.writeString(recvnick, 24);
         outMsg.writeString(msg, msg.length());
 
-        chatLog("Whispering to " + recvnick + " : " + msg, BY_PLAYER);
+        chatLog(_("Whispering to ") + recvnick + " : " + msg, BY_PLAYER);
         return;
     }
     if (command == "record") {
@@ -392,29 +395,29 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
     }
     if (command == "toggle") {
         if (msg == "") {
-            chatLog(mReturnToggles ? "Return toggles chat."
-                    : "Message closes chat.", BY_SERVER);
+            chatLog(mReturnToggles ? _("Return toggles chat.")
+                    : _("Message closes chat."), BY_SERVER);
             return;
         }
         msg = msg.substr(0, 1);
         if (msg == "1" || msg == "y" || msg == "t" || msg == "Y" || msg == "T") {
-            chatLog("Return now toggles chat.", BY_SERVER);
+            chatLog(_("Return now toggles chat."), BY_SERVER);
             mReturnToggles = true;
             return;
         }
         if (msg == "0" || msg == "n" || msg == "f" || msg == "N" || msg == "F") {
-            chatLog("Message now closes chat.", BY_SERVER);
+            chatLog(_("Message now closes chat."), BY_SERVER);
             mReturnToggles = false;
             return;
         }
-        chatLog("Options to /toggle are \"yes\", \"no\", \"true\", \"false\", "
-                "\"1\", \"0\".", BY_SERVER);
+        chatLog(_("Options to /toggle are \"yes\", \"no\", \"true\", \"false\", "
+                "\"1\", \"0\"."), BY_SERVER);
         return;
     }
     if (command == "party") {
         if (msg == "") {
-            chatLog("Unknown party command... Type \"/help\" party for more "
-                    "information.", BY_SERVER);
+            chatLog(_("Unknown party command... Type \"/help\" party for more "
+                    "information."), BY_SERVER);
             return;
         }
         const std::string::size_type space = msg.find(" ");
@@ -451,10 +454,10 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
                 outMsg.writeInt8(0);
                 outMsg.writeString("", 24);
             } else {
-                chatLog("No such spell!", BY_SERVER);
+                chatLog(_("No such spell!"), BY_SERVER);
             }
         } else {
-            chatLog("The current server doesn't support spells", BY_SERVER);
+            chatLog(_("The current server doesn't support spells"), BY_SERVER);
         }
         return;
     }
@@ -484,14 +487,14 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
                 << "] ";
 
 
-            mRecorder->record(timeStr.str() + "Present: " + response + ".");
-            chatLog("Attendance written to record log.", BY_SERVER, true);
+            mRecorder->record(timeStr.str() + _("Present: ") + response + ".");
+            chatLog(_("Attendance written to record log."), BY_SERVER, true);
         } else {
-            chatLog("Present: " + response, BY_SERVER);
+            chatLog(_("Present: ") + response, BY_SERVER);
         }
         return;
     }
-    chatLog("Unknown command", BY_SERVER);
+    chatLog(_("Unknown command"), BY_SERVER);
 }
 
 std::string ChatWindow::const_msg(CHATSKILL act)
@@ -500,70 +503,72 @@ std::string ChatWindow::const_msg(CHATSKILL act)
     if (act.success == SKILL_FAILED && act.skill == SKILL_BASIC) {
         switch (act.bskill) {
             case BSKILL_TRADE:
-                msg = "Trade failed!";
+                msg = _("Trade failed!");
                 break;
             case BSKILL_EMOTE:
-                msg = "Emote failed!";
+                msg = _("Emote failed!");
                 break;
             case BSKILL_SIT:
-                msg = "Sit failed!";
+                msg = _("Sit failed!");
                 break;
             case BSKILL_CREATECHAT:
-                msg = "Chat creating failed!";
+                msg = _("Chat creating failed!");
                 break;
             case BSKILL_JOINPARTY:
-                msg = "Could not join party!";
+                msg = _("Could not join party!");
                 break;
             case BSKILL_SHOUT:
-                msg = "Cannot shout!";
+                msg = _("Cannot shout!");
                 break;
         }
 
+        msg += " ";
+
         switch (act.reason) {
             case RFAIL_SKILLDEP:
-                msg += " You have not yet reached a high enough level!";
+                msg += _("You have not yet reached a high enough lvl!");
                 break;
             case RFAIL_INSUFHP:
-                msg += " Insufficient HP!";
+                msg += _("Insufficient HP!");
                 break;
             case RFAIL_INSUFSP:
-                msg += " Insufficient SP!";
+                msg += _("Insufficient SP!");
                 break;
             case RFAIL_NOMEMO:
-                msg += " You have no memos!";
+                msg += _("You have no memos!");
                 break;
             case RFAIL_SKILLDELAY:
-                msg += " You cannot do that right now!";
+                msg += _("You cannot do that right now!");
                 break;
             case RFAIL_ZENY:
-                msg += " Seems you need more Zeny... ;-)";
+                msg += _("Seems you need more Zeny... ;-)");
                 break;
             case RFAIL_WEAPON:
-                msg += " You cannot use this skill with that kind of weapon!";
+                msg += _("You cannot use this skill with that kind of weapon!");
                 break;
             case RFAIL_REDGEM:
-                msg += " You need another red gem!";
+                msg += _("You need another red gem!");
                 break;
             case RFAIL_BLUEGEM:
-                msg += " You need another blue gem!";
+                msg += _("You need another blue gem!");
                 break;
             case RFAIL_OVERWEIGHT:
-                msg += " You're carrying to much to do this!";
+                msg += _("You're carrying to much to do this!");
                 break;
             default:
-                msg += " Huh? What's that?";
+                msg += _("Huh? What's that?");
                 break;
         }
     } else {
         switch (act.skill) {
-            case SKILL_WARP:
-                msg = "Warp failed...";
+            case SKILL_WARP :
+                msg = _("Warp failed...");
                 break;
-            case SKILL_STEAL:
-                msg = "Could not steal anything...";
+            case SKILL_STEAL :
+                msg = _("Could not steal anything...");
                 break;
-            case SKILL_ENVENOM:
-                msg = "Poison had no effect...";
+            case SKILL_ENVENOM :
+                msg = _("Poison had no effect...");
                 break;
         }
     }
@@ -631,18 +636,18 @@ void ChatWindow::party(const std::string & command, const std::string & rest)
         if (rest == "") {
             char temp[2] = ".";
             *temp = mPartyPrefix;
-            chatLog("The current party prefix is " + std::string(temp),
+            chatLog(_("The current party prefix is ") + std::string(temp),
                     BY_SERVER);
             return;
         }
         if (rest.length() != 1) {
-            chatLog("Party prefix must be one character long.", BY_SERVER);
+            chatLog(_("Party prefix must be one character long."), BY_SERVER);
         } else {
             if (rest == "/") {
-                chatLog("Cannot use a '/' as the prefix.", BY_SERVER);
+                chatLog(_("Cannot use a '/' as the prefix."), BY_SERVER);
             } else {
                 mPartyPrefix = rest.at(0);
-                chatLog("Changing prefix to " + rest, BY_SERVER);
+                chatLog(_("Changing prefix to ") + rest, BY_SERVER);
             }
         }
         return;
@@ -652,45 +657,47 @@ void ChatWindow::party(const std::string & command, const std::string & rest)
 
 void ChatWindow::help(const std::string & msg1, const std::string & msg2)
 {
-    chatLog("-- Help --", BY_SERVER);
+    chatLog(_("-- Help --"), BY_SERVER);
     if (msg1 == "") {
-        chatLog("/announce: Global announcement (GM only)", BY_SERVER);
-        chatLog("/clear: Clears this window", BY_SERVER);
-        chatLog("/help: Display this help.", BY_SERVER);
+        chatLog(_("/announce: Global announcement (GM only)"), BY_SERVER);
+        chatLog(_("/clear: Clears this window"), BY_SERVER);
+        chatLog(_("/help: Display this help"), BY_SERVER);
         mParty->help();
-        chatLog("/present: Get list of players present", BY_SERVER);
+        chatLog(_("/msg <nick> <message>: Alternate form for /whisper"), BY_SERVER);
+        chatLog(_("/present: Get list of players present"), BY_SERVER);
         mRecorder->help();
-        chatLog("/toggle: Determine whether <return> toggles the chat log.",
+        chatLog(_("/toggle: Determine whether <return> toggles the chat log."),
                 BY_SERVER);
-        chatLog("/where: Display map name", BY_SERVER);
-        chatLog("/whisper <nick> <message>: Sends a private <message>"
-                " to <nick>", BY_SERVER);
-        chatLog("/who: Display number of online users", BY_SERVER);
-        chatLog("For more information, type /help <command>", BY_SERVER);
+        chatLog(_("/where: Display map name"), BY_SERVER);
+        chatLog(_("/w <nick> <message>: Short form for /whisper"), BY_SERVER);
+        chatLog(_("/whisper <nick> <message>: Sends a private <message>"
+                    " to <nick>"), BY_SERVER);
+        chatLog(_("/who: Display number of online users"), BY_SERVER);
+        chatLog(_("For more information, type /help <command>"), BY_SERVER);
         return;
     }
     if (msg1 == "announce")
     {
-        chatLog("Command: /announce <msg>", BY_SERVER);
-        chatLog("*** only available to a GM ***", BY_SERVER);
-        chatLog("This command sends the message <msg> to "
-                "all players currently online.", BY_SERVER);
+        chatLog(_("Command: /announce <msg>"), BY_SERVER);
+        chatLog(_("*** only available to a GM ***"), BY_SERVER);
+        chatLog(_("This command sends the message <msg> to "
+                    "all players currently online."), BY_SERVER);
         return;
     }
     if (msg1 == "clear")
     {
-        chatLog("Command: /clear", BY_SERVER);
-        chatLog("This command clears the chat log of previous chat.",
+        chatLog(_("Command: /clear"), BY_SERVER);
+        chatLog(_("This command clears the chat log of previous chat."),
                 BY_SERVER);
         return;
     }
     if (msg1 == "help")
     {
-        chatLog("Command: /help", BY_SERVER);
-        chatLog("This command displays a list of all commands available.",
+        chatLog(_("Command: /help"), BY_SERVER);
+        chatLog(_("This command displays a list of all commands available."),
                 BY_SERVER);
-        chatLog("Command: /help <command>", BY_SERVER);
-        chatLog("This command displays help on <command>.", BY_SERVER);
+        chatLog(_("Command: /help <command>"), BY_SERVER);
+        chatLog(_("This command displays help on <command>."), BY_SERVER);
         return;
     }
     if (msg1 == "party") 
@@ -700,10 +707,8 @@ void ChatWindow::help(const std::string & msg1, const std::string & msg2)
     }
     if (msg1 == "present") 
     {
-        chatLog("Command: /present", BY_SERVER);
-        chatLog("This command gets a list of players within hearing "
-                "and sends it to either the record log if recording, or the "
-                "chat log otherwise.", BY_SERVER);
+        chatLog(_("Command: /present"), BY_SERVER);
+        chatLog(_("This command gets a list of players within hearing and sends it to either the record log if recording, or the chat log otherwise."), BY_SERVER);
         return;
     }
     if (msg1 == "record") 
@@ -713,38 +718,39 @@ void ChatWindow::help(const std::string & msg1, const std::string & msg2)
     }
     if (msg1 == "toggle") 
     {
-        chatLog("Command: /toggle <state>", BY_SERVER);
-        chatLog("This command sets whether the return key should toggle the "
-                "chat log, or whether the chat log turns off automatically.",
+        chatLog(_("Command: /toggle <state>"), BY_SERVER);
+        chatLog(_("This command sets whether the return key should toggle the chat log, or whether the chat log turns off automatically."),
                 BY_SERVER);
-        chatLog("<state> can be one of \"1\", \"yes\", \"true\" to turn "
-                "the toggle on, or \"0\", \"no\", \"false\" to turn the "
-                "toggle off.", BY_SERVER);
-        chatLog("Command: /toggle", BY_SERVER);
-        chatLog("This command displays the return toggle status.", BY_SERVER);
+        chatLog(_("<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0\", \"no\", \"false\" to turn the toggle off."), BY_SERVER);
+        chatLog(_("Command: /toggle"), BY_SERVER);
+        chatLog(_("This command displays the return toggle status."), BY_SERVER);
         return;
     }
     if (msg1 == "where")
     {
-        chatLog("Command: /where", BY_SERVER);
-        chatLog("This command displays the name of the current map.",
+        chatLog(_("Command: /where"), BY_SERVER);
+        chatLog(_("This command displays the name of the current map."),
                 BY_SERVER);
         return;
     }
-    if (msg1 == "whisper" || msg1 == "msg" || msg1 == "w") {
-        chatLog("Command: /whisper <nick> <msg>", BY_SERVER);
-        chatLog("This command sends the message <msg> to <nick.", BY_SERVER);
-        chatLog("If the <nick> has spaces in it, enclose it in "
-                "double quotes (\").", BY_SERVER);
+    if (msg1 == "whisper" || msg1 == "msg" || msg1 == "w")
+    {
+        chatLog(_("Command: /msg <nick> <msg>"), BY_SERVER);
+        chatLog(_("Command: /whisper <nick> <msg>"), BY_SERVER);
+        chatLog(_("Command: /w <nick> <msg>"), BY_SERVER);
+        chatLog(_("This command sends the message <msg> to <nick>."),
+                BY_SERVER);
+        chatLog(_("If the <nick> has spaces in it, enclose it in "
+                "double quotes (\")."), BY_SERVER);
         return;
     }
     if (msg1 == "who")
     {
-        chatLog("Command: /who", BY_SERVER);
-        chatLog("This command displays the number of players currently "
-                "online.", BY_SERVER);
+        chatLog(_("Command: /who"), BY_SERVER);
+        chatLog(_("This command displays the number of players currently "
+                "online."), BY_SERVER);
         return;
     }
-    chatLog("Unknown command.", BY_SERVER);
-    chatLog("Type /help for a list of commands.", BY_SERVER);
+    chatLog(_("Unknown command."), BY_SERVER);
+    chatLog(_("Type /help for a list of commands."), BY_SERVER);
 }
diff --git a/src/gui/colour.cpp b/src/gui/colour.cpp
index 4c3782a4..816420ed 100644
--- a/src/gui/colour.cpp
+++ b/src/gui/colour.cpp
@@ -25,17 +25,19 @@
 
 #include "../configuration.h"
 
+#include "../utils/gettext.h"
+
 Colour::Colour()
 {
-    addColour('C', 0x000000, "Chat");
-    addColour('G', 0xff0000, "GM");
-    addColour('Y', 0x1fa052, "Player");
-    addColour('W', 0x0000ff, "Whisper");
-    addColour('I', 0xf1dc27, "Is");
-    addColour('P', 0xff00d8, "Party");
-    addColour('S', 0x8415e2, "Server");
-    addColour('L', 0x919191, "Logger");
-    addColour('<', 0xe50d0d, "Hyperlink");
+    addColour('C', 0x000000, _("Chat"));
+    addColour('G', 0xff0000, _("GM"));
+    addColour('Y', 0x1fa052, _("Player"));
+    addColour('W', 0x0000ff, _("Whisper"));
+    addColour('I', 0xf1dc27, _("Is"));
+    addColour('P', 0xff00d8, _("Party"));
+    addColour('S', 0x8415e2, _("Server"));
+    addColour('L', 0x919191, _("Logger"));
+    addColour('<', 0xe50d0d, _("Hyperlink"));
     commit();
 }
 
diff --git a/src/gui/help.cpp b/src/gui/help.cpp
index 19413a08..3594b9a6 100644
--- a/src/gui/help.cpp
+++ b/src/gui/help.cpp
@@ -26,8 +26,10 @@
 
 #include "../resources/resourcemanager.h"
 
+#include "../utils/gettext.h"
+
 HelpWindow::HelpWindow():
-    Window("Help")
+    Window(_("Help"))
 {
     setContentSize(455, 350);
     setWindowName("Help");
@@ -35,7 +37,7 @@ HelpWindow::HelpWindow():
     mBrowserBox = new BrowserBox();
     mBrowserBox->setOpaque(false);
     mScrollArea = new ScrollArea(mBrowserBox);
-    Button *okButton = new Button("Close", "close", this);
+    Button *okButton = new Button(_("Close"), "close", this);
 
     mScrollArea->setDimension(gcn::Rectangle(
                 5, 5, 445, 335 - okButton->getHeight()));
diff --git a/src/gui/setup_colours.cpp b/src/gui/setup_colours.cpp
index 0becd48f..dca47630 100644
--- a/src/gui/setup_colours.cpp
+++ b/src/gui/setup_colours.cpp
@@ -32,8 +32,10 @@
 
 #include "../configuration.h"
 
+#include "../utils/gettext.h"
+
 Setup_Colours::Setup_Colours() :
-    mColourLabel("Colour:"),
+    mColourLabel(_("Colour:")),
     mSelected(-1)
 {
     mColourBox = new gcn::ListBox(textColour);
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 007fcb52..75fa542f 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -33,6 +33,7 @@
 #include "../configuration.h"
 #include "../keyboardconfig.h"
 
+#include "../utils/gettext.h"
 #include "../utils/tostring.h"
 
 /**
@@ -83,13 +84,13 @@ Setup_Keyboard::Setup_Keyboard():
     scrollArea->setDimension(gcn::Rectangle(10, 10, 200, 140));
     add(scrollArea);
 
-    mAssignKeyButton = new Button("Assign", "assign", this);
+    mAssignKeyButton = new Button(_("Assign"), "assign", this);
     mAssignKeyButton->setPosition(165, 155);
     mAssignKeyButton->addActionListener(this);
     mAssignKeyButton->setEnabled(false);
     add(mAssignKeyButton);
 
-    mMakeDefaultButton = new Button("Default", "makeDefault", this);
+    mMakeDefaultButton = new Button(_("Default"), "makeDefault", this);
     mMakeDefaultButton->setPosition(10, 155);
     mMakeDefaultButton->addActionListener(this);
     add(mMakeDefaultButton);
@@ -110,8 +111,9 @@ void Setup_Keyboard::apply()
 
     if (keyboard.hasConflicts())
     {
-        new OkDialog("Key Conflict(s) Detected.",
-            "Resolve them, or gameplay may result in strange behaviour.");
+        new OkDialog(_("Key Conflict(s) Detected."),
+                     _("Resolve them, or gameplay may result in strange "
+                       "behaviour."));
     }
     keyboard.setEnabled(true);
     keyboard.store();
@@ -169,7 +171,7 @@ void Setup_Keyboard::newKeyCallback(int index)
 
 void Setup_Keyboard::refreshKeys()
 {
-    for(int i = 0; i < keyboard.KEY_TOTAL; i++)
+    for (int i = 0; i < keyboard.KEY_TOTAL; i++)
     {
         refreshAssignedKey(i);
     }
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index d07a9685..0f52be41 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -34,6 +34,8 @@
 #include "../player_relations.h"
 #include "../sound.h"
 
+#include "../utils/gettext.h"
+
 #define COLUMNS_NR 2 // name plus listbox
 #define NAME_COLUMN 0
 #define RELATION_CHOICE_COLUMN 1
@@ -46,10 +48,16 @@
 
 #define WIDGET_AT(row, column) (((row) * COLUMNS_NR) + column)
 
-static std::string table_titles[COLUMNS_NR] = {" name", "relation "};
+static const char *table_titles[COLUMNS_NR] = {
+    N_("Name"),
+    N_("Relation")
+};
 
-static const std::string RELATION_NAMES[PlayerRelation::RELATIONS_NR] = {
-    "neutral", "friend", "disregarded", "ignored"
+static const char *RELATION_NAMES[PlayerRelation::RELATIONS_NR] = {
+    N_("Neutral"),
+    N_("Friend"),
+    N_("Disregarded"),
+    N_("Ignored")
 };
 
 class PlayerRelationListModel : public gcn::ListModel
@@ -66,7 +74,7 @@ public:
     {
         if (i >= getNumberOfElements() || i < 0)
             return "";
-        return RELATION_NAMES[i];
+        return gettext(RELATION_NAMES[i]);
     }
 };
 
@@ -135,7 +143,8 @@ public:
 
     virtual void updateModelInRow(int row)
     {
-        gcn::DropDown *choicebox = dynamic_cast<gcn::DropDown *>(getElementAt(row, RELATION_CHOICE_COLUMN));
+        gcn::DropDown *choicebox = dynamic_cast<gcn::DropDown *>(
+                getElementAt(row, RELATION_CHOICE_COLUMN));
         player_relations.setRelation(getPlayerAt(row),
                                      static_cast<PlayerRelation::relation>(choicebox->getSelected()));
     }
@@ -185,7 +194,7 @@ public:
     virtual std::string getElementAt(int i)
     {
         if (i >= getNumberOfElements()) {
-            return "???";
+            return _("???");
         }
         return (*player_relations.getPlayerIgnoreStrategies())[i]->mDescription;
     }
@@ -201,21 +210,27 @@ Setup_Players::Setup_Players():
     mPlayerTable(new GuiTable(mPlayerTableModel)),
     mPlayerTitleTable(new GuiTable(mPlayerTableTitleModel)),
     mPlayerScrollArea(new ScrollArea(mPlayerTable)),
-    mPersistIgnores(new CheckBox("save player list", player_relations.getPersistIgnores())),
-    mDefaultTrading(new CheckBox("allow trading", player_relations.getDefault() & PlayerRelation::TRADE)),
-    mDefaultWhisper(new CheckBox("allow whispers", player_relations.getDefault() & PlayerRelation::WHISPER)),
-    mDeleteButton(new Button("Delete", ACTION_DELETE, this)),
+    mPersistIgnores(new CheckBox(_("Save player list"),
+                player_relations.getPersistIgnores())),
+    mDefaultTrading(new CheckBox(_("Allow trading"),
+                player_relations.getDefault() & PlayerRelation::TRADE)),
+    mDefaultWhisper(new CheckBox(_("Allow whispers"),
+                player_relations.getDefault() & PlayerRelation::WHISPER)),
+    mDeleteButton(new Button(_("Delete"), ACTION_DELETE, this)),
     mIgnoreActionChoicesBox(new gcn::DropDown(new IgnoreChoicesListModel()))
 {
     setOpaque(false);
 
     int table_width = NAME_COLUMN_WIDTH + RELATION_CHOICE_COLUMN_WIDTH;
     mPlayerTableTitleModel->fixColumnWidth(NAME_COLUMN, NAME_COLUMN_WIDTH);
-    mPlayerTableTitleModel->fixColumnWidth(RELATION_CHOICE_COLUMN, RELATION_CHOICE_COLUMN_WIDTH);
+    mPlayerTableTitleModel->fixColumnWidth(RELATION_CHOICE_COLUMN,
+                                           RELATION_CHOICE_COLUMN_WIDTH);
     mPlayerTitleTable->setDimension(gcn::Rectangle(10, 10, table_width, 10));
     mPlayerTitleTable->setBackgroundColor(gcn::Color(0xbf, 0xbf, 0xbf));
-    for (int i = 0; i < COLUMNS_NR; i++)
-        mPlayerTableTitleModel->set(0, i, new gcn::Label(table_titles[i]));
+    for (int i = 0; i < COLUMNS_NR; i++) {
+        mPlayerTableTitleModel->set(0, i,
+                new gcn::Label(gettext(table_titles[i])));
+    }
     mPlayerTitleTable->setLinewiseSelection(true);
 
     mPlayerScrollArea->setDimension(gcn::Rectangle(10, 25, table_width + COLUMNS_NR, 90));
@@ -226,7 +241,7 @@ Setup_Players::Setup_Players():
 
     mDeleteButton->setPosition(10, 118);
 
-    gcn::Label *ignore_action_label = new gcn::Label("When ignoring:");
+    gcn::Label *ignore_action_label = new gcn::Label(_("When ignoring:"));
 
     ignore_action_label->setPosition(80, 118);
     mIgnoreActionChoicesBox->setDimension(gcn::Rectangle(80, 132, 120, 12));
@@ -269,9 +284,9 @@ Setup_Players::~Setup_Players(void)
 void
 Setup_Players::reset()
 {
-    // We now have to search through the list of ignore choices to find the current
-    // selection.  We could use an index into the table of config options in
-    // player_relations instead of strategies to sidestep this.
+    // We now have to search through the list of ignore choices to find the
+    // current selection. We could use an index into the table of config
+    // options in player_relations instead of strategies to sidestep this.
     int selection = 0;
     for (unsigned int i = 0; i < player_relations.getPlayerIgnoreStrategies()->size(); ++i)
         if ((*player_relations.getPlayerIgnoreStrategies())[i] ==
@@ -306,9 +321,10 @@ void
 Setup_Players::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == ACTION_TABLE) {
-        // temporarily eliminate ourselves: we are fully aware of this change, so there is no
-        // need for asynchronous updates.  (In fact, thouse might destroy the widet that
-        // triggered them, which would be rather embarrassing.)
+        // temporarily eliminate ourselves: we are fully aware of this change,
+        // so there is no need for asynchronous updates.  (In fact, thouse
+        // might destroy the widet that triggered them, which would be rather
+        // embarrassing.)
         player_relations.removeListener(this);
 
         int row = mPlayerTable->getSelectedRow();
@@ -340,6 +356,8 @@ void
 Setup_Players::updatedPlayer(const std::string &name)
 {
     mPlayerTableModel->playerRelationsUpdated();
-    mDefaultTrading->setSelected(player_relations.getDefault() & PlayerRelation::TRADE);
-    mDefaultWhisper->setSelected(player_relations.getDefault() & PlayerRelation::WHISPER);
+    mDefaultTrading->setSelected(
+            player_relations.getDefault() & PlayerRelation::TRADE);
+    mDefaultWhisper->setSelected(
+            player_relations.getDefault() & PlayerRelation::WHISPER);
 }
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index f53a9716..724ce8b4 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -86,9 +86,9 @@ ModeListModel::ModeListModel()
 
     /* Check which modes are available */
     if (modes == (SDL_Rect **)0) {
-        logger->log("No modes available");
+        logger->log(_("No modes available"));
     } else if (modes == (SDL_Rect **)-1) {
-        logger->log("All resolutions available");
+        logger->log(_("All resolutions available"));
     } else {
         //logger->log("Available Modes");
         for (int i = 0; modes[i]; ++i) {
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 321a6c52..5e5782d9 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -32,9 +32,11 @@
 #include "../log.h"
 
 #include "../utils/dtor.h"
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
 #include "../utils/xml.h"
 
-#define SKILLS_FILE "skills.xml"
+static const char *SKILLS_FILE = "skills.xml";
 
 struct SkillInfo {
     std::string name;
@@ -77,7 +79,7 @@ public:
     virtual void
     update(void)
     {
-	static const SkillInfo fakeSkillInfo = { "???", false };
+	static const SkillInfo fakeSkillInfo = { _("???"), false };
 
         mEntriesNr = mDialog->getSkills().size();
         resize();
@@ -94,13 +96,13 @@ public:
                 info = &fakeSkillInfo;
 
             sprintf(tmp, "%c%s", info->modifiable? ' ' : '*', info->name.c_str());
-            gcn::Label *name_label = new gcn::Label(std::string(tmp));
+            gcn::Label *name_label = new gcn::Label(tmp);
 
             sprintf(tmp, "Lv:%i", skill->lv);
-            gcn::Label *lv_label = new gcn::Label(std::string(tmp));
+            gcn::Label *lv_label = new gcn::Label(tmp);
 
             sprintf(tmp, "Sp:%i", skill->sp);
-            gcn::Label *sp_label = new gcn::Label(std::string(tmp));
+            gcn::Label *sp_label = new gcn::Label(tmp);
 
             set(i, 0, name_label);
             set(i, 1, lv_label);
@@ -116,22 +118,22 @@ private:
 
 
 SkillDialog::SkillDialog():
-    Window("Skills")
+    Window(_("Skills"))
 {
     initSkillinfo();
     mTableModel = new SkillGuiTableModel(this);
     mTable.setModel(mTableModel);
     mTable.setLinewiseSelection(true);
 
-    setWindowName("Skills");
+    setWindowName(_("Skills"));
     setCloseButton(true);
     setDefaultSize(windowContainer->getWidth() - 260, 25, 255, 260);
 
 //    mSkillListBox = new ListBox(this);
-    skillScrollArea = new ScrollArea(&mTable);
-    mPointsLabel = new gcn::Label("Skill Points:");
-    mIncButton = new Button("Up", "inc", this);
-    mUseButton = new Button("Use", "use", this);
+    ScrollArea *skillScrollArea = new ScrollArea(&mTable);
+    mPointsLabel = new gcn::Label(strprintf(_("Skill points: %d"), 0));
+    mIncButton = new Button(_("Up"), _("inc"), this);
+    mUseButton = new Button(_("Use"), _("use"), this);
     mUseButton->setEnabled(false);
 
 //    mSkillListBox->setActionEventId("skill");
@@ -185,11 +187,8 @@ void SkillDialog::action(const gcn::ActionEvent &event)
 
 void SkillDialog::update()
 {
-    if (mPointsLabel != NULL) {
-        char tmp[128];
-        sprintf(tmp, "Skill points: %i", player_node->mSkillPoint);
-        mPointsLabel->setCaption(tmp);
-    }
+    mPointsLabel->setCaption(strprintf(_("Skill points: %d"),
+                                       player_node->mSkillPoint));
 
     int selectedSkill = mTable.getSelectedRow();
 
@@ -260,8 +259,7 @@ initSkillinfo(void)
 
     if (!root || !xmlStrEqual(root->name, BAD_CAST "skills"))
     {
-        logger->log("Error loading skills file: "
-                    SKILLS_FILE);
+        logger->log(_("Error loading skills file: %s"), SKILLS_FILE);
         skill_db.resize(2, emptySkillInfo);
         skill_db[1].name = "Basic";
         skill_db[1].modifiable = true;
diff --git a/src/gui/smileycontainer.cpp b/src/gui/smileycontainer.cpp
index 5eb99723..d5e2e815 100644
--- a/src/gui/smileycontainer.cpp
+++ b/src/gui/smileycontainer.cpp
@@ -31,6 +31,7 @@
 #include "../resources/iteminfo.h"
 #include "../resources/resourcemanager.h"
 
+#include "../utils/gettext.h"
 #include "../utils/tostring.h"
 
 const int SmileyContainer::gridWidth = 34;  // item icon width + 4
@@ -44,10 +45,10 @@ SmileyContainer::SmileyContainer():
     ResourceManager *resman = ResourceManager::getInstance();
 
     mSmileyImg = resman->getImageSet("graphics/gui/emotions.png",30,32);
-    if (!mSmileyImg) logger->error("Unable to load emotions");
+    if (!mSmileyImg) logger->error(_("Unable to load emotions"));
 
     mSelImg = resman->getImage("graphics/gui/selection.png");
-    if (!mSelImg) logger->error("Unable to load selection.png");
+    if (!mSelImg) logger->error(_("Unable to load selection.png"));
 
     mMaxSmiley = mSmileyImg->size(); 
 
diff --git a/src/gui/smileyshortcutcontainer.cpp b/src/gui/smileyshortcutcontainer.cpp
index 5a9c3036..f857ed5d 100644
--- a/src/gui/smileyshortcutcontainer.cpp
+++ b/src/gui/smileyshortcutcontainer.cpp
@@ -33,6 +33,7 @@
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
 
+#include "../utils/gettext.h"
 #include "../utils/tostring.h"
 
 SmileyShortcutContainer::SmileyShortcutContainer():
@@ -48,7 +49,7 @@ SmileyShortcutContainer::SmileyShortcutContainer():
 
     mBackgroundImg = resman->getImage("graphics/gui/item_shortcut_bgr.png");
     mSmileyImg = resman->getImageSet("graphics/gui/emotions.png",30,32);
-    if (!mSmileyImg) logger->error("Unable to load emotions");
+    if (!mSmileyImg) logger->error(_("Unable to load emotions"));
 
     mMaxItems = 12; 
 
diff --git a/src/gui/smileywindow.cpp b/src/gui/smileywindow.cpp
index faf634af..570eb45c 100644
--- a/src/gui/smileywindow.cpp
+++ b/src/gui/smileywindow.cpp
@@ -28,19 +28,22 @@
 #include "smileywindow.h"
 #include "smileycontainer.h"
 #include "scrollarea.h"
-#include "../localplayer.h"      
+
+#include "../localplayer.h"
+
+#include "../utils/gettext.h"      
 #include "../utils/tostring.h"
 
 SmileyWindow::SmileyWindow():
-    Window("Emote")
+    Window(_("Emote"))
 {
-    setWindowName("Emote");
+    setWindowName(_("Emote"));
     setResizable(true);
     setCloseButton(true);
     setMinWidth(80);
     setDefaultSize(115, 25, 322, 200);
 
-    mUseButton = new Button("Use", "use", this);
+    mUseButton = new Button(_("Use"), "use", this);
 
     mItems = new SmileyContainer();
     mItems->addSelectionListener(this);
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 6af16496..5539202e 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -27,10 +27,12 @@
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
 
+#include "../utils/gettext.h"
+
 // TODO: Fix windows so that they can each load their own skins without the
 // other windows overriding another window's skin.
 SpeechBubble::SpeechBubble():
-    Window("Message", false, NULL, "graphics/gui/speechbubble.xml")
+    Window(_("Message"), false, NULL, "graphics/gui/speechbubble.xml")
 {
     mSpeechBox = new TextBox();
     mSpeechBox->setEditable(false);
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index fbcc01d6..64f3db48 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -28,13 +28,15 @@
 
 #include "../localplayer.h"
 
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
 #include "../utils/tostring.h"
 
 StatusWindow::StatusWindow(LocalPlayer *player):
     Window(player->getName()),
     mPlayer(player)
 {
-    setWindowName("Status");
+    setWindowName(_("Status"));
     setCloseButton(true);
     setDefaultSize((windowContainer->getWidth() - 365) / 2,
                    (windowContainer->getHeight() - 255) / 2, 365, 275);
@@ -44,25 +46,25 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     // Status Part
     // ----------------------
 
-    mLvlLabel = new gcn::Label("Level:");
-    mGpLabel = new gcn::Label("Money:");
-    mJobLvlLabel = new gcn::Label("Job:");
+    mLvlLabel = new gcn::Label(strprintf(_("Level: %d"), 0));
+    mGpLabel = new gcn::Label(strprintf(_("Job: %d"), 0));
+    mJobLvlLabel = new gcn::Label(strprintf(_("Money: %d GP"), 0));
 
     mHpLabel = new gcn::Label("HP:");
     mHpBar = new ProgressBar(1.0f, 80, 15, 0, 171, 34);
-    mHpValueLabel = new gcn::Label("");
+    mHpValueLabel = new gcn::Label;
 
     mXpLabel = new gcn::Label("Exp:");
     mXpBar = new ProgressBar(1.0f, 80, 15, 143, 192, 211);
-    mXpValueLabel = new gcn::Label("");
+    mXpValueLabel = new gcn::Label;
 
     mMpLabel = new gcn::Label("MP:");
     mMpBar = new ProgressBar(1.0f, 80, 15, 26, 102, 230);
-    mMpValueLabel = new gcn::Label("");
+    mMpValueLabel = new gcn::Label;
 
     mJobXpLabel = new gcn::Label("Job:");
     mJobXpBar = new ProgressBar(1.0f, 80, 15, 220, 135, 203);
-    mJobValueLabel = new gcn::Label("");
+    mJobValueLabel = new gcn::Label;
 
     int y = 3;
     int x = 5;
@@ -120,34 +122,34 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     // ----------------------
 
     // Static Labels
-    gcn::Label *mStatsTitleLabel = new gcn::Label("Stats");
-    gcn::Label *mStatsTotalLabel = new gcn::Label("Total");
-    gcn::Label *mStatsCostLabel = new gcn::Label("Cost");
+    gcn::Label *mStatsTitleLabel = new gcn::Label(_("Stats"));
+    gcn::Label *mStatsTotalLabel = new gcn::Label(_("Total"));
+    gcn::Label *mStatsCostLabel = new gcn::Label(_("Cost"));
 
     // Derived Stats
-    mStatsAttackLabel = new gcn::Label("Attack:");
-    mStatsDefenseLabel= new gcn::Label("Defense:");
-    mStatsMagicAttackLabel = new gcn::Label("M.Attack:");
-    mStatsMagicDefenseLabel = new gcn::Label("M.Defense:");
-    mStatsAccuracyLabel = new gcn::Label("% Accuracy:");
-    mStatsEvadeLabel = new gcn::Label("% Evade:");
-    mStatsReflexLabel = new gcn::Label("% Reflex:");
-
-    mStatsAttackPoints = new gcn::Label("");
-    mStatsDefensePoints = new gcn::Label("");
-    mStatsMagicAttackPoints = new gcn::Label("");
-    mStatsMagicDefensePoints = new gcn::Label("");
-    mStatsAccuracyPoints = new gcn::Label("% Accuracy:");
-    mStatsEvadePoints = new gcn::Label("% Evade:");
-    mStatsReflexPoints = new gcn::Label("% Reflex:");
+    mStatsAttackLabel = new gcn::Label(_("Attack:"));
+    mStatsDefenseLabel= new gcn::Label(_("Defense:"));
+    mStatsMagicAttackLabel = new gcn::Label(_("M.Attack:"));
+    mStatsMagicDefenseLabel = new gcn::Label(_("M.Defense:"));
+    mStatsAccuracyLabel = new gcn::Label(_("% Accuracy:"));
+    mStatsEvadeLabel = new gcn::Label(_("% Evade:"));
+    mStatsReflexLabel = new gcn::Label(_("% Reflex:"));
+
+    mStatsAttackPoints = new gcn::Label;
+    mStatsDefensePoints = new gcn::Label;
+    mStatsMagicAttackPoints = new gcn::Label;
+    mStatsMagicDefensePoints = new gcn::Label;
+    mStatsAccuracyPoints = new gcn::Label;
+    mStatsEvadePoints = new gcn::Label;
+    mStatsReflexPoints = new gcn::Label;
 
     // New labels
     for (int i = 0; i < 6; i++) {
-        mStatsLabel[i] = new gcn::Label();
-        mStatsDisplayLabel[i] = new gcn::Label();
+        mStatsLabel[i] = new gcn::Label;
+        mStatsDisplayLabel[i] = new gcn::Label;
         mPointsLabel[i] = new gcn::Label("0");
     }
-    mRemainingStatsPointsLabel = new gcn::Label();
+    mRemainingStatsPointsLabel = new gcn::Label;
 
     // Set button events Id
     mStatsButton[0] = new Button("+", "STR", this);
@@ -225,13 +227,13 @@ void StatusWindow::update()
 {
     // Status Part
     // -----------
-    mLvlLabel->setCaption("Level: " + toString(mPlayer->mLevel));
+    mLvlLabel->setCaption(strprintf(_("Level: %d"), mPlayer->mLevel));
     mLvlLabel->adjustSize();
 
-    mJobLvlLabel->setCaption("Job: " + toString(mPlayer->mJobLevel));
+    mJobLvlLabel->setCaption(strprintf(_("Job: %d"), mPlayer->mJobLevel));
     mJobLvlLabel->adjustSize();
 
-    mGpLabel->setCaption("Money: " + toString(mPlayer->mGp) + " GP");
+    mGpLabel->setCaption(strprintf(_("Money: %d GP"), mPlayer->mGp));
     mGpLabel->adjustSize();
 
     mHpValueLabel->setCaption(toString(mPlayer->mHp) +
@@ -274,20 +276,20 @@ void StatusWindow::update()
 
     // Stats Part
     // ----------
-    static const std::string attrNames[6] = {
-        "Strength",
-        "Agility",
-        "Vitality",
-        "Intelligence",
-        "Dexterity",
-        "Luck"
+    static const char *attrNames[6] = {
+        N_("Strength"),
+        N_("Agility"),
+        N_("Vitality"),
+        N_("Intelligence"),
+        N_("Dexterity"),
+        N_("Luck")
     };
     int statusPoints = mPlayer->mStatsPointsToAttribute;
 
     // Update labels
     for (int i = 0; i < 6; i++)
     {
-        mStatsLabel[i]->setCaption(attrNames[i]);
+        mStatsLabel[i]->setCaption(gettext(attrNames[i]));
         mStatsDisplayLabel[i]->setCaption(toString((int) mPlayer->mAttr[i]));
         mPointsLabel[i]->setCaption(toString((int) mPlayer->mAttrUp[i]));
 
@@ -297,8 +299,8 @@ void StatusWindow::update()
 
         mStatsButton[i]->setEnabled(mPlayer->mAttrUp[i] <= statusPoints);
     }
-    mRemainingStatsPointsLabel->setCaption("Remaining Status Points: " +
-            toString(statusPoints));
+    mRemainingStatsPointsLabel->setCaption(
+            strprintf(_("Remaining Status Points: %d"), statusPoints));
     mRemainingStatsPointsLabel->adjustSize();
 
     // Derived Stats Points
@@ -351,12 +353,12 @@ void StatusWindow::update()
             mXpBar->getX() + mXpBar->getWidth() + 5,
             mXpLabel->getY());
 
-    mJobXpLabel->setPosition(mXpBar->getX() - mJobXpLabel->getWidth() - 5, 
+    mJobXpLabel->setPosition(mXpBar->getX() - mJobXpLabel->getWidth() - 5,
                              mMpLabel->getY());
     mJobXpBar->setPosition(
             mJobXpLabel->getX() + mJobXpLabel->getWidth() + 5,
             mJobXpLabel->getY());
-    mJobValueLabel->setPosition(mJobXpBar->getX() + mJobXpBar->getWidth() + 5, 
+    mJobValueLabel->setPosition(mJobXpBar->getX() + mJobXpBar->getWidth() + 5,
                                 mJobXpLabel->getY());
 }
 
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 4546cd9e..f6e1c5ea 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -280,8 +280,8 @@ void TradeWindow::action(const gcn::ActionEvent &event)
             return;
 
         if (mMyInventory->contains(item)) {
-            chatWindow->chatLog("Failed adding item. You can not "
-                    "overlap one kind of item on the window.", BY_SERVER);
+            chatWindow->chatLog(_("Failed adding item. You can not "
+                        "overlap one kind of item on the window."), BY_SERVER);
             return;
         }
 
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index e0a9da2e..72cbb34a 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -43,6 +43,7 @@
 
 #include "../resources/resourcemanager.h"
 
+#include "../utils/gettext.h"
 #include "../utils/tostring.h"
 
 /**
@@ -75,7 +76,7 @@ loadTextFile(const std::string &fileName)
     std::ifstream fin(fileName.c_str());
 
     if (!fin) {
-        logger->log("Couldn't load text file: %s", fileName.c_str());
+        logger->log(_("Couldn't load text file: %s"), fileName.c_str());
         return lines;
     }
 
@@ -90,7 +91,7 @@ loadTextFile(const std::string &fileName)
 
 UpdaterWindow::UpdaterWindow(const std::string &updateHost,
                              const std::string &updatesDir):
-    Window("Updating..."),
+    Window(_("Updating...")),
     mThread(NULL),
     mDownloadStatus(UPDATE_NEWS),
     mUpdateHost(updateHost),
@@ -109,10 +110,10 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost,
 
     mBrowserBox = new BrowserBox();
     mScrollArea = new ScrollArea(mBrowserBox);
-    mLabel = new gcn::Label("Connecting...");
+    mLabel = new gcn::Label(_("Connecting..."));
     mProgressBar = new ProgressBar(0.0, 310, 20, 168, 116, 31);
-    mCancelButton = new Button("Cancel", "cancel", this);
-    mPlayButton = new Button("Play", "play", this);
+    mCancelButton = new Button(_("Cancel"), "cancel", this);
+    mPlayButton = new Button(_("Play"), "play", this);
 
     mBrowserBox->setOpaque(false);
     mPlayButton->setEnabled(false);
@@ -193,7 +194,7 @@ void UpdaterWindow::loadNews()
 {
     if (!mMemoryBuffer)
     {
-        logger->log("Couldn't load news");
+        logger->log(_("Couldn't load news"));
         return;
     }
 
@@ -324,8 +325,8 @@ int UpdaterWindow::downloadThread(void *ptr)
                 {
                 case CURLE_COULDNT_CONNECT:
                 default:
-                    std::cerr << "curl error " << res << ": "
-                              << uw->mCurlError << " host: " << url.c_str()
+                    std::cerr << _("curl error ") << res << ": "
+                              << uw->mCurlError << _(" host: ") << url.c_str()
                               << std::endl;
                     break;
                 }
@@ -360,7 +361,7 @@ int UpdaterWindow::downloadThread(void *ptr)
                         // Remove the corrupted file
                         ::remove(outFilename.c_str());
                         logger->log(
-                            "Checksum for file %s failed: (%lx/%lx)",
+                            _("Checksum for file %s failed: (%lx/%lx)"),
                             uw->mCurrentFile.c_str(),
                             adler, uw->mCurrentChecksum);
                         attempts++;
@@ -410,7 +411,7 @@ void UpdaterWindow::download()
 
     if (mThread == NULL)
     {
-        logger->log("Unable to create mThread");
+        logger->log(_("Unable to create mThread"));
         mDownloadStatus = UPDATE_ERROR;
     }
 }
@@ -448,9 +449,9 @@ void UpdaterWindow::logic()
                 mThread = NULL;
             }
             mBrowserBox->addRow("");
-            mBrowserBox->addRow("##1  The update process is incomplete.");
-            mBrowserBox->addRow("##1  It is strongly recommended that");
-            mBrowserBox->addRow("##1  you try again later");
+            mBrowserBox->addRow(_("##1  The update process is incomplete."));
+            mBrowserBox->addRow(_("##1  It is strongly recommended that"));
+            mBrowserBox->addRow(_("##1  you try again later"));
             mBrowserBox->addRow(mCurlError);
             mScrollArea->setVerticalScrollAmount(
                     mScrollArea->getVerticalMaxScroll());
@@ -504,7 +505,7 @@ void UpdaterWindow::logic()
                     }
                     else
                     {
-                        logger->log("%s already here", mCurrentFile.c_str());
+                        logger->log(_("%s already here"), mCurrentFile.c_str());
                     }
                     mLineIndex++;
                 }
@@ -517,7 +518,7 @@ void UpdaterWindow::logic()
             break;
         case UPDATE_COMPLETE:
             enable();
-            setLabel("Completed");
+            setLabel(_("Completed"));
             break;
         case UPDATE_IDLE:
             break;
diff --git a/src/main.cpp b/src/main.cpp
index 4a3acce8..c15011ff 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -202,12 +202,12 @@ void setUpdatesDir()
                     << "/" << loginData.port;
             updatesDir = updates.str();
         } else {
-            logger->log("Error: Invalid update host: %s", updateHost.c_str());
-            errorMessage = "Invalid update host: " + updateHost;
+            logger->log(_("Error: Invalid update host: %s"), updateHost.c_str());
+            errorMessage = _("Invalid update host: ") + updateHost;
             state = ERROR_STATE;
         }
     } else {
-        logger->log("Warning: no protocol was specified for the update host");
+        logger->log(_("Warning: no protocol was specified for the update host"));
         updates << "updates/" << updateHost  << "/" << loginData.port;
         updatesDir = updates.str();
     }
@@ -217,9 +217,9 @@ void setUpdatesDir()
     // Verify that the updates directory exists. Create if necessary.
     if (!resman->isDirectory("/" + updatesDir)) {
         if (!resman->mkdir("/" + updatesDir)) {
-            logger->log("Error: %s/%s can't be made, but doesn't exist!",
+            logger->log(_("Error: %s/%s can't be made, but doesn't exist!"),
                          homeDir.c_str(), updatesDir.c_str());
-            errorMessage = "Error creating updates directory!";
+            errorMessage = _("Error creating updates directory!");
             state = ERROR_STATE;
         }
     }
@@ -247,7 +247,7 @@ void init_engine(const Options &options)
 #endif
     {
         std::cout << homeDir
-                  << " can't be created, but it doesn't exist! Exiting."
+                  << _(" can't be created, but it doesn't exist! Exiting.")
                   << std::endl;
         exit(1);
     }
@@ -256,15 +256,15 @@ void init_engine(const Options &options)
     logger->setLogFile(homeDir + std::string("/aethyra.log"));
 
     #ifdef PACKAGE_VERSION
-        logger->log("Starting Aethyra Version %s", PACKAGE_VERSION);
+        logger->log(_("Starting Aethyra Version %s"), PACKAGE_VERSION);
     #else
-        logger->log("Starting Aethyra - Version not defined");
+        logger->log(_("Starting Aethyra - Version not defined"));
     #endif
 
     // Initialize SDL
-    logger->log("Initializing SDL...");
+    logger->log(_("Initializing SDL..."));
     if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) < 0) {
-        std::cerr << "Could not initialize SDL: " <<
+        std::cerr << _("Could not initialize SDL: ") <<
             SDL_GetError() << std::endl;
         exit(1);
     }
@@ -277,7 +277,7 @@ void init_engine(const Options &options)
 
     if (!resman->setWriteDir(homeDir)) {
         std::cout << homeDir
-                  << " couldn't be set as home directory! Exiting."
+                  << _(" couldn't be set as home directory! Exiting.")
                   << std::endl;
         exit(1);
     }
@@ -297,7 +297,7 @@ void init_engine(const Options &options)
     if (!CFURLGetFileSystemRepresentation(resourcesURL, TRUE, (UInt8 *)path,
                                           PATH_MAX))
     {
-        fprintf(stderr, "Can't find Resources directory\n");
+        fprintf(stderr, _("Can't find Resources directory\n"));
     }
     CFRelease(resourcesURL);
     strncat(path, "/data", PATH_MAX - 1);
@@ -307,7 +307,7 @@ void init_engine(const Options &options)
 #endif
 
     // Fill configuration with defaults
-    logger->log("Initializing configuration...");
+    logger->log(_("Initializing configuration..."));
     config.setValue("host", "www.aethyra.org");
     config.setValue("port", 21001);
     config.setValue("hwaccel", 0);
@@ -390,8 +390,8 @@ void init_engine(const Options &options)
     // Try to set the desired video mode
     if (!graphics->setVideoMode(width, height, bpp, fullscreen, hwaccel))
     {
-        std::cerr << "Couldn't set "
-                  << width << "x" << height << "x" << bpp << " video mode: "
+        std::cerr << _("Couldn't set ")
+                  << width << "x" << height << "x" << bpp << _(" video mode: ")
                   << SDL_GetError() << std::endl;
         exit(1);
     }
@@ -418,7 +418,7 @@ void init_engine(const Options &options)
     catch (const char *err) {
         state = ERROR_STATE;
         errorMessage = err;
-        logger->log("Warning: %s", err);
+        logger->log(_("Warning: %s"), err);
     }
 
     // Initialize keyboard
@@ -458,29 +458,28 @@ void exit_engine()
 void printHelp()
 {
     std::cout
-        << "aethyra" << std::endl << std::endl
-        << "Options: " << std::endl
-        << "  -C --configfile : Configuration file to use" << std::endl
-        << "  -d --data       : Directory to load game data from" << std::endl
-        << "  -D --default    : Bypass the login process with default "
-                               "settings" << std::endl
-        << "  -h --help       : Display this help" << std::endl
-        << "  -H --updatehost : Use this update host" << std::endl
-        << "  -p --playername : Login with this player" << std::endl
-        << "  -P --password   : Login with this password" << std::endl
-        << "  -u --skipupdate : Skip the update downloads" << std::endl
-        << "  -U --username   : Login with this username" << std::endl
-        << "  -v --version    : Display the version" << std::endl;
+        << _("aethyra") << std::endl << std::endl
+        << _("Options: ") << std::endl
+        << _("  -C --configfile : Configuration file to use") << std::endl
+        << _("  -d --data       : Directory to load game data from") << std::endl
+        << _("  -D --default    : Bypass the login process with default settings") << std::endl
+        << _("  -h --help       : Display this help") << std::endl
+        << _("  -H --updatehost : Use this update host") << std::endl
+        << _("  -p --playername : Login with this player") << std::endl
+        << _("  -P --password   : Login with this password") << std::endl
+        << _("  -u --skipupdate : Skip the update downloads") << std::endl
+        << _("  -U --username   : Login with this username") << std::endl
+        << _("  -v --version    : Display the version") << std::endl;
 }
 
 void printVersion()
 {
 #ifdef PACKAGE_VERSION
-    std::cout << "Aethyra version " << PACKAGE_VERSION <<
+    std::cout << _("Aethyra version ") << PACKAGE_VERSION <<
         std::endl;
 #else
-    std::cout << "Aethyra version " <<
-             "(local build?, PACKAGE_VERSION is not defined)" << std::endl;
+    std::cout << _("Aethyra version ") <<
+             _("(local build?, PACKAGE_VERSION is not defined)") << std::endl;
 #endif
 }
 
@@ -576,8 +575,8 @@ struct ErrorListener : public gcn::ActionListener
 // TODO Find some nice place for these functions
 void accountLogin(Network *network, LoginData *loginData)
 {
-    logger->log("Trying to connect to account server...");
-    logger->log("Username is %s", loginData->username.c_str());
+    logger->log(_("Trying to connect to account server..."));
+    logger->log(_("Username is %s"), loginData->username.c_str());
     network->connect(loginData->hostname, loginData->port);
     network->registerHandler(&loginHandler);
     loginHandler.setLoginData(loginData);
@@ -631,7 +630,7 @@ void positionDialog(Window *dialog, int screenWidth, int screenHeight)
 
 void charLogin(Network *network, LoginData *loginData)
 {
-    logger->log("Trying to connect to char server...");
+    logger->log(_("Trying to connect to char server..."));
     network->connect(loginData->hostname, loginData->port);
     network->registerHandler(&charServerHandler);
     charServerHandler.setCharInfo(&charInfo);
@@ -653,14 +652,14 @@ void charLogin(Network *network, LoginData *loginData)
 
 void mapLogin(Network *network, LoginData *loginData)
 {
-    logger->log("Memorizing selected character %s",
+    logger->log(_("Memorizing selected character %s"),
             player_node->getName().c_str());
     config.setValue("lastCharacter", player_node->getName());
 
     MessageOut outMsg(network);
 
-    logger->log("Trying to connect to map server...");
-    logger->log("Map: %s", map_path.c_str());
+    logger->log(_("Trying to connect to map server..."));
+    logger->log(_("Map: %s"), map_path.c_str());
 
     network->connect(loginData->hostname, loginData->port);
     network->registerHandler(&mapLoginHandler);
@@ -745,7 +744,7 @@ int main(int argc, char *argv[])
     top->add(progressLabel, 15 + progressBar->getWidth(),
                             progressBar->getY() + 4);
     progressBar->setVisible(false);
-    gcn::Button *setup = new Button("Setup", "Setup", &listener);
+    gcn::Button *setup = new Button(_("Setup"), "Setup", &listener);
     setup->setPosition(top->getWidth() - setup->getWidth() - 3, 3);
     top->add(setup);
 
@@ -787,7 +786,7 @@ int main(int argc, char *argv[])
     login_wallpaper = ResourceManager::getInstance()-> getImage(wallpaperName);
 
     if (!login_wallpaper)
-        logger->log("Couldn't load %s as wallpaper", wallpaperName.c_str());
+        logger->log(_("Couldn't load %s as wallpaper"), wallpaperName.c_str());
 
     // Needs to be created in main, as the updater uses it
     textColour = new Colour();
@@ -823,7 +822,7 @@ int main(int argc, char *argv[])
             if (!network->getError().empty()) {
                 errorMessage = network->getError();
             } else {
-                errorMessage = "Got disconnected from server!";
+                errorMessage = _("Got disconnected from server!");
             }
         }
 
@@ -1013,7 +1012,7 @@ int main(int argc, char *argv[])
 
                 case ERROR_STATE:
                     logger->log("State: ERROR");
-                    currentDialog = new OkDialog("Error", errorMessage);
+                    currentDialog = new OkDialog(_("Error"), errorMessage);
                     positionDialog(currentDialog, screenWidth, screenHeight);
                     currentDialog->addActionListener(&errorListener);
                     currentDialog = NULL; // OkDialog deletes itself
@@ -1024,7 +1023,8 @@ int main(int argc, char *argv[])
                 case CONNECTING_STATE:
                     logger->log("State: CONNECTING");
                     progressBar->setVisible(true);
-                    progressLabel->setCaption("Connecting to map server...");
+                    progressLabel->setCaption(
+                            _("Connecting to map server..."));
                     progressLabel->adjustSize();
                     mapLogin(network, &loginData);
                     break;
@@ -1032,7 +1032,7 @@ int main(int argc, char *argv[])
                 case CHAR_CONNECT_STATE:
                     progressBar->setVisible(true);
                     progressLabel->setCaption(
-                            "Connecting to character server...");
+                            _("Connecting to character server..."));
                     progressLabel->adjustSize();
                     charLogin(network, &loginData);
                     break;
@@ -1040,7 +1040,7 @@ int main(int argc, char *argv[])
                 case ACCOUNT_STATE:
                     progressBar->setVisible(true);
                     progressLabel->setCaption(
-                            "Connecting to account server...");
+                            _("Connecting to account server..."));
                     progressLabel->adjustSize();
                     accountLogin(network, &loginData);
                     break;
-- 
cgit v1.2.3-70-g09d2


From 621df3bc632054573f910449678525c01d6de81d Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <crush@themanaworld.org>
Date: Fri, 9 Jan 2009 10:08:38 +0100
Subject: Fixed nonsensical percent values in update dialog.

---
 src/gui/updatewindow.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 72cbb34a..2c15037c 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -225,8 +225,9 @@ int UpdaterWindow::updateProgress(void *ptr,
     float progress = dn / dt;
     UpdaterWindow *uw = reinterpret_cast<UpdaterWindow *>(ptr);
 
-    if (progress < 0) progress = 0.0f;
-    if (progress > 1) progress = 1.0f;
+    if(progress != progress) progress = 0.0f; // check for NaN
+    if (progress < 0.0f) progress = 0.0f; // no idea how this could ever happen, but why not check for it anyway.
+    if (progress > 1.0f) progress = 1.0f;
 
     uw->setLabel(
             uw->mCurrentFile + " (" + toString((int) (progress * 100)) + "%)");
-- 
cgit v1.2.3-70-g09d2


From 4cddba3b2a759d2d794809a6b7cc3e46ca88d9dd Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <crush@themanaworld.org>
Date: Fri, 9 Jan 2009 11:20:06 +0100
Subject: Style fix for last commit

---
 src/gui/updatewindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 2c15037c..fab048fc 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -225,7 +225,7 @@ int UpdaterWindow::updateProgress(void *ptr,
     float progress = dn / dt;
     UpdaterWindow *uw = reinterpret_cast<UpdaterWindow *>(ptr);
 
-    if(progress != progress) progress = 0.0f; // check for NaN
+    if (progress != progress) progress = 0.0f; // check for NaN
     if (progress < 0.0f) progress = 0.0f; // no idea how this could ever happen, but why not check for it anyway.
     if (progress > 1.0f) progress = 1.0f;
 
-- 
cgit v1.2.3-70-g09d2


From a9716272cd2b5720a88f3d6904ec0f156177266d Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 9 Jan 2009 13:22:30 -0700
Subject: Fixed minimap state saving.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 po/POTFILES.in      |  1 +
 src/game.cpp        | 35 ++++++++++++++---------------------
 src/gui/minimap.cpp | 17 ++++++++++++++++-
 src/gui/minimap.h   |  6 ++++++
 4 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1005e363..11bb6aa0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -38,4 +38,5 @@ src/gui/trade.cpp
 src/gui/updatewindow.cpp
 src/net/playerhandler.cpp
 src/resources/itemdb.cpp
+src/game.cpp
 src/main.cpp
diff --git a/src/game.cpp b/src/game.cpp
index da733fe3..18169cd0 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -30,7 +30,6 @@
 #include <guichan/sdl/sdlinput.hpp>
 
 #include "beingmanager.h"
-#include "configuration.h"
 #include "effectmanager.h"
 #include "engine.h"
 #include "flooritemmanager.h"
@@ -91,6 +90,8 @@
 
 #include "resources/imagewriter.h"
 
+#include "utils/gettext.h"
+
 extern Graphics *graphics;
 
 class Map;
@@ -125,7 +126,6 @@ Setup* setupWindow;
 Minimap *minimap;
 EquipmentWindow *equipmentWindow;
 TradeWindow *tradeWindow;
-//BuddyWindow *buddyWindow;
 HelpWindow *helpWindow;
 DebugWindow *debugWindow;
 ShortcutWindow *itemShortcutWindow;
@@ -210,15 +210,11 @@ void createGuiWindows(Network *network)
     minimap = new Minimap();
     equipmentWindow = new EquipmentWindow(player_node->mEquipment.get());
     tradeWindow = new TradeWindow(network);
-    //buddyWindow = new BuddyWindow();
     helpWindow = new HelpWindow();
     debugWindow = new DebugWindow();
     itemShortcutWindow = new ShortcutWindow("ItemShortcut",new ItemShortcutContainer);
     smileyShortcutWindow = new ShortcutWindow("SmileyShortcut",new SmileyShortcutContainer);
 
-    // Initialize window positions
-    //buddyWindow->setPosition(10, minimap->getHeight() + 30);
-
     // Set initial window visibility
     chatWindow->setVisible((bool) config.getValue(
         chatWindow->getWindowName() + "Visible", true));
@@ -226,8 +222,6 @@ void createGuiWindows(Network *network)
         miniStatusWindow->getWindowName() + "Visible", true));
     buyDialog->setVisible(false);
     sellDialog->setVisible(false);
-    minimap->setVisible((bool) config.getValue(
-        minimap->getWindowName() + "Visible", true));
     tradeWindow->setVisible(false);
     menuWindow->setVisible((bool) config.getValue(
         menuWindow->getWindowName() + "Visible", true));
@@ -264,7 +258,6 @@ void destroyGuiWindows()
     delete minimap;
     delete equipmentWindow;
     delete tradeWindow;
-    //delete buddyWindow;
     delete helpWindow;
     delete debugWindow;
     delete itemShortcutWindow;
@@ -390,13 +383,13 @@ static bool saveScreenshot()
     if (success)
     {
         std::stringstream chatlogentry;
-        chatlogentry << "Screenshot saved to ~/" << filenameSuffix.str();
+        chatlogentry << _("Screenshot saved to ~/") << filenameSuffix.str();
         chatWindow->chatLog(chatlogentry.str(), BY_SERVER);
     }
     else
     {
-        chatWindow->chatLog("Saving screenshot failed!", BY_SERVER);
-        logger->log("Error: could not save screenshot.");
+        chatWindow->chatLog(_("Saving screenshot failed!"), BY_SERVER);
+        logger->log(_("Error: could not save screenshot."));
     }
 
     SDL_FreeSurface(screenshot);
@@ -471,9 +464,8 @@ void Game::logic()
         {
             if (!disconnectedDialog)
             {
-                disconnectedDialog = new OkDialog("Network Error",
-                        "The connection to the server was lost, "
-                        "the program will now quit");
+                disconnectedDialog = new OkDialog(_("Network Error"),
+                        _("The connection to the server was lost, the program will now quit"));
                 disconnectedDialog->addActionListener(&exitListener);
                 disconnectedDialog->requestMoveToTop();
             }
@@ -536,12 +528,12 @@ void Game::handleInput()
 				unsigned int deflt = player_relations.getDefault();
 				if (deflt & PlayerRelation::TRADE) {
 				    chatWindow->chatLog(
-					    "Ignoring incoming trade requests",
+					    _("Ignoring incoming trade requests"),
 					    BY_SERVER);
 				    deflt &= ~PlayerRelation::TRADE;
 				} else {
 				    chatWindow->chatLog(
-					    "Accepting incoming trade requests",
+					    _("Accepting incoming trade requests"),
 					    BY_SERVER);
 				    deflt |= PlayerRelation::TRADE;
 				}
@@ -557,7 +549,7 @@ void Game::handleInput()
 	    if (keyboard.isKeyActive(keyboard.KEY_SMILIE))
 	    {
 		// Emotions
-		int emotion=keyboard.getKeySmilieOffset(event.key.keysym.sym);
+		int emotion = keyboard.getKeySmilieOffset(event.key.keysym.sym);
 		if (emotion)
 		{
 		    smileyShortcut->useSmiley(emotion);
@@ -643,13 +635,13 @@ void Game::handleInput()
 		case SDLK_ESCAPE:
 		    if (!exitConfirm) {
 			exitConfirm = new ConfirmDialog(
-				"Quit", "Are you sure you want to quit?");
+				_("Quit"), _("Are you sure you want to quit?"));
 			exitConfirm->addActionListener(&exitListener);
 			exitConfirm->requestMoveToTop();
 		    }
 		    else
 		    {
-			exitConfirm->action(gcn::ActionEvent(NULL, "no"));
+			exitConfirm->action(gcn::ActionEvent(NULL, _("no")));
 		    }
 		    break;
 
@@ -738,6 +730,7 @@ void Game::handleInput()
 			requestedWindow = skillDialog;
 			break;
 		    case KeyboardConfig::KEY_WINDOW_MINIMAP:
+			minimap->toggle();
 			requestedWindow = minimap;
 			break;
 		    case KeyboardConfig::KEY_WINDOW_CHAT:
@@ -789,7 +782,7 @@ void Game::handleInput()
 	    catch (gcn::Exception e)
 	    {
 		const char* err = e.getMessage().c_str();
-		logger->log("Warning: guichan input exception: %s", err);
+		logger->log(_("Warning: guichan input exception: %s"), err);
 	    }
 	}
     } // End while
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 8519b985..ebeed6d7 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -23,6 +23,7 @@
 
 #include "../being.h"
 #include "../beingmanager.h"
+#include "../configuration.h"
 #include "../graphics.h"
 #include "../localplayer.h"
 
@@ -30,6 +31,8 @@
 
 #include "../utils/gettext.h"
 
+bool Minimap::mShow = config.getValue("MinimapVisible", true);
+
 Minimap::Minimap():
     Window(_("Map")),
     mMapImage(NULL),
@@ -56,13 +59,14 @@ void Minimap::setMapImage(Image *img)
     {
         int offsetX = getPadding() + 4;
         int offsetY = getTitleBarHeight() + 4;
-        mMapImage->setAlpha(0.7);
+        mMapImage->setAlpha(config.getValue("guialpha", 0.8));
         setDefaultSize(offsetX, offsetY, 
                        mMapImage->getWidth() < 100 ? 
                            mMapImage->getWidth() + offsetX : 100, 
                        mMapImage->getHeight() < 100 ? 
                            mMapImage->getHeight() + offsetY : 100);
         loadWindowState();
+        setVisible(mShow);
     }
     else
     {
@@ -70,10 +74,21 @@ void Minimap::setMapImage(Image *img)
     }
 }
 
+void Minimap::toggle()
+{
+    mShow = !mShow;
+    config.setValue("MinimapVisible", mShow);
+}
+
 void Minimap::draw(gcn::Graphics *graphics)
 {
+    setVisible(mShow);
+
     Window::draw(graphics);
 
+    if (!mShow)
+        return;
+
     const gcn::Rectangle a = getChildrenArea();
 
     graphics->pushClipArea(a);
diff --git a/src/gui/minimap.h b/src/gui/minimap.h
index 7897ebdb..b6dbc322 100644
--- a/src/gui/minimap.h
+++ b/src/gui/minimap.h
@@ -56,6 +56,11 @@ class Minimap : public Window
          */
         void setProportion(float proportion) { mProportion = proportion; }
 
+        /**
+         * Toggles the displaying of the minimap.
+         */
+        void toggle();
+
         /**
          * Draws the minimap.
          */
@@ -64,6 +69,7 @@ class Minimap : public Window
     private:
         Image *mMapImage;
         float mProportion;
+        static bool mShow;
 };
 
 extern Minimap *minimap;
-- 
cgit v1.2.3-70-g09d2


From 1e70a04b0e004787a158584f247ebc3ffa654029 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 9 Jan 2009 14:37:32 -0700
Subject: Made experience percentages report to the newest hundredth (as well
 as placed in checks for bogus amounts of experience, and correct them).

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/ministatus.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 6884f4d6..6d9fc5b1 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -95,19 +95,24 @@ void MiniStatusWindow::update()
         mHpBar->setColor(0, 171, 34); // Green
     }
 
+    float xp = (float) player_node->getXp() / player_node->mXpForNextLevel;
+
+    std::cout << xp << std::endl;
+
+    if (xp != xp) xp = 0.0f; // check for NaN
+    if (xp < 0.0f) xp = 0.0f; // make sure the experience isn't negative (uninitialized pointer most likely)
+    if (xp > 1.0f) xp = 1.0f;
+
     mHpBar->setProgress((float) player_node->mHp / player_node->mMaxHp);
     mMpBar->setProgress((float) player_node->mMp / player_node->mMaxMp);
-    mXpBar->setProgress(
-            (float) player_node->getXp() / player_node->mXpForNextLevel);
+    mXpBar->setProgress(xp);
 
     // Update labels
     mHpLabel->setCaption(toString(player_node->mHp));
     mMpLabel->setCaption(toString(player_node->mMp));
 
     std::stringstream updatedText;
-    updatedText << (int) (
-            (float) player_node->getXp() /
-            player_node->mXpForNextLevel * 100) << "%";
+    updatedText << (float) ((int) (xp * 10000.0f)) / 100.0f << "%";
 
     // Displays the number of monsters to next lvl
     // (disabled for now but interesting idea)
-- 
cgit v1.2.3-70-g09d2


From dbd70f58177e65266d1dff00f4ccf5bca7acbc04 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 9 Jan 2009 14:40:28 -0700
Subject: Removed close button from minimap windows. While this was a nice idea
 at the time (and it might be added back in the future), it requires a bit of
 a change to the window code to fix (not too hard) and its own custom click
 handler (again, not that hard). Done for the sake of avoiding too much
 redundancy.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/minimap.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index ebeed6d7..0d14c360 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -38,7 +38,6 @@ Minimap::Minimap():
     mMapImage(NULL),
     mProportion(0.5)
 {
-    setCloseButton(true);
     setWindowName(_("MiniMap"));
 }
 
-- 
cgit v1.2.3-70-g09d2


From a4bb147cc8321a210b5fe6a6ce776679369d76e8 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 9 Jan 2009 15:24:10 -0700
Subject: Fixed the default size for shortcut windows, as well as added both of
 the new shortcut windows to the reset shortcut window.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/setup.cpp          | 4 ++++
 src/gui/shortcutwindow.cpp | 6 ++++--
 src/gui/shortcutwindow.h   | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 73023eba..bcffbae0 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -43,6 +43,8 @@ extern Window *minimap;
 extern Window *skillDialog;
 extern Window *statusWindow;
 extern Window *itemShortcutWindow;
+extern Window *smileyShortcutWindow;
+extern Window *smileyWindow;
 extern Window *tradeWindow;
 
 Setup::Setup():
@@ -136,6 +138,8 @@ void Setup::action(const gcn::ActionEvent &event)
         helpWindow->resetToDefaultSize();
         skillDialog->resetToDefaultSize();
         itemShortcutWindow->resetToDefaultSize();
+        smileyShortcutWindow->resetToDefaultSize();
+        smileyWindow->resetToDefaultSize();
         tradeWindow->resetToDefaultSize();
     }
 }
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index d2aa2c2c..eb9efa84 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -25,14 +25,13 @@
 
 static const int SCROLL_PADDING = 0;
 
-ShortcutWindow::ShortcutWindow(const char * title,ShortcutContainer *content)
+ShortcutWindow::ShortcutWindow(const char *title, ShortcutContainer *content)
 {
     setWindowName(title);
     // no title presented, title bar is padding so window can be moved.
     gcn::Window::setTitleBarHeight(gcn::Window::getPadding());
     setShowTitle(false);
     setResizable(true);
-    setDefaultSize(758, 174, 42, 426);
 
     mItems = content;
 
@@ -42,6 +41,9 @@ ShortcutWindow::ShortcutWindow(const char * title,ShortcutContainer *content)
     setMaxWidth(mItems->getBoxWidth() * mItems->getMaxItems() + border);
     setMaxHeight(mItems->getBoxHeight() * mItems->getMaxItems() + border);
 
+    setDefaultSize(758, 174, mItems->getBoxWidth() + border, 
+                   (mItems->getBoxHeight() * mItems->getMaxItems()) + border);
+
     mScrollArea = new ScrollArea(mItems);
     mScrollArea->setPosition(SCROLL_PADDING, SCROLL_PADDING);
     mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h
index c9ba9d2e..b5a23c2c 100644
--- a/src/gui/shortcutwindow.h
+++ b/src/gui/shortcutwindow.h
@@ -40,7 +40,7 @@ class ShortcutWindow : public Window
         /**
          * Constructor.
          */
-        ShortcutWindow(const char *title,ShortcutContainer *content);
+        ShortcutWindow(const char *title, ShortcutContainer *content);
 
         /**
          * Destructor.
-- 
cgit v1.2.3-70-g09d2


From 5ac0e7d568ab0203d478d6b35d3e5d9308d3c9b7 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 9 Jan 2009 15:50:50 -0700
Subject: Changed reset defaults to be dependant upon the screen resolution for
 the shortcut window.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/shortcutwindow.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index eb9efa84..d2b939f5 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -23,6 +23,8 @@
 #include "shortcutwindow.h"
 #include "scrollarea.h"
 
+#include "../configuration.h"
+
 static const int SCROLL_PADDING = 0;
 
 ShortcutWindow::ShortcutWindow(const char *title, ShortcutContainer *content)
@@ -41,7 +43,12 @@ ShortcutWindow::ShortcutWindow(const char *title, ShortcutContainer *content)
     setMaxWidth(mItems->getBoxWidth() * mItems->getMaxItems() + border);
     setMaxHeight(mItems->getBoxHeight() * mItems->getMaxItems() + border);
 
-    setDefaultSize(758, 174, mItems->getBoxWidth() + border, 
+    const int width = (int) config.getValue("screenwidth", 800);
+    const int height = (int) config.getValue("screenheight", 600);
+
+    setDefaultSize(width - mItems->getBoxWidth() - border, 
+                   height - (mItems->getBoxHeight() * mItems->getMaxItems()) - 
+                   border, mItems->getBoxWidth() + border, 
                    (mItems->getBoxHeight() * mItems->getMaxItems()) + border);
 
     mScrollArea = new ScrollArea(mItems);
-- 
cgit v1.2.3-70-g09d2


From c7a2b7f6bcc5deca46e1f01486b359380eb73e75 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 9 Jan 2009 16:21:29 -0700
Subject: Expanded status window slightly so that experience isn't cut off for
 upper levels.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/status.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 64f3db48..19cd921a 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -39,7 +39,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     setWindowName(_("Status"));
     setCloseButton(true);
     setDefaultSize((windowContainer->getWidth() - 365) / 2,
-                   (windowContainer->getHeight() - 255) / 2, 365, 275);
+                   (windowContainer->getHeight() - 255) / 2, 400, 275);
     loadWindowState();
 
     // ----------------------
-- 
cgit v1.2.3-70-g09d2


From 43630ab7969fa26cb0a3e2773e7266f2f9647867 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 9 Jan 2009 20:35:42 -0700
Subject: Fixed color setup dialog (which was uninitialized in older commits
 when the setup button was created )

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/main.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index efb14deb..5f508c52 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -734,6 +734,9 @@ int main(int argc, char *argv[])
 
     unsigned int oldstate = !state; // We start with a status change.
 
+    // Needs to be created in main, as the updater uses it
+    textColour = new Colour();
+
     Game *game = NULL;
     Window *currentDialog = NULL;
     Image *login_wallpaper = NULL;
@@ -794,9 +797,6 @@ int main(int argc, char *argv[])
     if (!login_wallpaper)
         logger->log(_("Couldn't load %s as wallpaper"), wallpaperName.c_str());
 
-    // Needs to be created in main, as the updater uses it
-    textColour = new Colour();
-
     while (state != EXIT_STATE)
     {
         // Handle SDL events
-- 
cgit v1.2.3-70-g09d2


From 0dabbade690301ef89da2fb2562da8e48afc22d3 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 9 Jan 2009 21:24:13 -0700
Subject: Added the ability to see your own name in game.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/being.cpp           |  1 +
 src/gui/chat.cpp        | 12 ++++++++++--
 src/gui/setup_video.cpp | 22 +++++++++++++++++++++-
 src/gui/setup_video.h   |  2 ++
 src/gui/viewport.cpp    | 11 +++++++++++
 src/localplayer.cpp     | 44 ++++++++++++++++++++++++++++++++++++++++++++
 src/localplayer.h       | 32 +++++++++++++++++++++++---------
 src/main.cpp            |  1 +
 src/player.cpp          | 15 ++++-----------
 src/player.h            | 19 +++++++------------
 10 files changed, 124 insertions(+), 35 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index aff52757..ba3107db 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -69,6 +69,7 @@ Being::Being(int id, int job, Map *map):
     mWalkSpeed(150),
     mDirection(DOWN),
     mMap(NULL),
+    mName(""),
     mIsGM(false),
     mParticleEffects(config.getValue("particleeffects", 1)),
     mEquippedWeapon(NULL),
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 35976963..d4818504 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -95,8 +95,7 @@ ChatWindow::~ChatWindow()
     delete mRecorder;
 }
 
-void
- ChatWindow::logic()
+void ChatWindow::logic()
 {
     // todo: only do this when the size changes (updateWidgets?)
 
@@ -296,6 +295,15 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
     }
     // Prepare ordinary message
     if (msg.substr(0, 1) != "/") {
+        // The server never tells you about your own GM status, so work around
+        // this for now by intercepting it here. NOTE: This assumes that the 
+        // assert works, when it's not guaranteed to.
+
+        std::size_t space = msg.find(" ");
+        const std::string command = msg.substr(1, space);
+        if (msg.at(0) == '@' && command == "assert")
+            player_node->setGM();
+
         msg = nick + " : " + msg;
 
         MessageOut outMsg(mNetwork);
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 724ce8b4..a23f5923 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -38,6 +38,7 @@
 
 #include "../configuration.h"
 #include "../graphics.h"
+#include "../localplayer.h"
 #include "../log.h"
 #include "../main.h"
 #include "../particle.h"
@@ -106,6 +107,7 @@ Setup_Video::Setup_Video():
     mCustomCursorEnabled(config.getValue("customcursor", 1)),
     mParticleEffectsEnabled(config.getValue("particleeffects", 1)),
     mSpeechBubbleEnabled(config.getValue("speechbubble", 1)),
+    mNameEnabled(config.getValue("showownname", 0)),
     mOpacity(config.getValue("guialpha", 0.8)),
     mFps((int) config.getValue("fpslimit", 0)),
     mModeListModel(new ModeListModel),
@@ -115,6 +117,7 @@ Setup_Video::Setup_Video():
     mCustomCursorCheckBox(new CheckBox(_("Custom cursor"), mCustomCursorEnabled)),
     mParticleEffectsCheckBox(new CheckBox(_("Particle effects"), mParticleEffectsEnabled)),
     mSpeechBubbleCheckBox(new CheckBox(_("Speech bubbles"), mSpeechBubbleEnabled)),
+    mNameCheckBox(new CheckBox(_("Show name"), mNameEnabled)),
     mAlphaSlider(new Slider(0.2, 1.0)),
     mFpsCheckBox(new CheckBox(_("FPS Limit:"))),
     mFpsSlider(new Slider(10, 200)),
@@ -145,8 +148,9 @@ Setup_Video::Setup_Video():
     mModeList->setDimension(gcn::Rectangle(0, 0, 60, 70));
     scrollArea->setDimension(gcn::Rectangle(10, 10, 90, 70));
     mFsCheckBox->setPosition(110, 10);
+    mNameCheckBox->setPosition(195, 10);
     mOpenGLCheckBox->setPosition(110, 30);
-    mParticleEffectsCheckBox->setPosition(175, 30);
+    mParticleEffectsCheckBox->setPosition(180, 30);
     mCustomCursorCheckBox->setPosition(110, 50);
     mSpeechBubbleCheckBox->setPosition(110, 70);
     mAlphaSlider->setDimension(gcn::Rectangle(10, 100, 75, 10));
@@ -170,6 +174,7 @@ Setup_Video::Setup_Video():
     mCustomCursorCheckBox->setActionEventId("customcursor");
     mParticleEffectsCheckBox->setActionEventId("particleeffects");
     mSpeechBubbleCheckBox->setActionEventId("speechbubble");
+    mNameCheckBox->setActionEventId("showownname");
     mAlphaSlider->setActionEventId("guialpha");
     mFpsCheckBox->setActionEventId("fpslimitcheckbox");
     mFpsSlider->setActionEventId("fpslimitslider");
@@ -186,6 +191,7 @@ Setup_Video::Setup_Video():
     mCustomCursorCheckBox->addActionListener(this);
     mParticleEffectsCheckBox->addActionListener(this);
     mSpeechBubbleCheckBox->addActionListener(this);
+    mNameCheckBox->addActionListener(this);
     mAlphaSlider->addActionListener(this);
     mFpsCheckBox->addActionListener(this);
     mFpsSlider->addActionListener(this);
@@ -262,6 +268,7 @@ Setup_Video::Setup_Video():
     add(mCustomCursorCheckBox);
     add(mParticleEffectsCheckBox);
     add(mSpeechBubbleCheckBox);
+    add(mNameCheckBox);
     add(mAlphaSlider);
     add(alphaLabel);
     add(mFpsCheckBox);
@@ -344,6 +351,7 @@ void Setup_Video::apply()
     mCustomCursorEnabled = config.getValue("customcursor", 1);
     mParticleEffectsEnabled = config.getValue("particleeffects", 1);
     mSpeechBubbleEnabled = config.getValue("speechbubble", 1);
+    mNameEnabled = config.getValue("showownname", 0);
     mOpacity = config.getValue("guialpha", 0.8);
     mOverlayDetail = (int)config.getValue("OverlayDetail", 2);
     mOpenGLEnabled = config.getValue("opengl", 0);
@@ -375,6 +383,9 @@ void Setup_Video::cancel()
     mFsCheckBox->setSelected(mFullScreenEnabled);
     mOpenGLCheckBox->setSelected(mOpenGLEnabled);
     mCustomCursorCheckBox->setSelected(mCustomCursorEnabled);
+    mParticleEffectsCheckBox->setSelected(mParticleEffectsEnabled);
+    mSpeechBubbleCheckBox->setSelected(mSpeechBubbleEnabled);
+    mNameCheckBox->setSelected(mNameEnabled);
     mAlphaSlider->setValue(mOpacity);
     mOverlayDetailSlider->setValue(mOverlayDetail);
     mParticleDetailSlider->setValue(mParticleDetail);
@@ -388,6 +399,7 @@ void Setup_Video::cancel()
     config.setValue("customcursor", mCustomCursorEnabled ? 1 : 0);
     config.setValue("particleeffects", mParticleEffectsEnabled ? 1 : 0);
     config.setValue("speechbubble", mSpeechBubbleEnabled ? 1 : 0);
+    config.setValue("showownname", mNameEnabled ? 1 : 0);
     config.setValue("guialpha", mOpacity);
     config.setValue("opengl", mOpenGLEnabled ? 1 : 0);
 }
@@ -445,6 +457,14 @@ void Setup_Video::action(const gcn::ActionEvent &event)
         config.setValue("speechbubble",
                 mSpeechBubbleCheckBox->isSelected() ? 1 : 0);
     }
+    else if (event.getId() == "showownname")
+    {
+        // Notify the local player that settings have changed for the name
+        // and requires an update
+        player_node->mUpdateName = true;
+        config.setValue("showownname",
+                mNameCheckBox->isSelected() ? 1 : 0);
+    }
     else if (event.getId() == "fpslimitslider")
     {
         mFps = (int) mFpsSlider->getValue();
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index 4103c5ef..dfc3da38 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -51,6 +51,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
         bool mCustomCursorEnabled;
         bool mParticleEffectsEnabled;
         bool mSpeechBubbleEnabled;
+        bool mNameEnabled;
         double mOpacity;
         int mFps;
 
@@ -62,6 +63,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
         gcn::CheckBox *mCustomCursorCheckBox;
         gcn::CheckBox *mParticleEffectsCheckBox;
         gcn::CheckBox *mSpeechBubbleCheckBox;
+        gcn::CheckBox *mNameCheckBox;
 
         gcn::Slider *mAlphaSlider;
         gcn::CheckBox *mFpsCheckBox;
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 080ebddc..75b756f5 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -93,6 +93,10 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
 
     Graphics *graphics = static_cast<Graphics*>(gcnGraphics);
 
+    // Ensure the client doesn't freak out if a feature localplayer uses
+    // is dependent on a map.
+    player_node->mMapInitialized = true;
+
     // Avoid freaking out when tick_time overflows
     if (tick_time < lastTick)
     {
@@ -196,6 +200,13 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
         }
     }
 
+    if (player_node->mUpdateName)
+    {
+        player_node->mUpdateName = false;
+        player_node->setName(player_node->getName());
+    }
+
+
     // Draw text
     if (textManager)
     {
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 24b50d03..fb568d20 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -20,6 +20,7 @@
  */
 #include <cassert>
 
+#include "configuration.h"
 #include "equipment.h"
 #include "floor_item.h"
 #include "game.h"
@@ -44,6 +45,9 @@
 
 LocalPlayer *player_node = NULL;
 
+static const int NAME_X_OFFSET = 15;
+static const int NAME_Y_OFFSET = 30;
+
 LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map):
     Player(id, job, map),
     mCharId(0),
@@ -68,6 +72,13 @@ LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map):
     mInventory(new Inventory(INVENTORY_SIZE)),
     mStorage(new Inventory(STORAGE_SIZE))
 {
+    // Variable to keep the local player from doing certain actions before a map
+    // is initialized. e.g. drawing a player's name using the TextManager, since
+    // it appears to be dependant upon map coordinates for updating drawing.
+    mMapInitialized = false;
+
+    mUpdateName = true;
+
     initTargetCursor();
 }
 
@@ -75,6 +86,7 @@ LocalPlayer::~LocalPlayer()
 {
     delete mInventory;
     delete mStorage;
+    delete mName;
 
     for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
     {
@@ -158,6 +170,38 @@ void LocalPlayer::logic()
     Being::logic();
 }
 
+void LocalPlayer::setGM()
+{ 
+    mIsGM = !mIsGM;
+    setName(getName());  
+}
+
+void LocalPlayer::setName(const std::string &name)
+{
+    if (mName)
+    {
+        delete mName;
+        mName = 0;
+    }
+
+    if (config.getValue("showownname", false) && mMapInitialized)
+    {
+        Player::setName(name);
+    }
+    else
+    {
+        Being::setName(name);
+    }
+}
+
+void LocalPlayer::updateCoords()
+{
+    if (mName)
+    {
+        mName->adviseXY(mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET);
+    }
+}
+
 void LocalPlayer::nextStep()
 {
     if (mPath.empty())
diff --git a/src/localplayer.h b/src/localplayer.h
index 0760f226..28551a22 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -57,7 +57,7 @@ class LocalPlayer : public Player
          */
         ~LocalPlayer();
 
-        void setName(const std::string &name) {Being::setName(name); }
+        virtual void setName(const std::string &name);
         void setNetwork(Network *network) { mNetwork = network; }
         Network *getNetwork() {return mNetwork; }
         virtual void logic();
@@ -126,6 +126,14 @@ class LocalPlayer : public Player
 
         void attack(Being *target = NULL, bool keep = false);
 
+        /**
+         * Triggers whether or not to show the name as a GM name.
+         * NOTE: This doesn't mean that just anyone can use this.
+         * If the server doesn't acknowlege you, you won't be shown
+         * as a GM on other people's clients.
+         */
+        virtual void setGM();
+
         void stopAttack();
 
         Being* getTarget() const;
@@ -212,6 +220,10 @@ class LocalPlayer : public Player
         Uint16 mStatPoint, mSkillPoint;
         Uint16 mStatsPointsToAttribute;
 
+        bool mUpdateName;     /** Whether or not the name settings have changed */
+
+        bool mMapInitialized; /** Whether or not the map is available yet */
+
         float mLastAttackTime; /**< Used to synchronize the charge dialog */
 
         void drawTargetCursor(Graphics *graphics, int offsetX, int offsetY);
@@ -232,15 +244,15 @@ class LocalPlayer : public Player
         FloorItem *mPickUpTarget;
 
         bool mTrading;
-        bool mInStorage;    /**< Whether storage is currently accessible */
+        bool mInStorage;      /**< Whether storage is currently accessible */
         bool mGoingToTarget;
-        bool mKeepAttacking;/** Whether or not to continue to attack */
-        int mTargetTime;    /** How long the being has been targeted **/
-        int mLastAction;    /**< Time stamp of the last action, -1 if none. */
-        int mLastTarget;    /** Time stamp of last targeting action, -1 if none. */
-        int mWalkingDir;    /**< The direction the player is walking in. */
-        int mDestX;         /**< X coordinate of destination. */
-        int mDestY;         /**< Y coordinate of destination. */
+        bool mKeepAttacking;  /** Whether or not to continue to attack */
+        int mTargetTime;      /** How long the being has been targeted **/
+        int mLastAction;      /**< Time stamp of the last action, -1 if none. */
+        int mLastTarget;      /** Time stamp of last targeting action, -1 if none. */
+        int mWalkingDir;      /**< The direction the player is walking in. */
+        int mDestX;           /**< X coordinate of destination. */
+        int mDestY;           /**< Y coordinate of destination. */
 
         Inventory *mInventory;
         Inventory *mStorage;
@@ -259,6 +271,8 @@ class LocalPlayer : public Player
 
         // Load the target cursors into memory
         void initTargetCursor();
+
+        virtual void updateCoords();
 };
 
 extern LocalPlayer *player_node;
diff --git a/src/main.cpp b/src/main.cpp
index 5f508c52..d9ebaefa 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -968,6 +968,7 @@ int main(int argc, char *argv[])
                     if (options.chooseDefault)
                         ((CharSelectDialog*) currentDialog)->action(
                             gcn::ActionEvent(NULL, "ok"));
+
                     break;
 
                 case GAME_STATE:
diff --git a/src/player.cpp b/src/player.cpp
index 47275c81..ca728bef 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -41,15 +41,11 @@ Player::Player(int id, int job, Map *map):
     Being(id, job, map)
 {
     mName = 0;
-    mIsGM = false;
 }
 
 Player::~Player()
 {
-    if (mName)
-    {
-        delete mName;
-    }
+    delete mName;
 }
 
 void Player::setName(const std::string &name)
@@ -69,8 +65,7 @@ void Player::setName(const std::string &name)
     }
 }
 
-void
-Player::logic()
+void Player::logic()
 {
     switch (mAction) {
         case STAND:
@@ -109,14 +104,12 @@ Player::logic()
     Being::logic();
 }
 
-Being::Type
-Player::getType() const
+Being::Type Player::getType() const
 {
     return PLAYER;
 }
 
-void
-Player::flash(int time)
+void Player::flash(int time)
 {
     if (mName)
     {
diff --git a/src/player.h b/src/player.h
index 97ff15d9..a082a92b 100644
--- a/src/player.h
+++ b/src/player.h
@@ -43,17 +43,13 @@ class Player : public Being
         /**
          * Set up mName to be the character's name
          */
-        virtual void
-        setName(const std::string &name);
+        virtual void setName(const std::string &name);
 
-        virtual void
-        logic();
+        virtual void logic();
 
-        virtual Type
-        getType() const;
+        virtual Type getType() const;
 
-        virtual void
-        setGender(Gender gender);
+        virtual void setGender(Gender gender);
 
         /**
          * Sets the hair style and color for this player.
@@ -70,8 +66,7 @@ class Player : public Being
         /**
          * Sets visible equipments for this player.
          */
-        virtual void
-        setSprite(int slot, int id, std::string color = "");
+        virtual void setSprite(int slot, int id, std::string color = "");
 
         /**
          * Flash the player's name
@@ -79,8 +74,8 @@ class Player : public Being
         void flash(int time);
 
     protected:
-        void updateCoords();
-    private:
+        virtual void updateCoords();
+
         FlashText *mName;
 };
 
-- 
cgit v1.2.3-70-g09d2


From afe43d3736eaf33ba26d2373917d2a8de3f39667 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 9 Jan 2009 20:32:20 +0100
Subject: Updated translations

---
 po/aethyra.pot | 522 ++++++++++++++++++++++++++++++++++++++++++++++------
 po/ar.po       | 553 +++++++++++++++++++++++++++++++++++++++++++++++--------
 po/ca.po       | 523 ++++++++++++++++++++++++++++++++++++++++++++++------
 po/cs.po       | 549 +++++++++++++++++++++++++++++++++++++++++++++++--------
 po/da.po       | 557 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 po/de.po       | 557 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 po/en_GB.po    | 553 +++++++++++++++++++++++++++++++++++++++++++++++--------
 po/eo.po       | 522 ++++++++++++++++++++++++++++++++++++++++++++++------
 po/es.po       | 553 +++++++++++++++++++++++++++++++++++++++++++++++--------
 po/fi.po       | 557 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 po/fr.po       | 557 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 po/he.po       | 557 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 po/hr.po       | 546 +++++++++++++++++++++++++++++++++++++++++++++++--------
 po/id.po       | 550 +++++++++++++++++++++++++++++++++++++++++++++++--------
 po/it.po       | 553 +++++++++++++++++++++++++++++++++++++++++++++++--------
 po/ja.po       | 542 +++++++++++++++++++++++++++++++++++++++++++++++-------
 po/nl.po       | 543 +++++++++++++++++++++++++++++++++++++++++++++++-------
 po/pl.po       | 557 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 po/pt.po       | 565 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 po/pt_BR.po    | 557 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 po/ru.po       | 553 +++++++++++++++++++++++++++++++++++++++++++++++--------
 po/sk.po       | 532 ++++++++++++++++++++++++++++++++++++++++++++++-------
 po/sv.po       | 553 +++++++++++++++++++++++++++++++++++++++++++++++--------
 po/th.po       | 546 +++++++++++++++++++++++++++++++++++++++++++++++--------
 po/zh_CN.po    | 553 +++++++++++++++++++++++++++++++++++++++++++++++--------
 25 files changed, 11914 insertions(+), 1796 deletions(-)

diff --git a/po/aethyra.pot b/po/aethyra.pot
index ae49bb32..9e8e8579 100644
--- a/po/aethyra.pot
+++ b/po/aethyra.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,122 +16,130 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+msgid "Shop"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr ""
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr ""
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr ""
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr ""
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr ""
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr ""
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr ""
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr ""
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr ""
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr ""
 
@@ -144,6 +152,225 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr ""
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr ""
@@ -152,7 +379,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr ""
 
@@ -160,11 +387,20 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr ""
 
@@ -190,31 +426,27 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr ""
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr ""
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr ""
 
@@ -222,7 +454,7 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr ""
 
@@ -230,7 +462,7 @@ msgstr ""
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr ""
 
@@ -322,14 +554,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr ""
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr ""
@@ -390,6 +618,62 @@ msgstr ""
 msgid "Rotate the stick"
 msgstr ""
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+msgid "Name"
+msgstr ""
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr ""
@@ -464,6 +748,100 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, c-format
+msgid "Money: %d GP"
+msgstr ""
+
+#: src/gui/status.cpp:127
+msgid "Stats"
+msgstr ""
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+msgid "Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:133
+msgid "Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:134
+msgid "M.Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:135
+msgid "M.Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+msgid "Strength"
+msgstr ""
+
+#: src/gui/status.cpp:283
+msgid "Agility"
+msgstr ""
+
+#: src/gui/status.cpp:284
+msgid "Vitality"
+msgstr ""
+
+#: src/gui/status.cpp:285
+msgid "Intelligence"
+msgstr ""
+
+#: src/gui/status.cpp:286
+msgid "Dexterity"
+msgstr ""
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
@@ -481,6 +859,38 @@ msgstr ""
 msgid "You give:"
 msgstr ""
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
+
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+msgid "Connecting to map server..."
+msgstr ""
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
diff --git a/po/ar.po b/po/ar.po
index f8cead32..0a19529e 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-07-16 18:28+0000\n"
 "Last-Translator: صقر بن عبدالله <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "شراء"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "السعر: %d GP / الإجمالي: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "مغادرة"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "الوصف: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "التأثير: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "إيقاف"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "بيع"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "إلغاء"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "إنتقاء الشخصيّة"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "موافق"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "إلغاء"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "جديد"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "حذف"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "السّابق"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "التّالي"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "الاسم: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "المستوى: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "المستوى: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "النقود: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "إنشاء شخصيّة"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "الاسم:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "لون الشعر:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "قصّة الشعر:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "إنشاء"
 
@@ -146,6 +155,225 @@ msgstr "إنتقاء الشخصيّة"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "الخادوم:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "نعم"
@@ -154,7 +382,7 @@ msgstr "نعم"
 msgid "No"
 msgstr "لا"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "جارِ الاتّصال..."
 
@@ -162,11 +390,20 @@ msgstr "جارِ الاتّصال..."
 msgid "Equipment"
 msgstr "العتاد"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "الجردة"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "استخدام"
 
@@ -192,31 +429,27 @@ msgstr "تجريد من العتاد"
 msgid "Equip"
 msgstr "استعمال العتاد"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "انتقاء كمّيّة من المواد لإسقاطها."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "ولوج"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "كلمة السرّ:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "الخادوم:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "تسجيل"
 
@@ -224,7 +457,7 @@ msgstr "تسجيل"
 msgid "Status"
 msgstr "الحالة"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "مهارات"
 
@@ -232,7 +465,7 @@ msgstr "مهارات"
 msgid "Shortcut"
 msgstr "اختصار"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "تثبيت"
 
@@ -325,14 +558,10 @@ msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محار
 msgid "Passwords do not match."
 msgstr "كلمات السرّ غير متطابقة."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "خطأ"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "بيع"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "صوت"
@@ -393,6 +622,64 @@ msgstr "إيقاف"
 msgid "Rotate the stick"
 msgstr "تدوير العصا"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "حذف"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "الاسم:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "ملء الشاشة"
@@ -467,6 +754,110 @@ msgstr "تغيير OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "المستوى: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "النقود: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "الحالة"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "مهاجمة %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "دفاع %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "مهاجمة %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "دفاع %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "القوّة:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "خفّة الحركة:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "نشاط:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "ذكاء:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "المهارة:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "إضافة"
@@ -484,27 +875,45 @@ msgstr "أنت تحصل على %d GP."
 msgid "You give:"
 msgstr "أنت تقدّم:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "إلغاء التسجيل"
-
-#~ msgid "Strength:"
-#~ msgstr "القوّة:"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "خفّة الحركة:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "جارِ الاتّصال..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "المهارة:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "نشاط:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "ذكاء:"
+#~ msgid "Unregister"
+#~ msgstr "إلغاء التسجيل"
 
 #~ msgid "Willpower:"
 #~ msgstr "قوّة الذات:"
@@ -557,12 +966,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "تغيير"
 
-#~ msgid "Attack %+d"
-#~ msgstr "مهاجمة %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "دفاع %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/ca.po b/po/ca.po
index 97527d96..7325a252 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-07-03 17:21+0000\n"
 "Last-Translator: Habari <thomas.becerril@gmail.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -17,122 +17,130 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "preu %d GP / total %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "sortir"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+msgid "Shop"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr ""
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr ""
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr ""
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr ""
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr ""
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "nom"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr ""
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr ""
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr ""
 
@@ -145,6 +153,225 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr ""
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "si"
@@ -153,7 +380,7 @@ msgstr "si"
 msgid "No"
 msgstr "no"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr ""
 
@@ -161,11 +388,20 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr ""
 
@@ -191,31 +427,27 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr ""
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr ""
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr ""
 
@@ -223,7 +455,7 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr ""
 
@@ -231,7 +463,7 @@ msgstr ""
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr ""
 
@@ -323,14 +555,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr ""
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr ""
@@ -391,6 +619,63 @@ msgstr ""
 msgid "Rotate the stick"
 msgstr ""
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "nom"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr ""
@@ -465,6 +750,100 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, c-format
+msgid "Money: %d GP"
+msgstr ""
+
+#: src/gui/status.cpp:127
+msgid "Stats"
+msgstr ""
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+msgid "Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:133
+msgid "Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:134
+msgid "M.Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:135
+msgid "M.Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+msgid "Strength"
+msgstr ""
+
+#: src/gui/status.cpp:283
+msgid "Agility"
+msgstr ""
+
+#: src/gui/status.cpp:284
+msgid "Vitality"
+msgstr ""
+
+#: src/gui/status.cpp:285
+msgid "Intelligence"
+msgstr ""
+
+#: src/gui/status.cpp:286
+msgid "Dexterity"
+msgstr ""
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
@@ -482,9 +861,41 @@ msgstr ""
 msgid "You give:"
 msgstr ""
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+msgid "Connecting to map server..."
+msgstr ""
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Change"
 #~ msgstr "canvi"
diff --git a/po/cs.po b/po/cs.po
index 67a31efc..efb03f63 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-12-17 16:31+0000\n"
 "Last-Translator: Lubos <alvinx12@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -17,123 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Nákup"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+msgid "Shop"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Prodej"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "Potvrďte vymazání postavy"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 #, fuzzy
 msgid "Select Character"
 msgstr "Vytvořit postavu"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Nová"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Odstranit"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Předchozí"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Další"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Jméno: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Peníze: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Vytvořit postavu"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Jméno:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Barva vlasů:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Styl vlasů:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Vytvořit"
 
@@ -147,6 +155,225 @@ msgstr "Server:"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Ano"
@@ -155,7 +382,7 @@ msgstr "Ano"
 msgid "No"
 msgstr "Ne"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
@@ -163,11 +390,20 @@ msgstr "Připojuji se..."
 msgid "Equipment"
 msgstr "Vybavení"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventář"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr ""
 
@@ -193,31 +429,27 @@ msgstr ""
 msgid "Equip"
 msgstr "Vybavit"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Vyberte množství zboží, se kterým budete obchodovat."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Vyberte množství zboží, které chcete upustit."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr "Zapamatovat uživatelské jméno"
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registrace"
 
@@ -225,7 +457,7 @@ msgstr "Registrace"
 msgid "Status"
 msgstr "Stav"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Dovednosti"
 
@@ -233,7 +465,7 @@ msgstr "Dovednosti"
 msgid "Shortcut"
 msgstr "Zkratka"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Nastavení"
 
@@ -325,14 +557,10 @@ msgstr "Heslo musí být kratší než %d znaků."
 msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Chyba"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Prodej"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Zvuk"
@@ -393,6 +621,64 @@ msgstr ""
 msgid "Rotate the stick"
 msgstr ""
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Odstranit"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Jméno:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr ""
@@ -467,6 +753,109 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Úroveň: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Peníze: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Stav"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Útok %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Obrana %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Útok %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Obrana %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Síla:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Vitalita:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitalita:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Inteligence:"
+
+#: src/gui/status.cpp:286
+msgid "Dexterity"
+msgstr ""
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
@@ -484,10 +873,43 @@ msgstr ""
 msgid "You give:"
 msgstr ""
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Připojuji se..."
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Správa účtu a postavy"
 
@@ -503,15 +925,6 @@ msgstr ""
 #~ msgid "Account: %s"
 #~ msgstr "Účet: %s"
 
-#~ msgid "Strength:"
-#~ msgstr "Síla:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitalita:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Inteligence:"
-
 #~ msgid "Please distribute %d points"
 #~ msgstr "Rozdělte prosím %d bodů"
 
@@ -541,9 +954,3 @@ msgstr ""
 
 #~ msgid "Change"
 #~ msgstr "Změnit"
-
-#~ msgid "Attack %+d"
-#~ msgstr "Útok %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Obrana %+d"
diff --git a/po/da.po b/po/da.po
index ff2506c1..dae66aca 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-12-28 14:45+0000\n"
 "Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Køb"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Pris: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Stop"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Sælg"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Fortryd"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "Er du sikker på at du vil slette denne figur?"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Er du sikker på at du vil slette denne figur?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Vælg Bruger"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "O.k."
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Fortryd"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Opret"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Slet"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Forrige"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Næste"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Navn; %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Niveau: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Penge: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Lav figur."
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Navn:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Hårfarve:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Frisure:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Opret"
 
@@ -146,6 +155,225 @@ msgstr "Vælg Bruger"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Ja"
@@ -154,7 +382,7 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Opretter forbindelse..."
 
@@ -162,11 +390,20 @@ msgstr "Opretter forbindelse..."
 msgid "Equipment"
 msgstr "Udstyr"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventarliste"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Brug"
 
@@ -192,31 +429,27 @@ msgstr "Tag af"
 msgid "Equip"
 msgstr "Tag på"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Vælge hvor mange du vil bytte."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Vælg hvor mange du vil smide,"
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Log Ind"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr "Husk dette brugernavn."
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registrer"
 
@@ -224,7 +457,7 @@ msgstr "Registrer"
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Færdigheder"
 
@@ -232,7 +465,7 @@ msgstr "Færdigheder"
 msgid "Shortcut"
 msgstr "Genvej"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Opsætning"
 
@@ -325,14 +558,10 @@ msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
 msgid "Passwords do not match."
 msgstr "Adgangskoder stemmer ikke overens."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Fejl"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Sælg"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Lyd"
@@ -393,6 +622,64 @@ msgstr "Stop"
 msgid "Rotate the stick"
 msgstr "Roter joystick"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Slet"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Navn:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Fuld Skærm"
@@ -467,6 +754,110 @@ msgstr "Skrifter til OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Niveau: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Penge: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Status"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Angrib %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Forsvar %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Angrib %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Forsvar %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Styrke"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Adræthed"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Helbred:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Intelligens:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Behændighed:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Tilføj"
@@ -484,10 +875,43 @@ msgstr "Du får %d GP."
 msgid "You give:"
 msgstr "Du giver:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Opretter forbindelse..."
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Ret konto og figurer"
 
@@ -503,21 +927,6 @@ msgstr ""
 #~ msgid "Account: %s"
 #~ msgstr "Bruger: %s"
 
-#~ msgid "Strength:"
-#~ msgstr "Styrke"
-
-#~ msgid "Agility:"
-#~ msgstr "Adræthed"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Behændighed:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Helbred:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligens:"
-
 #~ msgid "Willpower:"
 #~ msgstr "Viljestyrke:"
 
@@ -581,12 +990,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Ændre"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Angrib %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Forsvar %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/de.po b/po/de.po
index 578ae8b8..6e71b451 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-10-13 00:25+0000\n"
 "Last-Translator: Aeneas Jaißle <Unknown>\n"
 "Language-Team: German\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Kaufen"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preis: %d GP / Summe: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Stopp"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Verkaufen"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "Bestätige Charakter-Löschung"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Spielfigur auswählen"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Neu"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Zurück"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Weiter"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Name : %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Geld: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Charakter erstellen"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Name :"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Haarfarbe"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Frisur"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Erstellen"
 
@@ -146,6 +155,225 @@ msgstr "Spielfigur auswählen"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Ja"
@@ -154,7 +382,7 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Verbinde..."
 
@@ -162,11 +390,20 @@ msgstr "Verbinde..."
 msgid "Equipment"
 msgstr "Ausrüstung"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventar"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Benutzen"
 
@@ -192,31 +429,27 @@ msgstr "Ablegen"
 msgid "Equip"
 msgstr "Ausrüsten"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Wähle aus, wieviele Gegenstände Du tauschen möchtest."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Wähle aus, wieviele Gegenstände Du wegwerfen möchtest."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Anmelden"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Passwort:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr "Benutzernamen merken"
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registrieren"
 
@@ -224,7 +457,7 @@ msgstr "Registrieren"
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Fertigkeiten"
 
@@ -232,7 +465,7 @@ msgstr "Fertigkeiten"
 msgid "Shortcut"
 msgstr "Tastenkürzel"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Einstellungen"
 
@@ -325,14 +558,10 @@ msgstr "Das Passwort muss kürzer als %d Zeichen sein."
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Fehler"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Verkaufen"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Ton"
@@ -393,6 +622,64 @@ msgstr "Stopp"
 msgid "Rotate the stick"
 msgstr "Kreise den Steuerknüppel"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Löschen"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Name :"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Vollbild"
@@ -469,6 +756,110 @@ msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Stufe: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Geld: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Status"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Angriff %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Verteidigung %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Angriff %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Verteidigung %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Stärke:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Agilität:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitalität:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Intelligenz:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Geschicklichkeit:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Hinzufügen"
@@ -486,10 +877,43 @@ msgstr "Du erhälst %d GP."
 msgid "You give:"
 msgstr "Du gibst:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Verbinde..."
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Account- und Charakterverwaltung"
 
@@ -505,21 +929,6 @@ msgstr ""
 #~ msgid "Account: %s"
 #~ msgstr "Account: %s"
 
-#~ msgid "Strength:"
-#~ msgstr "Stärke:"
-
-#~ msgid "Agility:"
-#~ msgstr "Agilität:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Geschicklichkeit:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitalität:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligenz:"
-
 #~ msgid "Willpower:"
 #~ msgstr "Willenskraft:"
 
@@ -583,12 +992,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Ändern"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Angriff %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Verteidigung %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index c17c3ad7..80a6ef41 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-05-10 16:51+0000\n"
 "Last-Translator: Me <Glich.Glich@googlemail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Buy"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Price: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Exit"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Description: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effect: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Stop"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Sell"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Cancel"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Are you sure you want to delete this character?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Select Character"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Cancel"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "New"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Previous"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Next"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Name: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Money: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Create Character"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Name:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Hair Colour:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Hair Style:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Create"
 
@@ -146,6 +155,225 @@ msgstr "Select Character"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Yes"
@@ -154,7 +382,7 @@ msgstr "Yes"
 msgid "No"
 msgstr "No"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Connecting..."
 
@@ -162,11 +390,20 @@ msgstr "Connecting..."
 msgid "Equipment"
 msgstr "Equipment"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventory"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Use"
 
@@ -192,31 +429,27 @@ msgstr "Unequip"
 msgid "Equip"
 msgstr "Equip"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Select amount of items to trade."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Select amount of items to drop."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Register"
 
@@ -224,7 +457,7 @@ msgstr "Register"
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Skills"
 
@@ -232,7 +465,7 @@ msgstr "Skills"
 msgid "Shortcut"
 msgstr "Shortcut"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Setup"
 
@@ -325,14 +558,10 @@ msgstr "The password needs to be less than %d characters long."
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Error"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Sell"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Sound"
@@ -393,6 +622,64 @@ msgstr "Stop"
 msgid "Rotate the stick"
 msgstr "Rotate the stick"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Delete"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Name:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Full screen"
@@ -467,6 +754,110 @@ msgstr "Changing OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applying change to OpenGL requires restart."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Level: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Money: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Status"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Attack %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Defense %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Attack %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Defense %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Strength:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Agility:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitality:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Intelligence:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Dexterity:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Add"
@@ -484,27 +875,45 @@ msgstr "You get %d GP."
 msgid "You give:"
 msgstr "You give:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "Unregister"
-
-#~ msgid "Strength:"
-#~ msgstr "Strength:"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "Agility:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Connecting..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "Dexterity:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Vitality:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligence:"
+#~ msgid "Unregister"
+#~ msgstr "Unregister"
 
 #~ msgid "Willpower:"
 #~ msgstr "Willpower:"
@@ -557,12 +966,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Change"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Attack %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Defense %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/eo.po b/po/eo.po
index ad4bcdca..928b0fbf 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-11-10 22:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -17,122 +17,130 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+msgid "Shop"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr ""
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr ""
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr ""
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr ""
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr ""
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr ""
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr ""
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr ""
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr ""
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr ""
 
@@ -145,6 +153,225 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr ""
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr ""
@@ -153,7 +380,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr ""
 
@@ -161,11 +388,20 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr ""
 
@@ -191,31 +427,27 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr ""
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr ""
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr ""
 
@@ -223,7 +455,7 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr ""
 
@@ -231,7 +463,7 @@ msgstr ""
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr ""
 
@@ -323,14 +555,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr ""
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr ""
@@ -391,6 +619,62 @@ msgstr ""
 msgid "Rotate the stick"
 msgstr ""
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+msgid "Name"
+msgstr ""
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr ""
@@ -465,6 +749,100 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, c-format
+msgid "Money: %d GP"
+msgstr ""
+
+#: src/gui/status.cpp:127
+msgid "Stats"
+msgstr ""
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+msgid "Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:133
+msgid "Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:134
+msgid "M.Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:135
+msgid "M.Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+msgid "Strength"
+msgstr ""
+
+#: src/gui/status.cpp:283
+msgid "Agility"
+msgstr ""
+
+#: src/gui/status.cpp:284
+msgid "Vitality"
+msgstr ""
+
+#: src/gui/status.cpp:285
+msgid "Intelligence"
+msgstr ""
+
+#: src/gui/status.cpp:286
+msgid "Dexterity"
+msgstr ""
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
@@ -482,6 +860,38 @@ msgstr ""
 msgid "You give:"
 msgstr ""
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
+
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+msgid "Connecting to map server..."
+msgstr ""
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
diff --git a/po/es.po b/po/es.po
index e544ff86..f4f67a3f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-10-15 01:37+0000\n"
 "Last-Translator: catalania <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Precio: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Salir"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descripción: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efecto: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Detener"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Vender"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "¿Seguro que quieres borrar este personaje?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Seleccionar personaje"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Aceptar"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Nuevo"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Dinero: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Crear Personaje"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Color de pelo:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "corte de pelo"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Crear"
 
@@ -146,6 +155,225 @@ msgstr "Seleccionar personaje"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Servidor:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Sí"
@@ -154,7 +382,7 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Conectando…"
 
@@ -162,11 +390,20 @@ msgstr "Conectando…"
 msgid "Equipment"
 msgstr "Equipo"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventario"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Usar"
 
@@ -192,31 +429,27 @@ msgstr "quitarselo"
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Seleccione objetos para comerciar."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Seleccione objetos para soltar."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "conectarse"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Servidor:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registrar"
 
@@ -224,7 +457,7 @@ msgstr "Registrar"
 msgid "Status"
 msgstr "Estado"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -232,7 +465,7 @@ msgstr "Habilidades"
 msgid "Shortcut"
 msgstr "Atajos"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Configuración"
 
@@ -325,14 +558,10 @@ msgstr "La contraseña puede tener como máximo %d caracteres."
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Error"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Vender"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Sonido"
@@ -393,6 +622,64 @@ msgstr "Detener"
 msgid "Rotate the stick"
 msgstr "Gire el stick"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Eliminar"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Nombre:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Pantalla completa"
@@ -467,6 +754,110 @@ msgstr "Cambiar a OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Se necesita reiniciar para aplicar los cambios hechos a OpenGL."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Nivel: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Dinero: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Estado"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Ataque %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Defensa %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Ataque %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Defensa %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Fuerza:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Agilidad:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitalidad:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Inteligencia:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Destreza:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Añadir"
@@ -484,27 +875,45 @@ msgstr "Tu consigues %d GP."
 msgid "You give:"
 msgstr "Tu das:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "Cancelar Cuenta"
-
-#~ msgid "Strength:"
-#~ msgstr "Fuerza:"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "Agilidad:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Conectando…"
 
-#~ msgid "Dexterity:"
-#~ msgstr "Destreza:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Vitalidad:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "Inteligencia:"
+#~ msgid "Unregister"
+#~ msgstr "Cancelar Cuenta"
 
 #~ msgid "Willpower:"
 #~ msgstr "Fuerza de voluntad:"
@@ -557,12 +966,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Modificar"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Ataque %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Defensa %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/fi.po b/po/fi.po
index e4b01584..80b21093 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-12-30 10:23+0000\n"
 "Last-Translator: ville-v <villev90@gmail.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -17,123 +17,132 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Osta"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Kappalehinta: %d GP / Yhteensä: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Sulje"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Kuvaus: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Vaikutus: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Lopeta"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Myy"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Peru"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "Vahvista hahmon poistopyyntö"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 #, fuzzy
 msgid "Select Character"
 msgstr "Luo hahmo"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Peru"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Uusi"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Poista"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Edellinen"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Seuraava"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nimi: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Taso: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Taso: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Rahatilanne: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Luo hahmo"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Nimi:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Hiusten väri:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Hiustyyli:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Luo"
 
@@ -147,6 +156,225 @@ msgstr "Vaihda palvelinta"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Palvelin:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Kyllä"
@@ -155,7 +383,7 @@ msgstr "Kyllä"
 msgid "No"
 msgstr "Ei"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
@@ -163,11 +391,20 @@ msgstr "Yhdistetään..."
 msgid "Equipment"
 msgstr "Varusteet"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Tavaraluettelo"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Käytä"
 
@@ -193,31 +430,27 @@ msgstr "Poista varuste käytöstä"
 msgid "Equip"
 msgstr "Ota käyttöön"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Anna vaihdettavien tavaroiden määrä."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Anna pudotettavien tavaroiden määrä."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Salasana:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Palvelin:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr "Muista käyttäjätunnus"
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Rekisteröidy"
 
@@ -225,7 +458,7 @@ msgstr "Rekisteröidy"
 msgid "Status"
 msgstr "Hahmon tiedot"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Taidot"
 
@@ -233,7 +466,7 @@ msgstr "Taidot"
 msgid "Shortcut"
 msgstr "Pikavalinnat"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Asetukset"
 
@@ -326,14 +559,10 @@ msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Virhe"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Myy"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Ääni"
@@ -394,6 +623,64 @@ msgstr "Lopeta"
 msgid "Rotate the stick"
 msgstr "Käytä ohjain ääriasennoissaan pyörittämällä"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Poista"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Nimi:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Kokoruututila"
@@ -468,6 +755,110 @@ msgstr "Vaihdetaan OpenGL -toimintatilaan"
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetusten muutokset vaativat ohjelman uudelleenkäynnistyksen"
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Taso: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Rahatilanne: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Hahmon tiedot"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Hyökkäys %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Puolustus %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Hyökkäys %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Puolustus %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Voima:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Ketteryys:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Elinvoima:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Älykkyys:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Näppäryys:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Lisää"
@@ -485,10 +876,43 @@ msgstr "Sait %d GP"
 msgid "You give:"
 msgstr "Annat:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Yhdistetään..."
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Tilin ja hahmojen hallinta"
 
@@ -504,21 +928,6 @@ msgstr ""
 #~ msgid "Account: %s"
 #~ msgstr "Tili: %s"
 
-#~ msgid "Strength:"
-#~ msgstr "Voima:"
-
-#~ msgid "Agility:"
-#~ msgstr "Ketteryys:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Näppäryys:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Elinvoima:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Älykkyys:"
-
 #~ msgid "Willpower:"
 #~ msgstr "Tahdonvoima:"
 
@@ -579,12 +988,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Muuta"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Hyökkäys %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Puolustus %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "Iskupisteet %+d"
 
diff --git a/po/fr.po b/po/fr.po
index ed1340d3..3d8a121c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-12-26 10:43+0000\n"
 "Last-Translator: Johan Serre <Unknown>\n"
 "Language-Team: French\n"
@@ -18,122 +18,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Acheter"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Prix : %d PO / Total : %d PO"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effet : %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Stop"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Vendre"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Annuler"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "Confirmer la suppression du personnage"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Choix du personnage"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Annuler"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Nouveau"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Précédent"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Suivant"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nom : %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Argent : %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Création du personnage"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Nom :"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Couleur des cheveux"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Coiffure :"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Créer"
 
@@ -147,6 +156,225 @@ msgstr "Choix du personnage"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Serveur :"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Oui"
@@ -155,7 +383,7 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Connexion..."
 
@@ -163,11 +391,20 @@ msgstr "Connexion..."
 msgid "Equipment"
 msgstr "Équipement"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventaire"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Utiliser"
 
@@ -193,31 +430,27 @@ msgstr "Retirer"
 msgid "Equip"
 msgstr "Équiper"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Choisissez le nombre d'objets à troquer."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Choisissez le nombre d'objets à lâcher."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Connexion"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Serveur :"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr "Se souvenir du nom d'utilisateur"
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "S'inscrire"
 
@@ -225,7 +458,7 @@ msgstr "S'inscrire"
 msgid "Status"
 msgstr "Statut"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Compétences"
 
@@ -233,7 +466,7 @@ msgstr "Compétences"
 msgid "Shortcut"
 msgstr "Raccourci"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Configuration"
 
@@ -326,14 +559,10 @@ msgstr "Le mot de passe doit faire moins de %d caractères."
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe ne correspondent pas."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Erreur"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Vendre"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Son"
@@ -394,6 +623,64 @@ msgstr "Stop"
 msgid "Rotate the stick"
 msgstr "Tourner le joystick"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Supprimer"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Nom :"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Plein écran"
@@ -470,6 +757,110 @@ msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Niveau : %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Argent : %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Statut"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Attaque %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Défense %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Attaque %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Défense %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Force :"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Agilité :"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitalité :"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Intelligence :"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Dextérité :"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Ajouter"
@@ -487,10 +878,43 @@ msgstr "Vous obtenez %d PO."
 msgid "You give:"
 msgstr "Vous donnez :"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Connexion..."
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Gestion du compte et du personnage"
 
@@ -506,21 +930,6 @@ msgstr ""
 #~ msgid "Account: %s"
 #~ msgstr "Compte: %s"
 
-#~ msgid "Strength:"
-#~ msgstr "Force :"
-
-#~ msgid "Agility:"
-#~ msgstr "Agilité :"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Dextérité :"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitalité :"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligence :"
-
 #~ msgid "Willpower:"
 #~ msgstr "Volonté :"
 
@@ -584,12 +993,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Changer"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Attaque %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Défense %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "PV %+d"
 
diff --git a/po/he.po b/po/he.po
index 0b78dda9..87766812 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-10-20 00:23+0000\n"
 "Last-Translator: Ddorda <d.dorda@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -17,123 +17,132 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "קנה"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "מחיר: %d זהב / סה\"כ %d זהב"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "יציאה"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "תיאור: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "השפעה: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "עצור"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "מכר"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "ביטול"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "אשר מחיקת שחקן"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 #, fuzzy
 msgid "Select Character"
 msgstr "צור שחקן"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "אישור"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "ביטול"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "חדש"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "מחק"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "הקודם"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "הבא"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "שם: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "רמה: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "רמה: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "זהב: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "צור שחקן"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "שם:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "צבע שיער:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "תיספורת:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "צור"
 
@@ -147,6 +156,225 @@ msgstr "החלף שרת"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "שרת:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "כן"
@@ -155,7 +383,7 @@ msgstr "כן"
 msgid "No"
 msgstr "לא"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "מתחבר..."
 
@@ -163,11 +391,20 @@ msgstr "מתחבר..."
 msgid "Equipment"
 msgstr "ציוד"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "ציוד"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "השתמש"
 
@@ -193,31 +430,27 @@ msgstr "הורד"
 msgid "Equip"
 msgstr "החזק"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "בחר כמות חפצים לסחור."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "בחר כמות חפצים להשליך."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "התחברות"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "שרת:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr "זכור שם משתמש"
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "הרשם"
 
@@ -225,7 +458,7 @@ msgstr "הרשם"
 msgid "Status"
 msgstr "מצב"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "כישורים"
 
@@ -233,7 +466,7 @@ msgstr "כישורים"
 msgid "Shortcut"
 msgstr "קיצור-דרך"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "הגדרות"
 
@@ -326,14 +559,10 @@ msgstr "הסיסמה חייבת להכיל פחות מ-%d תוים."
 msgid "Passwords do not match."
 msgstr "הסיסמאות אינן תואמות."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "שגיאה"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "מכר"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "צליל"
@@ -394,6 +623,64 @@ msgstr "עצור"
 msgid "Rotate the stick"
 msgstr "סובב את המקל"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "מחק"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "שם:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "מסך מלא"
@@ -468,6 +755,110 @@ msgstr "משנה OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "אישור שינויים עבור OpenGL דורש איתחול."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "רמה: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "זהב: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "מצב"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "התקפה %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "הגנה %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "התקפה %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "הגנה %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "עוצמה:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "זריזות:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "חיוניות:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "תבונה:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "מיומנות:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "הוסף"
@@ -485,10 +876,43 @@ msgstr "אתה מקבל %d זהב."
 msgid "You give:"
 msgstr "אתה נותן:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "מתחבר..."
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "ניהול משתמש ושחקן"
 
@@ -504,21 +928,6 @@ msgstr ""
 #~ msgid "Account: %s"
 #~ msgstr "משתמש: %s"
 
-#~ msgid "Strength:"
-#~ msgstr "עוצמה:"
-
-#~ msgid "Agility:"
-#~ msgstr "זריזות:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "מיומנות:"
-
-#~ msgid "Vitality:"
-#~ msgstr "חיוניות:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "תבונה:"
-
 #~ msgid "Willpower:"
 #~ msgstr "כח רצון:"
 
@@ -579,12 +988,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "שנה"
 
-#~ msgid "Attack %+d"
-#~ msgstr "התקפה %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "הגנה %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/hr.po b/po/hr.po
index 70fabbce..cef7cc6f 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-12-28 23:36+0000\n"
 "Last-Translator: Dino Paskvan <dpaskvan@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -17,123 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Kupi"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cijena: %d zlatnika / Ukupno: %d zlatnika"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Izlaz"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Učinak: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+msgid "Shop"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Poništi"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "Potvrdi Brisanje Lika"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Da li ste sigurni da želite obrisati ovog lika?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 #, fuzzy
 msgid "Select Character"
 msgstr "Stvori Lika"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "U redu"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Poništi"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Novi"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Prethodni"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Slijedeći"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Ime: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Novac: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Stvori Lika"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Boja kose:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Frizura:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Stvori"
 
@@ -146,6 +154,225 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr ""
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Da"
@@ -154,7 +381,7 @@ msgstr "Da"
 msgid "No"
 msgstr "Ne"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Spajanje..."
 
@@ -162,11 +389,20 @@ msgstr "Spajanje..."
 msgid "Equipment"
 msgstr "Oprema"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Zalihe"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Upotrijebi"
 
@@ -192,31 +428,27 @@ msgstr "Skini opremu"
 msgid "Equip"
 msgstr "Opremi"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Odaberi količinu predmeta za razmjenu."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Odaberi količinu predmeta za ispuštanje."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Korisničko ime"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Lozinka"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr ""
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr "Zapamti korisničko ime"
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registriraj se"
 
@@ -224,7 +456,7 @@ msgstr "Registriraj se"
 msgid "Status"
 msgstr "Stanje"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Vještine"
 
@@ -232,7 +464,7 @@ msgstr "Vještine"
 msgid "Shortcut"
 msgstr "Kratica"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Podešavanje"
 
@@ -325,14 +557,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Greška"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr ""
@@ -393,6 +621,64 @@ msgstr ""
 msgid "Rotate the stick"
 msgstr ""
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Obriši"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Ime:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr ""
@@ -467,6 +753,106 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Nivo: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Novac: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Stanje"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+msgid "Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:133
+msgid "Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:134
+msgid "M.Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:135
+msgid "M.Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Snaga:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Okretnost:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitalnost:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Inteligencija:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Spretnost:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
@@ -484,10 +870,43 @@ msgstr ""
 msgid "You give:"
 msgstr ""
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Spajanje..."
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Upravljanje Računom i Likovima"
 
@@ -503,21 +922,6 @@ msgstr ""
 #~ msgid "Account: %s"
 #~ msgstr "Korisnički račun: %s"
 
-#~ msgid "Strength:"
-#~ msgstr "Snaga:"
-
-#~ msgid "Agility:"
-#~ msgstr "Okretnost:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Spretnost:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitalnost:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Inteligencija:"
-
 #~ msgid "Willpower:"
 #~ msgstr "Snaga volje:"
 
diff --git a/po/id.po b/po/id.po
index c470df15..6f2dda71 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-03-26 09:11+0000\n"
 "Last-Translator: ActiveFile <activefile@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Beli"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Harga: %d GP / Jumlah: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Keluar"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Deskripsi: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efek: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Berhenti"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Jual"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Batal"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Pilih Karakter"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Batal"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Buat baru"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Berikutnya"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nama: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Uang: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Buat Karakter"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Nama:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Warna Rambut:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Gaya Rambut:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Buat"
 
@@ -146,6 +155,225 @@ msgstr "Pilih Karakter"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Ya"
@@ -154,7 +382,7 @@ msgstr "Ya"
 msgid "No"
 msgstr "Tidak"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Menyambung..."
 
@@ -162,11 +390,20 @@ msgstr "Menyambung..."
 msgid "Equipment"
 msgstr "Perlengkapan"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventaris"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Gunakan"
 
@@ -192,31 +429,27 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Pilih jumlah item yang mau di perdagangkan"
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Pilih jumlah item yang mau di buang"
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Kata Sandi:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Mendaftar"
 
@@ -224,7 +457,7 @@ msgstr "Mendaftar"
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Keahlian"
 
@@ -232,7 +465,7 @@ msgstr "Keahlian"
 msgid "Shortcut"
 msgstr "Tombol Singkat"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Atur"
 
@@ -325,14 +558,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr "Kata sandi tidak sama."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Jual"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Suara"
@@ -393,6 +622,64 @@ msgstr "Berhenti"
 msgid "Rotate the stick"
 msgstr "Memutar tongkat"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Hapus"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Nama:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Layar penuh"
@@ -467,6 +754,110 @@ msgstr "Mengubah OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Tingkatan: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Uang: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Status"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Serangan %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Pertahanan %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Serangan %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Pertahanan %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Kekuatan"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Daya/Tenaga Hidup"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Daya/Tenaga Hidup"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Kecerdasan"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Ketangkasan"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Tambah"
@@ -484,24 +875,45 @@ msgstr "Anda mendapatkan %d GP."
 msgid "You give:"
 msgstr "Anda memberikan:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "Tidak terdaftar"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Strength:"
-#~ msgstr "Kekuatan"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Menyambung..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "Ketangkasan"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Daya/Tenaga Hidup"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "Kecerdasan"
+#~ msgid "Unregister"
+#~ msgstr "Tidak terdaftar"
 
 #~ msgid "Willpower:"
 #~ msgstr "Ketekunan"
@@ -554,12 +966,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Ubah"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Serangan %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Pertahanan %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/it.po b/po/it.po
index 3f3cd860..a86caec2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2007-12-03 01:45+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Italian\n"
@@ -19,122 +19,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Compra"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Prezzo: %d GP / Totale: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Esci"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descrizione : %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effetto : %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Ferma"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Vendi"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Cancella"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Sei sicuro di voler cancellare questo personaggio?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Scelta Personaggio"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Cancella"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Nuovo"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Precedente"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Prossimo"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nome : %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Livello: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Livello: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Monete: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Crea Personaggio"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Nome :"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Colore Capelli"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Stile Capelli:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Create"
 
@@ -148,6 +157,225 @@ msgstr "Scelta Personaggio"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Si"
@@ -156,7 +384,7 @@ msgstr "Si"
 msgid "No"
 msgstr "No"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Connessione..."
 
@@ -164,11 +392,20 @@ msgstr "Connessione..."
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventario"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Usa"
 
@@ -194,31 +431,27 @@ msgstr "Rimuovi"
 msgid "Equip"
 msgstr "Equipaggia"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Seleziona la quantità di oggetti da scambiare."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Seleziona la quantità di oggetti da lasciare."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Autenticazione"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registra"
 
@@ -226,7 +459,7 @@ msgstr "Registra"
 msgid "Status"
 msgstr "Stato"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Abilità"
 
@@ -234,7 +467,7 @@ msgstr "Abilità"
 msgid "Shortcut"
 msgstr "Scorciatoia"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Impostazioni"
 
@@ -327,14 +560,10 @@ msgstr "La password deve contenere meno di %d caratteri."
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Errore"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Vendi"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Suono"
@@ -395,6 +624,64 @@ msgstr "Ferma"
 msgid "Rotate the stick"
 msgstr "Ruota la manopola"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Elimina"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Nome :"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Schermo intero"
@@ -469,6 +756,110 @@ msgstr "Modifica OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Livello: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Monete: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Stato"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Attacco %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Difesa %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Attacco %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Difesa %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Forza:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Agilità:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitalità:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Intelligenza:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Destrezza:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Aggiungi"
@@ -486,27 +877,45 @@ msgstr "Ottieni %d GP."
 msgid "You give:"
 msgstr "Dai:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "Cancella registrazione"
-
-#~ msgid "Strength:"
-#~ msgstr "Forza:"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "Agilità:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Connessione..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "Destrezza:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Vitalità:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligenza:"
+#~ msgid "Unregister"
+#~ msgstr "Cancella registrazione"
 
 #~ msgid "Willpower:"
 #~ msgstr "Volontà:"
@@ -559,12 +968,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Cambia"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Attacco %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Difesa %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "PF %+d"
 
diff --git a/po/ja.po b/po/ja.po
index 9f3ee5a3..bd629cd2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-06-28 16:27+0000\n"
 "Last-Translator: fate <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -17,122 +17,130 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "買う"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "価格: %d GP / 合計: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "終了"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "名状: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "効用: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+msgid "Shop"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "取消"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "このキャラは消してもいいですか?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "キャラを選択"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "了解"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "取消"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "新規"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "削除"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "前へ"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "次へ"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "名前: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "レベル: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "GP: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "キャラを作成"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "名前:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "髪の色："
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "髪型："
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "作成"
 
@@ -146,6 +154,225 @@ msgstr "キャラを選択"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "サーバ:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "はい"
@@ -154,7 +381,7 @@ msgstr "はい"
 msgid "No"
 msgstr "いいえ"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "接続しています..."
 
@@ -162,11 +389,20 @@ msgstr "接続しています..."
 msgid "Equipment"
 msgstr ""
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "使う"
 
@@ -192,31 +428,27 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "ログイン"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "パスワード:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "サーバ:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr ""
 
@@ -224,7 +456,7 @@ msgstr ""
 msgid "Status"
 msgstr "状態"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr ""
 
@@ -232,7 +464,7 @@ msgstr ""
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "セットアップ"
 
@@ -325,14 +557,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr "パスワードが一致していません。"
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "エラー"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr ""
@@ -393,6 +621,64 @@ msgstr ""
 msgid "Rotate the stick"
 msgstr ""
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "削除"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "名前:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr ""
@@ -467,6 +753,106 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "レベル: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "GP: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "状態"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+msgid "Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:133
+msgid "Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:134
+msgid "M.Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:135
+msgid "M.Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "筋力:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "素早さ:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "体力:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "知性:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "敏捷:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
@@ -484,27 +870,45 @@ msgstr ""
 msgid "You give:"
 msgstr ""
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "登録削除"
-
-#~ msgid "Strength:"
-#~ msgstr "筋力:"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "素早さ:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "接続しています..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "敏捷:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "体力:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "知性:"
+#~ msgid "Unregister"
+#~ msgstr "登録削除"
 
 #~ msgid "Willpower:"
 #~ msgstr "精神:"
diff --git a/po/nl.po b/po/nl.po
index 3d8aaf75..c2700ada 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-10-10 00:04+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Dutch\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Kopen"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beschrijving: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effect: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Stoppen"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Kies Personage"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Oké"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Nieuw"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Vorige"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Volgende"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Naam: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Geld: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Personage Aanmaken"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Haarkleur:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Haarstijl:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -146,6 +155,225 @@ msgstr "Kies Personage"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Ja"
@@ -154,7 +382,7 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nee"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Verbinden..."
 
@@ -162,11 +390,20 @@ msgstr "Verbinden..."
 msgid "Equipment"
 msgstr "Uitrusting"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventaris"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Gebruiken"
 
@@ -192,31 +429,27 @@ msgstr "Afdoen"
 msgid "Equip"
 msgstr "Uitrusten"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal exemplaren om te verhandelen"
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal exemplaren om neer te leggen"
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Inloggen"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Wachtword:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Aanmelden"
 
@@ -224,7 +457,7 @@ msgstr "Aanmelden"
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Vaardigheden"
 
@@ -232,7 +465,7 @@ msgstr "Vaardigheden"
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Configureren"
 
@@ -325,14 +558,10 @@ msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Fout"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Geluid"
@@ -393,6 +622,64 @@ msgstr "Stoppen"
 msgid "Rotate the stick"
 msgstr "Maak rondjes met de stick"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Verwijderen"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Naam:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Volledig scherm"
@@ -467,6 +754,106 @@ msgstr "Veranderen van OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Level: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Geld: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Status"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+msgid "Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:133
+msgid "Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:134
+msgid "M.Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:135
+msgid "M.Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Sterkte:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Agiliteit:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitaliteit:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Intelligentie:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Dexteriteit:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
@@ -484,27 +871,45 @@ msgstr ""
 msgid "You give:"
 msgstr "Je geeft:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "Registreren"
-
-#~ msgid "Strength:"
-#~ msgstr "Sterkte:"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "Agiliteit:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Verbinden..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "Dexteriteit:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Vitaliteit:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligentie:"
+#~ msgid "Unregister"
+#~ msgstr "Registreren"
 
 #~ msgid "Willpower:"
 #~ msgstr "Wilskracht:"
diff --git a/po/pl.po b/po/pl.po
index 114ba4fa..46cee40e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-10-10 05:26+0000\n"
 "Last-Translator: Michał Trzebiatowski <Unknown>\n"
 "Language-Team: <pl@li.org>\n"
@@ -19,122 +19,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Kup"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cena: %d GP / Razem: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Wyjdź"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efekt: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Zatrzymaj"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Sprzedaj"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Wybierz postać"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Nowa"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Następny"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Imię: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Poziom: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Poziom: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Pieniądze: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Stwórz postać"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Imię:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Kolor włosów:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Fryzura:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Stwórz"
 
@@ -148,6 +157,225 @@ msgstr "Wybierz postać"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Serwer:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Tak"
@@ -156,7 +384,7 @@ msgstr "Tak"
 msgid "No"
 msgstr "Nie"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Łączenie..."
 
@@ -164,11 +392,20 @@ msgstr "Łączenie..."
 msgid "Equipment"
 msgstr "Ekwipunek"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inwentarz"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Użyj"
 
@@ -194,31 +431,27 @@ msgstr "Zdejmij"
 msgid "Equip"
 msgstr "Załóż"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Wybierz ilość przedmiotów do wymiany."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Wybierz ilość przedmiotów do upuszczenia."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Użytkownik"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Hasło:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Serwer:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Rejestruj"
 
@@ -226,7 +459,7 @@ msgstr "Rejestruj"
 msgid "Status"
 msgstr "Stan"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Zdolności"
 
@@ -234,7 +467,7 @@ msgstr "Zdolności"
 msgid "Shortcut"
 msgstr "Skrót"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Konfiguracja"
 
@@ -327,14 +560,10 @@ msgstr "Hasło nie może mieć więcej jak %d znaków."
 msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Błąd"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Sprzedaj"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Dźwięk"
@@ -395,6 +624,64 @@ msgstr "Zatrzymaj"
 msgid "Rotate the stick"
 msgstr "Obróć drążek"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Usuń"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Imię:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Pełen ekran"
@@ -470,6 +757,110 @@ msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Zastosowywanie zmian w konfiguracji OpenGL wymaga ponownego uruchomienia."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Poziom: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Pieniądze: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Stan"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Atak %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Obrona %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Atak %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Obrona %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Siła:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Zwinność:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Witalność:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Inteligencja:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Zręczność:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Dodaj"
@@ -487,30 +878,48 @@ msgstr "Otrzymujesz %d GP"
 msgid "You give:"
 msgstr "Dajesz:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "Wyrejestruj"
-
-#~ msgid "Change Password"
-#~ msgstr "Zmień hasło"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Strength:"
-#~ msgstr "Siła:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Łączenie..."
 
-#~ msgid "Agility:"
-#~ msgstr "Zwinność:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Dexterity:"
-#~ msgstr "Zręczność:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Witalność:"
+#~ msgid "Unregister"
+#~ msgstr "Wyrejestruj"
 
-#~ msgid "Intelligence:"
-#~ msgstr "Inteligencja:"
+#~ msgid "Change Password"
+#~ msgstr "Zmień hasło"
 
 #~ msgid "Willpower:"
 #~ msgstr "Siła woli:"
@@ -563,12 +972,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Zmień"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Atak %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Obrona %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "PŻ %+d"
 
diff --git a/po/pt.po b/po/pt.po
index a49fcaec..bd9630d1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-02-03 10:14+0000\n"
 "Last-Translator: Tiago Silva <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preço: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efeito: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Parar"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Vender"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem a certeza que quer apagar este personagem"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Seleccione um Personagem"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Novo"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Seguinte"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Dinheiro: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Cor de Cabelo:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Criar"
 
@@ -146,6 +155,225 @@ msgstr "Seleccione um Personagem"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Servidor:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Sim"
@@ -154,7 +382,7 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Conectando..."
 
@@ -162,11 +390,20 @@ msgstr "Conectando..."
 msgid "Equipment"
 msgstr "Equipamento"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventário"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Usar"
 
@@ -192,31 +429,27 @@ msgstr "Desequipar"
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Seleccionar a quantidade de itens a negociar."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Seleccionar a quantidade de itens a largar."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Autenticar"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Servidor:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registo"
 
@@ -224,7 +457,7 @@ msgstr "Registo"
 msgid "Status"
 msgstr "Estado"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Competências"
 
@@ -232,7 +465,7 @@ msgstr "Competências"
 msgid "Shortcut"
 msgstr "Atalho"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Configuração"
 
@@ -325,14 +558,10 @@ msgstr "A password só pode ter até %d caracteres."
 msgid "Passwords do not match."
 msgstr "As senhas não coincidem."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Erro"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Vender"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Som"
@@ -393,6 +622,64 @@ msgstr "Parar"
 msgid "Rotate the stick"
 msgstr "Rode o manipulo"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Eliminar"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Nome:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Ecrã completo"
@@ -467,6 +754,118 @@ msgstr "Mudando OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "É necessário reiniciar para as alterações ao OpenGl terem efeito."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Nível: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Dinheiro: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Estado"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr ""
+"Copy text   \t\r\n"
+"Ataque %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr ""
+"Copy text   \t\r\n"
+"Defesa %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr ""
+"Copy text   \t\r\n"
+"Ataque %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr ""
+"Copy text   \t\r\n"
+"Defesa %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Força:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Agilidade:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitalidade:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Inteligência:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Destreza:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Adicionar"
@@ -484,27 +883,45 @@ msgstr "Recebe %d GP."
 msgid "You give:"
 msgstr "Dá:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "Remover o Registo"
-
-#~ msgid "Strength:"
-#~ msgstr "Força:"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "Agilidade:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Conectando..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "Destreza:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Vitalidade:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "Inteligência:"
+#~ msgid "Unregister"
+#~ msgstr "Remover o Registo"
 
 #~ msgid "Willpower:"
 #~ msgstr "Força de Vontade:"
@@ -557,16 +974,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Modificar"
 
-#~ msgid "Attack %+d"
-#~ msgstr ""
-#~ "Copy text   \t\r\n"
-#~ "Ataque %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr ""
-#~ "Copy text   \t\r\n"
-#~ "Defesa %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b9bc6820..586cfc2d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-12-14 21:37+0000\n"
 "Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preço: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efeito: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Parar"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Vender"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "Confimar exclusão do personagem"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem certeza de que deseja excluir este personagem?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Selecionar personagem"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Novo"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Próximo"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Dinheiro: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Cor do Cabelo:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Criar"
 
@@ -146,6 +155,225 @@ msgstr "Selecionar personagem"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Servidor:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Sim"
@@ -154,7 +382,7 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Conectando..."
 
@@ -162,11 +390,20 @@ msgstr "Conectando..."
 msgid "Equipment"
 msgstr "Equipamento"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventório"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Usar"
 
@@ -192,31 +429,27 @@ msgstr "Desequipar"
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Selecionar montante de itens para negociar."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Selecionar montante de itens para descartar."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Servidor:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr "Lembrar nome de usuário"
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registrar"
 
@@ -224,7 +457,7 @@ msgstr "Registrar"
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -232,7 +465,7 @@ msgstr "Habilidades"
 msgid "Shortcut"
 msgstr "Atalho"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Configurar"
 
@@ -325,14 +558,10 @@ msgstr "A senha deve ser menor que %d caracteres."
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Erro"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Vender"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Som"
@@ -393,6 +622,64 @@ msgstr "Parar"
 msgid "Rotate the stick"
 msgstr ""
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Excluir"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Nome:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Tela cheia"
@@ -467,6 +754,110 @@ msgstr "Trocando OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicando mudança a OpenGL requer reiniciar o jogo."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Nível: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Dinheiro: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Status"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Ataque %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Defesa %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Ataque %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Defesa %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Força:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Agilidade:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitalidade:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Inteligência:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Destreza:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Adicionar"
@@ -484,10 +875,43 @@ msgstr "Voc pegou %d GP."
 msgid "You give:"
 msgstr "Você dá:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Conectando..."
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Gerenciamento de Conta e Personagem"
 
@@ -503,21 +927,6 @@ msgstr ""
 #~ msgid "Account: %s"
 #~ msgstr "Conta: %s"
 
-#~ msgid "Strength:"
-#~ msgstr "Força:"
-
-#~ msgid "Agility:"
-#~ msgstr "Agilidade:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Destreza:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitalidade:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Inteligência:"
-
 #~ msgid "Willpower:"
 #~ msgstr "Força de Vontade:"
 
@@ -581,12 +990,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Mudar"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Ataque %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Defesa %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/ru.po b/po/ru.po
index 2eaa1a05..94be1f08 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-01-08 11:50+0000\n"
 "Last-Translator: idle sign <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Купить"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Стоимость: %d GP / Всегоl: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Выход"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Эффект: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Стоп"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Продать"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Отмена"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Вы уверены, что хотите удалить этого персонажа?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Выбор персонажа"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Отмена"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Новый"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Следующий"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Имя: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Деньги: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Создать персонажа"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Имя:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Цвет волос:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Стрижка:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Создать"
 
@@ -146,6 +155,225 @@ msgstr "Выбор персонажа"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Сервер:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Да"
@@ -154,7 +382,7 @@ msgstr "Да"
 msgid "No"
 msgstr "Нет"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Соединение..."
 
@@ -162,11 +390,20 @@ msgstr "Соединение..."
 msgid "Equipment"
 msgstr "Снаряжение"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Инвентарь"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Использовать"
 
@@ -192,31 +429,27 @@ msgstr "Снять"
 msgid "Equip"
 msgstr "Надеть"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Сколько предметов продать."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Сколько предметов сбросить."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Вход"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Сервер:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Зарегистрироваться"
 
@@ -224,7 +457,7 @@ msgstr "Зарегистрироваться"
 msgid "Status"
 msgstr "Состояние"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Умения"
 
@@ -232,7 +465,7 @@ msgstr "Умения"
 msgid "Shortcut"
 msgstr "Клавиша"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Настройка"
 
@@ -325,14 +558,10 @@ msgstr "Пароль не должен содержать более %d симв
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Продать"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Звук"
@@ -393,6 +622,64 @@ msgstr "Стоп"
 msgid "Rotate the stick"
 msgstr "Вращайте рукоять"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Удалить"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Имя:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "На полный экран"
@@ -467,6 +754,110 @@ msgstr "Переключение на OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Переход к OpenGL требует перезагрузки игры."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Уровень: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Деньги: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Состояние"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Атака %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Защита %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Атака %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Защита %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Сила:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Выносливость:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Живучесть:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Интеллект:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Ловкость:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Добавить"
@@ -484,27 +875,45 @@ msgstr "Вы получили %d GP."
 msgid "You give:"
 msgstr "Вы отдаете:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "Удалить регистрацию"
-
-#~ msgid "Strength:"
-#~ msgstr "Сила:"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "Выносливость:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Соединение..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "Ловкость:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Живучесть:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "Интеллект:"
+#~ msgid "Unregister"
+#~ msgstr "Удалить регистрацию"
 
 #~ msgid "Willpower:"
 #~ msgstr "Сила волиr:"
@@ -557,12 +966,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Сменить"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Атака %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Защита %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/sk.po b/po/sk.po
index 682fa81a..453c67dc 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-12-30 14:07+0000\n"
 "Last-Translator: TomasKovacik <nail@nodomain.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -17,123 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Kúpiť"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cena: %d GP / Spolu: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+msgid "Shop"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Zrušiť"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "Potvrdte zmazanie postavy"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 #, fuzzy
 msgid "Select Character"
 msgstr "Vytvoriť postavu"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ano"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Zrušiť"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Nový"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Vymazať"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Predchádzajúci"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Nasledujúci"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Peniaze: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Vytvoriť postavu"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Meno"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Farba vlasov:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Štýl vlasov:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Vytvoriť"
 
@@ -146,6 +154,225 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr ""
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr ""
@@ -154,7 +381,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr ""
 
@@ -162,11 +389,20 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr ""
 
@@ -192,31 +428,27 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr ""
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr ""
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr ""
 
@@ -224,7 +456,7 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr ""
 
@@ -232,7 +464,7 @@ msgstr ""
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr ""
 
@@ -324,14 +556,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr ""
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr ""
@@ -392,6 +620,64 @@ msgstr ""
 msgid "Rotate the stick"
 msgstr ""
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Vymazať"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Meno"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr ""
@@ -466,6 +752,102 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Level: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Peniaze: %d"
+
+#: src/gui/status.cpp:127
+msgid "Stats"
+msgstr ""
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+msgid "Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:133
+msgid "Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:134
+msgid "M.Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:135
+msgid "M.Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Sila:"
+
+#: src/gui/status.cpp:283
+msgid "Agility"
+msgstr ""
+
+#: src/gui/status.cpp:284
+msgid "Vitality"
+msgstr ""
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Inteligencia:"
+
+#: src/gui/status.cpp:286
+msgid "Dexterity"
+msgstr ""
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
@@ -483,10 +865,42 @@ msgstr ""
 msgid "You give:"
 msgstr ""
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+msgid "Connecting to map server..."
+msgstr ""
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Účet a správa postáv"
 
@@ -501,9 +915,3 @@ msgstr ""
 
 #~ msgid "Account: %s"
 #~ msgstr "Účet: %s"
-
-#~ msgid "Strength:"
-#~ msgstr "Sila:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Inteligencia:"
diff --git a/po/sv.po b/po/sv.po
index 0d029cf5..85e37a50 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-05-07 19:04+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Köp"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Pris: %d GP / Totalt: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Stopp"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Sälj"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Är du säker på att du vill ta bort den här karaktären?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Välj karaktär"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Ny"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Föregående"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Nästa"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Namn: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Pengar: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Skapa karaktär"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Namn:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Hårfärg:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Frisyr:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Skapa"
 
@@ -146,6 +155,225 @@ msgstr "Välj karaktär"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Ja"
@@ -154,7 +382,7 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Ansluter..."
 
@@ -162,11 +390,20 @@ msgstr "Ansluter..."
 msgid "Equipment"
 msgstr "Utrustning"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventarium"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Använd"
 
@@ -192,31 +429,27 @@ msgstr "Avrusta"
 msgid "Equip"
 msgstr "Utrusta"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Välj antal föremål att handla med."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Välj antal föremål att släppa."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Användarnamn"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registrera"
 
@@ -224,7 +457,7 @@ msgstr "Registrera"
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Färdigheter"
 
@@ -232,7 +465,7 @@ msgstr "Färdigheter"
 msgid "Shortcut"
 msgstr "Genväg"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Inställningar"
 
@@ -325,14 +558,10 @@ msgstr "Lösenordet måste vara kortare än %d tecken."
 msgid "Passwords do not match."
 msgstr "Lösenorden stämmer inte överens."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Fel"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Sälj"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Ljud"
@@ -393,6 +622,64 @@ msgstr "Stopp"
 msgid "Rotate the stick"
 msgstr "Rotera spaken"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Ta bort"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Namn:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Helskärm"
@@ -467,6 +754,110 @@ msgstr "Ändrar OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ändringar i OpenGL kräver omstart."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Nivå: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Pengar: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Status"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Attack %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Försvar %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Attack %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Försvar %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Styrka:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Smidighet:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Hälsa:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Intelligens:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Skicklighet:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Lägg till"
@@ -484,27 +875,45 @@ msgstr "Du får %d GP."
 msgid "You give:"
 msgstr "Du ger:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "Avregistrera"
-
-#~ msgid "Strength:"
-#~ msgstr "Styrka:"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "Smidighet:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Ansluter..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "Skicklighet:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Hälsa:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligens:"
+#~ msgid "Unregister"
+#~ msgstr "Avregistrera"
 
 #~ msgid "Willpower:"
 #~ msgstr "Viljestyrka:"
@@ -557,12 +966,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Ändra"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Attack %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Försvar %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "Hälsa %+d"
 
diff --git a/po/th.po b/po/th.po
index beaa5a31..e2ee2ab5 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-11-25 06:16+0000\n"
 "Last-Translator: Tharawut Paripaiboon <Unknown>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -17,123 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "ซื้อ"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "ราคา: %d GP / ทั้งหมด: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "ออก"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+msgid "Shop"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "ยกเลิก"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "ยืนยันการลบตัวละคร"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 #, fuzzy
 msgid "Select Character"
 msgstr "สร้างตัวละคร"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "ตกลง"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "ยกเลิก"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "สร้างใหม่"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "ลบทิ้ง"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "ก่อนหน้า"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "ถัดไป"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "ชื่อ: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "สร้างตัวละคร"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "ชื่อ:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "สีผม:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "ทรงผม:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "สร้าง"
 
@@ -146,6 +154,225 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr ""
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "ใช่"
@@ -154,7 +381,7 @@ msgstr "ใช่"
 msgid "No"
 msgstr "ไม่"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "กำลังเชื่อมต่อ..."
 
@@ -162,11 +389,20 @@ msgstr "กำลังเชื่อมต่อ..."
 msgid "Equipment"
 msgstr ""
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "ใช้"
 
@@ -192,31 +428,27 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "เข้าระบบ"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr ""
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "สมัครสมาชิก"
 
@@ -224,7 +456,7 @@ msgstr "สมัครสมาชิก"
 msgid "Status"
 msgstr "สถานะ"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr ""
 
@@ -232,7 +464,7 @@ msgstr ""
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "ตั้งค่า"
 
@@ -324,14 +556,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "ผิดพลาด"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr ""
@@ -392,6 +620,64 @@ msgstr ""
 msgid "Rotate the stick"
 msgstr ""
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "ลบทิ้ง"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "ชื่อ:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr ""
@@ -466,6 +752,106 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, c-format
+msgid "Money: %d GP"
+msgstr ""
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "สถานะ"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+msgid "Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:133
+msgid "Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:134
+msgid "M.Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:135
+msgid "M.Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Strength:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Agility:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitality:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Intelligence:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Dexterity:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
@@ -483,30 +869,48 @@ msgstr ""
 msgid "You give:"
 msgstr ""
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Change Password"
-#~ msgstr "เปลี่ยนรหัสผ่าน"
-
-#~ msgid "Change Email Address"
-#~ msgstr "เปลี่ยนที่อยู่ Email"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Strength:"
-#~ msgstr "Strength:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "กำลังเชื่อมต่อ..."
 
-#~ msgid "Agility:"
-#~ msgstr "Agility:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Dexterity:"
-#~ msgstr "Dexterity:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Vitality:"
+#~ msgid "Change Password"
+#~ msgstr "เปลี่ยนรหัสผ่าน"
 
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligence:"
+#~ msgid "Change Email Address"
+#~ msgstr "เปลี่ยนที่อยู่ Email"
 
 #~ msgid "Willpower:"
 #~ msgstr "Willpower:"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1dc7a3f0..031fde9c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-09-17 14:41+0000\n"
 "Last-Translator: luojie-dune <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "买"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "价格：%d GP/总数：%d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "退出"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "描述：%s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "影响: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "停止"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "出售"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "取消"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "你确定想删除这个较色"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "选择较色"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "OK"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "取消"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "新建"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "删除"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "上一页"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "下一页"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "名字：%s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "金钱：%d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "创建角色"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "名称"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "头发颜色"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "发型"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "建立"
 
@@ -146,6 +155,225 @@ msgstr "选择较色"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "服务器："
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "是"
@@ -154,7 +382,7 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "连接中..."
 
@@ -162,11 +390,20 @@ msgstr "连接中..."
 msgid "Equipment"
 msgstr "装备"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "清单"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "使用"
 
@@ -192,31 +429,27 @@ msgstr "卸下装备"
 msgid "Equip"
 msgstr "装备"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "请选择交易的物品数量"
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "请选择丢弃的物品数量"
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "登陆"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "密码："
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "服务器："
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "注册"
 
@@ -224,7 +457,7 @@ msgstr "注册"
 msgid "Status"
 msgstr "状态"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "技能"
 
@@ -232,7 +465,7 @@ msgstr "技能"
 msgid "Shortcut"
 msgstr "快捷键"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "安装"
 
@@ -325,14 +558,10 @@ msgstr "密码不能少于%d个字符"
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "错误"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "出售"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "声音"
@@ -393,6 +622,64 @@ msgstr "停止"
 msgid "Rotate the stick"
 msgstr "旋转手柄"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "删除"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "名称"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "全屏"
@@ -467,6 +754,110 @@ msgstr "改变成OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "等级：%d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "金钱：%d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "状态"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "攻击 %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "防护 %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "攻击 %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "防护 %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "力量"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "敏捷:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "体力:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "智力:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "智慧:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "添加"
@@ -484,27 +875,45 @@ msgstr "你得到%d GP."
 msgid "You give:"
 msgstr "你得到："
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "注销"
-
-#~ msgid "Strength:"
-#~ msgstr "力量"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "敏捷:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "连接中..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "智慧:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "体力:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "智力:"
+#~ msgid "Unregister"
+#~ msgstr "注销"
 
 #~ msgid "Willpower:"
 #~ msgstr "意志力:"
@@ -557,12 +966,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "改变"
 
-#~ msgid "Attack %+d"
-#~ msgstr "攻击 %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "防护 %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
-- 
cgit v1.2.3-70-g09d2


From 2f7fdae1ac1afef86e2a8a856964e7415593b206 Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <bertram@cegetel.net>
Date: Fri, 11 Apr 2008 23:57:58 +0000
Subject: Removed the rhombs around the radio buttons.

(cherry picked from commit 2fd5b9e2fea5f95f54e543011e2e8fb70f0b037f)
---
 src/gui/radiobutton.cpp | 19 +++++++++++++++++++
 src/gui/radiobutton.h   |  6 ++++++
 2 files changed, 25 insertions(+)

diff --git a/src/gui/radiobutton.cpp b/src/gui/radiobutton.cpp
index 5f929e62..619ec84f 100644
--- a/src/gui/radiobutton.cpp
+++ b/src/gui/radiobutton.cpp
@@ -81,3 +81,22 @@ void RadioButton::drawBox(gcn::Graphics* graphics)
         static_cast<Graphics*>(graphics)->drawImage(box, 2, 2);
     }
 }
+
+void RadioButton::draw(gcn::Graphics* graphics)
+{
+
+    graphics->pushClipArea(gcn::Rectangle(1,
+                                    1,
+                                    getWidth() - 1,
+                                    getHeight() - 1));
+
+    drawBox(graphics);
+
+    graphics->popClipArea();
+
+    graphics->setFont(getFont());
+    graphics->setColor(getForegroundColor());
+
+    int h = getHeight() + getHeight() / 2;
+    graphics->drawText(getCaption(), h - 2, 0);
+}
diff --git a/src/gui/radiobutton.h b/src/gui/radiobutton.h
index 8fb6d832..ef4c128c 100644
--- a/src/gui/radiobutton.h
+++ b/src/gui/radiobutton.h
@@ -49,6 +49,12 @@ class RadioButton : public gcn::RadioButton {
          */
         void drawBox(gcn::Graphics* graphics);
 
+        /**
+         * Implementation of the draw methods.
+         * Thus, avoiding the rhomb around the radio button.
+         */
+        void draw(gcn::Graphics* graphics);
+
     private:
         static int instances;
         static Image *radioNormal;
-- 
cgit v1.2.3-70-g09d2


From 6c806db4367e161d915196cd4638a44a941fca20 Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@gmail.com>
Date: Wed, 14 Nov 2007 10:07:55 +0000
Subject: Improved item amount dialog box.

(cherry picked from commit 69c147510bce9aa24be5ddcb3d050a5d52e3abe7)

Conflicts:

	src/gui/item_amount.cpp
---
 src/gui/inttextbox.cpp | 22 +++++++++++-----------
 src/gui/inttextbox.h   |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/gui/inttextbox.cpp b/src/gui/inttextbox.cpp
index 858a3fcb..df8cf24e 100644
--- a/src/gui/inttextbox.cpp
+++ b/src/gui/inttextbox.cpp
@@ -19,9 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/key.hpp>
-
 #include "inttextbox.h"
+#include "sdlinput.h"
 
 #include "../utils/tostring.h"
 
@@ -35,17 +34,20 @@ IntTextBox::keyPressed(gcn::KeyEvent &event)
 {
     const gcn::Key &key = event.getKey();
 
-    if (key.isNumber() || key.getValue() == gcn::Key::BACKSPACE
-        || key.getValue() == gcn::Key::DELETE)
+    if (key.getValue() == Key::BACKSPACE ||
+        key.getValue() == Key::DELETE)
     {
-        gcn::TextBox::keyPressed(event);
+        setText(std::string());
+        event.consume();
     }
 
-    std::stringstream s(gcn::TextBox::getText());
+    if (!key.isNumber()) return;
+    TextField::keyPressed(event);
+
+    std::istringstream s(getText());
     int i;
     s >> i;
-    if (gcn::TextBox::getText() != "")
-        setInt(i);
+    setInt(i);
 }
 
 void IntTextBox::setRange(int min, int max)
@@ -56,9 +58,7 @@ void IntTextBox::setRange(int min, int max)
 
 int IntTextBox::getInt()
 {
-    if (gcn::TextBox::getText() == "")
-        return 0;
-    return mValue;
+    return getText().empty() ? mMin : mValue;
 }
 
 void IntTextBox::setInt(int i)
diff --git a/src/gui/inttextbox.h b/src/gui/inttextbox.h
index 922ef4c5..9c6e8bf4 100644
--- a/src/gui/inttextbox.h
+++ b/src/gui/inttextbox.h
@@ -22,14 +22,14 @@
 #ifndef INTTEXTBOX_H
 #define INTTEXTBOX_H
 
-#include "textbox.h"
+#include "textfield.h"
 
 #include "../guichanfwd.h"
 
 /**
  * TextBox which only accepts numbers as input.
  */
-class IntTextBox : public TextBox
+class IntTextBox : public TextField
 {
     public:
         /**
-- 
cgit v1.2.3-70-g09d2


From bbc0fb7292460c7d383d16c25aa21bc68c06c27c Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sat, 10 Jan 2009 00:57:09 +0100
Subject: Merged comment by silene from mainline

We should probably look into fixing the thing he's talking about.
---
 src/gui/browserbox.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 8b222810..8be32ebb 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -352,6 +352,10 @@ BrowserBox::draw(gcn::Graphics *graphics)
                 char const *hyphen = "~";
                 int hyphenWidth =  font->getWidth(hyphen);
 
+                /* FIXME: This code layout makes it easy to crash remote
+                   clients by talking garbage. Forged long utf-8 characters
+                   will cause either a buffer underflow in substr or an
+                   infinite loop in the main loop. */
                 do
                 {
                     if (!forced)
-- 
cgit v1.2.3-70-g09d2


From 6a5e9a013a2bf8ca6b99c1c45b58de4d72b662ef Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 9 Jan 2009 22:07:45 -0700
Subject: Added the ability to save GM assert state to the client, as
 requested.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/chat.cpp    | 5 +++++
 src/localplayer.cpp | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index d4818504..3c569ded 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -84,6 +84,11 @@ Window(""), mNetwork(network), mTmpVisible(false)
     mReturnToggles = config.getValue("ReturnToggles", "0") == "1";
     mRecorder = new Recorder(this);
     mParty = new Party(this, mNetwork);
+
+    // If the player had @assert on in the last session, ask the server to
+    // run the @assert command for the player again. Convenience for GMs.
+    if (config.getValue(player_node->getName() + "GMassert", 0))
+        chatSend(player_node->getName(), "@assert");
 }
 
 ChatWindow::~ChatWindow()
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index fb568d20..c6ce6fc5 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -173,7 +173,8 @@ void LocalPlayer::logic()
 void LocalPlayer::setGM()
 { 
     mIsGM = !mIsGM;
-    setName(getName());  
+    setName(getName());
+    config.setValue(getName() + "GMassert", mIsGM);
 }
 
 void LocalPlayer::setName(const std::string &name)
-- 
cgit v1.2.3-70-g09d2


From 6cfd91a8f0a367946ec73f537ef4bb112f1283cc Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 9 Jan 2009 22:09:36 -0700
Subject: Fixed a potential crash in the setup window when setting whether a
 name is viewable or not, and the player doesn't exist yet.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/setup_video.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index a23f5923..afc7b1b5 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -461,7 +461,8 @@ void Setup_Video::action(const gcn::ActionEvent &event)
     {
         // Notify the local player that settings have changed for the name
         // and requires an update
-        player_node->mUpdateName = true;
+        if (player_node)
+            player_node->mUpdateName = true;
         config.setValue("showownname",
                 mNameCheckBox->isSelected() ? 1 : 0);
     }
-- 
cgit v1.2.3-70-g09d2


From f3e77c4f86e9a312f74f22d575cf1f4759701337 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 9 Jan 2009 22:18:06 -0700
Subject: Removed an unneccessary function

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/localplayer.cpp | 8 --------
 src/localplayer.h   | 2 --
 2 files changed, 10 deletions(-)

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index c6ce6fc5..7d3ff3ab 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -195,14 +195,6 @@ void LocalPlayer::setName(const std::string &name)
     }
 }
 
-void LocalPlayer::updateCoords()
-{
-    if (mName)
-    {
-        mName->adviseXY(mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET);
-    }
-}
-
 void LocalPlayer::nextStep()
 {
     if (mPath.empty())
diff --git a/src/localplayer.h b/src/localplayer.h
index 28551a22..76c810bb 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -271,8 +271,6 @@ class LocalPlayer : public Player
 
         // Load the target cursors into memory
         void initTargetCursor();
-
-        virtual void updateCoords();
 };
 
 extern LocalPlayer *player_node;
-- 
cgit v1.2.3-70-g09d2


From b19fb7a2d562931c08472794fea90a0e4c320760 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 9 Jan 2009 22:23:12 -0700
Subject: Code style cleanup

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/configuration.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/configuration.cpp b/src/configuration.cpp
index 8e80de18..a2ce4500 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -70,8 +70,7 @@ float ConfigurationObject::getValue(const std::string &key, float deflt)
     return (iter != mOptions.end()) ? atof(iter->second.c_str()) : deflt;
 }
 
-void
-ConfigurationObject::deleteList(const std::string &name)
+void ConfigurationObject::deleteList(const std::string &name)
 {
     for (ConfigurationList::const_iterator
              it = mContainerOptions[name].begin(); it != mContainerOptions[name].end(); it++)
@@ -80,8 +79,7 @@ ConfigurationObject::deleteList(const std::string &name)
     mContainerOptions[name].clear();
 }
 
-void
-ConfigurationObject::clear(void)
+void ConfigurationObject::clear(void)
 {
     for (std::map<std::string, ConfigurationList>::const_iterator
              it = mContainerOptions.begin(); it != mContainerOptions.end(); it++)
@@ -95,8 +93,7 @@ ConfigurationObject::~ConfigurationObject(void)
     clear();
 }
 
-void
-ConfigurationObject::initFromXML(xmlNodePtr parent_node)
+void ConfigurationObject::initFromXML(xmlNodePtr parent_node)
 {
     clear();
 
@@ -161,8 +158,7 @@ void Configuration::init(const std::string &filename)
     xmlFreeDoc(doc);
 }
 
-void
-ConfigurationObject::writeToXML(xmlTextWriterPtr writer)
+void ConfigurationObject::writeToXML(xmlTextWriterPtr writer)
 {
     for (OptionIterator i = mOptions.begin(); i != mOptions.end(); i++)
     {
-- 
cgit v1.2.3-70-g09d2


From d80a7f02c4e1b9f9a728364b61118cc25d872a58 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 9 Jan 2009 22:39:51 -0700
Subject: More code style cleanups

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/viewport.cpp |  6 ++----
 src/gui/viewport.h   | 36 ++++++++++++------------------------
 2 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 75b756f5..5bb29987 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -77,14 +77,12 @@ Viewport::~Viewport()
     delete mPopupMenu;
 }
 
-void
-Viewport::setMap(Map *map)
+void Viewport::setMap(Map *map)
 {
     mMap = map;
 }
 
-void
-Viewport::draw(gcn::Graphics *gcnGraphics)
+void Viewport::draw(gcn::Graphics *gcnGraphics)
 {
     static int lastTick = tick_time;
 
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 3120de91..ef8e7a38 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -62,75 +62,63 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         /**
          * Sets the map displayed by the viewport.
          */
-        void
-        setMap(Map *map);
+        void setMap(Map *map);
 
         /**
          * Draws the viewport.
          */
-        void
-        draw(gcn::Graphics *graphics);
+        void draw(gcn::Graphics *graphics);
 
         /**
          * Implements player to keep following mouse.
          */
-        void
-        logic();
+        void logic();
 
         /**
          * Toggles whether the path debug graphics are shown
          */
-        void
-        toggleDebugPath() { mShowDebugPath = !mShowDebugPath; }
+        void toggleDebugPath() { mShowDebugPath = !mShowDebugPath; }
 
         /**
          * Handles mouse press on map.
          */
-        void
-        mousePressed(gcn::MouseEvent &event);
+        void mousePressed(gcn::MouseEvent &event);
 
         /**
          * Handles mouse move on map
          */
-        void
-        mouseDragged(gcn::MouseEvent &event);
+        void mouseDragged(gcn::MouseEvent &event);
 
         /**
          * Handles mouse button release on map.
          */
-        void
-        mouseReleased(gcn::MouseEvent &event);
+        void mouseReleased(gcn::MouseEvent &event);
 
         /**
          * Shows a popup for an item.
          * TODO Find some way to get rid of Item here
          */
-        void
-        showPopup(int x, int y, Item *item);
+        void showPopup(int x, int y, Item *item);
 
         /**
          * A relevant config option changed.
          */
-        void
-        optionChanged(const std::string &name);
+        void optionChanged(const std::string &name);
 
         /**
          * Returns camera x offset in pixels.
          */
-        int
-        getCameraX() const { return (int) mPixelViewX; }
+        int getCameraX() const { return (int) mPixelViewX; }
 
         /**
          * Returns camera y offset in pixels.
          */
-        int
-        getCameraY() const { return (int) mPixelViewY; }
+        int getCameraY() const { return (int) mPixelViewY; }
 
         /**
          * Changes viewpoint by relative pixel coordinates.
          */
-        void
-        scrollBy(float x, float y) { mPixelViewX += x; mPixelViewY += y; }
+        void scrollBy(float x, float y) { mPixelViewX += x; mPixelViewY += y; }
 
     private:
         Map *mMap;                 /**< The current map. */
-- 
cgit v1.2.3-70-g09d2


From f634a2811c613d6ec43915841b37b66d54e2d4d4 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 10 Jan 2009 13:42:43 -0700
Subject: Made a few more window components use a transparency under OpenGL, as
 well as some code style cleanups in the skill dialog.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/itemshortcutcontainer.cpp |  3 +++
 src/gui/playerbox.cpp             |  2 ++
 src/gui/scrollarea.cpp            |  3 +++
 src/gui/skill.cpp                 | 15 +++++----------
 src/gui/smileycontainer.cpp       |  3 +++
 src/gui/textfield.cpp             |  2 ++
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index f0ab8274..b576e843 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -21,6 +21,7 @@
 
 #include "itemshortcutcontainer.h"
 
+#include "../configuration.h"
 #include "../graphics.h"
 #include "../inventory.h"
 #include "../item.h"
@@ -47,6 +48,8 @@ ItemShortcutContainer::ItemShortcutContainer():
     mBackgroundImg = resman->getImage("graphics/gui/item_shortcut_bgr.png");
     mMaxItems = itemShortcut->getItemCount();
 
+    mBackgroundImg->setAlpha(config.getValue("guialpha", 0.8));
+
     mBoxHeight = 42;
     mBoxWidth = 36;
 }
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index 79c5676f..e5227e5a 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -23,6 +23,7 @@
 
 #include "playerbox.h"
 
+#include "../configuration.h"
 #include "../graphics.h"
 #include "../player.h"
 
@@ -54,6 +55,7 @@ PlayerBox::PlayerBox(const Player *player):
                         bggridx[x], bggridy[y],
                         bggridx[x + 1] - bggridx[x] + 1,
                         bggridy[y + 1] - bggridy[y] + 1);
+                background.grid[a]->setAlpha(config.getValue("guialpha", 0.8));
                 a++;
             }
         }
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index 032e3f78..ba119a61 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -23,6 +23,7 @@
 
 #include "scrollarea.h"
 
+#include "../configuration.h"
 #include "../graphics.h"
 
 #include "../resources/image.h"
@@ -94,6 +95,7 @@ void ScrollArea::init()
                         bggridx[x], bggridy[y],
                         bggridx[x + 1] - bggridx[x] + 1,
                         bggridy[y + 1] - bggridy[y] + 1);
+                background.grid[a]->setAlpha(config.getValue("guialpha", 0.8));
                 a++;
             }
         }
@@ -112,6 +114,7 @@ void ScrollArea::init()
                         vsgridx[x], vsgridy[y],
                         vsgridx[x + 1] - vsgridx[x],
                         vsgridy[y + 1] - vsgridy[y]);
+                vMarker.grid[a]->setAlpha(config.getValue("guialpha", 0.8));
                 a++;
             }
         }
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 5e5782d9..2ff82030 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -58,11 +58,9 @@ public:
         update();
     }
 
-    virtual int
-    getRows(void) { return mEntriesNr; }
+    virtual int getRows(void) { return mEntriesNr; }
 
-    virtual int
-    getColumnWidth(int index)
+    virtual int getColumnWidth(int index)
     {
         switch (index) {
         case 0:  return 160;
@@ -70,14 +68,12 @@ public:
         }
     }
 
-    virtual int
-    getRowHeight(void)
+    virtual int getRowHeight(void)
     {
         return 12;
     }
 
-    virtual void
-    update(void)
+    virtual void update(void)
     {
 	static const SkillInfo fakeSkillInfo = { _("???"), false };
 
@@ -249,8 +245,7 @@ void SkillDialog::cleanList()
     mSkillList.clear();
 }
 
-static void
-initSkillinfo(void)
+static void initSkillinfo(void)
 {
     SkillInfo emptySkillInfo = { "", false };
 
diff --git a/src/gui/smileycontainer.cpp b/src/gui/smileycontainer.cpp
index afe4ce15..d221f55c 100644
--- a/src/gui/smileycontainer.cpp
+++ b/src/gui/smileycontainer.cpp
@@ -24,6 +24,7 @@
 #include <guichan/mouseinput.hpp>
 #include <guichan/selectionlistener.hpp>
 
+#include "../configuration.h"
 #include "../graphics.h"
 #include "../log.h"
 #include "../smileyshortcut.h"
@@ -51,6 +52,8 @@ SmileyContainer::SmileyContainer():
     mSelImg = resman->getImage("graphics/gui/selection.png");
     if (!mSelImg) logger->error(_("Unable to load selection.png"));
 
+    mSelImg->setAlpha(config.getValue("guialpha", 0.8));
+
     mMaxSmiley = mSmileyImg->size(); 
 
     addMouseListener(this);
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index d4709d3f..0146fd4a 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -30,6 +30,7 @@
 #include "sdlinput.h"
 #include "textfield.h"
 
+#include "../configuration.h"
 #include "../graphics.h"
 
 #include "../resources/image.h"
@@ -67,6 +68,7 @@ TextField::TextField(const std::string& text):
                         gridx[x], gridy[y],
                         gridx[x + 1] - gridx[x] + 1,
                         gridy[y + 1] - gridy[y] + 1);
+                skin.grid[a]->setAlpha(config.getValue("guialpha", 0.8));
                 a++;
             }
         }
-- 
cgit v1.2.3-70-g09d2


From e1b29d03d1fa9f1e6716fdd03f4baa62a02240dd Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 10 Jan 2009 17:10:38 -0700
Subject: Removed a debug line that was accidently left in.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/ministatus.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 6d9fc5b1..c4c834c7 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -97,8 +97,6 @@ void MiniStatusWindow::update()
 
     float xp = (float) player_node->getXp() / player_node->mXpForNextLevel;
 
-    std::cout << xp << std::endl;
-
     if (xp != xp) xp = 0.0f; // check for NaN
     if (xp < 0.0f) xp = 0.0f; // make sure the experience isn't negative (uninitialized pointer most likely)
     if (xp > 1.0f) xp = 1.0f;
-- 
cgit v1.2.3-70-g09d2


From 4018856d2d30532ad2404de4462ff3e473938a22 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 10 Jan 2009 18:19:25 -0700
Subject: Changed a few emote variable names to be more sensible, as well as
 removing emotions.png from the client data files (should have never been
 there to begin with, IMO). TODO: Simplify the emote code so that there is a
 lot less redundant code, as well as make filling out the possible emotes more
 flexible.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 data/graphics/gui/Makefile.am       |   1 -
 data/graphics/gui/emotions.png      | Bin 19386 -> 0 bytes
 po/POTFILES.in                      |   1 +
 src/Makefile.am                     |  20 ++++++++++----------
 src/being.cpp                       |   5 +++--
 src/gui/smileycontainer.cpp         |  26 +++++++++++++-------------
 src/gui/smileycontainer.h           |   8 ++++----
 src/gui/smileyshortcutcontainer.cpp |   6 +++---
 src/gui/smileywindow.cpp            |  14 +++++++-------
 src/gui/smileywindow.h              |   2 +-
 10 files changed, 42 insertions(+), 41 deletions(-)
 delete mode 100644 data/graphics/gui/emotions.png

diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 32028bfd..b2c499f0 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -11,7 +11,6 @@ gui_DATA =				\
 	close_button.png		\
 	deepbox.png			\
 	default.png			\
-	emotions.png			\
 	gui.xml				\
 	hits_blue.png			\
 	hits_red.png			\
diff --git a/data/graphics/gui/emotions.png b/data/graphics/gui/emotions.png
deleted file mode 100644
index 146f2d24..00000000
Binary files a/data/graphics/gui/emotions.png and /dev/null differ
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 11bb6aa0..1816a886 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -38,5 +38,6 @@ src/gui/trade.cpp
 src/gui/updatewindow.cpp
 src/net/playerhandler.cpp
 src/resources/itemdb.cpp
+src/being.cpp
 src/game.cpp
 src/main.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index d267022b..e189b793 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,20 +47,10 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/inttextbox.cpp \
 	      gui/inventorywindow.cpp \
 	      gui/inventorywindow.h \
-	      gui/smileywindow.cpp \
-	      gui/smileywindow.h \
-	      gui/smileycontainer.cpp \
-	      gui/smileycontainer.h \
 	      gui/itemcontainer.cpp \
 	      gui/itemcontainer.h \
 	      gui/itemshortcutcontainer.cpp \
 	      gui/itemshortcutcontainer.h \
-	      gui/shortcutwindow.cpp \
-	      gui/shortcutwindow.h \
-	      gui/smileyshortcutcontainer.cpp \
-	      gui/smileyshortcutcontainer.h \
-	      gui/shortcutcontainer.cpp \
-	      gui/shortcutcontainer.h \
 	      gui/item_amount.cpp \
 	      gui/item_amount.h \
 	      gui/linkhandler.h \
@@ -119,10 +109,20 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/shop.h \
 	      gui/shoplistbox.cpp \
 	      gui/shoplistbox.h \
+	      gui/shortcutwindow.cpp \
+	      gui/shortcutwindow.h \
+	      gui/shortcutcontainer.cpp \
+	      gui/shortcutcontainer.h \
 	      gui/skill.cpp \
 	      gui/skill.h \
 	      gui/slider.cpp \
 	      gui/slider.h \
+	      gui/smileycontainer.cpp \
+	      gui/smileycontainer.h \
+	      gui/smileyshortcutcontainer.cpp \
+	      gui/smileyshortcutcontainer.h \
+	      gui/smileywindow.cpp \
+	      gui/smileywindow.h \
 	      gui/speechbubble.cpp \
 	      gui/speechbubble.h \
 	      gui/status.cpp \
diff --git a/src/being.cpp b/src/being.cpp
index ba3107db..5eb62b2d 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -44,6 +44,7 @@
 #include "gui/speechbubble.h"
 
 #include "utils/dtor.h"
+#include "utils/gettext.h"  
 #include "utils/tostring.h"
 #include "utils/xml.h"
 
@@ -91,8 +92,8 @@ Being::Being(int id, int job, Map *map):
     {
         // Load the emotion set
         ResourceManager *rm = ResourceManager::getInstance();
-        emotionSet = rm->getImageSet("graphics/gui/emotions.png", 30, 32);
-        if (!emotionSet) logger->error("Unable to load emotions!");
+        emotionSet = rm->getImageSet("graphics/sprites/emotions.png", 30, 32);
+        if (!emotionSet) logger->error(_("Unable to load emotions"));
 
         // Hairstyles are encoded as negative numbers.  Count how far negative we can go.
         int hairstyles = 1;
diff --git a/src/gui/smileycontainer.cpp b/src/gui/smileycontainer.cpp
index d221f55c..f8f57c45 100644
--- a/src/gui/smileycontainer.cpp
+++ b/src/gui/smileycontainer.cpp
@@ -36,17 +36,17 @@
 #include "../utils/gettext.h"
 #include "../utils/tostring.h"
 
-const int SmileyContainer::gridWidth = 34;  // item icon width + 4
-const int SmileyContainer::gridHeight = 36; // item icon height + 4
+const int SmileyContainer::gridWidth = 34;  // emote icon width + 4
+const int SmileyContainer::gridHeight = 36; // emote icon height + 4
 
-static const int NO_ITEM = -1;
+static const int NO_EMOTE = -1;
 
 SmileyContainer::SmileyContainer():
-    mSelectedItemIndex(NO_ITEM)
+    mSelectedEmoteIndex(NO_EMOTE)
 {
     ResourceManager *resman = ResourceManager::getInstance();
 
-    mSmileyImg = resman->getImageSet("graphics/gui/emotions.png",30,32);
+    mSmileyImg = resman->getImageSet("graphics/sprites/emotions.png", 30, 32);
     if (!mSmileyImg) logger->error(_("Unable to load emotions"));
 
     mSelImg = resman->getImage("graphics/gui/selection.png");
@@ -95,7 +95,7 @@ void SmileyContainer::draw(gcn::Graphics *graphics)
                     mSmileyImg->get(i), itemX, itemY);
 
         // Draw selection image below selected item
-        if (mSelectedItemIndex == i)
+        if (mSelectedEmoteIndex == i)
         {
             static_cast<Graphics*>(graphics)->drawImage(
                     mSelImg, itemX, itemY);
@@ -123,23 +123,23 @@ void SmileyContainer::recalculateHeight()
 
 int SmileyContainer::getSelectedSmiley() 
 {
-    if (mSelectedItemIndex == NO_ITEM)
+    if (mSelectedEmoteIndex == NO_EMOTE)
         return 0;
 
-    return 1+mSelectedItemIndex;
+    return 1+mSelectedEmoteIndex;
 }
 
 void SmileyContainer::selectNone()
 {
-    setSelectedItemIndex(NO_ITEM);
+    setSelectedEmoteIndex(NO_EMOTE);
 }
 
-void SmileyContainer::setSelectedItemIndex(int index)
+void SmileyContainer::setSelectedEmoteIndex(int index)
 {
     if (index < 0 || index >= mMaxSmiley )
-        mSelectedItemIndex = NO_ITEM;
+        mSelectedEmoteIndex = NO_EMOTE;
     else
-        mSelectedItemIndex = index;
+        mSelectedEmoteIndex = index;
 }
 
 void SmileyContainer::distributeValueChangedEvent()
@@ -165,7 +165,7 @@ void SmileyContainer::mousePressed(gcn::MouseEvent &event)
         int index = mx / gridWidth + ((my / gridHeight) * columns);
         if (index <mMaxSmiley)
         {
-           setSelectedItemIndex(index);
+           setSelectedEmoteIndex(index);
            smileyShortcut->setSmileySelected(index+1);
         }
     }
diff --git a/src/gui/smileycontainer.h b/src/gui/smileycontainer.h
index ddfe9ec5..88ca0b48 100644
--- a/src/gui/smileycontainer.h
+++ b/src/gui/smileycontainer.h
@@ -33,7 +33,7 @@
 
 class Image;
 class Inventory;
-class Item;
+class Emote;
 
 namespace gcn {
     class SelectionListener;
@@ -107,12 +107,12 @@ class SmileyContainer : public gcn::Widget,
 
          * Sets the currently selected item.  Invalid (e.g., negative) indices set `no item'.
          */
-        void setSelectedItemIndex(int index);
+        void setSelectedEmoteIndex(int index);
 
         /**
          * Find the current item index by the most recently used item ID
          */
-        void refindSelectedItem(void);
+        void refindSelectedEmote(void);
 
         /**
          * Determine and set the height of the container.
@@ -126,7 +126,7 @@ class SmileyContainer : public gcn::Widget,
 
         ImageSet *mSmileyImg;
         Image *mSelImg;
-        int mSelectedItemIndex;
+        int mSelectedEmoteIndex;
 
         int mMaxSmiley;
 
diff --git a/src/gui/smileyshortcutcontainer.cpp b/src/gui/smileyshortcutcontainer.cpp
index 6028939f..c3cd056d 100644
--- a/src/gui/smileyshortcutcontainer.cpp
+++ b/src/gui/smileyshortcutcontainer.cpp
@@ -41,15 +41,15 @@ SmileyShortcutContainer::SmileyShortcutContainer():
     mSmileyClicked(false),
     mSmileyMoved(0)
 {
-    mGridWidth=1,
-    mGridHeight=1,
+    mGridWidth = 1,
+    mGridHeight = 1,
     addMouseListener(this);
     addWidgetListener(this);
 
     ResourceManager *resman = ResourceManager::getInstance();
 
     mBackgroundImg = resman->getImage("graphics/gui/item_shortcut_bgr.png");
-    mSmileyImg = resman->getImageSet("graphics/gui/emotions.png",30,32);
+    mSmileyImg = resman->getImageSet("graphics/sprites/emotions.png", 30, 32);
     if (!mSmileyImg) logger->error(_("Unable to load emotions"));
 
     mMaxItems = smileyShortcut->getSmileyCount(); 
diff --git a/src/gui/smileywindow.cpp b/src/gui/smileywindow.cpp
index 570eb45c..e3e821ff 100644
--- a/src/gui/smileywindow.cpp
+++ b/src/gui/smileywindow.cpp
@@ -45,10 +45,10 @@ SmileyWindow::SmileyWindow():
 
     mUseButton = new Button(_("Use"), "use", this);
 
-    mItems = new SmileyContainer();
-    mItems->addSelectionListener(this);
+    mEmotes = new SmileyContainer();
+    mEmotes->addSelectionListener(this);
 
-    mInvenScroll = new ScrollArea(mItems);
+    mInvenScroll = new ScrollArea(mEmotes);
     mInvenScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
 
     draw();
@@ -63,12 +63,12 @@ SmileyWindow::SmileyWindow():
 
 void SmileyWindow::action(const gcn::ActionEvent &event)
 {
-    int item = mItems->getSelectedSmiley();
+    int emote = mEmotes->getSelectedSmiley();
 
-    if (!item)
+    if (!emote)
         return;
 
-    player_node->emote(item);
+    player_node->emote(emote);
 }
 
 
@@ -95,5 +95,5 @@ void SmileyWindow::widgetResized(const gcn::Event &event)
 
 int SmileyWindow::getSelectedSmiley() const
 {
-    return mItems->getSelectedSmiley();
+    return mEmotes->getSelectedSmiley();
 }
diff --git a/src/gui/smileywindow.h b/src/gui/smileywindow.h
index 81ec6663..db27fcbd 100644
--- a/src/gui/smileywindow.h
+++ b/src/gui/smileywindow.h
@@ -69,7 +69,7 @@ class SmileyWindow : public Window, gcn::ActionListener,
 
     private:
 
-        SmileyContainer *mItems;
+        SmileyContainer *mEmotes;
 
         gcn::Button *mUseButton;
         gcn::ScrollArea *mInvenScroll;
-- 
cgit v1.2.3-70-g09d2


From fc1539e019b6d916d1470ddf1f31997044af8396 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 12 Jan 2009 09:54:00 -0700
Subject: Fixed minimap so that map names don't overflow the minimap's width.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/minimap.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 0d14c360..61a56445 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -19,6 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <guichan/font.hpp>
+
 #include "minimap.h"
 
 #include "../being.h"
@@ -56,12 +58,14 @@ void Minimap::setMapImage(Image *img)
 
     if (mMapImage)
     {
-        int offsetX = getPadding() + 4;
-        int offsetY = getTitleBarHeight() + 4;
+        const int offsetX = getPadding() + 4;
+        const int offsetY = getTitleBarHeight() + 4;
+        const int titleWidth = getFont()->getWidth(getCaption()) + 15;
+        const int mapWidth = mMapImage->getWidth() < 100 ? 
+                             mMapImage->getWidth() + offsetX : 100;
         mMapImage->setAlpha(config.getValue("guialpha", 0.8));
         setDefaultSize(offsetX, offsetY, 
-                       mMapImage->getWidth() < 100 ? 
-                           mMapImage->getWidth() + offsetX : 100, 
+                       mapWidth > titleWidth ? mapWidth : titleWidth, 
                        mMapImage->getHeight() < 100 ? 
                            mMapImage->getHeight() + offsetY : 100);
         loadWindowState();
-- 
cgit v1.2.3-70-g09d2


From 7f8f7bcd329e62d240914686b01a9cd68624309c Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 12 Jan 2009 15:41:10 -0700
Subject: Some rather pedantic changes. Unified all naming for emoticons in the
 code so that only one term is used everywhere (to simplify maintainability),
 as well as corrected several variable names and comments where there was
 copy/pasted code, but it wasn't corrected. Also moved emote shortcuts back to
 where they were originally, to reduce player confusion when the next build
 comes around.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 aethyra.cbp                         |  14 +--
 src/Makefile.am                     |  16 +--
 src/emoteshortcut.cpp               |  77 +++++++++++++++
 src/emoteshortcut.h                 | 125 +++++++++++++++++++++++
 src/game.cpp                        |  46 ++++-----
 src/gui/emotecontainer.cpp          | 171 ++++++++++++++++++++++++++++++++
 src/gui/emotecontainer.h            | 140 ++++++++++++++++++++++++++
 src/gui/emoteshortcutcontainer.cpp  | 192 ++++++++++++++++++++++++++++++++++++
 src/gui/emoteshortcutcontainer.h    |  82 +++++++++++++++
 src/gui/emotewindow.cpp             |  99 +++++++++++++++++++
 src/gui/emotewindow.h               |  79 +++++++++++++++
 src/gui/itemshortcutcontainer.cpp   |   6 +-
 src/gui/menuwindow.cpp              |   4 +-
 src/gui/setup.cpp                   |   8 +-
 src/gui/setup.h                     |   3 +-
 src/gui/shortcutcontainer.cpp       |   9 +-
 src/gui/shortcutcontainer.h         |   9 +-
 src/gui/shortcutwindow.h            |   2 +-
 src/gui/smileycontainer.cpp         | 172 --------------------------------
 src/gui/smileycontainer.h           | 139 --------------------------
 src/gui/smileyshortcutcontainer.cpp | 179 ---------------------------------
 src/gui/smileyshortcutcontainer.h   |  82 ---------------
 src/gui/smileywindow.cpp            |  99 -------------------
 src/gui/smileywindow.h              |  80 ---------------
 src/itemshortcut.h                  |   2 +-
 src/keyboardconfig.cpp              |  52 +++++-----
 src/keyboardconfig.h                |  40 ++++----
 src/main.cpp                        |   8 +-
 src/smileyshortcut.cpp              |  76 --------------
 src/smileyshortcut.h                | 127 ------------------------
 30 files changed, 1075 insertions(+), 1063 deletions(-)
 create mode 100644 src/emoteshortcut.cpp
 create mode 100644 src/emoteshortcut.h
 create mode 100644 src/gui/emotecontainer.cpp
 create mode 100644 src/gui/emotecontainer.h
 create mode 100644 src/gui/emoteshortcutcontainer.cpp
 create mode 100644 src/gui/emoteshortcutcontainer.h
 create mode 100644 src/gui/emotewindow.cpp
 create mode 100644 src/gui/emotewindow.h
 delete mode 100644 src/gui/smileycontainer.cpp
 delete mode 100644 src/gui/smileycontainer.h
 delete mode 100644 src/gui/smileyshortcutcontainer.cpp
 delete mode 100644 src/gui/smileyshortcutcontainer.h
 delete mode 100644 src/gui/smileywindow.cpp
 delete mode 100644 src/gui/smileywindow.h
 delete mode 100644 src/smileyshortcut.cpp
 delete mode 100644 src/smileyshortcut.h

diff --git a/aethyra.cbp b/aethyra.cbp
index 0ede5d07..67d8d7d2 100644
--- a/aethyra.cbp
+++ b/aethyra.cbp
@@ -100,6 +100,8 @@
 		<Unit filename="src\configuration.h" />
 		<Unit filename="src\effectmanager.cpp" />
 		<Unit filename="src\effectmanager.h" />
+		<Unit filename="src\emoteshortcut.cpp" />
+		<Unit filename="src\emoteshortcut.h" />
 		<Unit filename="src\engine.cpp" />
 		<Unit filename="src\engine.h" />
 		<Unit filename="src\equipment.cpp" />
@@ -141,6 +143,12 @@
 		<Unit filename="src\gui\connection.h" />
 		<Unit filename="src\gui\debugwindow.cpp" />
 		<Unit filename="src\gui\debugwindow.h" />
+		<Unit filename="src\gui\emotecontainer.cpp" />
+		<Unit filename="src\gui\emotecontainer.h" />
+		<Unit filename="src\gui\emoteshortcutcontainer.cpp" />
+		<Unit filename="src\gui\emoteshortcutcontainer.h" />
+		<Unit filename="src\gui\emotewindow.cpp" />
+		<Unit filename="src\gui\emotewindow.h" />
 		<Unit filename="src\gui\equipmentwindow.cpp" />
 		<Unit filename="src\gui\equipmentwindow.h" />
 		<Unit filename="src\gui\focushandler.cpp" />
@@ -223,12 +231,6 @@
 		<Unit filename="src\gui\skill.h" />
 		<Unit filename="src\gui\slider.cpp" />
 		<Unit filename="src\gui\slider.h" />
-		<Unit filename="src\gui\smileycontainer.cpp" />
-		<Unit filename="src\gui\smileycontainer.h" />
-		<Unit filename="src\gui\smileyshortcutcontainer.cpp" />
-		<Unit filename="src\gui\smileyshortcutcontainer.h" />
-		<Unit filename="src\gui\smileywindow.cpp" />
-		<Unit filename="src\gui\smileywindow.h" />
 		<Unit filename="src\gui\speechbubble.cpp" />
 		<Unit filename="src\gui\speechbubble.h" />
 		<Unit filename="src\gui\status.cpp" />
diff --git a/src/Makefile.am b/src/Makefile.am
index e189b793..96be8465 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,6 +33,12 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/connection.h \
 	      gui/debugwindow.cpp \
 	      gui/debugwindow.h \
+	      gui/emotecontainer.cpp \
+	      gui/emotecontainer.h \
+	      gui/emoteshortcutcontainer.cpp \
+	      gui/emoteshortcutcontainer.h \
+	      gui/emotewindow.cpp \
+	      gui/emotewindow.h \
 	      gui/equipmentwindow.cpp \
 	      gui/equipmentwindow.h \
 	      gui/focushandler.cpp \
@@ -117,12 +123,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/skill.h \
 	      gui/slider.cpp \
 	      gui/slider.h \
-	      gui/smileycontainer.cpp \
-	      gui/smileycontainer.h \
-	      gui/smileyshortcutcontainer.cpp \
-	      gui/smileyshortcutcontainer.h \
-	      gui/smileywindow.cpp \
-	      gui/smileywindow.h \
 	      gui/speechbubble.cpp \
 	      gui/speechbubble.h \
 	      gui/status.cpp \
@@ -252,6 +252,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      configuration.h \
 	      effectmanager.cpp \
 	      effectmanager.h \
+	      emoteshortcut.cpp \
+	      emoteshortcut.h \
 	      engine.cpp \
 	      engine.h \
 	      equipment.cpp \
@@ -272,8 +274,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      inventory.h \
 	      item.cpp \
 	      item.h \
-	      smileyshortcut.cpp \
-	      smileyshortcut.h \
 	      itemshortcut.cpp \
 	      itemshortcut.h \
 	      joystick.cpp \
diff --git a/src/emoteshortcut.cpp b/src/emoteshortcut.cpp
new file mode 100644
index 00000000..66989d44
--- /dev/null
+++ b/src/emoteshortcut.cpp
@@ -0,0 +1,77 @@
+/*
+ *  Aethyra
+ *  Copyright 2009 Aethyra Development Team
+ *
+ *  This file is part of Aethyra.
+ *
+ *  Aethyra is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  Aethyra is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Aethyra; if not, write to the Free Software Foundation, 
+ *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "emoteshortcut.h"
+
+#include "configuration.h"
+#include "localplayer.h"
+
+#include "utils/tostring.h"
+
+EmoteShortcut::EmoteShortcut *emoteShortcut;
+
+EmoteShortcut::EmoteShortcut():
+    mEmoteSelected(0)
+{
+    for (int i = 0; i < SHORTCUT_EMOTES; i++)
+    {
+        mEmotes[i] = i + 1;
+    }
+    load();
+}
+
+EmoteShortcut::~EmoteShortcut()
+{
+    save();
+}
+
+void EmoteShortcut::load()
+{
+    for (int i = 0; i < SHORTCUT_EMOTES; i++)
+    {
+        int emoteId = (int) config.getValue("emoteshortcut" + toString(i), i + 1);
+
+        if (emoteId)
+        {
+            mEmotes[i] = emoteId;
+        }
+    }
+}
+
+void EmoteShortcut::save()
+{
+    for (int i = 0; i < SHORTCUT_EMOTES; i++)
+    {
+        const int emoteId = mEmotes[i] ? mEmotes[i] : 0;
+        config.setValue("emoteshortcut" + toString(i), emoteId);
+    }
+}
+
+void EmoteShortcut::useEmote(int index)
+{
+    if ((index > 0) && (index <= SHORTCUT_EMOTES))
+    {
+       if (mEmotes[index - 1] > 0)
+       {
+          player_node->emote(mEmotes[index - 1]);
+       }
+    }
+}
diff --git a/src/emoteshortcut.h b/src/emoteshortcut.h
new file mode 100644
index 00000000..14162f73
--- /dev/null
+++ b/src/emoteshortcut.h
@@ -0,0 +1,125 @@
+/*
+ *  Aethyra
+ *  Copyright 2009 Aethyra Development Team
+ *
+ *  This file is part of Aethyra.
+ *
+ *  Aethyra is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  Aethyra is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Aethyra; if not, write to the Free Software Foundation, 
+ *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _AETHYRA_EMOTESHORTCUT_H__
+#define _AETHYRA_EMOTESHORTCUT_H__
+
+#define SHORTCUT_EMOTES 12
+
+/**
+ * The class which keeps track of the emote shortcuts.
+ */
+class EmoteShortcut
+{
+    public:
+        /**
+         * Constructor.
+         */
+        EmoteShortcut();
+
+        /**
+         * Destructor.
+         */
+        ~EmoteShortcut();
+
+        /**
+         * Load the configuration information.
+         */
+        void load();
+
+        /**
+         * Returns the shortcut Emote ID specified by the index.
+         *
+         * @param index Index of the shortcut Emote.
+         */
+        int getEmote(int index) const
+        { return mEmotes[index]; }
+
+        /**
+         * Returns the amount of shortcut Emotes.
+         */
+        int getEmoteCount() const
+        { return SHORTCUT_EMOTES; }
+
+        /**
+         * Returns the emote ID that is currently selected.
+         */
+        int getEmoteSelected() const
+        { return mEmoteSelected; }
+
+        /**
+         * Adds the selected emote ID to the emotes specified by the index.
+         *
+         * @param index Index of the emotes.
+         */
+        void setEmote(int index)
+        { mEmotes[index] = mEmoteSelected; }
+
+        /**
+         * Adds a emoticon to the emotes store specified by the index.
+         *
+         * @param index Index of the emote.
+         * @param emoteId ID of the emote.
+         */
+        void setEmotes(int index, int emoteId)
+        { mEmotes[index] = emoteId; }
+
+        /**
+         * Set the Emote that is selected.
+         *
+         * @param emoteId The ID of the emote that is to be assigned.
+         */
+        void setEmoteSelected(int emoteId)
+        { mEmoteSelected = emoteId; }
+
+        /**
+         * A flag to check if the Emote is selected.
+         */
+        bool isEmoteSelected()
+        { return mEmoteSelected; }
+
+        /**
+         * Remove a Emote from the shortcut.
+         */
+        void removeEmote(int index)
+        { mEmotes[index] = 0; }
+
+        /**
+         * Try to use the Emote specified by the index.
+         *
+         * @param index Index of the emote shortcut.
+         */
+        void useEmote(int index);
+
+    private:
+        /**
+         * Save the configuration information.
+         */
+        void save();
+
+        int mEmotes[SHORTCUT_EMOTES];  /**< The emote stored. */
+        int mEmoteSelected;            /**< The emote held by cursor. */
+
+};
+
+extern EmoteShortcut *emoteShortcut;
+
+#endif
diff --git a/src/game.cpp b/src/game.cpp
index 18169cd0..753d7afa 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -35,7 +35,6 @@
 #include "flooritemmanager.h"
 #include "graphics.h"
 #include "itemshortcut.h"
-#include "smileyshortcut.h"
 #include "joystick.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
@@ -49,15 +48,16 @@
 #include "gui/chat.h"
 #include "gui/confirm_dialog.h"
 #include "gui/debugwindow.h"
+#include "gui/emoteshortcut.h"
+#include "gui/emoteshortcutcontainer.h"
+#include "gui/emotewindow.h"
 #include "gui/equipmentwindow.h"
 #include "gui/gui.h"
 #include "gui/help.h"
 #include "gui/inventorywindow.h"
-#include "gui/smileywindow.h"
 #include "gui/shortcutwindow.h"
 #include "gui/shortcutcontainer.h"
 #include "gui/itemshortcutcontainer.h"
-#include "gui/smileyshortcutcontainer.h"
 #include "gui/menuwindow.h"
 #include "gui/minimap.h"
 #include "gui/ministatus.h"
@@ -118,7 +118,7 @@ BuyDialog *buyDialog;
 SellDialog *sellDialog;
 BuySellDialog *buySellDialog;
 InventoryWindow *inventoryWindow;
-SmileyWindow *smileyWindow;
+EmoteWindow *emoteWindow;
 NpcListDialog *npcListDialog;
 NpcTextDialog *npcTextDialog;
 SkillDialog *skillDialog;
@@ -129,7 +129,7 @@ TradeWindow *tradeWindow;
 HelpWindow *helpWindow;
 DebugWindow *debugWindow;
 ShortcutWindow *itemShortcutWindow;
-ShortcutWindow *smileyShortcutWindow;
+ShortcutWindow *emoteShortcutWindow;
 
 BeingManager *beingManager = NULL;
 FloorItemManager *floorItemManager = NULL;
@@ -202,7 +202,7 @@ void createGuiWindows(Network *network)
     sellDialog = new SellDialog(network);
     buySellDialog = new BuySellDialog();
     inventoryWindow = new InventoryWindow();
-    smileyWindow = new SmileyWindow();
+    emoteWindow = new EmoteWindow();
     npcTextDialog = new NpcTextDialog();
     npcListDialog = new NpcListDialog();
     skillDialog = new SkillDialog();
@@ -213,7 +213,7 @@ void createGuiWindows(Network *network)
     helpWindow = new HelpWindow();
     debugWindow = new DebugWindow();
     itemShortcutWindow = new ShortcutWindow("ItemShortcut",new ItemShortcutContainer);
-    smileyShortcutWindow = new ShortcutWindow("SmileyShortcut",new SmileyShortcutContainer);
+    emoteShortcutWindow = new ShortcutWindow("emoteShortcut",new EmoteShortcutContainer);
 
     // Set initial window visibility
     chatWindow->setVisible((bool) config.getValue(
@@ -227,8 +227,8 @@ void createGuiWindows(Network *network)
         menuWindow->getWindowName() + "Visible", true));
     itemShortcutWindow->setVisible((bool) config.getValue(
         itemShortcutWindow->getWindowName() + "Visible", true));
-    smileyShortcutWindow->setVisible((bool) config.getValue(
-        smileyShortcutWindow->getWindowName() + "Visible", true));
+    emoteShortcutWindow->setVisible((bool) config.getValue(
+        emoteShortcutWindow->getWindowName() + "Visible", true));
 
     if (config.getValue("logToChat", 0))
     {
@@ -250,7 +250,7 @@ void destroyGuiWindows()
     delete sellDialog;
     delete buySellDialog;
     delete inventoryWindow;
-    delete smileyWindow;
+    delete emoteWindow;
     delete npcListDialog;
     delete npcTextDialog;
     delete skillDialog;
@@ -261,7 +261,7 @@ void destroyGuiWindows()
     delete helpWindow;
     delete debugWindow;
     delete itemShortcutWindow;
-    delete smileyShortcutWindow;
+    delete emoteShortcutWindow;
 }
 
 Game::Game(Network *network):
@@ -545,14 +545,14 @@ void Game::handleInput()
 		    }
 		}
 
-	    // Smilie
-	    if (keyboard.isKeyActive(keyboard.KEY_SMILIE))
+	    // Mode switch to emotes
+	    if (keyboard.isKeyActive(keyboard.KEY_EMOTE))
 	    {
 		// Emotions
-		int emotion = keyboard.getKeySmilieOffset(event.key.keysym.sym);
+		int emotion = keyboard.getKeyEmoteOffset(event.key.keysym.sym);
 		if (emotion)
 		{
-		    smileyShortcut->useSmiley(emotion);
+		    emoteShortcut->useEmote(emotion);
 		    used = true;
                     return;
 		}
@@ -655,13 +655,13 @@ void Game::handleInput()
 		if (!tradeWindow->isVisible())
 		{
 		    // Checks if any item shortcut is pressed.
-		    for (int i = KeyboardConfig::KEY_SHORTCUT_0;
-			    i <= KeyboardConfig::KEY_SHORTCUT_9;
+		    for (int i = KeyboardConfig::KEY_SHORTCUT_1;
+			    i <= KeyboardConfig::KEY_SHORTCUT_12;
 			    i++)
 		    {
 			if (tKey == i && !used) {
 			    itemShortcut->useItem(
-				    i - KeyboardConfig::KEY_SHORTCUT_0);
+				    i - KeyboardConfig::KEY_SHORTCUT_1);
 			    break;
 			}
 		    }
@@ -708,7 +708,7 @@ void Game::handleInput()
 			{
 			    statusWindow->setVisible(false);
 			    inventoryWindow->setVisible(false);
-			    smileyWindow->setVisible(false);
+			    emoteWindow->setVisible(false);
 			    skillDialog->setVisible(false);
 			    setupWindow->setVisible(false);
 			    equipmentWindow->setVisible(false);
@@ -745,11 +745,11 @@ void Game::handleInput()
 		    case KeyboardConfig::KEY_WINDOW_DEBUG:
 			requestedWindow = debugWindow;
 			break;
-		    case KeyboardConfig::KEY_WINDOW_ALLSMILEY:
-			requestedWindow = smileyWindow;
+		    case KeyboardConfig::KEY_WINDOW_EMOTE:
+			requestedWindow = emoteWindow;
 			break;
-		    case KeyboardConfig::KEY_WINDOW_SMILEY_SHORTCUT:
-			requestedWindow = smileyShortcutWindow;
+		    case KeyboardConfig::KEY_WINDOW_EMOTE_SHORTCUT:
+			requestedWindow = emoteShortcutWindow;
 			break;
 		}
 	    }
diff --git a/src/gui/emotecontainer.cpp b/src/gui/emotecontainer.cpp
new file mode 100644
index 00000000..c3e20c41
--- /dev/null
+++ b/src/gui/emotecontainer.cpp
@@ -0,0 +1,171 @@
+/*
+ *  Aethyra
+ *  Copyright 2009 Aethyra Development Team
+ *
+ *  This file is part of Aethyra.
+ *
+ *  Aethyra is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  Aethyra is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Aethyra; if not, write to the Free Software Foundation, 
+ *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <guichan/mouseinput.hpp>
+#include <guichan/selectionlistener.hpp>
+
+#include "emotecontainer.h"
+#include "emoteshortcut.h"
+
+#include "../configuration.h"
+#include "../graphics.h"
+#include "../log.h"
+
+#include "../resources/image.h"
+#include "../resources/iteminfo.h"
+#include "../resources/resourcemanager.h"
+
+#include "../utils/gettext.h"
+#include "../utils/tostring.h"
+
+const int EmoteContainer::gridWidth = 34;  // emote icon width + 4
+const int EmoteContainer::gridHeight = 36; // emote icon height + 4
+
+static const int NO_EMOTE = -1;
+
+EmoteContainer::EmoteContainer():
+    mSelectedEmoteIndex(NO_EMOTE)
+{
+    ResourceManager *resman = ResourceManager::getInstance();
+
+    mEmoteImg = resman->getImageSet("graphics/sprites/emotions.png", 30, 32);
+    if (!mEmoteImg) logger->error(_("Unable to load emotions"));
+
+    mSelImg = resman->getImage("graphics/gui/selection.png");
+    if (!mSelImg) logger->error(_("Unable to load selection.png"));
+
+    mSelImg->setAlpha(config.getValue("guialpha", 0.8));
+
+    mMaxEmote = mEmoteImg->size(); 
+
+    addMouseListener(this);
+    addWidgetListener(this);
+}
+
+EmoteContainer::~EmoteContainer()
+{
+    if (mEmoteImg)
+    {
+       mEmoteImg->decRef();
+       mEmoteImg = NULL;
+    }
+    if (!mSelImg)
+    {
+       mSelImg->decRef();
+       mSelImg = NULL;
+    }
+}
+
+void EmoteContainer::draw(gcn::Graphics *graphics)
+{
+    int columns = getWidth() / gridWidth;
+
+    // Have at least 1 column
+    if (columns < 1)
+    {
+        columns = 1;
+    }
+
+    for (int i = 0; i < mMaxEmote ; i++)
+    {
+        int emoteX = ((i) % columns) * gridWidth;
+        int emoteY = ((i) / columns) * gridHeight;
+           
+        // Draw emote icon
+        static_cast<Graphics*>(graphics)->drawImage(
+                    mEmoteImg->get(i), emoteX, emoteY);
+
+        // Draw selection image below selected item
+        if (mSelectedEmoteIndex == i)
+        {
+            static_cast<Graphics*>(graphics)->drawImage(
+                    mSelImg, emoteX, emoteY);
+        }
+    }
+}
+
+void EmoteContainer::widgetResized(const gcn::Event &event)
+{
+    recalculateHeight();
+}
+
+void EmoteContainer::recalculateHeight()
+{
+    int cols = getWidth() / gridWidth;
+
+    if (cols < 1)
+        cols = 1;
+
+    const int rows = (mMaxEmote / cols) + (mMaxEmote % cols > 0 ? 1 : 0);
+    const int height = rows * gridHeight + 8;
+    if (height != getHeight())
+        setHeight(height);
+}
+
+int EmoteContainer::getSelectedEmote() 
+{
+    if (mSelectedEmoteIndex == NO_EMOTE)
+        return 0;
+
+    return 1 + mSelectedEmoteIndex;
+}
+
+void EmoteContainer::selectNone()
+{
+    setSelectedEmoteIndex(NO_EMOTE);
+}
+
+void EmoteContainer::setSelectedEmoteIndex(int index)
+{
+    if (index < 0 || index >= mMaxEmote )
+        mSelectedEmoteIndex = NO_EMOTE;
+    else
+        mSelectedEmoteIndex = index;
+}
+
+void EmoteContainer::distributeValueChangedEvent()
+{
+    gcn::SelectionEvent event(this);
+    std::list<gcn::SelectionListener*>::iterator i_end = mListeners.end();
+    std::list<gcn::SelectionListener*>::iterator i;
+
+    for (i = mListeners.begin(); i != i_end; ++i)
+    {
+        (*i)->valueChanged(event);
+    }
+}
+
+void EmoteContainer::mousePressed(gcn::MouseEvent &event)
+{
+    int button = event.getButton();
+    if (button == gcn::MouseEvent::LEFT || button == gcn::MouseEvent::RIGHT)
+    {
+        int columns = getWidth() / gridWidth;
+        int mx = event.getX();
+        int my = event.getY();
+        int index = mx / gridWidth + ((my / gridHeight) * columns);
+        if (index < mMaxEmote)
+        {
+           setSelectedEmoteIndex(index);
+           emoteShortcut->setEmoteSelected(index + 1);
+        }
+    }
+}
diff --git a/src/gui/emotecontainer.h b/src/gui/emotecontainer.h
new file mode 100644
index 00000000..f5922a9c
--- /dev/null
+++ b/src/gui/emotecontainer.h
@@ -0,0 +1,140 @@
+/*
+ *  Aethyra
+ *  Copyright 2009 Aethyra Development Team
+ *
+ *  This file is part of Aethyra.
+ *
+ *  Aethyra is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  Aethyra is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Aethyra; if not, write to the Free Software Foundation, 
+ *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _AETHYRA_EMOTECONTAINER_H__
+#define _AETHYRA_EMOTECONTAINER_H__
+
+#include <list>
+
+#include <guichan/mouselistener.hpp>
+#include <guichan/widget.hpp>
+#include <guichan/widgetlistener.hpp>
+
+#include "../guichanfwd.h"
+
+#include "../resources/imageset.h"
+
+class Image;
+class Inventory;
+class Emote;
+
+namespace gcn {
+    class SelectionListener;
+}
+
+/**
+ * An item container. Used to show items in inventory and trade dialog.
+ *
+ * \ingroup GUI
+ */
+class EmoteContainer : public gcn::Widget, 
+                       public gcn::MouseListener,
+                       public gcn::WidgetListener
+{
+    public:
+        /**
+         * Constructor. Initializes the graphic.
+         */
+        EmoteContainer();
+
+        /**
+         * Destructor.
+         */
+        virtual ~EmoteContainer();
+
+        /**
+         * Draws the items.
+         */
+        void draw(gcn::Graphics *graphics);
+
+        /**
+         * Called whenever the widget changes size.
+         */
+        void widgetResized(const gcn::Event &event);
+
+        /**
+         * Handles mouse click.
+         */
+        void mousePressed(gcn::MouseEvent &event);
+
+        /**
+         * Returns the selected item.
+         */
+        int getSelectedEmote();
+
+        /**
+         * Sets selected item to NULL.
+         */
+        void selectNone();
+
+        /**
+         * Adds a listener to the list that's notified each time a change to
+         * the selection occurs.
+         */
+        void addSelectionListener(gcn::SelectionListener *listener)
+        {
+            mListeners.push_back(listener);
+        }
+
+        /**
+         * Removes a listener from the list that's notified each time a change
+         * to the selection occurs.
+         */
+        void removeSelectionListener(gcn::SelectionListener *listener)
+        {
+            mListeners.remove(listener);
+        }
+
+    private:
+        /**
+
+         * Sets the currently selected item.  Invalid (e.g., negative) indices set `no item'.
+         */
+        void setSelectedEmoteIndex(int index);
+
+        /**
+         * Find the current item index by the most recently used item ID
+         */
+        void refindSelectedEmote(void);
+
+        /**
+         * Determine and set the height of the container.
+         */
+        void recalculateHeight(void);
+
+        /**
+         * Sends out selection events to the list of selection listeners.
+         */
+        void distributeValueChangedEvent(void);
+
+        ImageSet *mEmoteImg;
+        Image *mSelImg;
+        int mSelectedEmoteIndex;
+
+        int mMaxEmote;
+
+        std::list<gcn::SelectionListener*> mListeners;
+
+        static const int gridWidth;
+        static const int gridHeight;
+};
+
+#endif
diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
new file mode 100644
index 00000000..5e984dd5
--- /dev/null
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -0,0 +1,192 @@
+/*
+ *  Aethyra
+ *  Copyright 2009 Aethyra Development Team
+ *
+ *  This file is part of Aethyra.
+ *
+ *  Aethyra is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  Aethyra is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Aethyra; if not, write to the Free Software Foundation, 
+ *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "emoteshortcutcontainer.h"
+
+#include "../emoteshortcut.h"
+#include "../graphics.h"
+#include "../inventory.h"
+#include "../item.h"
+#include "../itemshortcut.h"
+#include "../keyboardconfig.h"
+#include "../localplayer.h"
+#include "../log.h"
+
+#include "../resources/image.h"
+#include "../resources/resourcemanager.h"
+
+#include "../utils/gettext.h"
+#include "../utils/tostring.h"
+
+EmoteShortcutContainer::EmoteShortcutContainer():
+    mEmoteClicked(false),
+    mEmoteMoved(0)
+{
+    mGridWidth = 1,
+    mGridHeight = 1,
+    addMouseListener(this);
+    addWidgetListener(this);
+
+    ResourceManager *resman = ResourceManager::getInstance();
+
+    mBackgroundImg = resman->getImage("graphics/gui/item_shortcut_bgr.png");
+    mEmoteImg = resman->getImageSet("graphics/sprites/emotions.png", 30, 32);
+    if (!mEmoteImg) logger->error(_("Unable to load emotions"));
+
+    mMaxItems = emoteShortcut->getEmoteCount(); 
+
+    mBoxHeight = mBackgroundImg->getHeight();
+    mBoxWidth = mBackgroundImg->getWidth();
+}
+
+EmoteShortcutContainer::~EmoteShortcutContainer()
+{
+    mBackgroundImg->decRef();
+    if (mEmoteImg)
+    {
+        mEmoteImg->decRef();
+        mEmoteImg=NULL;
+    }
+}
+
+void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
+{
+    Graphics *g = static_cast<Graphics*>(graphics);
+
+    //graphics->setFont(getFont());
+
+    for (int i = 0; i < mMaxItems; i++)
+    {
+        const int emoteX = (i % mGridWidth) * mBoxWidth;
+        const int emoteY = (i / mGridWidth) * mBoxHeight;
+
+        g->drawImage(mBackgroundImg, emoteX, emoteY);
+
+        // Draw emote keyboard shortcut.
+        const char *key = SDL_GetKeyName(
+                         (SDLKey) keyboard.getKeyValue(keyboard.KEY_EMOTE_1 + i));
+        graphics->setColor(0x000000);
+        g->drawText(key, emoteX + 2, emoteY + 2, gcn::Graphics::LEFT);
+
+        if (emoteShortcut->getEmote(i))
+        {
+            static_cast<Graphics*>(graphics)->drawImage(
+                                   mEmoteImg->get(emoteShortcut->getEmote(i) - 1), emoteX + 2, emoteY + 10);
+        }
+
+    }
+    if (mEmoteMoved)
+    {
+        // Draw the emote image being dragged by the cursor.
+        Image* image = mEmoteImg->get(mEmoteMoved-1);
+        if (image)
+        {
+            const int tPosX = mCursorPosX - (image->getWidth() / 2);
+            const int tPosY = mCursorPosY - (image->getHeight() / 2);
+
+            g->drawImage(image, tPosX, tPosY);
+        }
+    }
+}
+
+void EmoteShortcutContainer::mouseDragged(gcn::MouseEvent &event)
+{
+    if (event.getButton() == gcn::MouseEvent::LEFT) 
+    {
+        if (!mEmoteMoved && mEmoteClicked) 
+        {
+            const int index = getIndexFromGrid(event.getX(), event.getY());
+            const int emoteId = emoteShortcut->getEmote(index);
+
+            if (index == -1) 
+            {
+                return;
+            }
+
+            if (emoteId)
+            {
+                mEmoteMoved = emoteId;
+                emoteShortcut->removeEmote(index);
+            }
+        }
+        if (mEmoteMoved) 
+        {
+            mCursorPosX = event.getX();
+            mCursorPosY = event.getY();
+        }
+    }
+}
+
+void EmoteShortcutContainer::mousePressed(gcn::MouseEvent &event)
+{
+    const int index = getIndexFromGrid(event.getX(), event.getY());
+
+    if (index == -1) 
+    {
+         return;
+    }
+
+    // Stores the selected emote if there is one.
+    if (emoteShortcut->isEmoteSelected()) 
+    {
+         emoteShortcut->setEmote(index);
+         emoteShortcut->setEmoteSelected(0);
+    }
+    else if (emoteShortcut->getEmote(index)) 
+    {
+         mEmoteClicked = true;
+    }
+}
+
+void EmoteShortcutContainer::mouseReleased(gcn::MouseEvent &event)
+{
+    if (event.getButton() == gcn::MouseEvent::LEFT)
+    {
+        const int index = getIndexFromGrid(event.getX(), event.getY());
+
+        if (emoteShortcut->isEmoteSelected())
+        {
+            emoteShortcut->setEmoteSelected(0);
+        }
+
+        if (index == -1) 
+        {
+            mEmoteMoved = 0;
+            return;
+        }
+
+        if (mEmoteMoved) 
+        {
+            emoteShortcut->setEmotes(index, mEmoteMoved);
+            mEmoteMoved = 0;
+        }
+        else if (emoteShortcut->getEmote(index) && mEmoteClicked)
+        {
+            emoteShortcut->useEmote(index + 1);
+        }
+
+        if (mEmoteClicked) 
+        {
+            mEmoteClicked = false;
+        }
+    }
+}
+
diff --git a/src/gui/emoteshortcutcontainer.h b/src/gui/emoteshortcutcontainer.h
new file mode 100644
index 00000000..5b3f61cd
--- /dev/null
+++ b/src/gui/emoteshortcutcontainer.h
@@ -0,0 +1,82 @@
+/*
+ *  Aethyra
+ *  Copyright 2009 Aethyra Development Team
+ *
+ *  This file is part of Aethyra.
+ *
+ *  Aethyra is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  Aethyra is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Aethyra; if not, write to the Free Software Foundation, 
+ *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _AETHYRA_EMOTESHORTCUTCONTAINER_H__
+#define _AETHYRA_EMOTESHORTCUTCONTAINER_H__
+
+#include <guichan/mouselistener.hpp>
+#include <guichan/widget.hpp>
+#include <guichan/widgetlistener.hpp>
+
+#include "shortcutcontainer.h"
+
+#include "../guichanfwd.h"
+
+#include "../resources/imageset.h"
+
+class Image;
+
+/**
+ * An emote shortcut container. Used to quickly use emoticons.
+ *
+ * \ingroup GUI
+ */
+class EmoteShortcutContainer : public ShortcutContainer
+{
+    public:
+        /**
+         * Constructor. Initializes the graphic.
+         */
+        EmoteShortcutContainer();
+
+        /**
+         * Destructor.
+         */
+        virtual ~EmoteShortcutContainer();
+
+        /**
+         * Draws the items.
+         */
+        void draw(gcn::Graphics *graphics);
+
+        /**
+         * Handles mouse when dragged.
+         */
+        void mouseDragged(gcn::MouseEvent &event);
+
+        /**
+         * Handles mouse when pressed.
+         */
+        void mousePressed(gcn::MouseEvent &event);
+
+        /**
+         * Handles mouse release.
+         */
+        void mouseReleased(gcn::MouseEvent &event);
+
+    private:
+        ImageSet *mEmoteImg;
+
+        bool mEmoteClicked;
+        int mEmoteMoved;
+};
+
+#endif
diff --git a/src/gui/emotewindow.cpp b/src/gui/emotewindow.cpp
new file mode 100644
index 00000000..af9648ef
--- /dev/null
+++ b/src/gui/emotewindow.cpp
@@ -0,0 +1,99 @@
+/*
+ *  Aethyra
+ *  Copyright 2009 Aethyra Development Team
+ *
+ *  This file is part of Aethyra.
+ *
+ *  Aethyra is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  Aethyra is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Aethyra; if not, write to the Free Software Foundation, 
+ *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <string>
+
+#include <guichan/mouseinput.hpp>
+
+#include "button.h"
+#include "gui.h"
+#include "emotewindow.h"
+#include "emotecontainer.h"
+#include "scrollarea.h"
+
+#include "../localplayer.h"
+
+#include "../utils/gettext.h"      
+#include "../utils/tostring.h"
+
+EmoteWindow::EmoteWindow():
+    Window(_("Emote"))
+{
+    setWindowName(_("Emote"));
+    setResizable(true);
+    setCloseButton(true);
+    setMinWidth(80);
+    setDefaultSize(115, 25, 322, 200);
+
+    mUseButton = new Button(_("Use"), "use", this);
+
+    mEmotes = new EmoteContainer();
+    mEmotes->addSelectionListener(this);
+
+    mInvenScroll = new ScrollArea(mEmotes);
+    mInvenScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+
+    draw();
+
+    add(mUseButton);
+    add(mInvenScroll);
+
+    mUseButton->setSize(60, mUseButton->getHeight());
+
+    loadWindowState();
+}
+
+void EmoteWindow::action(const gcn::ActionEvent &event)
+{
+    int emote = mEmotes->getSelectedEmote();
+
+    if (!emote)
+        return;
+
+    player_node->emote(emote);
+}
+
+
+void EmoteWindow::draw()
+{
+    const gcn::Rectangle &area = getChildrenArea();
+    const int width = area.width;
+    const int height = area.height;
+
+    mUseButton->setPosition(8, height - 8 - mUseButton->getHeight());
+
+    mInvenScroll->setSize(width - 16, mUseButton->getY() - 18);
+    mInvenScroll->setPosition(8,  10);
+
+    setMinHeight(130);
+}
+
+void EmoteWindow::widgetResized(const gcn::Event &event)
+{
+    Window::widgetResized(event);
+    draw();
+}
+
+
+int EmoteWindow::getSelectedEmote() const
+{
+    return mEmotes->getSelectedEmote();
+}
diff --git a/src/gui/emotewindow.h b/src/gui/emotewindow.h
new file mode 100644
index 00000000..a382e37d
--- /dev/null
+++ b/src/gui/emotewindow.h
@@ -0,0 +1,79 @@
+/*
+ *  Aethyra
+ *  Copyright 2009 Aethyra Development Team
+ *
+ *  This file is part of Aethyra.
+ *
+ *  Aethyra is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  Aethyra is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Aethyra; if not, write to the Free Software Foundation, 
+ *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _AETHYRA_EMOTEWINDOW_H
+#define _AETHYRA_EMOTEWINDOW_H
+
+#include <guichan/actionlistener.hpp>
+#include <guichan/selectionlistener.hpp>
+
+#include "textbox.h"
+#include "window.h"
+
+#include "../guichanfwd.h"
+
+class EmoteContainer;
+
+/**
+ * Emote dialog.
+ *
+ * \ingroup Interface
+ */
+class EmoteWindow : public Window, gcn::ActionListener,
+    gcn::SelectionListener
+{
+    public:
+        /**
+         * Constructor.
+         */
+        EmoteWindow();
+
+        /**
+         * Called when receiving actions from the widgets.
+         */
+        void action(const gcn::ActionEvent &event);
+
+        /**
+         * Returns the selected item.
+         */
+        int getSelectedEmote() const;
+
+        /**
+         * Updates window drawing.
+         */
+        void draw();
+
+        /**
+         * Called whenever the widget changes size.
+         */
+        void widgetResized(const gcn::Event &event);
+
+    private:
+
+        EmoteContainer *mEmotes;
+
+        gcn::Button *mUseButton;
+        gcn::ScrollArea *mInvenScroll;
+};
+
+extern EmoteWindow *emoteWindow;
+
+#endif
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index b576e843..7e2eeac0 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -50,8 +50,8 @@ ItemShortcutContainer::ItemShortcutContainer():
 
     mBackgroundImg->setAlpha(config.getValue("guialpha", 0.8));
 
-    mBoxHeight = 42;
-    mBoxWidth = 36;
+    mBoxHeight = mBackgroundImg->getHeight();
+    mBoxWidth = mBackgroundImg->getWidth();
 }
 
 ItemShortcutContainer::~ItemShortcutContainer()
@@ -89,7 +89,7 @@ ItemShortcutContainer::draw(gcn::Graphics *graphics)
 
         // Draw item keyboard shortcut.
         const char *key = SDL_GetKeyName(
-            (SDLKey) keyboard.getKeyValue(keyboard.KEY_SHORTCUT_0 + i));
+            (SDLKey) keyboard.getKeyValue(keyboard.KEY_SHORTCUT_1 + i));
         graphics->setColor(0x000000);
         g->drawText(key, itemX + 2, itemY + 2, gcn::Graphics::LEFT);
 
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index 99eaca34..2a175a61 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -33,7 +33,7 @@ extern Window *chatWindow;
 extern Window *equipmentWindow;
 extern Window *inventoryWindow;
 extern Window *itemShortcutWindow;
-extern Window *smileyWindow;
+extern Window *emoteWindow;
 extern Window *setupWindow;
 extern Window *skillDialog;
 extern Window *statusWindow;
@@ -120,7 +120,7 @@ void MenuWindowListener::action(const gcn::ActionEvent &event)
     }
     else if (event.getId() == _("Emote"))
     {
-        window = smileyWindow;
+        window = emoteWindow;
     }
     else if (event.getId() == _("Setup"))
     {
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index bcffbae0..66f15f03 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -43,8 +43,8 @@ extern Window *minimap;
 extern Window *skillDialog;
 extern Window *statusWindow;
 extern Window *itemShortcutWindow;
-extern Window *smileyShortcutWindow;
-extern Window *smileyWindow;
+extern Window *emoteShortcutWindow;
+extern Window *emoteWindow;
 extern Window *tradeWindow;
 
 Setup::Setup():
@@ -138,8 +138,8 @@ void Setup::action(const gcn::ActionEvent &event)
         helpWindow->resetToDefaultSize();
         skillDialog->resetToDefaultSize();
         itemShortcutWindow->resetToDefaultSize();
-        smileyShortcutWindow->resetToDefaultSize();
-        smileyWindow->resetToDefaultSize();
+        emoteShortcutWindow->resetToDefaultSize();
+        emoteWindow->resetToDefaultSize();
         tradeWindow->resetToDefaultSize();
     }
 }
diff --git a/src/gui/setup.h b/src/gui/setup.h
index fd200f4c..1ad93cac 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -53,8 +53,7 @@ class Setup : public Window, public gcn::ActionListener
         /**
          * Event handling method.
          */
-        void
-        action(const gcn::ActionEvent &event);
+        void action(const gcn::ActionEvent &event);
 
     private:
         std::list<SetupTab*> mTabs;
diff --git a/src/gui/shortcutcontainer.cpp b/src/gui/shortcutcontainer.cpp
index 32d7c6af..88d9bb22 100644
--- a/src/gui/shortcutcontainer.cpp
+++ b/src/gui/shortcutcontainer.cpp
@@ -43,7 +43,8 @@ ShortcutContainer::ShortcutContainer():
 void ShortcutContainer::widgetResized(const gcn::Event &event)
 {
     mGridWidth = getWidth() / mBoxWidth;
-    if (mGridWidth < 1) {
+    if (mGridWidth < 1) 
+    {
         mGridWidth = 1;
     }
 
@@ -51,7 +52,8 @@ void ShortcutContainer::widgetResized(const gcn::Event &event)
                 (mMaxItems % mGridWidth > 0 ? 1 : 0)) * mBoxHeight);
 
     mGridHeight = getHeight() / mBoxHeight;
-    if (mGridHeight < 1) {
+    if (mGridHeight < 1) 
+    {
         mGridHeight = 1;
     }
 }
@@ -61,7 +63,8 @@ ShortcutContainer::getIndexFromGrid(int pointX, int pointY) const
 {
     const gcn::Rectangle tRect = gcn::Rectangle(
         0, 0, mGridWidth * mBoxWidth, mGridHeight * mBoxHeight);
-    if (!tRect.isPointInRect(pointX, pointY)) {
+    if (!tRect.isPointInRect(pointX, pointY)) 
+    {
         return -1;
     }
     const int index = ((pointY / mBoxHeight) * mGridWidth) +
diff --git a/src/gui/shortcutcontainer.h b/src/gui/shortcutcontainer.h
index ebc0a9fc..9d0584d3 100644
--- a/src/gui/shortcutcontainer.h
+++ b/src/gui/shortcutcontainer.h
@@ -29,7 +29,6 @@
 #include "../guichanfwd.h"
 
 class Image;
-class Item;
 
 /**
  * An item shortcut container. Used to quickly use items.
@@ -54,7 +53,7 @@ class ShortcutContainer : public gcn::Widget,
         /**
          * Draws the items.
          */
-        virtual void draw(gcn::Graphics *graphics)=0;
+        virtual void draw(gcn::Graphics *graphics) = 0;
 
         /**
          * Invoked when a widget changes its size. This is used to determine
@@ -65,17 +64,17 @@ class ShortcutContainer : public gcn::Widget,
         /**
          * Handles mouse when dragged.
          */
-        virtual void mouseDragged(gcn::MouseEvent &event)=0;
+        virtual void mouseDragged(gcn::MouseEvent &event) = 0;
 
         /**
          * Handles mouse when pressed.
          */
-        virtual void mousePressed(gcn::MouseEvent &event)=0;
+        virtual void mousePressed(gcn::MouseEvent &event) = 0;
 
         /**
          * Handles mouse release.
          */
-        virtual void mouseReleased(gcn::MouseEvent &event)=0;
+        virtual void mouseReleased(gcn::MouseEvent &event) = 0;
 
         virtual int getMaxItems()
         { return mMaxItems; }
diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h
index b5a23c2c..9ac1a52a 100644
--- a/src/gui/shortcutwindow.h
+++ b/src/gui/shortcutwindow.h
@@ -60,6 +60,6 @@ class ShortcutWindow : public Window
 };
 
 extern ShortcutWindow *itemShortcutWindow;
-extern ShortcutWindow *smileyShortcutWindow;
+extern ShortcutWindow *emoteShortcutWindow;
 
 #endif
diff --git a/src/gui/smileycontainer.cpp b/src/gui/smileycontainer.cpp
deleted file mode 100644
index f8f57c45..00000000
--- a/src/gui/smileycontainer.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "smileycontainer.h"
-
-#include <guichan/mouseinput.hpp>
-#include <guichan/selectionlistener.hpp>
-
-#include "../configuration.h"
-#include "../graphics.h"
-#include "../log.h"
-#include "../smileyshortcut.h"
-
-#include "../resources/image.h"
-#include "../resources/iteminfo.h"
-#include "../resources/resourcemanager.h"
-
-#include "../utils/gettext.h"
-#include "../utils/tostring.h"
-
-const int SmileyContainer::gridWidth = 34;  // emote icon width + 4
-const int SmileyContainer::gridHeight = 36; // emote icon height + 4
-
-static const int NO_EMOTE = -1;
-
-SmileyContainer::SmileyContainer():
-    mSelectedEmoteIndex(NO_EMOTE)
-{
-    ResourceManager *resman = ResourceManager::getInstance();
-
-    mSmileyImg = resman->getImageSet("graphics/sprites/emotions.png", 30, 32);
-    if (!mSmileyImg) logger->error(_("Unable to load emotions"));
-
-    mSelImg = resman->getImage("graphics/gui/selection.png");
-    if (!mSelImg) logger->error(_("Unable to load selection.png"));
-
-    mSelImg->setAlpha(config.getValue("guialpha", 0.8));
-
-    mMaxSmiley = mSmileyImg->size(); 
-
-    addMouseListener(this);
-    addWidgetListener(this);
-}
-
-SmileyContainer::~SmileyContainer()
-{
-    if (mSmileyImg)
-    {
-       mSmileyImg->decRef();
-       mSmileyImg=NULL;
-    }
-    if (!mSelImg)
-    {
-       mSelImg->decRef();
-       mSelImg=NULL;
-    }
-}
-
-void SmileyContainer::draw(gcn::Graphics *graphics)
-{
-    int columns = getWidth() / gridWidth;
-
-    // Have at least 1 column
-    if (columns < 1)
-    {
-        columns = 1;
-    }
-
-    for (int i = 0; i < mMaxSmiley ; i++)
-    {
-        int itemX = ((i) % columns) * gridWidth;
-        int itemY = ((i) / columns) * gridHeight;
-           
-
-        // Draw item icon
-        static_cast<Graphics*>(graphics)->drawImage(
-                    mSmileyImg->get(i), itemX, itemY);
-
-        // Draw selection image below selected item
-        if (mSelectedEmoteIndex == i)
-        {
-            static_cast<Graphics*>(graphics)->drawImage(
-                    mSelImg, itemX, itemY);
-        }
-    }
-}
-
-void SmileyContainer::widgetResized(const gcn::Event &event)
-{
-    recalculateHeight();
-}
-
-void SmileyContainer::recalculateHeight()
-{
-    int cols = getWidth() / gridWidth;
-
-    if (cols < 1)
-        cols = 1;
-
-    const int rows = (mMaxSmiley / cols) + (mMaxSmiley % cols > 0 ? 1 : 0);
-    const int height = rows * gridHeight + 8;
-    if (height != getHeight())
-        setHeight(height);
-}
-
-int SmileyContainer::getSelectedSmiley() 
-{
-    if (mSelectedEmoteIndex == NO_EMOTE)
-        return 0;
-
-    return 1+mSelectedEmoteIndex;
-}
-
-void SmileyContainer::selectNone()
-{
-    setSelectedEmoteIndex(NO_EMOTE);
-}
-
-void SmileyContainer::setSelectedEmoteIndex(int index)
-{
-    if (index < 0 || index >= mMaxSmiley )
-        mSelectedEmoteIndex = NO_EMOTE;
-    else
-        mSelectedEmoteIndex = index;
-}
-
-void SmileyContainer::distributeValueChangedEvent()
-{
-    gcn::SelectionEvent event(this);
-    std::list<gcn::SelectionListener*>::iterator i_end = mListeners.end();
-    std::list<gcn::SelectionListener*>::iterator i;
-
-    for (i = mListeners.begin(); i != i_end; ++i)
-    {
-        (*i)->valueChanged(event);
-    }
-}
-
-void SmileyContainer::mousePressed(gcn::MouseEvent &event)
-{
-    int button = event.getButton();
-    if (button == gcn::MouseEvent::LEFT || button == gcn::MouseEvent::RIGHT)
-    {
-        int columns = getWidth() / gridWidth;
-        int mx = event.getX();
-        int my = event.getY();
-        int index = mx / gridWidth + ((my / gridHeight) * columns);
-        if (index <mMaxSmiley)
-        {
-           setSelectedEmoteIndex(index);
-           smileyShortcut->setSmileySelected(index+1);
-        }
-    }
-}
diff --git a/src/gui/smileycontainer.h b/src/gui/smileycontainer.h
deleted file mode 100644
index 88ca0b48..00000000
--- a/src/gui/smileycontainer.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _TMW_SMILEYCONTAINER_H__
-#define _TMW_SMILEYCONTAINER_H__
-
-#include <list>
-
-#include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
-
-#include "../resources/imageset.h"
-#include "../guichanfwd.h"
-
-class Image;
-class Inventory;
-class Emote;
-
-namespace gcn {
-    class SelectionListener;
-}
-
-/**
- * An item container. Used to show items in inventory and trade dialog.
- *
- * \ingroup GUI
- */
-class SmileyContainer : public gcn::Widget, 
-                      public gcn::MouseListener,
-                      public gcn::WidgetListener
-{
-    public:
-        /**
-         * Constructor. Initializes the graphic.
-         */
-        SmileyContainer();
-
-        /**
-         * Destructor.
-         */
-        virtual ~SmileyContainer();
-
-        /**
-         * Draws the items.
-         */
-        void draw(gcn::Graphics *graphics);
-
-        /**
-         * Called whenever the widget changes size.
-         */
-        void widgetResized(const gcn::Event &event);
-
-        /**
-         * Handles mouse click.
-         */
-        void mousePressed(gcn::MouseEvent &event);
-
-        /**
-         * Returns the selected item.
-         */
-        int getSelectedSmiley();
-
-        /**
-         * Sets selected item to NULL.
-         */
-        void selectNone();
-
-        /**
-         * Adds a listener to the list that's notified each time a change to
-         * the selection occurs.
-         */
-        void addSelectionListener(gcn::SelectionListener *listener)
-        {
-            mListeners.push_back(listener);
-        }
-
-        /**
-         * Removes a listener from the list that's notified each time a change
-         * to the selection occurs.
-         */
-        void removeSelectionListener(gcn::SelectionListener *listener)
-        {
-            mListeners.remove(listener);
-        }
-
-    private:
-        /**
-
-         * Sets the currently selected item.  Invalid (e.g., negative) indices set `no item'.
-         */
-        void setSelectedEmoteIndex(int index);
-
-        /**
-         * Find the current item index by the most recently used item ID
-         */
-        void refindSelectedEmote(void);
-
-        /**
-         * Determine and set the height of the container.
-         */
-        void recalculateHeight(void);
-
-        /**
-         * Sends out selection events to the list of selection listeners.
-         */
-        void distributeValueChangedEvent(void);
-
-        ImageSet *mSmileyImg;
-        Image *mSelImg;
-        int mSelectedEmoteIndex;
-
-        int mMaxSmiley;
-
-        std::list<gcn::SelectionListener*> mListeners;
-
-        static const int gridWidth;
-        static const int gridHeight;
-};
-
-#endif
diff --git a/src/gui/smileyshortcutcontainer.cpp b/src/gui/smileyshortcutcontainer.cpp
deleted file mode 100644
index c3cd056d..00000000
--- a/src/gui/smileyshortcutcontainer.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2007 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "smileyshortcutcontainer.h"
-
-#include "../graphics.h"
-#include "../inventory.h"
-#include "../item.h"
-#include "../itemshortcut.h"
-#include "../smileyshortcut.h"
-#include "../keyboardconfig.h"
-#include "../localplayer.h"
-#include "../log.h"
-
-
-#include "../resources/image.h"
-#include "../resources/resourcemanager.h"
-
-#include "../utils/gettext.h"
-#include "../utils/tostring.h"
-
-SmileyShortcutContainer::SmileyShortcutContainer():
-    mSmileyClicked(false),
-    mSmileyMoved(0)
-{
-    mGridWidth = 1,
-    mGridHeight = 1,
-    addMouseListener(this);
-    addWidgetListener(this);
-
-    ResourceManager *resman = ResourceManager::getInstance();
-
-    mBackgroundImg = resman->getImage("graphics/gui/item_shortcut_bgr.png");
-    mSmileyImg = resman->getImageSet("graphics/sprites/emotions.png", 30, 32);
-    if (!mSmileyImg) logger->error(_("Unable to load emotions"));
-
-    mMaxItems = smileyShortcut->getSmileyCount(); 
-
-    mBoxHeight = 42;
-    mBoxWidth = 36;
-}
-
-SmileyShortcutContainer::~SmileyShortcutContainer()
-{
-    mBackgroundImg->decRef();
-    if (mSmileyImg)
-    {
-       mSmileyImg->decRef();
-       mSmileyImg=NULL;
-    }
-
-}
-
-void
-SmileyShortcutContainer::draw(gcn::Graphics *graphics)
-{
-    Graphics *g = static_cast<Graphics*>(graphics);
-
-    graphics->setFont(getFont());
-
-    for (int i = 0; i < mMaxItems; i++)
-    {
-        const int itemX = (i % mGridWidth) * mBoxWidth;
-        const int itemY = (i / mGridWidth) * mBoxHeight;
-
-        g->drawImage(mBackgroundImg, itemX, itemY);
-
-        // Draw item keyboard shortcut.
-        const char *key = SDL_GetKeyName(
-            (SDLKey) keyboard.getKeyValue(keyboard.KEY_SMILEY_1 + i));
-        graphics->setColor(0x000000);
-        g->drawText(key, itemX + 2, itemY + 2, gcn::Graphics::LEFT);
-        if (smileyShortcut->getSmiley(i))
-        {
-        static_cast<Graphics*>(graphics)->drawImage(
-                    mSmileyImg->get(smileyShortcut->getSmiley(i)-1), itemX+2, itemY+10);
-        }
-
-    }
-    if (mSmileyMoved)
-    {
-        // Draw the item image being dragged by the cursor.
-        Image* image = mSmileyImg->get(mSmileyMoved-1);
-        if (image)
-        {
-            const int tPosX = mCursorPosX - (image->getWidth() / 2);
-            const int tPosY = mCursorPosY - (image->getHeight() / 2);
-
-            g->drawImage(image, tPosX, tPosY);
-        }
-    }
-}
-
-void
-SmileyShortcutContainer::mouseDragged(gcn::MouseEvent &event)
-{
-   if (event.getButton() == gcn::MouseEvent::LEFT) {
-      if (!mSmileyMoved && mSmileyClicked) {
-         const int index = getIndexFromGrid(event.getX(), event.getY());
-         if (index == -1) {
-            return;
-         }
-         const int smileyId = smileyShortcut->getSmiley(index);
-         if (smileyId)
-         {
-            mSmileyMoved = smileyId;
-            smileyShortcut->removeSmiley(index);
-         }
-      }
-      if (mSmileyMoved) {
-         mCursorPosX = event.getX();
-         mCursorPosY = event.getY();
-      }
-   }
-}
-
-void
-SmileyShortcutContainer::mousePressed(gcn::MouseEvent &event)
-{
-   const int index = getIndexFromGrid(event.getX(), event.getY());
-   if (index == -1) {
-      return;
-   }
-   // Stores the selected item if theirs one.
-   if (smileyShortcut->isSmileySelected()) {
-      smileyShortcut->setSmiley(index);
-      smileyShortcut->setSmileySelected(0);
-   }
-   else if (smileyShortcut->getSmiley(index)) {
-      mSmileyClicked = true;
-   }
-}
-
-void
-SmileyShortcutContainer::mouseReleased(gcn::MouseEvent &event)
-{
-   if (event.getButton() == gcn::MouseEvent::LEFT)
-   {
-      if (smileyShortcut->isSmileySelected())
-      {
-         smileyShortcut->setSmileySelected(0);
-      }
-      const int index = getIndexFromGrid(event.getX(), event.getY());
-      if (index == -1) {
-         mSmileyMoved = 0;
-         return;
-      }
-      if (mSmileyMoved) {
-         smileyShortcut->setSmileys(index, mSmileyMoved);
-         mSmileyMoved = 0;
-      }
-      else if (smileyShortcut->getSmiley(index) && mSmileyClicked)
-      {
-         smileyShortcut->useSmiley(index+1);
-      }
-      if (mSmileyClicked) {
-         mSmileyClicked = false;
-      }
-   }
-}
-
diff --git a/src/gui/smileyshortcutcontainer.h b/src/gui/smileyshortcutcontainer.h
deleted file mode 100644
index 55df6124..00000000
--- a/src/gui/smileyshortcutcontainer.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2007 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _TMW_SMILEYSHORTCUTCONTAINER_H__
-#define _TMW_SMILEYSHORTCUTCONTAINER_H__
-
-#include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
-
-#include "../resources/imageset.h"
-#include "../guichanfwd.h"
-
-#include "shortcutcontainer.h"
-
-class Image;
-class Item;
-
-/**
- * A smiley shortcut container. Used to quickly use items.
- *
- * \ingroup GUI
- */
-class SmileyShortcutContainer : public ShortcutContainer
-{
-    public:
-        /**
-         * Constructor. Initializes the graphic.
-         */
-        SmileyShortcutContainer();
-
-        /**
-         * Destructor.
-         */
-        virtual ~SmileyShortcutContainer();
-
-        /**
-         * Draws the items.
-         */
-        void draw(gcn::Graphics *graphics);
-
-        /**
-         * Handles mouse when dragged.
-         */
-        void mouseDragged(gcn::MouseEvent &event);
-
-        /**
-         * Handles mouse when pressed.
-         */
-        void mousePressed(gcn::MouseEvent &event);
-
-        /**
-         * Handles mouse release.
-         */
-        void mouseReleased(gcn::MouseEvent &event);
-
-    private:
-        ImageSet *mSmileyImg;
-
-        bool mSmileyClicked;
-        int mSmileyMoved;
-};
-
-#endif
diff --git a/src/gui/smileywindow.cpp b/src/gui/smileywindow.cpp
deleted file mode 100644
index e3e821ff..00000000
--- a/src/gui/smileywindow.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <string>
-
-#include <guichan/mouseinput.hpp>
-
-#include "button.h"
-#include "gui.h"
-#include "smileywindow.h"
-#include "smileycontainer.h"
-#include "scrollarea.h"
-
-#include "../localplayer.h"
-
-#include "../utils/gettext.h"      
-#include "../utils/tostring.h"
-
-SmileyWindow::SmileyWindow():
-    Window(_("Emote"))
-{
-    setWindowName(_("Emote"));
-    setResizable(true);
-    setCloseButton(true);
-    setMinWidth(80);
-    setDefaultSize(115, 25, 322, 200);
-
-    mUseButton = new Button(_("Use"), "use", this);
-
-    mEmotes = new SmileyContainer();
-    mEmotes->addSelectionListener(this);
-
-    mInvenScroll = new ScrollArea(mEmotes);
-    mInvenScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-
-    draw();
-
-    add(mUseButton);
-    add(mInvenScroll);
-
-    mUseButton->setSize(60, mUseButton->getHeight());
-
-    loadWindowState();
-}
-
-void SmileyWindow::action(const gcn::ActionEvent &event)
-{
-    int emote = mEmotes->getSelectedSmiley();
-
-    if (!emote)
-        return;
-
-    player_node->emote(emote);
-}
-
-
-void SmileyWindow::draw()
-{
-    const gcn::Rectangle &area = getChildrenArea();
-    const int width = area.width;
-    const int height = area.height;
-
-    mUseButton->setPosition(8, height - 8 - mUseButton->getHeight());
-
-    mInvenScroll->setSize(width - 16, mUseButton->getY() - 18);
-    mInvenScroll->setPosition(8,  10);
-
-    setMinHeight(130);
-}
-
-void SmileyWindow::widgetResized(const gcn::Event &event)
-{
-    Window::widgetResized(event);
-    draw();
-}
-
-
-int SmileyWindow::getSelectedSmiley() const
-{
-    return mEmotes->getSelectedSmiley();
-}
diff --git a/src/gui/smileywindow.h b/src/gui/smileywindow.h
deleted file mode 100644
index db27fcbd..00000000
--- a/src/gui/smileywindow.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _TMW_SMILEYWINDOW_H
-#define _TMW_SMILEYWINDOW_H
-
-#include <guichan/actionlistener.hpp>
-#include <guichan/selectionlistener.hpp>
-
-#include "textbox.h"
-#include "window.h"
-
-#include "../guichanfwd.h"
-
-class Item;
-class SmileyContainer;
-
-/**
- * smiley dialog.
- *
- * \ingroup Interface
- */
-class SmileyWindow : public Window, gcn::ActionListener,
-    gcn::SelectionListener
-{
-    public:
-        /**
-         * Constructor.
-         */
-        SmileyWindow();
-
-        /**
-         * Called when receiving actions from the widgets.
-         */
-        void action(const gcn::ActionEvent &event);
-
-        /**
-         * Returns the selected item.
-         */
-        int getSelectedSmiley() const;
-
-        /**
-         * Updates window drawing.
-         */
-        void draw();
-
-        /**
-         * Called whenever the widget changes size.
-         */
-        void widgetResized(const gcn::Event &event);
-
-    private:
-
-        SmileyContainer *mEmotes;
-
-        gcn::Button *mUseButton;
-        gcn::ScrollArea *mInvenScroll;
-};
-
-extern SmileyWindow *smileyWindow;
-
-#endif
diff --git a/src/itemshortcut.h b/src/itemshortcut.h
index a0c52468..57800d96 100644
--- a/src/itemshortcut.h
+++ b/src/itemshortcut.h
@@ -22,7 +22,7 @@
 #ifndef _TMW_ITEMSHORTCUT_H__
 #define _TMW_ITEMSHORTCUT_H__
 
-#define SHORTCUT_ITEMS 10
+#define SHORTCUT_ITEMS 12
 
 class Item;
 
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 0923f331..932f6ad2 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -50,7 +50,6 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
     {"keyPickup", SDLK_z, "Pickup"},
     {"keyHideWindows", SDLK_h, "Hide Windows"},
     {"keyBeingSit", SDLK_s, "Sit"},
-    {"keyShortcut0", SDLK_0, "Item Shortcut 0"},
     {"keyShortcut1", SDLK_1, "Item Shortcut 1"},
     {"keyShortcut2", SDLK_2, "Item Shortcut 2"},
     {"keyShortcut3", SDLK_3, "Item Shortcut 3"},
@@ -60,6 +59,9 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
     {"keyShortcut7", SDLK_7, "Item Shortcut 7"},
     {"keyShortcut8", SDLK_8, "Item Shortcut 8"},
     {"keyShortcut9", SDLK_9, "Item Shortcut 9"},
+    {"keyShortcut10", SDLK_0, "Item Shortcut 10"},
+    {"keyShortcut11", SDLK_MINUS, "Item Shortcut 11"},
+    {"keyShortcut12", SDLK_EQUALS, "Item Shortcut 12"},
     {"keyWindowStatus", SDLK_F2, "Status Window"},
     {"keyWindowInventory", SDLK_F3, "Inventory Window"},
     {"keyWindowEquipment", SDLK_F4, "Equipment WIndow"},
@@ -69,20 +71,20 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
     {"keyWindowShortcut", SDLK_F8, "Item Shortcut Window"},
     {"keyWindowSetup", SDLK_F9, "Setup Window"},
     {"keyWindowDebug", SDLK_F10, "Debug Window"},
-    {"keyWindowSmileyList", SDLK_F11, "Smiley List Window"},
-    {"keyWindowSmileyBar", SDLK_F12, "Smiley Shortcut Window"},
-    {"keySmileyShortcut1", SDLK_KP1, "Smiley Shortcut 1"},
-    {"keySmileyShortcut2", SDLK_KP2, "Smiley Shortcut 2"},
-    {"keySmileyShortcut3", SDLK_KP3, "Smiley Shortcut 3"},
-    {"keySmileyShortcut4", SDLK_KP4, "Smiley Shortcut 4"},
-    {"keySmileyShortcut5", SDLK_KP5, "Smiley Shortcut 5"},
-    {"keySmileyShortcut6", SDLK_KP6, "Smiley Shortcut 6"},
-    {"keySmileyShortcut7", SDLK_KP7, "Smiley Shortcut 7"},
-    {"keySmileyShortcut8", SDLK_KP8, "Smiley Shortcut 8"},
-    {"keySmileyShortcut9", SDLK_KP9, "Smiley Shortcut 9"},
-    {"keySmileyShortcut10", SDLK_KP0, "Smiley Shortcut 10"},
-    {"keySmileyShortcut11", SDLK_KP_DIVIDE, "Smiley Shortcut 11"},
-    {"keySmileyShortcut12", SDLK_KP_MULTIPLY, "Smiley Shortcut 12"}
+    {"keyWindowEmote", SDLK_F11, "Emote Window"},
+    {"keyWindowEmoteBar", SDLK_F12, "Emote Shortcut Window"},
+    {"keyEmoteShortcut1", SDLK_1, "Emote Shortcut 1"},
+    {"keyEmoteShortcut2", SDLK_2, "Emote Shortcut 2"},
+    {"keyEmoteShortcut3", SDLK_3, "Emote Shortcut 3"},
+    {"keyEmoteShortcut4", SDLK_4, "Emote Shortcut 4"},
+    {"keyEmoteShortcut5", SDLK_5, "Emote Shortcut 5"},
+    {"keyEmoteShortcut6", SDLK_6, "Emote Shortcut 6"},
+    {"keyEmoteShortcut7", SDLK_7, "Emote Shortcut 7"},
+    {"keyEmoteShortcut8", SDLK_8, "Emote Shortcut 8"},
+    {"keyEmoteShortcut9", SDLK_9, "Emote Shortcut 9"},
+    {"keyEmoteShortcut10", SDLK_0, "Emote Shortcut 10"},
+    {"keyEmoteShortcut11", SDLK_MINUS, "Emote Shortcut 11"},
+    {"keyEmoteShortcut12", SDLK_EQUALS, "Emote Shortcut 12"}
 };
 
 void KeyboardConfig::init()
@@ -134,16 +136,11 @@ bool KeyboardConfig::hasConflicts()
  */
     for (i = 0; i < KEY_TOTAL; i++)
     {
-        for (j = i,j++; j < KEY_TOTAL; j++)
+        for (j = i, j++; j < KEY_TOTAL; j++)
         {
-/**
- * KEY_SMILEY_* are separated from other keys, duplicate in different
- *  area is allowed, but not in same area (of course)
- *  (i.e.: not two identical key for smiley, not two identical for other;
- *  but same key for a smiley and a not-smiley is ok)
- *  
- */
-            if (!((i<KEY_SMILEY_1)&&(j>=KEY_SMILEY_1))
+            // Allow for item shortcut and emote keys to overlap, but no other keys
+            if (!(((i >= KEY_SHORTCUT_1) && (i <= KEY_SHORTCUT_12)) && 
+                  ((j >= KEY_EMOTE_1) && (j <= KEY_EMOTE_12)))
                  && mKey[i].value == mKey[j].value
 	       )
             {
@@ -171,13 +168,14 @@ int KeyboardConfig::getKeyIndex(int keyValue) const
     return KEY_NO_VALUE;
 }
 
-int KeyboardConfig::getKeySmilieOffset(int keyValue) const
+
+int KeyboardConfig::getKeyEmoteOffset(int keyValue) const
 {
-    for (int i = KEY_SMILEY_1; i <= KEY_SMILEY_12; i++)
+    for (int i = KEY_EMOTE_1; i <= KEY_EMOTE_12; i++)
     {
         if(keyValue == mKey[i].value)
         {
-            return 1+i-KEY_SMILEY_1;
+            return 1 + i - KEY_EMOTE_1;
         }
     }
     return 0;
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index f6439795..716f9a17 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -103,9 +103,9 @@ class KeyboardConfig
         int getKeyIndex(int keyValue) const;
 
         /**
-         * Get the key function index for smiley by providing the offset value.
+         * Get the key function index for an emote by providing the offset value.
          */
-        int getKeySmilieOffset(int keyValue) const;
+        int getKeyEmoteOffset(int keyValue) const;
 
         /**
          * Set the enable flag, which will stop the user from doing actions.
@@ -147,8 +147,6 @@ class KeyboardConfig
          * KEY_TOTAL should always be last (used as a conditional in loops).
          * The key assignment view gets arranged according to the order of
          * these values.
-         *
-         * KEY_SMILEY_* must be also at the end (just before KEY_TOTAL)
          */
         enum KeyAction {
             KEY_NO_VALUE = -1,
@@ -157,7 +155,7 @@ class KeyboardConfig
             KEY_MOVE_LEFT,
             KEY_MOVE_RIGHT,
             KEY_ATTACK,
-            KEY_SMILIE,
+            KEY_EMOTE,
             KEY_TALK,
             KEY_TARGET,
             KEY_TARGET_CLOSEST,
@@ -166,7 +164,6 @@ class KeyboardConfig
             KEY_PICKUP,
             KEY_HIDE_WINDOWS,
             KEY_SIT,
-            KEY_SHORTCUT_0,
             KEY_SHORTCUT_1,
             KEY_SHORTCUT_2,
             KEY_SHORTCUT_3,
@@ -176,6 +173,9 @@ class KeyboardConfig
             KEY_SHORTCUT_7,
             KEY_SHORTCUT_8,
             KEY_SHORTCUT_9,
+            KEY_SHORTCUT_10,
+            KEY_SHORTCUT_11,
+            KEY_SHORTCUT_12,
             KEY_WINDOW_STATUS,
             KEY_WINDOW_INVENTORY,
             KEY_WINDOW_EQUIPMENT,
@@ -185,20 +185,20 @@ class KeyboardConfig
             KEY_WINDOW_SHORTCUT,
             KEY_WINDOW_SETUP,
             KEY_WINDOW_DEBUG,
-            KEY_WINDOW_ALLSMILEY,
-            KEY_WINDOW_SMILEY_SHORTCUT,
-            KEY_SMILEY_1,
-            KEY_SMILEY_2,
-            KEY_SMILEY_3,
-            KEY_SMILEY_4,
-            KEY_SMILEY_5,
-            KEY_SMILEY_6,
-            KEY_SMILEY_7,
-            KEY_SMILEY_8,
-            KEY_SMILEY_9,
-            KEY_SMILEY_10,
-            KEY_SMILEY_11,
-            KEY_SMILEY_12,
+            KEY_WINDOW_EMOTE,
+            KEY_WINDOW_EMOTE_SHORTCUT,
+            KEY_EMOTE_1,
+            KEY_EMOTE_2,
+            KEY_EMOTE_3,
+            KEY_EMOTE_4,
+            KEY_EMOTE_5,
+            KEY_EMOTE_6,
+            KEY_EMOTE_7,
+            KEY_EMOTE_8,
+            KEY_EMOTE_9,
+            KEY_EMOTE_10,
+            KEY_EMOTE_11,
+            KEY_EMOTE_12,
             KEY_TOTAL
         };
 
diff --git a/src/main.cpp b/src/main.cpp
index d9ebaefa..3cf8611d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -40,7 +40,6 @@
 #include "game.h"
 #include "graphics.h"
 #include "itemshortcut.h"
-#include "smileyshortcut.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
 #include "lockedarray.h"
@@ -57,6 +56,7 @@
 #include "gui/char_server.h"
 #include "gui/char_select.h"
 #include "gui/colour.h"
+#include "gui/emoteshortcut.h"
 #include "gui/gui.h"
 #include "gui/login.h"
 #include "gui/ok_dialog.h"
@@ -403,8 +403,8 @@ void init_engine(const Options &options)
     // Initialize the item shortcuts.
     itemShortcut = new ItemShortcut();
       
-    // Initialize the smiley shortcuts.
-    smileyShortcut = new SmileyShortcut();
+    // Initialize the emote shortcuts.
+    emoteShortcut = new EmoteShortcut();
 
     gui = new Gui(graphics);
     state = LOGIN_STATE; /**< Initial game state */
@@ -438,7 +438,7 @@ void exit_engine()
     // Before config.write() since it writes the shortcuts to the config
     delete itemShortcut;
     
-    delete smileyShortcut;
+    delete emoteShortcut;
 
     config.write();
 
diff --git a/src/smileyshortcut.cpp b/src/smileyshortcut.cpp
deleted file mode 100644
index adc7d9c3..00000000
--- a/src/smileyshortcut.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2007 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "configuration.h"
-#include "smileyshortcut.h"
-#include "localplayer.h"
-
-#include "utils/tostring.h"
-
-SmileyShortcut::SmileyShortcut *smileyShortcut;
-
-SmileyShortcut::SmileyShortcut():
-    mSmileySelected(0)
-{
-    for (int i = 0; i < SHORTCUT_SMILEYS; i++)
-    {
-        mSmileys[i] = i+1;
-    }
-    load();
-}
-
-SmileyShortcut::~SmileyShortcut()
-{
-    save();
-}
-
-void SmileyShortcut::load()
-{
-    for (int i = 0; i < SHORTCUT_SMILEYS; i++)
-    {
-        int smileyId = (int) config.getValue("Smileyshortcut" + toString(i), i+1);
-
-        if (smileyId)
-        {
-            mSmileys[i] = smileyId;
-        }
-    }
-}
-
-void SmileyShortcut::save()
-{
-    for (int i = 0; i < SHORTCUT_SMILEYS; i++)
-    {
-        const int smileyId = mSmileys[i] ? mSmileys[i] : 0;
-        config.setValue("Smileyshortcut" + toString(i), smileyId);
-    }
-}
-
-void SmileyShortcut::useSmiley(int index)
-{
-    if ((index>0)&&(index<=SHORTCUT_SMILEYS))
-    {
-       if (mSmileys[index-1]>0)
-       {
-          player_node->emote(mSmileys[index-1]);
-       }
-    }
-}
diff --git a/src/smileyshortcut.h b/src/smileyshortcut.h
deleted file mode 100644
index c4fb9280..00000000
--- a/src/smileyshortcut.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2007 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _TMW_SMILEYSHORTCUT_H__
-#define _TMW_SMILEYSHORTCUT_H__
-
-#define SHORTCUT_SMILEYS 12
-
-class Item;
-
-/**
- * The class which keeps track of the item shortcuts.
- */
-class SmileyShortcut
-{
-    public:
-        /**
-         * Constructor.
-         */
-        SmileyShortcut();
-
-        /**
-         * Destructor.
-         */
-        ~SmileyShortcut();
-
-        /**
-         * Load the configuration information.
-         */
-        void load();
-
-        /**
-         * Returns the shortcut smiley ID specified by the index.
-         *
-         * @param index Index of the shortcut smiley.
-         */
-        int getSmiley(int index) const
-        { return mSmileys[index]; }
-
-        /**
-         * Returns the amount of shortcut smileys.
-         */
-        int getSmileyCount() const
-        { return SHORTCUT_SMILEYS; }
-
-        /**
-         * Returns the item ID that is currently selected.
-         */
-        int getSmileySelected() const
-        { return mSmileySelected; }
-
-        /**
-         * Adds the selected item ID to the items specified by the index.
-         *
-         * @param index Index of the items.
-         */
-        void setSmiley(int index)
-        { mSmileys[index] = mSmileySelected; }
-
-        /**
-         * Adds a smiley to the smileys store specified by the index.
-         *
-         * @param index Index of the smiley.
-         * @param smileyId ID of the smiley.
-         */
-        void setSmileys(int index, int smileyId)
-        { mSmileys[index] = smileyId; }
-
-        /**
-         * Set the smiley that is selected.
-         *
-         * @param smileyId The ID of the smiley that is to be assigned.
-         */
-        void setSmileySelected(int smileyId)
-        { mSmileySelected = smileyId; }
-
-        /**
-         * A flag to check if the smiley is selected.
-         */
-        bool isSmileySelected()
-        { return mSmileySelected; }
-
-        /**
-         * Remove a smiley from the shortcut.
-         */
-        void removeSmiley(int index)
-        { mSmileys[index] = 0; }
-
-        /**
-         * Try to use the smiley specified by the index.
-         *
-         * @param index Index of the smiley shortcut.
-         */
-        void useSmiley(int index);
-
-    private:
-        /**
-         * Save the configuration information.
-         */
-        void save();
-
-        int mSmileys[SHORTCUT_SMILEYS]; /**< The smiley stored. */
-        int mSmileySelected;            /**< The smiley held by cursor. */
-
-};
-
-extern SmileyShortcut *smileyShortcut;
-
-#endif
-- 
cgit v1.2.3-70-g09d2


From 8e387c0a6992baa503797b6448bbccfc1d426447 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 12 Jan 2009 16:04:35 -0700
Subject: Some code style cleanups, as well as uncommented the font setting for
 the emote shortcut window (which I meant to test before committing. Don't
 remove this line, as text drawing behavior is rather crazy without it).

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/emoteshortcutcontainer.cpp |  2 +-
 src/gui/itemshortcutcontainer.cpp  | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
index 5e984dd5..de9f8bab 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -71,7 +71,7 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
 {
     Graphics *g = static_cast<Graphics*>(graphics);
 
-    //graphics->setFont(getFont());
+    graphics->setFont(getFont());
 
     for (int i = 0; i < mMaxItems; i++)
     {
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index 7e2eeac0..e66dc04f 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -59,8 +59,7 @@ ItemShortcutContainer::~ItemShortcutContainer()
     mBackgroundImg->decRef();
 }
 
-void
-ItemShortcutContainer::logic()
+void ItemShortcutContainer::logic()
 {
     gcn::Widget::logic();
 
@@ -73,8 +72,7 @@ ItemShortcutContainer::logic()
     }
 }
 
-void
-ItemShortcutContainer::draw(gcn::Graphics *graphics)
+void ItemShortcutContainer::draw(gcn::Graphics *graphics)
 {
     Graphics *g = static_cast<Graphics*>(graphics);
 
@@ -134,8 +132,7 @@ ItemShortcutContainer::draw(gcn::Graphics *graphics)
     }
 }
 
-void
-ItemShortcutContainer::mouseDragged(gcn::MouseEvent &event)
+void ItemShortcutContainer::mouseDragged(gcn::MouseEvent &event)
 {
     if (event.getButton() == gcn::MouseEvent::LEFT) {
         if (!mItemMoved && mItemClicked) {
@@ -160,8 +157,7 @@ ItemShortcutContainer::mouseDragged(gcn::MouseEvent &event)
     }
 }
 
-void
-ItemShortcutContainer::mousePressed(gcn::MouseEvent &event)
+void ItemShortcutContainer::mousePressed(gcn::MouseEvent &event)
 {
     const int index = getIndexFromGrid(event.getX(), event.getY());
     if (index == -1) {
@@ -178,8 +174,7 @@ ItemShortcutContainer::mousePressed(gcn::MouseEvent &event)
     }
 }
 
-void
-ItemShortcutContainer::mouseReleased(gcn::MouseEvent &event)
+void ItemShortcutContainer::mouseReleased(gcn::MouseEvent &event)
 {
     if (event.getButton() == gcn::MouseEvent::LEFT)
     {
-- 
cgit v1.2.3-70-g09d2


From 9eb240c821d75292ed02c64246d83558c8b84324 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 12 Jan 2009 16:44:38 -0700
Subject: Updated the po files so that they shouldn't generate errors for us
 any more, as well as a few more code style fixes.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 po/POTFILES.in                |    6 +-
 po/ar.po                      | 1264 +++++++++++++++++++++++++++++++---------
 po/ca.po                      | 1240 +++++++++++++++++++++++++++++++---------
 po/cs.po                      | 1257 +++++++++++++++++++++++++++++++---------
 po/da.po                      | 1269 +++++++++++++++++++++++++++++++---------
 po/de.po                      | 1269 +++++++++++++++++++++++++++++++---------
 po/en_GB.po                   | 1264 +++++++++++++++++++++++++++++++---------
 po/eo.po                      | 1231 ++++++++++++++++++++++++++++++---------
 po/es.po                      | 1264 +++++++++++++++++++++++++++++++---------
 po/fi.po                      | 1266 +++++++++++++++++++++++++++++++---------
 po/fr.po                      | 1271 ++++++++++++++++++++++++++++++++---------
 po/he.po                      | 1266 +++++++++++++++++++++++++++++++---------
 po/hr.po                      | 1255 +++++++++++++++++++++++++++++++---------
 po/id.po                      | 1264 +++++++++++++++++++++++++++++++---------
 po/it.po                      | 1264 +++++++++++++++++++++++++++++++---------
 po/ja.po                      | 1255 +++++++++++++++++++++++++++++++---------
 po/nl.po                      | 1264 +++++++++++++++++++++++++++++++---------
 po/pl.po                      | 1264 +++++++++++++++++++++++++++++++---------
 po/pt.po                      | 1264 +++++++++++++++++++++++++++++++---------
 po/pt_BR.po                   | 1269 +++++++++++++++++++++++++++++++---------
 po/ru.po                      | 1264 +++++++++++++++++++++++++++++++---------
 po/sk.po                      | 1243 +++++++++++++++++++++++++++++++---------
 po/sv.po                      | 1264 +++++++++++++++++++++++++++++++---------
 po/th.po                      | 1245 +++++++++++++++++++++++++++++++---------
 po/zh_CN.po                   | 1264 +++++++++++++++++++++++++++++++---------
 src/gui/setup_colours.cpp     |    2 +-
 src/gui/setup_players.cpp     |   15 +-
 src/gui/setup_video.cpp       |   10 +-
 src/gui/shortcutcontainer.cpp |    3 +-
 29 files changed, 23738 insertions(+), 6538 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1816a886..5f244d22 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,6 +8,9 @@ src/gui/chat.cpp
 src/gui/colour.cpp
 src/gui/confirm_dialog.cpp
 src/gui/connection.cpp
+src/gui/emotecontainer.cpp
+src/gui/emoteshortcutcontainer.cpp
+src/gui/emotewindow.cpp
 src/gui/equipmentwindow.cpp
 src/gui/help.cpp
 src/gui/inventorywindow.cpp
@@ -29,9 +32,6 @@ src/gui/setup_keyboard.cpp
 src/gui/setup_players.cpp
 src/gui/setup_video.cpp
 src/gui/skill.cpp
-src/gui/smileycontainer.cpp
-src/gui/smileyshortcutcontainer.cpp
-src/gui/smileywindow.cpp
 src/gui/speechbubble.cpp
 src/gui/status.cpp
 src/gui/trade.cpp
diff --git a/po/ar.po b/po/ar.po
index 0a19529e..e07e5814 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-07-16 18:28+0000\n"
 "Last-Translator: صقر بن عبدالله <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -17,898 +17,1622 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "شراء"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "السعر: %d GP / الإجمالي: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "مغادرة"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "الوصف: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "التأثير: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "إيقاف"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "بيع"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "إنتقاء الشخصيّة"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "موافق"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "جديد"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "حذف"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "السّابق"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "التّالي"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "الاسم: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "المستوى: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "المستوى: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "النقود: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "السّابق"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "التّالي"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "جديد"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "حذف"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "موافق"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "إنشاء شخصيّة"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "الاسم:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "لون الشعر:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "قصّة الشعر:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "إنشاء"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "إنتقاء الشخصيّة"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "إنشاء"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "الخادوم:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "تغيير OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "المنفذ:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "الخادوم:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "نعم"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "لا"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "جارِ الاتّصال..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "استخدام"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "العتاد"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "الجردة"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "استخدام"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "إسقاط"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "الوصف: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "التأثير: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "الاسم:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "التأثير: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "الوصف: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "تجريد من العتاد"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "استعمال العتاد"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "انتقاء كمّيّة من المواد لإسقاطها."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "ولوج"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "كلمة السرّ:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "المنفذ:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "ترك"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "تسجيل"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "الحالة"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "مهارات"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "اختصار"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "تثبيت"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "خارطة صغيرة"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "خارطة صغيرة"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@تجارة|متاجرة مع %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@مهاجمة|هاجم %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@محادثة|تحدّث مع NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@إلغاء|إلغاء@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@اقتطاف|اقتطاف %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@استخدام|استخدام العتاد@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@استخدام|استخدام العتاد@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@استخدم|استخدم@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@إسقاط|إسقاط@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@الوصف|الوصف@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "تأكيد:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "يجب أن يكون طول اسم المستخدم على الأقل %d محارف."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "يجب أن يكون طول اسم المستخدم أقل من %d محارف."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "يجب أن تكون طول كلمة السرّ على الأقل %d محارف."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محارف."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "كلمات السرّ غير متطابقة."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "خطأ"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "صوت"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "حجم صوت المؤثرّات"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "حجم صوت الموسيقا"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "تطبيق"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "تصفير النوافذ"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "مرئية"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "سمعيّ"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "عصا الألعاب"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "لون الشعر:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "إضغط على الزرّ لبدأ المعايرة"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "معايرة"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "تفعيل عصا الألعاب"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "إيقاف"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "تدوير العصا"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "حذف"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "الاسم:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "ملء الشاشة"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "مؤشّر مخصّص"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "حدّ FPS:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "عتمة واجهة المستخدم"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "نصف قطر اللفّ"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "كسل اللفّ"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "مؤثّرات محيطة"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "واقف"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "منخفض"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "مرتفع"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "ملء الشاشة"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "جارِ ملء الشاشة"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "تغيير OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "استخدام"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "المستوى: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "النقود: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "الحالة"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "مهاجمة %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "دفاع %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "مهاجمة %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "دفاع %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "القوّة:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "خفّة الحركة:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "نشاط:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "ذكاء:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "المهارة:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "إضافة"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "أنت تحصل على %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "أنت تقدّم:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "جارِ الاتّصال..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "جارِ الاتّصال..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "جارِ الاتّصال..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "الاسم: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "جارِ الاتّصال..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -951,9 +1675,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "اختار خادومك لـMana World"
 
-#~ msgid "Port:"
-#~ msgstr "المنفذ:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "رجاء طباعة عنوان ومنفذ الخادوم."
 
@@ -980,6 +1701,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "الوزن الإجماليّ: %d - وزن الحدّ الأقصى: %d"
-
-#~ msgid "Keep"
-#~ msgstr "ترك"
diff --git a/po/ca.po b/po/ca.po
index 7325a252..569fdab4 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-07-03 17:21+0000\n"
 "Last-Translator: Habari <thomas.becerril@gmail.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -17,885 +17,1587 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "preu %d GP / total %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "sortir"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr ""
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr ""
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr ""
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr ""
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr ""
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr ""
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr ""
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr ""
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr ""
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "nom"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr ""
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr ""
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "canvi"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
+msgstr ""
+
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr ""
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+msgid "Changing prefix to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+msgid "Party"
+msgstr ""
+
+#: ../src/gui/colour.cpp:38
+msgid "Server"
+msgstr ""
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "si"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "no"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr ""
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
+#: ../src/gui/inventorywindow.cpp:55
+msgid "Drop"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:57
-msgid "Drop"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+msgid "Description:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+msgid "Effect:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "nom"
+
+#: ../src/gui/inventorywindow.cpp:170
+msgid "Effect: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:172
+msgid "Description: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr ""
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr ""
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr ""
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr ""
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+msgid "Map"
+msgstr ""
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr ""
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+msgid "@@trade|Trade With "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+msgid "@@attack|Attack "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+msgid "Color:"
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "nom"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "fullscreen"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:452
+msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+msgid "use"
+msgstr ""
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, c-format
 msgid "Money: %d GP"
 msgstr ""
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 msgid "Stats"
 msgstr ""
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 msgid "Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 msgid "Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 msgid "M.Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 msgid "Strength"
 msgstr ""
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 msgid "Agility"
 msgstr ""
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 msgid "Vitality"
 msgstr ""
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 msgid "Intelligence"
 msgstr ""
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 msgid "Dexterity"
 msgstr ""
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+msgid "Are you sure you want to quit?"
+msgstr ""
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+msgid "Trying to connect to account server..."
+msgstr ""
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+msgid "Trying to connect to char server..."
+msgstr ""
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+msgid "Trying to connect to map server..."
+msgstr ""
+
+#: ../src/main.cpp:668
+#, c-format
+msgid "Map: %s"
+msgstr ""
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
-
-#~ msgid "Change"
-#~ msgstr "canvi"
diff --git a/po/cs.po b/po/cs.po
index efb03f63..9191a30c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-12-17 16:31+0000\n"
 "Last-Translator: Lubos <alvinx12@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -17,899 +17,1617 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Nákup"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Prodej"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "Potvrďte vymazání postavy"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 #, fuzzy
 msgid "Select Character"
 msgstr "Vytvořit postavu"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Nová"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Odstranit"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Předchozí"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Další"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Jméno: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Peníze: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Předchozí"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Další"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Nová"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Odstranit"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Vytvořit postavu"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Jméno:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Barva vlasů:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Styl vlasů:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Vytvořit"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Server:"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Vytvořit"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+msgid "Changing prefix to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Port:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Server:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Ano"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Ne"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr ""
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Vybavení"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventář"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Upustit"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Popis: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+msgid "Effect:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Jméno:"
+
+#: ../src/gui/inventorywindow.cpp:170
+msgid "Effect: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Popis: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Vybavit"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Vyberte množství zboží, se kterým budete obchodovat."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Vyberte množství zboží, které chcete upustit."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
-msgstr "Zapamatovat uživatelské jméno"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Port:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
+
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Registrace"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Stav"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Dovednosti"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Zkratka"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Nastavení"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "MiniMapa"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "MiniMapa"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+msgid "@@trade|Trade With "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+msgid "@@attack|Attack "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "Muž"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "Žena"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Uživatelské jméno musí být nejméně %d znaků dlouhé."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Uživatelské jméno musí být kratší než %d znaků."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Heslo musí být kratší než %d znaků."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Chyba"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Zvuk"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr "Klávesnice"
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Barva vlasů:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Kalibrovat"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Odstranit"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Jméno:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "fullscreen"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:452
+msgid "Restart your client or change maps for the change to take effect."
+msgstr ""
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+msgid "use"
+msgstr ""
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Peníze: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Stav"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Útok %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Obrana %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Útok %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Obrana %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Síla:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Vitalita:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalita:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligence:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 msgid "Dexterity"
 msgstr ""
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Připojuji se..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Připojuji se..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Připojuji se..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Jméno: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Připojuji se..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
+#~ msgid "Remember Username"
+#~ msgstr "Zapamatovat uživatelské jméno"
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Správa účtu a postavy"
 
@@ -943,9 +1661,6 @@ msgstr ""
 #~ msgid "Email:"
 #~ msgstr "E-mail:"
 
-#~ msgid "Port:"
-#~ msgstr "Port:"
-
 #~ msgid "Propose trade"
 #~ msgstr "Nabídnout obchod"
 
diff --git a/po/da.po b/po/da.po
index dae66aca..99f118ef 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-12-28 14:45+0000\n"
 "Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -17,901 +17,1628 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Køb"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Pris: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Stop"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Sælg"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Fortryd"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "Er du sikker på at du vil slette denne figur?"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Er du sikker på at du vil slette denne figur?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Vælg Bruger"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "O.k."
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Opret"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Slet"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Forrige"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Næste"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Navn; %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Niveau: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Penge: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Forrige"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Næste"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Opret"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Slet"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "O.k."
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Lav figur."
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Navn:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Hårfarve:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Frisure:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Opret"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Vælg Bruger"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Opret"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Skrifter til OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Port:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Server:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Ja"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Nej"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Opretter forbindelse..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Brug"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Udstyr"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventarliste"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Brug"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Smid"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Beskrivelse: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Effekt: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Navn:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Effekt: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Beskrivelse: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Tag af"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Tag på"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Vælge hvor mange du vil bytte."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Vælg hvor mange du vil smide,"
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Log Ind"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
-msgstr "Husk dette brugernavn."
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Port:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Behold"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Registrer"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Færdigheder"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Genvej"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Opsætning"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "MiniKort"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "MiniKort"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Byt Med %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Angrib %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Snak med NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuller@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Saml Op %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Tag på@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Tag på@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Brug@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Smid@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Beskrivelse@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Bekræft:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "Mand"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "Kvinde"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Brugernavnet skal mindst være %d bogstaver langt."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Brugernavnet skal være mindre end %d bogstaver langt."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Adgangskoden skal mindst være %d bogstaver langt."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Adgangskoder stemmer ikke overens."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Fejl"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Lyd"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Lydstyrke på effekter"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Lydstyrke på musik"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Anvend"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Nulstil vinduer"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Lyd"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Hårfarve:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Tryk på knappen for at starte justeringen."
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Justering"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Aktiver joystick"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Stop"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Roter joystick"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Slet"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Navn:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Fuld Skærm"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Brugerdefineret Musepil"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "FPS grænse:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Gennemsigtighed"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Følsomhed på mus"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Acceleration på mus"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Omgivende FX"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "fra"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "lav"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "høj"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Fuld Skærm"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Skifter til fuld skærm"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Skrifter til OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Ændringerne kræver at du genstarter klienten."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Ændringerne kræver at du genstarter klienten."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Brug"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Niveau: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Penge: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Status"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Angrib %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Forsvar %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Angrib %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Forsvar %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Styrke"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Adræthed"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Helbred:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligens:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Behændighed:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Du får %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Du giver:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Er du sikker på at du vil slette denne figur?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Opretter forbindelse..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Opretter forbindelse..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Opretter forbindelse..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Navn; %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Opretter forbindelse..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
+#~ msgid "Remember Username"
+#~ msgstr "Husk dette brugernavn."
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Ret konto og figurer"
 
@@ -972,9 +1699,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Vælg din Mana World Server"
 
-#~ msgid "Port:"
-#~ msgstr "Port:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Skriv både adressen og porten på serveren."
 
@@ -1004,6 +1728,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Total Vægt: %d - Maximum Vægt: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Behold"
diff --git a/po/de.po b/po/de.po
index 6e71b451..bd230744 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-10-13 00:25+0000\n"
 "Last-Translator: Aeneas Jaißle <Unknown>\n"
 "Language-Team: German\n"
@@ -17,903 +17,1630 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Kaufen"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preis: %d GP / Summe: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Stopp"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Verkaufen"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "Bestätige Charakter-Löschung"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Spielfigur auswählen"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Neu"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Löschen"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Zurück"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Weiter"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Name : %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Geld: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Zurück"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Weiter"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Neu"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Löschen"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Charakter erstellen"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Name :"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Haarfarbe"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Frisur"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Erstellen"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Spielfigur auswählen"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Erstellen"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Ändere OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Port:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Server:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Ja"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Nein"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Benutzen"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Ausrüstung"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventar"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Benutzen"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Wegwerfen"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Beschreibung: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Effekt: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Name :"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Effekt: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Beschreibung: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Ablegen"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Ausrüsten"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Wähle aus, wieviele Gegenstände Du tauschen möchtest."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Wähle aus, wieviele Gegenstände Du wegwerfen möchtest."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Anmelden"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Passwort:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
-msgstr "Benutzernamen merken"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Port:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Erinnern"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Registrieren"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Fertigkeiten"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Tastenkürzel"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "Übersichtskarte"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "Übersichtskarte"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Mit %s handeln@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|%s angreifen@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Mit NSC reden@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Abbrechen@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|%s aufheben@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Ausrüsten@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Ausrüsten@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Nutzen@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Fallen lassen@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Beschreibung@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "Männlich"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "Weiblich"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Der Nutzername muss aus mindestens %d Zeichen bestehen."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Der Nutzername muss kürzer als %d Zeichen sein."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Das Passwort muss aus mindestens %d bestehen."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Das Passwort muss kürzer als %d Zeichen sein."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Fehler"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Ton"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Lautstärke der Klangeffekte"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Latustärke der Musik"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Anwenden"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Haarfarbe"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Knopf drücken um die Kalibrierung zu starten"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Kalibrieren"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Joystick aktivieren"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Kreise den Steuerknüppel"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Löschen"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Name :"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Vollbild"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Benutzerdefinierten Zeiger"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "FPS-Limit:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "GUI Transparenz"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Scroll-Radius"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Scroll-Trägheit"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Hintergrundeffekte"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "Aus"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "Niedrig"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "Hoch"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Vollbild"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Wechsle zum Vollbildmodus"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Ändere OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Benutzen"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Geld: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Status"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Angriff %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Verteidigung %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Angriff %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Verteidigung %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Stärke:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Agilität:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalität:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligenz:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Geschicklichkeit:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Du erhälst %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Du gibst:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Verbinde..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Verbinde..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Verbinde..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Name : %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Verbinde..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
+#~ msgid "Remember Username"
+#~ msgstr "Benutzernamen merken"
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Account- und Charakterverwaltung"
 
@@ -974,9 +1701,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Wähle Deinen Mana World Spielserver"
 
-#~ msgid "Port:"
-#~ msgstr "Port:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Bitte die Adresse und den Port eines Servers eingeben"
 
@@ -1006,6 +1730,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Gesamtgewicht : %d - Maximales Gewicht : %d"
-
-#~ msgid "Keep"
-#~ msgstr "Erinnern"
diff --git a/po/en_GB.po b/po/en_GB.po
index 80a6ef41..4d10d394 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-05-10 16:51+0000\n"
 "Last-Translator: Me <Glich.Glich@googlemail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -17,898 +17,1622 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Buy"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Price: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Exit"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Description: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effect: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Stop"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Sell"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Are you sure you want to delete this character?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Select Character"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "New"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Delete"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Previous"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Next"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Name: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Money: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Previous"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Next"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "New"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Delete"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Create Character"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Name:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Hair Colour:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Hair Style:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Create"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Select Character"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Create"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Changing OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Port:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Server:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Yes"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "No"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Connecting..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Use"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Equipment"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventory"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Use"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Drop"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Description: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Effect: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Name:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Effect: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Description: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Unequip"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Equip"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Select amount of items to trade."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Select amount of items to drop."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Port:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Keep"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Register"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Skills"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Shortcut"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Setup"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "MiniMap"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "MiniMap"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Trade With %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Attack %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Talk To NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancel@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Pick Up %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Equip@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Equip@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Use@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Drop@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Description@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Confirm:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "The username needs to be at least %d characters long."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "The username needs to be less than %d characters long."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "The password needs to be at least %d characters long."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "The password needs to be less than %d characters long."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Error"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Sound"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Sfx volume"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Music volume"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Reset Windows"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Hair Colour:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Press the button to start calibration"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Calibrate"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Enable joystick"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Stop"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Rotate the stick"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Delete"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Name:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Full screen"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Custom cursor"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Gui opacity"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Scroll radius"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Scroll laziness"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Ambient FX"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "off"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "low"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "high"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Full screen"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Switching to full screen"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Restart needed for changes to take effect."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Changing OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applying change to OpenGL requires restart."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Restart needed for changes to take effect."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Restart needed for changes to take effect."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Use"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Level: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Money: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Status"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Attack %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Defense %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Attack %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Defense %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Strength:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Agility:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitality:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligence:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Dexterity:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Add"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "You get %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "You give:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Are you sure you want to delete this character?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Connecting..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Connecting..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Connecting..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Name: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Connecting..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -951,9 +1675,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Choose your Mana World Server"
 
-#~ msgid "Port:"
-#~ msgstr "Port:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Please type both the address and the port of a server."
 
@@ -980,6 +1701,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Total Weight: %d - Maximum Weight: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Keep"
diff --git a/po/eo.po b/po/eo.po
index 928b0fbf..0692acc3 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-11-10 22:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -17,881 +17,1584 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr ""
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
+#, c-format
+msgid "Name: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:86
-msgid "New"
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
+#, c-format
+msgid "Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
+#, c-format
+msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:88
-msgid "Previous"
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#, c-format
+msgid "Money: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:89
-msgid "Next"
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
 msgstr ""
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
-#, c-format
-msgid "Name: %s"
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
 msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
-#, c-format
-msgid "Level: %d"
+#: ../src/gui/char_select.cpp:93
+msgid "New"
 msgstr ""
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
-#, c-format
-msgid "Job Level: %d"
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
-#, c-format
-msgid "Money: %d"
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
 msgstr ""
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr ""
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr ""
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr ""
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
+msgstr ""
+
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr ""
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+msgid "Changing prefix to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+msgid "Party"
+msgstr ""
+
+#: ../src/gui/colour.cpp:38
+msgid "Server"
+msgstr ""
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr ""
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr ""
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
+#: ../src/gui/inventorywindow.cpp:55
+msgid "Drop"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:57
-msgid "Drop"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+msgid "Description:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+msgid "Effect:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+msgid "Name: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:170
+msgid "Effect: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:172
+msgid "Description: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr ""
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr ""
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr ""
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr ""
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+msgid "Map"
+msgstr ""
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr ""
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+msgid "@@trade|Trade With "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+msgid "@@attack|Attack "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+msgid "Color:"
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "fullscreen"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:452
+msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+msgid "use"
+msgstr ""
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, c-format
 msgid "Money: %d GP"
 msgstr ""
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 msgid "Stats"
 msgstr ""
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 msgid "Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 msgid "Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 msgid "M.Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 msgid "Strength"
 msgstr ""
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 msgid "Agility"
 msgstr ""
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 msgid "Vitality"
 msgstr ""
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 msgid "Intelligence"
 msgstr ""
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 msgid "Dexterity"
 msgstr ""
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+msgid "Are you sure you want to quit?"
+msgstr ""
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+msgid "Trying to connect to account server..."
+msgstr ""
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+msgid "Trying to connect to char server..."
+msgstr ""
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+msgid "Trying to connect to map server..."
+msgstr ""
+
+#: ../src/main.cpp:668
+#, c-format
+msgid "Map: %s"
+msgstr ""
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
diff --git a/po/es.po b/po/es.po
index f4f67a3f..442a5e8e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-10-15 01:37+0000\n"
 "Last-Translator: catalania <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -17,898 +17,1622 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Precio: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Salir"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descripción: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efecto: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Detener"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Vender"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "¿Seguro que quieres borrar este personaje?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Seleccionar personaje"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Aceptar"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Nuevo"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Eliminar"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Anterior"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Siguiente"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Dinero: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Siguiente"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Nuevo"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Eliminar"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Aceptar"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Crear Personaje"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Color de pelo:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "corte de pelo"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Crear"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Seleccionar personaje"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Crear"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Cambiar a OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Puerto:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Servidor:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Sí"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "No"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Conectando…"
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Usar"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Equipo"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventario"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Usar"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "tirar"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Descripción: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Efecto: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Nombre:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Efecto: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Descripción: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "quitarselo"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Seleccione objetos para comerciar."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Seleccione objetos para soltar."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "conectarse"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Puerto:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Mantener"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Estado"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Habilidades"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Atajos"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "Minimapa"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "Minimapa"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Comerciar con %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Atacar a %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Hablar al NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Recoger %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Equipar@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Equipar@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Tirar@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Descripción@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "El nombre de usuario debe tener al menos %d caracteres."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "El nombre de usuario puede tener como máximo %d caracteres."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "La contraseña debe tener al menos %d caracteres."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "La contraseña puede tener como máximo %d caracteres."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Error"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Sonido"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Volumen efectos"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Volumen musica"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Reiniciar ventanas"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Color de pelo:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Presione el botón para comenzar la calibración"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Calibrar"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Activar joystick"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Detener"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Gire el stick"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Eliminar"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Nombre:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Cursor propio"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "Límite de FPS:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Transparencia menus"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Ratio de scroll"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Velocidad de scroll"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Efectos ambientales"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "desactivado"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "bajo"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "alto"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Pantalla completa"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Cambiar a pantalla completa"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Se necesita reiniciar para aplicar los cambios."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Cambiar a OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "Se necesita reiniciar para aplicar los cambios hechos a OpenGL."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Se necesita reiniciar para aplicar los cambios."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Se necesita reiniciar para aplicar los cambios."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Usar"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Dinero: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Estado"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Ataque %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Defensa %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Ataque %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Defensa %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Fuerza:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Agilidad:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalidad:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligencia:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Destreza:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Añadir"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Tu consigues %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Tu das:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "¿Seguro que quieres borrar este personaje?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Conectando…"
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Conectando…"
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Conectando…"
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nombre: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Conectando…"
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -951,9 +1675,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Elija su servidor de Mana World"
 
-#~ msgid "Port:"
-#~ msgstr "Puerto:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Escriba la dirección y el puerto de un servidor."
 
@@ -980,6 +1701,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Peso Total: %d - Peso Máximo: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Mantener"
diff --git a/po/fi.po b/po/fi.po
index 80b21093..f7aef242 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-12-30 10:23+0000\n"
 "Last-Translator: ville-v <villev90@gmail.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -17,902 +17,1629 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Osta"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Kappalehinta: %d GP / Yhteensä: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Sulje"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Kuvaus: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Vaikutus: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Lopeta"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Myy"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Peru"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "Vahvista hahmon poistopyyntö"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 #, fuzzy
 msgid "Select Character"
 msgstr "Luo hahmo"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Uusi"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Poista"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Edellinen"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Seuraava"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nimi: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Taso: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Taso: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Rahatilanne: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Edellinen"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Seuraava"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Uusi"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Poista"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Luo hahmo"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Nimi:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Hiusten väri:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Hiustyyli:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Luo"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Vaihda palvelinta"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Luo"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Vaihdetaan OpenGL -toimintatilaan"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Portti:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Palvelin:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Ei"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Käytä"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Varusteet"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Tavaraluettelo"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Käytä"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Pudota"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Kuvaus: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Vaikutus: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Nimi:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Vaikutus: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Kuvaus: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Ota käyttöön"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Anna vaihdettavien tavaroiden määrä."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Anna pudotettavien tavaroiden määrä."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Salasana:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
-msgstr "Muista käyttäjätunnus"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Portti:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr ""
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Rekisteröidy"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Hahmon tiedot"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Taidot"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Pikavalinnat"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "Apukartta"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "Apukartta"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "Epäpelattava hahmo"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Vaihda tavaroita %s kanssa@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Hyökkää %s kimppuun@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Puhu epäpelattavalle hahmolle@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Peruuta@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Poimi %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Ota varuste käyttöön@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Ota varuste käyttöön@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Käytä@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Pudota maahan@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Kuvaus@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Vahvista:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "Miespuolinen"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "Naispuolinen"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Käyttäjänimen tulee olla vähintään %d merkkiä pitkä"
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Käyttäjänimen tulee olla alle %d merkkiä pitkä."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Salasanan tulee olla vähintään %d merkkiä pitkä"
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Virhe"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Ääni"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Äänitehosteiden voimakkuus"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Musiikin voimakkuus"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Käytä"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Kuva"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Ääni"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Peliohjain"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr "Näppäimistö"
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Hiusten väri:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Kalibroi"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Peliohjaintuki päälle"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Lopeta"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Käytä ohjain ääriasennoissaan pyörittämällä"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Poista"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Nimi:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Kokoruututila"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Tyylitelty hiiren osoitin"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "Piirtonopeusrajoitin (kuvaa / sekunti)"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Käyttöliittymän läpinäkyvyys"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Kameran perässälaahaus"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Kameran perässälaahauksen tiukkuus"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Taustaäänet"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "pois päältä"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "matala"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "korkea"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Kokoruututila"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Kokoruututilaan siirtyminen"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Vaihdetaan OpenGL -toimintatilaan"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetusten muutokset vaativat ohjelman uudelleenkäynnistyksen"
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Käytä"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Taso: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Rahatilanne: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Hahmon tiedot"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Hyökkäys %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Puolustus %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Hyökkäys %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Puolustus %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Voima:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Ketteryys:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Elinvoima:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Älykkyys:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Näppäryys:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Lisää"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Sait %d GP"
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Annat:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Yhdistetään..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Yhdistetään..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Yhdistetään..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nimi: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Yhdistetään..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
+#~ msgid "Remember Username"
+#~ msgstr "Muista käyttäjätunnus"
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Tilin ja hahmojen hallinta"
 
@@ -970,9 +1697,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Valitse Mana World -palvelimesi"
 
-#~ msgid "Port:"
-#~ msgstr "Portti:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti"
 
diff --git a/po/fr.po b/po/fr.po
index 3d8a121c..4e365259 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-12-26 10:43+0000\n"
 "Last-Translator: Johan Serre <Unknown>\n"
 "Language-Team: French\n"
@@ -18,903 +18,1632 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Acheter"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Prix : %d PO / Total : %d PO"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effet : %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Stop"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Vendre"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "Confirmer la suppression du personnage"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Choix du personnage"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Nouveau"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Supprimer"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Précédent"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Suivant"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nom : %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Argent : %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Précédent"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Suivant"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Nouveau"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Supprimer"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Création du personnage"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Nom :"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Couleur des cheveux"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Coiffure :"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Créer"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Choix du personnage"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Créer"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Serveur :"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Changement OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Port :"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Serveur :"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Oui"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Non"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Utiliser"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Équipement"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventaire"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Utiliser"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Lâcher"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Description : %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Effet : %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Nom :"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Effet : %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Description : %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Retirer"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Équiper"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Choisissez le nombre d'objets à troquer."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Choisissez le nombre d'objets à lâcher."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Connexion"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
-msgstr "Se souvenir du nom d'utilisateur"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Port :"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Conserver"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "S'inscrire"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Statut"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Compétences"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Raccourci"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "Plan"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "Plan"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "PNJ"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Troquer avec %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Attaquer %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Parler au PNJ@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuler@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Ramasser %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Équiper@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Équiper@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Utiliser@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Lâcher@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Description@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Vérification :"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "Masculin"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "Féminin"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Le nom d'utilisateur doit faire au moins %d caractères."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Le nom d'utilisateur doit faire moins de %d caractères."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Le mot de passe doit faire au moins %d caractères."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Le mot de passe doit faire moins de %d caractères."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe ne correspondent pas."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Erreur"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Son"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Volume des effets sonores"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Volume de la musique"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Appliquer"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr "Clavier"
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Couleur des cheveux"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Presser le bouton pour démarrer la calibration"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Calibrer"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Activer le joystick"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Stop"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Tourner le joystick"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Supprimer"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Nom :"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Plein écran"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Curseur personnalisé"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "Limite FPS :"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Opacité de l'interface"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Rayon du scrolling"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Paresse du scrolling"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Effets ambiants"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "aucun"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "léger"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "complet"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Plein écran"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Passage en plein écran"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Changement OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr ""
+"Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
+"Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Utiliser"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Argent : %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Statut"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Attaque %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Défense %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Attaque %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Défense %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Force :"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Agilité :"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalité :"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligence :"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Dextérité :"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Vous obtenez %d PO."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Vous donnez :"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Connexion..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Connexion..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Connexion..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nom : %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Connexion..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
+#~ msgid "Remember Username"
+#~ msgstr "Se souvenir du nom d'utilisateur"
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Gestion du compte et du personnage"
 
@@ -975,9 +1704,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Choisissez votre serveur The Mana World"
 
-#~ msgid "Port:"
-#~ msgstr "Port :"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Veuillez entrer l'adresse et le port du serveur."
 
@@ -1007,6 +1733,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Poids total : %d - Poids maximal : %d"
-
-#~ msgid "Keep"
-#~ msgstr "Conserver"
diff --git a/po/he.po b/po/he.po
index 87766812..9b622a04 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-10-20 00:23+0000\n"
 "Last-Translator: Ddorda <d.dorda@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -17,902 +17,1629 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "קנה"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "מחיר: %d זהב / סה\"כ %d זהב"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "יציאה"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "תיאור: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "השפעה: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "עצור"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "מכר"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "ביטול"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "אשר מחיקת שחקן"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 #, fuzzy
 msgid "Select Character"
 msgstr "צור שחקן"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "אישור"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "חדש"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "מחק"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "הקודם"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "הבא"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "שם: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "רמה: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "רמה: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "זהב: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "הקודם"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "הבא"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "חדש"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "מחק"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "אישור"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "צור שחקן"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "שם:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "צבע שיער:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "תיספורת:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "צור"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "החלף שרת"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "צור"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "שרת:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "משנה OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "פורט:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "שרת:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "כן"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "לא"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "מתחבר..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "השתמש"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "ציוד"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "ציוד"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "השתמש"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "השלך"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "תיאור: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "השפעה: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "שם:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "השפעה: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "תיאור: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "הורד"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "החזק"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "בחר כמות חפצים לסחור."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "בחר כמות חפצים להשליך."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "התחברות"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
-msgstr "זכור שם משתמש"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "פורט:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr ""
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "הרשם"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "מצב"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "כישורים"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "קיצור-דרך"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "הגדרות"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "מיני-מפה"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "מיני-מפה"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|סחור עם %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|תקוף את %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|דבר אל NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|ביטול@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|הרם %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|החזק@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|החזק@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Use@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|השלך@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|תיאור@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "אשר:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "זכר"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "נקבה"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "שם המשתמש חייב להכיל לפחות %d תוים."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "שם המשתמש חייב להכיל פחות מ-%d תוים."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "הסיסמה חייבת להכיל לפחות %d תוים."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "הסיסמה חייבת להכיל פחות מ-%d תוים."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "הסיסמאות אינן תואמות."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "שגיאה"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "צליל"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "עוצמת SFX"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "עוצמת מוזיקה"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "אשר"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "אתחל חלונות"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "וידאו"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "שמע"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "ג'ויסטיק"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr "מקלדת"
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "צבע שיער:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "לחץ על הכפתור בכדי להתחיל בכיול"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "כייל"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "אפשר ג'ויסטיק"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "עצור"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "סובב את המקל"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "מחק"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "שם:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "מסך מלא"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "‏OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "סמן-עכבר מותאם"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "הגבלת FPS:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "אטימות Gui"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "תווך גלילה"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "עצלנות גלילה"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "אופף FX"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "כבוי"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "נמוך"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "גבוה"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "מסך מלא"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "מחליף למסך מלא"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "משנה OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "אישור שינויים עבור OpenGL דורש איתחול."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "השתמש"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "רמה: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "זהב: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "מצב"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "התקפה %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "הגנה %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "התקפה %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "הגנה %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "עוצמה:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "זריזות:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "חיוניות:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "תבונה:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "מיומנות:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "הוסף"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "אתה מקבל %d זהב."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "אתה נותן:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "מתחבר..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "מתחבר..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "מתחבר..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "שם: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "מתחבר..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
+#~ msgid "Remember Username"
+#~ msgstr "זכור שם משתמש"
+
 #~ msgid "Account and Character Management"
 #~ msgstr "ניהול משתמש ושחקן"
 
@@ -970,9 +1697,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "בחר את שרת ה-Mana World"
 
-#~ msgid "Port:"
-#~ msgstr "פורט:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "אנא הכנס גם את כתובת וגם את פורט השרת."
 
diff --git a/po/hr.po b/po/hr.po
index cef7cc6f..fb7f13e7 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-12-28 23:36+0000\n"
 "Last-Translator: Dino Paskvan <dpaskvan@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -17,896 +17,1615 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Kupi"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cijena: %d zlatnika / Ukupno: %d zlatnika"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Izlaz"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Učinak: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Poništi"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "Potvrdi Brisanje Lika"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Da li ste sigurni da želite obrisati ovog lika?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 #, fuzzy
 msgid "Select Character"
 msgstr "Stvori Lika"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "U redu"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Novi"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Obriši"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Prethodni"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Slijedeći"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Ime: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Novac: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Prethodni"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Slijedeći"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Novi"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Obriši"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "U redu"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Stvori Lika"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Boja kose:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Frizura:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Stvori"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Stvori"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr ""
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+msgid "Changing prefix to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+msgid "Party"
+msgstr ""
+
+#: ../src/gui/colour.cpp:38
+msgid "Server"
+msgstr ""
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Da"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Ne"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Spajanje..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Upotrijebi"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Oprema"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Zalihe"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Upotrijebi"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Ispusti"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Opis: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Učinak: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Ime:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Učinak: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Opis: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Skini opremu"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Opremi"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Odaberi količinu predmeta za razmjenu."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Odaberi količinu predmeta za ispuštanje."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Korisničko ime"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Lozinka"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
-msgstr "Zapamti korisničko ime"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr ""
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
+
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Registriraj se"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Stanje"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Vještine"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Kratica"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Podešavanje"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "Karta"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "Karta"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+msgid "@@trade|Trade With "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+msgid "@@attack|Attack "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "Skini opremu"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "Muško"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "Žensko"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Greška"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Boja kose:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Obriši"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Ime:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "fullscreen"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+msgid "Restart your client or change maps for the change to take effect."
+msgstr ""
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Upotrijebi"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Novac: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Stanje"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 msgid "Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 msgid "Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 msgid "M.Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Snaga:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Okretnost:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalnost:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligencija:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Spretnost:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Da li ste sigurni da želite obrisati ovog lika?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Spajanje..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Spajanje..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Spajanje..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Ime: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Spajanje..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
+#~ msgid "Remember Username"
+#~ msgstr "Zapamti korisničko ime"
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Upravljanje Računom i Likovima"
 
diff --git a/po/id.po b/po/id.po
index 6f2dda71..1d6a8530 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-03-26 09:11+0000\n"
 "Last-Translator: ActiveFile <activefile@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -17,898 +17,1622 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Beli"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Harga: %d GP / Jumlah: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Keluar"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Deskripsi: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efek: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Berhenti"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Jual"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Batal"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Pilih Karakter"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Buat baru"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Hapus"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Sebelumnya"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Berikutnya"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nama: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Uang: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Sebelumnya"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Berikutnya"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Buat baru"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Hapus"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Buat Karakter"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Nama:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Warna Rambut:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Gaya Rambut:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Buat"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Pilih Karakter"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Buat"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Mengubah OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Port:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Server:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Ya"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Tidak"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Menyambung..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Gunakan"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Perlengkapan"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Gunakan"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Jatuh"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Deskripsi: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Efek: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Nama:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Efek: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Deskripsi: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Pilih jumlah item yang mau di perdagangkan"
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Pilih jumlah item yang mau di buang"
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Kata Sandi:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Port:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Pertahankan"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Mendaftar"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Keahlian"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Tombol Singkat"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Atur"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "MiniMap"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "MiniMap"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Dagang Dengan %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Serang%s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Bicara dengan NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Batal@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Ambil %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Melengkapi@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Melengkapi@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Gunakan@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Buang@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Deskripsi@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Konfirmasi:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Panjang username setidak-tidaknya %d karakter"
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Panjang kata-sandi setidak-tidaknya %d karakter"
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Kata sandi tidak sama."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Suara"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Volume sfx"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Volume Musik"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Terapkan"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Suara"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Warna Rambut:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Tekan tombol untuk memulai kalibrasi"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Kalibrasi"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Membolehkan joistik"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Berhenti"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Memutar tongkat"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Hapus"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Nama:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Layar penuh"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "Batas FPS"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Radius gulungan"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "mati"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "rendah"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "tinggi"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Layar penuh"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Mengganti ke layar penuh"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Mengubah OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Memulai dari awal di butuhkan untuk melihat efek"
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Memulai dari awal di butuhkan untuk melihat efek"
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Gunakan"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Uang: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Status"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Serangan %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Pertahanan %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Serangan %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Pertahanan %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Kekuatan"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Daya/Tenaga Hidup"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Daya/Tenaga Hidup"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Kecerdasan"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Ketangkasan"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Tambah"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Anda mendapatkan %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Anda memberikan:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Menyambung..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Menyambung..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Menyambung..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nama: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Menyambung..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -951,9 +1675,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Pilih Server Mana World"
 
-#~ msgid "Port:"
-#~ msgstr "Port:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Tolong tulis address dan port dari server"
 
@@ -980,6 +1701,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Jumlah Berat: %d - Berat Maksimum: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Pertahankan"
diff --git a/po/it.po b/po/it.po
index a86caec2..b1bf327c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2007-12-03 01:45+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Italian\n"
@@ -19,898 +19,1622 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Compra"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Prezzo: %d GP / Totale: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Esci"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descrizione : %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effetto : %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Ferma"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Vendi"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Cancella"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Sei sicuro di voler cancellare questo personaggio?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Scelta Personaggio"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Nuovo"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Elimina"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Precedente"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Prossimo"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nome : %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Livello: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Livello: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Monete: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Precedente"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Prossimo"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Nuovo"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Elimina"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Crea Personaggio"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Nome :"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Colore Capelli"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Stile Capelli:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Create"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Scelta Personaggio"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Create"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Modifica OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Porta:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Server:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Si"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "No"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Connessione..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Usa"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventario"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Usa"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Lascia"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Descrizione : %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Effetto : %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Nome :"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Effetto : %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Descrizione : %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Rimuovi"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Equipaggia"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Seleziona la quantità di oggetti da scambiare."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Seleziona la quantità di oggetti da lasciare."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Autenticazione"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Porta:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Mantieni"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Registra"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Stato"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Abilità"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Scorciatoia"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Impostazioni"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "Mini mappa"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "Mini mappa"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Scambia Con %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Attacca %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Parla con NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancella@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Raccogli %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Equipaggia@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Equipaggia@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@usa|Usa@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Lascia@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Descrizione@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Conferma:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Il nome utente deve contenere almeno %d caratteri."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Il nome utente deve avere meno di %d caratteri."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "La password deve essere lunga almeno %d caratteri."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "La password deve contenere meno di %d caratteri."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Errore"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Suono"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Volume effetti sonori"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Volume musica"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Applica"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Resetta finestre"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Colore Capelli"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Premi il pulsante per cominciare la calibrazione"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Calibra"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Abilita joystick"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Ferma"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Ruota la manopola"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Elimina"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Nome :"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Schermo intero"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Cursore personalizzato"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "Limita FPS:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Opacità IU"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Raggio dello scroll"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Lentezza dello scroll"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Suoni ambientali"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "Spento"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "Basso"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "Alto"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Schermo intero"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Modalità a schermo intero"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Modifica OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Usa"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Livello: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Monete: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Stato"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Attacco %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Difesa %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Attacco %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Difesa %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Forza:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Agilità:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalità:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligenza:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Destrezza:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Ottieni %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Dai:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Sei sicuro di voler cancellare questo personaggio?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Connessione..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Connessione..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Connessione..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nome : %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Connessione..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -953,9 +1677,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Scegli il tuo server Mana World"
 
-#~ msgid "Port:"
-#~ msgstr "Porta:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Per favore inserisci l'indirizzo e la porta del server."
 
@@ -982,6 +1703,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Peso totale : %d - Peso massimo : %d"
-
-#~ msgid "Keep"
-#~ msgstr "Mantieni"
diff --git a/po/ja.po b/po/ja.po
index bd629cd2..f82bdaef 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-06-28 16:27+0000\n"
 "Last-Translator: fate <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -17,893 +17,1611 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "買う"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "価格: %d GP / 合計: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "終了"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "名状: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "効用: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "取消"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "このキャラは消してもいいですか?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "キャラを選択"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "了解"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "新規"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "削除"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "前へ"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "次へ"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "名前: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "レベル: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "GP: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "前へ"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "次へ"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "新規"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "削除"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "了解"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "キャラを作成"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "名前:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "髪の色："
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "髪型："
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "作成"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "キャラを選択"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "作成"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "サーバ:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+msgid "Changing prefix to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "ポート:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "サーバ:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "はい"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "いいえ"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "接続しています..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "使う"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "使う"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "名状: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "効用: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "名前:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "効用: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "名状: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "ログイン"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "パスワード:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "ポート:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
+
+#: ../src/gui/login.cpp:75
+msgid "Keep"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "状態"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "セットアップ"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+msgid "Map"
+msgstr ""
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr ""
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+msgid "@@trade|Trade With "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|%sを攻撃する@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|NPCを喋る@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|使う@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|使う@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "パスワードが一致していません。"
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "エラー"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "音声"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "髪の色："
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "削除"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "名前:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "fullscreen"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+msgid "Restart your client or change maps for the change to take effect."
+msgstr ""
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "使う"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "レベル: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "GP: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "状態"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 msgid "Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 msgid "Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 msgid "M.Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "筋力:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "素早さ:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "体力:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "知性:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "敏捷:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "このキャラは消してもいいですか?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "接続しています..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "接続しています..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "接続しています..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "名前: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "接続しています..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -922,9 +1640,6 @@ msgstr ""
 #~ msgid "Email:"
 #~ msgstr "Eメール："
 
-#~ msgid "Port:"
-#~ msgstr "ポート:"
-
 #~ msgid "Confirm"
 #~ msgstr "確認"
 
diff --git a/po/nl.po b/po/nl.po
index c2700ada..ed33a824 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-10-10 00:04+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Dutch\n"
@@ -17,894 +17,1618 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Kopen"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beschrijving: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effect: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Stoppen"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Kies Personage"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Oké"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Nieuw"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Verwijderen"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Vorige"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Volgende"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Naam: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Geld: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Vorige"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Volgende"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Nieuw"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Oké"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Personage Aanmaken"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Haarkleur:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Haarstijl:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Aanmaken"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Kies Personage"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Aanmaken"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Veranderen van OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Poort:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Server:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Ja"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Nee"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Gebruiken"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Uitrusting"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Gebruiken"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Neerleggen"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Beschrijving: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Effect: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Naam:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Effect: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Beschrijving: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Afdoen"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Uitrusten"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal exemplaren om te verhandelen"
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal exemplaren om neer te leggen"
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Inloggen"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Wachtword:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Poort:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Behouden"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Aanmelden"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Vaardigheden"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "Kaartje"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "Kaartje"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Handelen met %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|%s aanvallen@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Praat met NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuleren@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|%s oppakken@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Uitrusten@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Uitrusten@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Gebruiken@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Neerleggen@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Beschrijving@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Bevestigen:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "De gebruikersnaam moet uit ten minste %d tekens bestaan."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "De gebruikersnaam moet uit minder dan %d tekens bestaan."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Het wachtwoord moet uit ten minste %d tekens bestaan."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Fout"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Geluid"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Volume van geluiden"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Muziek volume"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Toepassen"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Haarkleur:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Druk op de knop om het kalibreren te starten"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Kalibreren"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Joystick activeren"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Stoppen"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Maak rondjes met de stick"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Verwijderen"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Naam:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Volledig scherm"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "FPS limiet:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Dekking van de GUI"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Scroll radius"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Scroll vertraging"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Omgevingseffecten"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "uit"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "laag"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "hoog"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Volledig scherm"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Overgaan naar volledig scherm"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Veranderen van OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "De veranderingen worden pas actief na opnieuw opstarten"
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "De veranderingen worden pas actief na opnieuw opstarten"
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Gebruiken"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Level: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Geld: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Status"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 msgid "Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 msgid "Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 msgid "M.Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Sterkte:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Agiliteit:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitaliteit:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligentie:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Dexteriteit:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Je geeft:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Verbinden..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Verbinden..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Verbinden..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Naam: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Verbinden..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -941,9 +1665,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Kies uw Mana World server"
 
-#~ msgid "Port:"
-#~ msgstr "Poort:"
-
 #~ msgid "Confirm"
 #~ msgstr "Bevestigen"
 
@@ -952,6 +1673,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Totaal gewicht: %d - Maximum gewicht: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Behouden"
diff --git a/po/pl.po b/po/pl.po
index 46cee40e..84f5e412 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-10-10 05:26+0000\n"
 "Last-Translator: Michał Trzebiatowski <Unknown>\n"
 "Language-Team: <pl@li.org>\n"
@@ -19,899 +19,1623 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Kup"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cena: %d GP / Razem: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Wyjdź"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efekt: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Zatrzymaj"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Sprzedaj"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Wybierz postać"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Nowa"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Usuń"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Poprzedni"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Następny"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Imię: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Poziom: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Poziom: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Pieniądze: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Poprzedni"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Następny"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Nowa"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Usuń"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Stwórz postać"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Imię:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Kolor włosów:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Fryzura:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Stwórz"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Wybierz postać"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Stwórz"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Serwer:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Zmień ustawienia OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Port:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Serwer:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Tak"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Nie"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Użyj"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Ekwipunek"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inwentarz"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Użyj"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Upuść"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Opis: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Efekt: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Imię:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Efekt: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Opis: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Zdejmij"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Załóż"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Wybierz ilość przedmiotów do wymiany."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Wybierz ilość przedmiotów do upuszczenia."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Użytkownik"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Hasło:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Port:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Zachowaj"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Rejestruj"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Stan"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Zdolności"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Skrót"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Konfiguracja"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "MiniMapa"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "MiniMapa"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Targ z %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Atakuj %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Rozmawiaj z NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Anuluj@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Podnieś %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Załóż@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Załóż@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Użyj@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Upuść@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Opis@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Potwierdź:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "Mężczyzna"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "Kobieta"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Nazwa użytkownika musi być długa na conajmniej %d znaków."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Nazwa użytkownika musi mieć mniej niż %d znaków."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Hasło musi mieć conajmniej %d znaków."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Hasło nie może mieć więcej jak %d znaków."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Błąd"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Dźwięk"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Głośność efektów dźwiękowych"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Głośność muzyki"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Zresetuj okna"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Obraz"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Dźwięk"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Kolor włosów:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Wciśnij przycisk aby rozpocząć kalibrację"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Kalibruj"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Włącz joystick"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Obróć drążek"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Usuń"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Imię:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Pełen ekran"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Własny kursor"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "Limit FPS:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Przezroczystość GUI"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Skok przy przewijaniu ekranu"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Opóźnienie przy przewijaniu ekranu"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Dźwięki otoczenia"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "wyłączone"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "niskie"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "wysokie"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Pełen ekran"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Przełączanie na pełen ekran"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Zmień ustawienia OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Zastosowywanie zmian w konfiguracji OpenGL wymaga ponownego uruchomienia."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Użyj"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Poziom: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Pieniądze: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Stan"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Atak %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Obrona %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Atak %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Obrona %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Siła:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Zwinność:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Witalność:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligencja:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Zręczność:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Otrzymujesz %d GP"
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Dajesz:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Łączenie..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Łączenie..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Łączenie..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Imię: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Łączenie..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -957,9 +1681,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Wybierz serwer Mana World"
 
-#~ msgid "Port:"
-#~ msgstr "Port:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Proszę wpisać adres i port serwera"
 
@@ -986,6 +1707,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Całkowita waga: %d - Maksymalna waga: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Zachowaj"
diff --git a/po/pt.po b/po/pt.po
index bd9630d1..09f31b9b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-02-03 10:14+0000\n"
 "Last-Translator: Tiago Silva <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -17,906 +17,1630 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preço: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efeito: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Parar"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Vender"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem a certeza que quer apagar este personagem"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Seleccione um Personagem"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Novo"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Eliminar"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Anterior"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Seguinte"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Dinheiro: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Seguinte"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Novo"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Eliminar"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Cor de Cabelo:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Criar"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Seleccione um Personagem"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Criar"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Mudando OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Porta:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Servidor:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Sim"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Não"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Usar"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventário"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Usar"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Largar"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Descrição: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Efeito: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Nome:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Efeito: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Descrição: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Seleccionar a quantidade de itens a negociar."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Seleccionar a quantidade de itens a largar."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Autenticar"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Porta:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Manter"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Registo"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Estado"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Competências"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Atalho"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Configuração"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "MiniMapa"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "MiniMapa"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Negociar com %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Atacar %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Falar com o NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Apanhar %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Equipar@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Equipar@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Largar@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@descrição|Descrição@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "O nome de utilizador necessita de pelo menos %d caracteres."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "O nome de utilizador só pode ter %d caracteres."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "A password necessita de pelo menos %d caracteres."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "A password só pode ter até %d caracteres."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "As senhas não coincidem."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Erro"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Som"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Volume dos Efeitos"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Volume da Música"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Reiniciar Janelas"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Áudio"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Cor de Cabelo:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Pressione o botão para começar a calibragem"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Calibrar"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Habilitar Joystick"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Parar"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Rode o manipulo"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Eliminar"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Nome:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Ecrã completo"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Cursor personalizado"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "Limite de FPS:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Opacidade do Interface"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Efeitos Ambientais"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "desligado"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "baixo"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "elevado"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Ecrã completo"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Mudar para ecrã completo"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "É necessário reiniciar para as alterações terem efeito."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Mudando OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "É necessário reiniciar para as alterações ao OpenGl terem efeito."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "É necessário reiniciar para as alterações terem efeito."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "É necessário reiniciar para as alterações terem efeito."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Usar"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Nível: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Dinheiro: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Estado"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr ""
 "Copy text   \t\r\n"
 "Ataque %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr ""
 "Copy text   \t\r\n"
 "Defesa %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr ""
 "Copy text   \t\r\n"
 "Ataque %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr ""
 "Copy text   \t\r\n"
 "Defesa %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Força:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Agilidade:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalidade:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligência:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Destreza:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Recebe %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Dá:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Tem a certeza que quer apagar este personagem"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Conectando..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Conectando..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Conectando..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nome: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Conectando..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -959,9 +1683,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Escolha o seu Servidor de Mana World"
 
-#~ msgid "Port:"
-#~ msgstr "Porta:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Por favor escreva o endereço e a porta do servidor."
 
@@ -988,6 +1709,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Peso Total: %d - Peso Máximo: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Manter"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 586cfc2d..a1e318a6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-12-14 21:37+0000\n"
 "Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -17,901 +17,1628 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preço: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efeito: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Parar"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Vender"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "Confimar exclusão do personagem"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem certeza de que deseja excluir este personagem?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Selecionar personagem"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Novo"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Excluir"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Anterior"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Próximo"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Dinheiro: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Próximo"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Novo"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Excluir"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Cor do Cabelo:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Criar"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Selecionar personagem"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Criar"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Trocando OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Porta:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Servidor:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Sim"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Não"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Usar"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventório"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Usar"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Descartar"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Descrição: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Efeito: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Nome:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Efeito: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Descrição: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Selecionar montante de itens para negociar."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Selecionar montante de itens para descartar."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
-msgstr "Lembrar nome de usuário"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Porta:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Manter"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Habilidades"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Atalho"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "MiniMapa"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "MiniMapa"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@Negociar|Negociar com %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@atacar|Atacar %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@falar|Falar com NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancelar|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pegar|Pegar %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@usar|Equipar@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@usar|Equipar@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@usar|Usar@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@descartar|Descartar@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@descrição|Descrição@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "Homem"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "Mulher"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "O nome do usuário precisa ter pelo menos %d caracteres."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "O nome do usuário tem que ser inferior a %d caracteres."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "A senha deve ter pelo menos %d caracteres."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "A senha deve ser menor que %d caracteres."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Erro"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Som"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Volume Sfx"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Volume da Música"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Áudio"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Cor do Cabelo:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Aperto o botão para começar a calibração"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Calibrar"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Habilitar joystick"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Parar"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Excluir"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Nome:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Opacidade da GUI"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "desligado"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "baixo"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "alto"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Tela cheia"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Mudando para Tela cheia"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Trocando OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicando mudança a OpenGL requer reiniciar o jogo."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "É preciso reiniciar para as mudanças terem efeito."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "É preciso reiniciar para as mudanças terem efeito."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Usar"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Nível: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Dinheiro: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Status"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Ataque %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Defesa %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Ataque %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Defesa %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Força:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Agilidade:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalidade:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligência:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Destreza:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Voc pegou %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Você dá:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Tem certeza de que deseja excluir este personagem?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Conectando..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Conectando..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Conectando..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nome: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Conectando..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
+#~ msgid "Remember Username"
+#~ msgstr "Lembrar nome de usuário"
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Gerenciamento de Conta e Personagem"
 
@@ -972,9 +1699,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Escolha seu Servidor de Mana World"
 
-#~ msgid "Port:"
-#~ msgstr "Porta:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Por favor especifique ambos os Endereços e a Porta do servidor"
 
@@ -1004,6 +1728,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Peso Total: %d - Peso Máximo: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Manter"
diff --git a/po/ru.po b/po/ru.po
index 94be1f08..9dc5c43a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-01-08 11:50+0000\n"
 "Last-Translator: idle sign <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -17,898 +17,1622 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Купить"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Стоимость: %d GP / Всегоl: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Выход"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Эффект: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Стоп"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Продать"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Вы уверены, что хотите удалить этого персонажа?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Выбор персонажа"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Новый"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Удалить"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Предыдущий"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Следующий"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Имя: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Деньги: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Предыдущий"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Следующий"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Новый"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Удалить"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Создать персонажа"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Имя:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Цвет волос:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Стрижка:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Создать"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Выбор персонажа"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Создать"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Переключение на OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Порт:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Сервер:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Да"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Нет"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Соединение..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Использовать"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Снаряжение"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Инвентарь"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Использовать"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Сбросить"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Описание: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Эффект: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Имя:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Эффект: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Описание: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Снять"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Надеть"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Сколько предметов продать."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Сколько предметов сбросить."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Вход"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Порт:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Оставить"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Состояние"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Умения"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Клавиша"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Настройка"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "МиниКарта"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "МиниКарта"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Торговать с %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Атаковать %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Говорить с NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancelОтмена@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Подобрать %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Надеть@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Надеть@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Использовать@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Сбросить@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Описание@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Подтвердите:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Имя пользователя должно содержать не менее %d символов."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Имя пользователя не должно содержать более %d символов."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Пароль должен содержать не менее %d символов."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Пароль не должен содержать более %d символов."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Звук"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Громкость эффектов"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Громкость музыки"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Применить"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Восстановить расположение окон"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Видео"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Аудио"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Джойстик"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Цвет волос:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Нажмите кнопку, чтобы начать калибровку"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Калибровать"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Использовать джойстик"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Стоп"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Вращайте рукоять"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Удалить"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Имя:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "На полный экран"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Выборочный курсор"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "Ограничение кадр/с:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Прозрачность интерфейса"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Радиус прокрутки"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Заторможенность прокрутки"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Эффекты окружающей среды"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "выкл"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "низ."
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "выс."
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "На полный экран"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Переключение в полноэкранный режим"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Переключение на OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "Переход к OpenGL требует перезагрузки игры."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Использовать"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Деньги: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Состояние"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Атака %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Защита %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Атака %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Защита %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Сила:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Выносливость:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Живучесть:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Интеллект:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Ловкость:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Добавить"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Вы получили %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Вы отдаете:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Вы уверены, что хотите удалить этого персонажа?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Соединение..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Соединение..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Соединение..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Имя: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Соединение..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -951,9 +1675,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Выберите сервер Mana World"
 
-#~ msgid "Port:"
-#~ msgstr "Порт:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Следует указать адрес и порт сервера."
 
@@ -980,6 +1701,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Суммарный вес: %d - Макс. вес: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Оставить"
diff --git a/po/sk.po b/po/sk.po
index 453c67dc..e6b7a602 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-12-30 14:07+0000\n"
 "Last-Translator: TomasKovacik <nail@nodomain.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -17,887 +17,1598 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Kúpiť"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cena: %d GP / Spolu: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "Potvrdte zmazanie postavy"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 #, fuzzy
 msgid "Select Character"
 msgstr "Vytvoriť postavu"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ano"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Nový"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Vymazať"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Predchádzajúci"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Nasledujúci"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Peniaze: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Predchádzajúci"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Nasledujúci"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Nový"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Vymazať"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ano"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Vytvoriť postavu"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Meno"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Farba vlasov:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Štýl vlasov:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Vytvoriť"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Vytvoriť"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr ""
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+msgid "Changing prefix to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+msgid "Party"
+msgstr ""
+
+#: ../src/gui/colour.cpp:38
+msgid "Server"
+msgstr ""
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr ""
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr ""
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
+#: ../src/gui/inventorywindow.cpp:55
+msgid "Drop"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:57
-msgid "Drop"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Popis: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Effekt: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Meno"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Effekt: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Popis: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr ""
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr ""
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
+
+#: ../src/gui/login.cpp:75
+msgid "Keep"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr ""
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+msgid "Map"
+msgstr ""
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr ""
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+msgid "@@trade|Trade With "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+msgid "@@attack|Attack "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "Muž"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "Žena"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Farba vlasov:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Vymazať"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Meno"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "fullscreen"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:452
+msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+msgid "use"
+msgstr ""
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Level: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Peniaze: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 msgid "Stats"
 msgstr ""
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 msgid "Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 msgid "Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 msgid "M.Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Sila:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 msgid "Agility"
 msgstr ""
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 msgid "Vitality"
 msgstr ""
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligencia:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 msgid "Dexterity"
 msgstr ""
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Naozaj chcete odstrániť túto postavu?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+msgid "Trying to connect to account server..."
+msgstr ""
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+msgid "Trying to connect to char server..."
+msgstr ""
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+msgid "Trying to connect to map server..."
+msgstr ""
+
+#: ../src/main.cpp:668
+#, c-format
+msgid "Map: %s"
+msgstr ""
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 85e37a50..e4c7a401 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-05-07 19:04+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -17,898 +17,1622 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Köp"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Pris: %d GP / Totalt: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "Stopp"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "Sälj"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Är du säker på att du vill ta bort den här karaktären?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "Välj karaktär"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "Ok"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "Ny"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "Ta bort"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "Föregående"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "Nästa"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Namn: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "Pengar: %d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "Föregående"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "Nästa"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "Ny"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "Ta bort"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "Skapa karaktär"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "Namn:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "Hårfärg:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "Frisyr:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "Skapa"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "Välj karaktär"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "Skapa"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "Ändrar OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "Port:"
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "Server:"
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "Ja"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "Nej"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "Använd"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Utrustning"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventarium"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "Använd"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "Släpp"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "Beskrivning: %s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "Effekt: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "Namn:"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "Effekt: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "Beskrivning: %s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "Avrusta"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "Utrusta"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "Välj antal föremål att handla med."
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "Välj antal föremål att släppa."
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "Användarnamn"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "Port:"
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "Behåll"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "Registrera"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "Färdigheter"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "Genväg"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "Inställningar"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "Minikarta"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "Minikarta"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@trade|Handla med %s@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@attack|Attackera %s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Prata med NPC@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Avbryt@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Plocka upp %s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Utrusta@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@use|Utrusta@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@use|Använd@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Släpp@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@description|Beskrivning@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "Bekräfta:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Användarnamnet måste vara minst %d tecken långt."
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Användarnamnet måste vara kortare än %d tecken."
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Lösenordet måste vara minst %d tecken långt."
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Lösenordet måste vara kortare än %d tecken."
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "Lösenorden stämmer inte överens."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Fel"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "Ljud"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "Volym för ljudeffekter"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "Musikvolym"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Verkställ"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Återställ fönster"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "Ljud"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "Hårfärg:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "Klicka på knappen för att starta kalibreringen"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "Kalibrera"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "Aktivera joystick"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "Rotera spaken"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "Ta bort"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "Namn:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "Helskärm"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "Särskild muspekare"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "FPS-gräns:"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Genomskinlighet"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "Rullningsradie"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "Tröghet för rullning"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "Omgivande FX"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "av"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "låg"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "hög"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "Helskärm"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "Byte till helskärm"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "Ändrar OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ändringar i OpenGL kräver omstart."
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "Omstart krävs för att ändringarna ska synas."
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "Omstart krävs för att ändringarna ska synas."
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "Använd"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Pengar: %d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "Status"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "Attack %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "Försvar %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Attack %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Försvar %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Styrka:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Smidighet:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Hälsa:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligens:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Skicklighet:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "Du får %d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Du ger:"
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Är du säker på att du vill ta bort den här karaktären?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "Ansluter..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "Ansluter..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "Ansluter..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Namn: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Ansluter..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -951,9 +1675,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "Välj din Mana World-server"
 
-#~ msgid "Port:"
-#~ msgstr "Port:"
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Var vänlig skriv både adressen och porten till en server."
 
@@ -980,6 +1701,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Nuvarande vikt: %d - Maxvikt: %d"
-
-#~ msgid "Keep"
-#~ msgstr "Behåll"
diff --git a/po/th.po b/po/th.po
index e2ee2ab5..b5937c8d 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-11-25 06:16+0000\n"
 "Last-Translator: Tharawut Paripaiboon <Unknown>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -17,892 +17,1603 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "ซื้อ"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "ราคา: %d GP / ทั้งหมด: %d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "ออก"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr "ยืนยันการลบตัวละคร"
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 #, fuzzy
 msgid "Select Character"
 msgstr "สร้างตัวละคร"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "ตกลง"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "สร้างใหม่"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "ลบทิ้ง"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "ก่อนหน้า"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "ถัดไป"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "ชื่อ: %s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "ก่อนหน้า"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "ถัดไป"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "สร้างใหม่"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "ลบทิ้ง"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "ตกลง"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "สร้างตัวละคร"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "ชื่อ:"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "สีผม:"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "ทรงผม:"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "สร้าง"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "สร้าง"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr ""
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+msgid "Changing prefix to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+msgid "Party"
+msgstr ""
+
+#: ../src/gui/colour.cpp:38
+msgid "Server"
+msgstr ""
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "ใช่"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "ไม่"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "ใช้"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "ใช้"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "ทิ้ง"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+msgid "Description:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+msgid "Effect:"
+msgstr ""
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "ชื่อ:"
+
+#: ../src/gui/inventorywindow.cpp:170
+msgid "Effect: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:172
+msgid "Description: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "เข้าระบบ"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr ""
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr ""
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "สมัครสมาชิก"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "สถานะ"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "ตั้งค่า"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+msgid "Map"
+msgstr ""
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr ""
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+msgid "@@trade|Trade With "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+msgid "@@attack|Attack "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "ยืนยัน:"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr "ชาย"
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr "หญิง"
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "ผิดพลาด"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "สีผม:"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "ลบทิ้ง"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "ชื่อ:"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "fullscreen"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:452
+msgid "Restart your client or change maps for the change to take effect."
+msgstr ""
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "ใช้"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, c-format
 msgid "Money: %d GP"
 msgstr ""
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "สถานะ"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 msgid "Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 msgid "Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 msgid "M.Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "Strength:"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "Agility:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitality:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligence:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "Dexterity:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "กำลังเชื่อมต่อ..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "กำลังเชื่อมต่อ..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "กำลังเชื่อมต่อ..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "ชื่อ: %s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 031fde9c..7fca175b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-12 16:41-0700\n"
 "PO-Revision-Date: 2008-09-17 14:41+0000\n"
 "Last-Translator: luojie-dune <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -17,898 +17,1622 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "买"
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
+#: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "价格：%d GP/总数：%d GP"
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
 msgid "Quit"
 msgstr "退出"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
-#: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "描述：%s"
 
-#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
-#: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "影响: %s"
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
 msgstr "停止"
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
 msgstr "出售"
 
-#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
-#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
-#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
+#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
+#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
 msgid "Cancel"
 msgstr "取消"
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "你确定想删除这个较色"
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:80
 msgid "Select Character"
 msgstr "选择较色"
 
-#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
-#: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
-msgid "Ok"
-msgstr "OK"
-
-#: src/gui/char_select.cpp:86
-msgid "New"
-msgstr "新建"
-
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
-msgstr "删除"
-
-#: src/gui/char_select.cpp:88
-msgid "Previous"
-msgstr "上一页"
-
-#: src/gui/char_select.cpp:89
-msgid "Next"
-msgstr "下一页"
-
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
-#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
-#: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
+#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
+#: ../src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "名字：%s"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
+#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
+#: ../src/gui/char_select.cpp:183
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
 #, c-format
 msgid "Money: %d"
 msgstr "金钱：%d"
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:91
+msgid "Previous"
+msgstr "上一页"
+
+#: ../src/gui/char_select.cpp:92
+msgid "Next"
+msgstr "下一页"
+
+#: ../src/gui/char_select.cpp:93
+msgid "New"
+msgstr "新建"
+
+#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+msgid "Delete"
+msgstr "删除"
+
+#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+msgid "Ok"
+msgstr "OK"
+
+#: ../src/gui/char_select.cpp:172
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:241
 msgid "Create Character"
 msgstr "创建角色"
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:66
 msgid "Name:"
 msgstr "名称"
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:254
 msgid "Hair Color:"
 msgstr "头发颜色"
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:257
 msgid "Hair Style:"
 msgstr "发型"
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:258
 msgid "Create"
 msgstr "建立"
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
 msgstr "选择较色"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
+#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+#, fuzzy
+msgid "Chat"
+msgstr "建立"
+
+#. Fix the owner of welcome message.
+#: ../src/gui/chat.cpp:136
+msgid "Welcome"
 msgstr ""
 
-#: src/gui/chat.cpp:125
-#, c-format
-msgid "Global announcement from %s:"
+#: ../src/gui/chat.cpp:147
+msgid "Global announcement: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:152
+msgid "Global announcement from "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
 msgid "Server:"
 msgstr "服务器："
 
-#: src/gui/chat.cpp:146
-#, c-format
-msgid "%s whispers:"
+#: ../src/gui/chat.cpp:291
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:402
+msgid "Whispering to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:411
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:412
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:417
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:422
+msgid "Message now closes chat."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:426
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:470
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:473
+msgid "The current server doesn't support spells"
+msgstr ""
+
+#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:504
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:510
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:652
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:657
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:660
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:663
+#, fuzzy
+msgid "Changing prefix to "
+msgstr "改变成OpenGL"
+
+#: ../src/gui/chat.cpp:673
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:679
+msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:680
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:682
+msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:684
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:686
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:709
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:723
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:724
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:734
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:735
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:737
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:738
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:739
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:744
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:751
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:762
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:767
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:33
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+#, fuzzy
+msgid "Party"
+msgstr "端口："
+
+#: ../src/gui/colour.cpp:38
+#, fuzzy
+msgid "Server"
+msgstr "服务器："
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
 msgstr "是"
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:38
 msgid "No"
 msgstr "否"
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
+#: ../src/being.cpp:96
+msgid "Unable to load emotions"
+msgstr ""
+
+#: ../src/gui/emotecontainer.cpp:53
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+msgid "Use"
+msgstr "使用"
+
+#: ../src/gui/equipmentwindow.cpp:40 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "装备"
 
-#: src/gui/help.cpp:33
+#: ../src/gui/help.cpp:32
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:40
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "清单"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
-msgstr "使用"
-
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:55
 msgid "Drop"
 msgstr "丢弃"
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
+#, fuzzy
+msgid "Description:"
+msgstr "描述：%s"
+
+#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
+#, fuzzy
+msgid "Effect:"
+msgstr "影响: %s"
+
+#. Adjust widgets
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:73
+msgid " g Slots: "
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:111
+msgid " g  Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
+#: ../src/gui/inventorywindow.cpp:168
+#, fuzzy
+msgid "Name: "
+msgstr "名称"
+
+#: ../src/gui/inventorywindow.cpp:170
+#, fuzzy
+msgid "Effect: "
+msgstr "影响: %s"
+
+#: ../src/gui/inventorywindow.cpp:172
+#, fuzzy
+msgid "Description: "
+msgstr "描述：%s"
+
+#: ../src/gui/inventorywindow.cpp:255
 msgid "Unequip"
 msgstr "卸下装备"
 
-#: src/gui/inventorywindow.cpp:228
+#: ../src/gui/inventorywindow.cpp:258
 msgid "Equip"
 msgstr "装备"
 
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
 msgstr "请选择交易的物品数量"
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
 msgstr "请选择丢弃的物品数量"
 
-#: src/gui/login.cpp:42
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr "登陆"
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
 msgid "Password:"
 msgstr "密码："
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+msgid "Port:"
+msgstr "端口："
+
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:75
+msgid "Keep"
+msgstr "保持"
+
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
+#: ../src/gui/register.cpp:78
 msgid "Register"
 msgstr "注册"
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:39
 msgid "Status"
 msgstr "状态"
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
 msgid "Skills"
 msgstr "技能"
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr "快捷键"
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/main.cpp:756
 msgid "Setup"
 msgstr "安装"
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39
+#, fuzzy
+msgid "Map"
+msgstr "小地图"
+
+#: ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr "小地图"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/popupmenu.cpp:81
+#, fuzzy
+msgid "@@trade|Trade With "
 msgstr "@@交易|与%s交易@@"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:82
+#, fuzzy
+msgid "@@attack|Attack "
 msgstr "@@攻击|攻击%s@@"
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:91
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:92
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:97
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:109
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@谈话|和NPC谈话@@"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
+#: ../src/gui/popupmenu.cpp:302
 msgid "@@cancel|Cancel@@"
 msgstr "@@取消|取消@@"
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:139
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@捡起|捡起%s@@"
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@使用|装备@@"
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
 msgstr "@@使用|装备@@"
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:297
 msgid "@@use|Use@@"
 msgstr "@@使用|使用@@"
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:299
 msgid "@@drop|Drop@@"
 msgstr "@@丢弃|丢弃@@"
 
-#: src/gui/popupmenu.cpp:291
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@description|Description@@"
 msgstr "@@描述|描述@@"
 
-#: src/gui/register.cpp:67
+#: ../src/gui/register.cpp:68
 msgid "Confirm:"
 msgstr "确定"
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:76
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:77
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:186
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:195
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "用户名至少需要%d个字符"
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:203
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "用户名不能少于%d个字符"
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:211
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "密码需要至少%d个字符"
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:219
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "密码不能少于%d个字符"
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:226
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
 msgid "Error"
 msgstr "错误"
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:39
 msgid "Sound"
 msgstr "声音"
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:45
 msgid "Sfx volume"
 msgstr "音效声量"
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:46
 msgid "Music volume"
 msgstr "音乐声量"
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "应用"
 
-#: src/gui/setup.cpp:58
+#. Disable this button when the windows aren't created yet
+#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "重置窗口"
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:81
 msgid "Video"
 msgstr "视频"
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:85
 msgid "Audio"
 msgstr "音频"
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:89
 msgid "Joystick"
 msgstr "游戏杆"
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:93
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:97
+msgid "Colours"
+msgstr ""
+
+#: ../src/gui/setup.cpp:101
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:38
+#, fuzzy
+msgid "Color:"
+msgstr "头发颜色"
+
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
 msgstr "按下开始校准按钮"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
 msgid "Calibrate"
 msgstr "校准"
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:38
 msgid "Enable joystick"
 msgstr "启用游戏杆"
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:73
 msgid "Stop"
 msgstr "停止"
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:74
 msgid "Rotate the stick"
 msgstr "旋转手柄"
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:93
 #, fuzzy
 msgid "Default"
 msgstr "删除"
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:114
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:52
 #, fuzzy
 msgid "Name"
 msgstr "名称"
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:53
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:58
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:244
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:90
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:92
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
 msgstr "全屏"
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:116
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:117
 msgid "Custom cursor"
 msgstr "通常的光标"
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:119
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:120
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
 msgstr "FPS限制"
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:141
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:209
 msgid "Scroll radius"
 msgstr "滚动半径"
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:217
 msgid "Scroll laziness"
 msgstr "拉动极限"
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:225
 msgid "Ambient FX"
 msgstr "环境音效"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
 msgid "off"
 msgstr "离线"
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
+#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
 msgid "low"
 msgstr "低"
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
+#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
 msgid "high"
 msgstr "高"
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:244
 msgid "Particle Detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:320
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:321
+#, fuzzy
+msgid "fullscreen"
+msgstr "全屏"
+
+#: ../src/gui/setup_video.cpp:322
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:329
 msgid "Switching to full screen"
 msgstr "切换到全屏"
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:330
 msgid "Restart needed for changes to take effect."
 msgstr "只有改变生效后才能重启"
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:342
 msgid "Changing OpenGL"
 msgstr "改变成OpenGL"
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:343
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+msgid " video mode: "
+msgstr ""
+
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:432
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:433
+#, fuzzy
+msgid "Restart your client for the change to take effect."
+msgstr "只有改变生效后才能重启"
+
+#: ../src/gui/setup_video.cpp:451
+msgid "Particle effect settings changed"
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Restart your client or change maps for the change to take effect."
+msgstr "只有改变生效后才能重启"
+
+#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:131
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:131
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:132
+#, fuzzy
+msgid "use"
+msgstr "使用"
+
+#: ../src/gui/skill.cpp:257
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
+#: ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "等级：%d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "金钱：%d"
 
-#: src/gui/status.cpp:127
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:125
 #, fuzzy
 msgid "Stats"
 msgstr "状态"
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:126
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:127
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
 msgstr "攻击 %+d"
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
 msgstr "防护 %+d"
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
 msgstr "攻击 %+d"
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
 msgstr "防护 %+d"
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:136
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:280
 #, fuzzy
 msgid "Strength"
 msgstr "力量"
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:281
 #, fuzzy
 msgid "Agility"
 msgstr "敏捷:"
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
 msgstr "体力:"
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
 msgstr "智力:"
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
 msgstr "智慧:"
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:285
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "添加"
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
 #, c-format
 msgid "You get %d GP."
 msgstr "你得到%d GP."
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "你得到："
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:283
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:79
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:94
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:116
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:197
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:329
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:330
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:365
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:415
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:454
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:455
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:509
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:522
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/game.cpp:386
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:391
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:392
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:467
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:468
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:531
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:536
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:638
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "你确定想删除这个较色"
+
+#: ../src/game.cpp:644
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:785
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/main.cpp:206
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:207
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:211
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:221
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:223
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:251
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:260
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:262
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:266
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:268
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:281
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:301
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:311
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:425
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:467
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:468
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:469
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:470
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:471
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:472
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:473
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:474
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:475
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:476
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:477
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:478
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:484 ../src/main.cpp:487
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:488
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:584
+#, fuzzy
+msgid "Trying to connect to account server..."
+msgstr "连接中..."
+
+#: ../src/main.cpp:585
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:639
+#, fuzzy
+msgid "Trying to connect to char server..."
+msgstr "连接中..."
+
+#: ../src/main.cpp:661
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:667
+#, fuzzy
+msgid "Trying to connect to map server..."
+msgstr "连接中..."
+
+#: ../src/main.cpp:668
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "名字：%s"
+
+#: ../src/main.cpp:798
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:831
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1034
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "连接中..."
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1042
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1050
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -951,9 +1675,6 @@ msgstr ""
 #~ msgid "Choose your Mana World Server"
 #~ msgstr "请选择你的魔法世界服务器"
 
-#~ msgid "Port:"
-#~ msgstr "端口："
-
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "请输入服务器的IP地址和端口"
 
@@ -980,6 +1701,3 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "总的力量：%d - 最大力量：%d"
-
-#~ msgid "Keep"
-#~ msgstr "保持"
diff --git a/src/gui/setup_colours.cpp b/src/gui/setup_colours.cpp
index dca47630..b542839a 100644
--- a/src/gui/setup_colours.cpp
+++ b/src/gui/setup_colours.cpp
@@ -35,7 +35,7 @@
 #include "../utils/gettext.h"
 
 Setup_Colours::Setup_Colours() :
-    mColourLabel(_("Colour:")),
+    mColourLabel(_("Color:")),
     mSelected(-1)
 {
     mColourBox = new gcn::ListBox(textColour);
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 0f52be41..0e960b84 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -281,8 +281,7 @@ Setup_Players::~Setup_Players(void)
 }
 
 
-void
-Setup_Players::reset()
+void Setup_Players::reset()
 {
     // We now have to search through the list of ignore choices to find the
     // current selection. We could use an index into the table of config
@@ -299,8 +298,7 @@ Setup_Players::reset()
     mIgnoreActionChoicesBox->setSelected(selection);
 }
 
-void
-Setup_Players::apply()
+void Setup_Players::apply()
 {
     player_relations.setPersistIgnores(mPersistIgnores->isSelected());
     player_relations.store();
@@ -312,13 +310,11 @@ Setup_Players::apply()
                                 | (mDefaultWhisper->isSelected()? PlayerRelation::WHISPER : 0));
 }
 
-void
-Setup_Players::cancel()
+void Setup_Players::cancel()
 {
 }
 
-void
-Setup_Players::action(const gcn::ActionEvent &event)
+void Setup_Players::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == ACTION_TABLE) {
         // temporarily eliminate ourselves: we are fully aware of this change,
@@ -352,8 +348,7 @@ Setup_Players::action(const gcn::ActionEvent &event)
     }
 }
 
-void
-Setup_Players::updatedPlayer(const std::string &name)
+void Setup_Players::updatedPlayer(const std::string &name)
 {
     mPlayerTableModel->playerRelationsUpdated();
     mDefaultTrading->setSelected(
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index afc7b1b5..e424c43f 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -353,13 +353,12 @@ void Setup_Video::apply()
     mSpeechBubbleEnabled = config.getValue("speechbubble", 1);
     mNameEnabled = config.getValue("showownname", 0);
     mOpacity = config.getValue("guialpha", 0.8);
-    mOverlayDetail = (int)config.getValue("OverlayDetail", 2);
+    mOverlayDetail = (int) config.getValue("OverlayDetail", 2);
     mOpenGLEnabled = config.getValue("opengl", 0);
 }
 
-int
-Setup_Video::updateSlider(gcn::Slider *slider, gcn::TextField *field,
-                          const std::string &configName)
+int Setup_Video::updateSlider(gcn::Slider *slider, gcn::TextField *field,
+                              const std::string &configName)
 {
     int value;
     std::stringstream temp(field->getText());
@@ -538,8 +537,7 @@ void Setup_Video::action(const gcn::ActionEvent &event)
     }
 }
 
-void
-Setup_Video::keyPressed(gcn::KeyEvent &event)
+void Setup_Video::keyPressed(gcn::KeyEvent &event)
 {
     std::stringstream tempFps(mFpsField->getText());
 
diff --git a/src/gui/shortcutcontainer.cpp b/src/gui/shortcutcontainer.cpp
index 88d9bb22..d03bc809 100644
--- a/src/gui/shortcutcontainer.cpp
+++ b/src/gui/shortcutcontainer.cpp
@@ -58,8 +58,7 @@ void ShortcutContainer::widgetResized(const gcn::Event &event)
     }
 }
 
-int
-ShortcutContainer::getIndexFromGrid(int pointX, int pointY) const
+int ShortcutContainer::getIndexFromGrid(int pointX, int pointY) const
 {
     const gcn::Rectangle tRect = gcn::Rectangle(
         0, 0, mGridWidth * mBoxWidth, mGridHeight * mBoxHeight);
-- 
cgit v1.2.3-70-g09d2


From 50db322f400b80192d28a7104e4d3ae59e9caa16 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 12 Jan 2009 16:53:31 -0700
Subject: Since the po files are fixed now, remove ABOUT-NLS and config.rpath
 so that they don't require an autoreconf -i --force.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 ABOUT-NLS    | 279 -----------------------------------------------------------
 config.rpath |   0
 po/en_GB.po  |   3 +-
 3 files changed, 1 insertion(+), 281 deletions(-)
 delete mode 100644 ABOUT-NLS
 delete mode 100644 config.rpath

diff --git a/ABOUT-NLS b/ABOUT-NLS
deleted file mode 100644
index 249a4b5b..00000000
--- a/ABOUT-NLS
+++ /dev/null
@@ -1,279 +0,0 @@
-Notes on the Free Translation Project
-*************************************
-
-   Free software is going international!  The Free Translation Project
-is a way to get maintainers of free software, translators, and users all
-together, so that will gradually become able to speak many languages.
-A few packages already provide translations for their messages.
-
-   If you found this `ABOUT-NLS' file inside a distribution, you may
-assume that the distributed package does use GNU `gettext' internally,
-itself available at your nearest GNU archive site.  But you do *not*
-need to install GNU `gettext' prior to configuring, installing or using
-this package with messages translated.
-
-   Installers will find here some useful hints.  These notes also
-explain how users should proceed for getting the programs to use the
-available translations.  They tell how people wanting to contribute and
-work at translations should contact the appropriate team.
-
-   When reporting bugs in the `intl/' directory or bugs which may be
-related to internationalization, you should tell about the version of
-`gettext' which is used.  The information can be found in the
-`intl/VERSION' file, in internationalized packages.
-
-One advise in advance
-=====================
-
-   If you want to exploit the full power of internationalization, you
-should configure it using
-
-     ./configure --with-included-gettext
-
-to force usage of internationalizing routines provided within this
-package, despite the existence of internationalizing capabilities in the
-operating system where this package is being installed.  So far, only
-the `gettext' implementation in the GNU C library version 2 provides as
-many features (such as locale alias or message inheritance) as the
-implementation here.  It is also not possible to offer this additional
-functionality on top of a `catgets' implementation.  Future versions of
-GNU `gettext' will very likely convey even more functionality.  So it
-might be a good idea to change to GNU `gettext' as soon as possible.
-
-   So you need not provide this option if you are using GNU libc 2 or
-you have installed a recent copy of the GNU gettext package with the
-included `libintl'.
-
-INSTALL Matters
-===============
-
-   Some packages are "localizable" when properly installed; the
-programs they contain can be made to speak your own native language.
-Most such packages use GNU `gettext'.  Other packages have their own
-ways to internationalization, predating GNU `gettext'.
-
-   By default, this package will be installed to allow translation of
-messages.  It will automatically detect whether the system provides
-usable `catgets' (if using this is selected by the installer) or
-`gettext' functions.  If neither is available, the GNU `gettext' own
-library will be used.  This library is wholly contained within this
-package, usually in the `intl/' subdirectory, so prior installation of
-the GNU `gettext' package is *not* required.  Installers may use
-special options at configuration time for changing the default
-behaviour.  The commands:
-
-     ./configure --with-included-gettext
-     ./configure --with-catgets
-     ./configure --disable-nls
-
-will respectively bypass any pre-existing `catgets' or `gettext' to use
-the internationalizing routines provided within this package, enable
-the use of the `catgets' functions (if found on the locale system), or
-else, *totally* disable translation of messages.
-
-   When you already have GNU `gettext' installed on your system and run
-configure without an option for your new package, `configure' will
-probably detect the previously built and installed `libintl.a' file and
-will decide to use this.  This might be not what is desirable.  You
-should use the more recent version of the GNU `gettext' library.  I.e.
-if the file `intl/VERSION' shows that the library which comes with this
-package is more recent, you should use
-
-     ./configure --with-included-gettext
-
-to prevent auto-detection.
-
-   By default the configuration process will not test for the `catgets'
-function and therefore they will not be used.  The reasons are already
-given above: the emulation on top of `catgets' cannot provide all the
-extensions provided by the GNU `gettext' library.  If you nevertheless
-want to use the `catgets' functions use
-
-     ./configure --with-catgets
-
-to enable the test for `catgets' (this causes no harm if `catgets' is
-not available on your system).  If you really select this option we
-would like to hear about the reasons because we cannot think of any
-good one ourself.
-
-   Internationalized packages have usually many `po/LL.po' files, where
-LL gives an ISO 639 two-letter code identifying the language.  Unless
-translations have been forbidden at `configure' time by using the
-`--disable-nls' switch, all available translations are installed
-together with the package.  However, the environment variable `LINGUAS'
-may be set, prior to configuration, to limit the installed set.
-`LINGUAS' should then contain a space separated list of two-letter
-codes, stating which languages are allowed.
-
-Using This Package
-==================
-
-   As a user, if your language has been installed for this package, you
-only have to set the `LANG' environment variable to the appropriate
-ISO 639 `LL' two-letter code prior to using the programs in the
-package.  For example, let's suppose that you speak German.  At the
-shell prompt, merely execute `setenv LANG de' (in `csh'),
-`export LANG; LANG=de' (in `sh') or `export LANG=de' (in `bash').  This
-can be done from your `.login' or `.profile' file, once and for all.
-
-   An operating system might already offer message localization for
-many of its programs, while other programs have been installed locally
-with the full capabilities of GNU `gettext'.  Just using `gettext'
-extended syntax for `LANG' would break proper localization of already
-available operating system programs.  In this case, users should set
-both `LANGUAGE' and `LANG' variables in their environment, as programs
-using GNU `gettext' give preference to `LANGUAGE'.  For example, some
-Swedish users would rather read translations in German than English for
-when Swedish is not available.  This is easily accomplished by setting
-`LANGUAGE' to `sv:de' while leaving `LANG' to `sv'.
-
-Translating Teams
-=================
-
-   For the Free Translation Project to be a success, we need interested
-people who like their own language and write it well, and who are also
-able to synergize with other translators speaking the same language.
-Each translation team has its own mailing list, courtesy of Linux
-International.  You may reach your translation team at the address
-`LL@li.org', replacing LL by the two-letter ISO 639 code for your
-language.  Language codes are *not* the same as the country codes given
-in ISO 3166.  The following translation teams exist, as of August 1998:
-
-     Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en',
-     Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian
-     `hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja',
-     Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish
-     `pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es',
-     Swedish `sv', and Turkish `tr'.
-
-For example, you may reach the Chinese translation team by writing to
-`zh@li.org'.
-
-   If you'd like to volunteer to *work* at translating messages, you
-should become a member of the translating team for your own language.
-The subscribing address is *not* the same as the list itself, it has
-`-request' appended.  For example, speakers of Swedish can send a
-message to `sv-request@li.org', having this message body:
-
-     subscribe
-
-   Keep in mind that team members are expected to participate
-*actively* in translations, or at solving translational difficulties,
-rather than merely lurking around.  If your team does not exist yet and
-you want to start one, or if you are unsure about what to do or how to
-get started, please write to `translation@iro.umontreal.ca' to reach the
-coordinator for all translator teams.
-
-   The English team is special.  It works at improving and uniformizing
-the terminology in use.  Proven linguistic skill are praised more than
-programming skill, here.
-
-Available Packages
-==================
-
-   Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of August
-1998.  The matrix shows, in regard of each package, for which languages
-PO files have been submitted to translation coordination.
-
-     Ready PO files    cs da de el en es fi fr it
-                     .----------------------------.
-     bash            |       []             []    |
-     bison           |       []             []    |
-     clisp           |       []    [] []    []    |
-     cpio            |       []       []    []    |
-     diffutils       |       []       []    []    |
-     enscript        |       []       [] [] []    |
-     fileutils       | []    []       []    []    |
-     findutils       |       []       []    [] [] |
-     flex            |                []    []    |
-     gcal            |       []             []    |
-     gettext         |    [] [] []    []    []    |
-     grep            |       [] []    []    []    |
-     hello           |    [] []       []    [] [] |
-     id-utils        |       []             []    |
-     indent          |    [] []                   |
-     libc            |       []       []    []    |
-     m4              |       []             []    |
-     make            |       []       []    []    |
-     music           |                      []    |
-     ptx             |       []       []    []    |
-     recode          |    [] []       []    []    |
-     sed             |                            |
-     sh-utils        |       []       []    []    |
-     sharutils       | []    [] []    []    []    |
-     tar             | []    []             [] [] |
-     texinfo         | []    []             []    |
-     textutils       | []    []       []    []    |
-     wdiff           | []    []       []    []    |
-     wget            | []    [] []             [] |
-                     `----------------------------'
-                       cs da de el en es fi fr it
-                        7  4 26  4  1 18  1 26  4
-     
-                       ja ko nl no pl pt ru sl sv
-                     .----------------------------.
-     bash            |       []                   |  3
-     bison           |       []                   |  3
-     clisp           |                            |  4
-     cpio            |    [] []    []             |  6
-     diffutils       |             []          [] |  5
-     enscript        |       []             []    |  6
-     fileutils       |    [] []    [] [] [] [] [] | 11
-     findutils       |    [] []    []    []    [] |  9
-     flex            |    []                   [] |  4
-     gcal            |       []    []          [] |  5
-     gettext         |    [] [] [] [] []    [] [] | 13
-     grep            |    [] [] [] []    [] [] [] | 11
-     hello           |    [] [] [] [] []    [] [] | 12
-     id-utils        |             []             |  3
-     indent          |    []       []    []       |  5
-     libc            |    [] [] [] []          [] |  8
-     m4              | []    []          []    [] |  6
-     make            |    [] []    []             |  6
-     music           |             []             |  2
-     ptx             |       [] [] [] []       [] |  8
-     recode          |       []    [] []    [] [] |  9
-     sed             |                            |  0
-     sh-utils        |       [] [] [] []       [] |  8
-     sharutils       |       []                [] |  7
-     tar             |    [] [] [] [] []    [] [] | 11
-     texinfo         |       []                   |  4
-     textutils       |    [] [] [] []          [] |  9
-     wdiff           |       [] [] []          [] |  8
-     wget            |          []                |  5
-                     `----------------------------'
-       18 teams        ja ko nl no pl pt ru sl sv
-       29 domains       1 12 21 11 19  7  5  7 17  191
-
-   Some counters in the preceding matrix are higher than the number of
-visible blocks let us expect.  This is because a few extra PO files are
-used for implementing regional variants of languages, or language
-dialects.
-
-   For a PO file in the matrix above to be effective, the package to
-which it applies should also have been internationalized and
-distributed as such by its maintainer.  There might be an observable
-lag between the mere existence a PO file and its wide availability in a
-distribution.
-
-   If August 1998 seems to be old, you may fetch a more recent copy of
-this `ABOUT-NLS' file on most GNU archive sites.
-
-Using `gettext' in new packages
-===============================
-
-   If you are writing a freely available program and want to
-internationalize it you are welcome to use GNU `gettext' in your
-package.  Of course the GNU Public License applies to your sources from
-then if you include `gettext' directly in your distribution on but
-since you are writing free software anyway this is no restriction.
-
-   Once the sources are change appropriately and the setup can handle to
-use of `gettext' the only thing missing are the translations.  The Free
-Translation Project is also available for packages which are not
-developed inside the GNU project.  Therefore the information given above
-applies also for every other Free Software Project.  Contact
-`translation@iro.umontreal.ca' to make the `.pot' files available to
-the translation teams.
-
diff --git a/config.rpath b/config.rpath
deleted file mode 100644
index e69de29b..00000000
diff --git a/po/en_GB.po b/po/en_GB.po
index 4d10d394..31fbf2bb 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -858,9 +858,8 @@ msgid "Players"
 msgstr ""
 
 #: ../src/gui/setup_colours.cpp:38
-#, fuzzy
 msgid "Color:"
-msgstr "Hair Colour:"
+msgstr "Colour:"
 
 #: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
 msgid "Press the button to start calibration"
-- 
cgit v1.2.3-70-g09d2


From eda625ec28a2349692c749aa7802144407820d0b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 12 Jan 2009 17:40:21 -0700
Subject: Fixed a path error that slipped through by accident.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/game.cpp | 2 +-
 src/main.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 753d7afa..a9e59586 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -31,6 +31,7 @@
 
 #include "beingmanager.h"
 #include "effectmanager.h"
+#include "emoteshortcut.h"
 #include "engine.h"
 #include "flooritemmanager.h"
 #include "graphics.h"
@@ -48,7 +49,6 @@
 #include "gui/chat.h"
 #include "gui/confirm_dialog.h"
 #include "gui/debugwindow.h"
-#include "gui/emoteshortcut.h"
 #include "gui/emoteshortcutcontainer.h"
 #include "gui/emotewindow.h"
 #include "gui/equipmentwindow.h"
diff --git a/src/main.cpp b/src/main.cpp
index 3cf8611d..61b90b12 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -37,6 +37,7 @@
 #include <SDL/SDL_ttf.h>
 
 #include "configuration.h"
+#include "emoteshortcut.h"
 #include "game.h"
 #include "graphics.h"
 #include "itemshortcut.h"
@@ -56,7 +57,6 @@
 #include "gui/char_server.h"
 #include "gui/char_select.h"
 #include "gui/colour.h"
-#include "gui/emoteshortcut.h"
 #include "gui/gui.h"
 #include "gui/login.h"
 #include "gui/ok_dialog.h"
-- 
cgit v1.2.3-70-g09d2


From e7f4e78f76972ca3882b9d2763ae9cab31675d3a Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 12 Jan 2009 17:57:13 -0700
Subject: Fixed color spelling for American English.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 po/ar.po          | 7 ++++---
 po/ca.po          | 4 ++--
 po/cs.po          | 7 ++++---
 po/da.po          | 7 ++++---
 po/de.po          | 7 ++++---
 po/en_GB.po       | 4 ++--
 po/eo.po          | 4 ++--
 po/es.po          | 7 ++++---
 po/fi.po          | 7 ++++---
 po/fr.po          | 7 ++++---
 po/he.po          | 7 ++++---
 po/hr.po          | 7 ++++---
 po/id.po          | 7 ++++---
 po/it.po          | 7 ++++---
 po/ja.po          | 7 ++++---
 po/nl.po          | 7 ++++---
 po/pl.po          | 7 ++++---
 po/pt_BR.po       | 7 ++++---
 po/ru.po          | 7 ++++---
 po/sk.po          | 7 ++++---
 po/sv.po          | 7 ++++---
 po/th.po          | 7 ++++---
 po/zh_CN.po       | 7 ++++---
 src/gui/setup.cpp | 2 +-
 24 files changed, 87 insertions(+), 67 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index e07e5814..baa6ca73 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-07-16 18:28+0000\n"
 "Last-Translator: صقر بن عبدالله <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -850,8 +850,9 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "لون الشعر:"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/ca.po b/po/ca.po
index 569fdab4..0f69f976 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-07-03 17:21+0000\n"
 "Last-Translator: Habari <thomas.becerril@gmail.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -837,7 +837,7 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
+msgid "Colors"
 msgstr ""
 
 #: ../src/gui/setup.cpp:101
diff --git a/po/cs.po b/po/cs.po
index 9191a30c..b8e8c402 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-12-17 16:31+0000\n"
 "Last-Translator: Lubos <alvinx12@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -844,8 +844,9 @@ msgid "Keyboard"
 msgstr "Klávesnice"
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "Barva vlasů:"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/da.po b/po/da.po
index 99f118ef..b6468804 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-12-28 14:45+0000\n"
 "Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -850,8 +850,9 @@ msgid "Keyboard"
 msgstr "Tastatur"
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "Hårfarve:"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/de.po b/po/de.po
index bd230744..36f02ac3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-10-13 00:25+0000\n"
 "Last-Translator: Aeneas Jaißle <Unknown>\n"
 "Language-Team: German\n"
@@ -850,8 +850,9 @@ msgid "Keyboard"
 msgstr "Tastatur"
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "Haarfarbe"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/en_GB.po b/po/en_GB.po
index 31fbf2bb..3a4e4e56 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -850,8 +850,8 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+msgid "Colors"
+msgstr "Colours"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/eo.po b/po/eo.po
index 0692acc3..9b8d53a4 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-11-10 22:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -835,7 +835,7 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
+msgid "Colors"
 msgstr ""
 
 #: ../src/gui/setup.cpp:101
diff --git a/po/es.po b/po/es.po
index 442a5e8e..a9750855 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-10-15 01:37+0000\n"
 "Last-Translator: catalania <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -850,8 +850,9 @@ msgid "Keyboard"
 msgstr "Teclado"
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "Color de pelo:"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/fi.po b/po/fi.po
index f7aef242..16f6e5ab 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-12-30 10:23+0000\n"
 "Last-Translator: ville-v <villev90@gmail.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -851,8 +851,9 @@ msgid "Keyboard"
 msgstr "Näppäimistö"
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "Hiusten väri:"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/fr.po b/po/fr.po
index 4e365259..b1821706 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-12-26 10:43+0000\n"
 "Last-Translator: Johan Serre <Unknown>\n"
 "Language-Team: French\n"
@@ -851,8 +851,9 @@ msgid "Keyboard"
 msgstr "Clavier"
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "Couleur des cheveux"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/he.po b/po/he.po
index 9b622a04..c8a6d581 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-10-20 00:23+0000\n"
 "Last-Translator: Ddorda <d.dorda@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -851,8 +851,9 @@ msgid "Keyboard"
 msgstr "מקלדת"
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "צבע שיער:"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/hr.po b/po/hr.po
index fb7f13e7..786f7b3b 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-12-28 23:36+0000\n"
 "Last-Translator: Dino Paskvan <dpaskvan@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -844,8 +844,9 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "Boja kose:"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/id.po b/po/id.po
index 1d6a8530..084898ad 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-03-26 09:11+0000\n"
 "Last-Translator: ActiveFile <activefile@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -850,8 +850,9 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "Warna Rambut:"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/it.po b/po/it.po
index b1bf327c..760ea76d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2007-12-03 01:45+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Italian\n"
@@ -852,8 +852,9 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "Colore Capelli"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/ja.po b/po/ja.po
index f82bdaef..07dff2f7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-06-28 16:27+0000\n"
 "Last-Translator: fate <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -846,8 +846,9 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "髪の色："
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/nl.po b/po/nl.po
index ed33a824..3cbd5247 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-10-10 00:04+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Dutch\n"
@@ -850,8 +850,9 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "Haarkleur:"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/pl.po b/po/pl.po
index 84f5e412..55371e43 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-10-10 05:26+0000\n"
 "Last-Translator: Michał Trzebiatowski <Unknown>\n"
 "Language-Team: <pl@li.org>\n"
@@ -852,8 +852,9 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "Kolor włosów:"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a1e318a6..aaf8de44 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-12-14 21:37+0000\n"
 "Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -850,8 +850,9 @@ msgid "Keyboard"
 msgstr "Teclado"
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "Cor do Cabelo:"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/ru.po b/po/ru.po
index 9dc5c43a..82955c54 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-01-08 11:50+0000\n"
 "Last-Translator: idle sign <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -850,8 +850,9 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "Цвет волос:"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/sk.po b/po/sk.po
index e6b7a602..ef9d85bf 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-12-30 14:07+0000\n"
 "Last-Translator: TomasKovacik <nail@nodomain.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -842,8 +842,9 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "Farba vlasov:"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/sv.po b/po/sv.po
index e4c7a401..b0b4dc07 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-05-07 19:04+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -850,8 +850,9 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "Hårfärg:"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/th.po b/po/th.po
index b5937c8d..866c30ee 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-11-25 06:16+0000\n"
 "Last-Translator: Tharawut Paripaiboon <Unknown>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -838,8 +838,9 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "สีผม:"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7fca175b..05dc2b57 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-12 17:52-0700\n"
 "PO-Revision-Date: 2008-09-17 14:41+0000\n"
 "Last-Translator: luojie-dune <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -850,8 +850,9 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "头发颜色"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 66f15f03..551fe5bb 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -94,7 +94,7 @@ Setup::Setup():
     mTabs.push_back(tab);
 
     tab = new Setup_Colours();
-    panel->addTab(tab, _("Colours"));
+    panel->addTab(tab, _("Colors"));
     mTabs.push_back(tab);
 
     tab = new Setup_Players();
-- 
cgit v1.2.3-70-g09d2


From 10a9dbacd9334caede10f1b21d42cdf7e1efcd03 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 15 Jan 2009 11:06:32 -0700
Subject: Style cleanups throughout most of the code. Splitting function type
 from the function names should no longer be around.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 po/POTFILES.in                    |   4 +
 po/ar.po                          | 243 ++++++++++++++++++++++++++++------
 po/ca.po                          | 237 +++++++++++++++++++++++++++++-----
 po/cs.po                          | 238 +++++++++++++++++++++++++++++-----
 po/da.po                          | 239 +++++++++++++++++++++++++++++-----
 po/de.po                          | 239 +++++++++++++++++++++++++++++-----
 po/en_GB.po                       | 239 +++++++++++++++++++++++++++++-----
 po/eo.po                          | 237 +++++++++++++++++++++++++++++-----
 po/es.po                          | 239 +++++++++++++++++++++++++++++-----
 po/fi.po                          | 239 +++++++++++++++++++++++++++++-----
 po/fr.po                          | 239 +++++++++++++++++++++++++++++-----
 po/he.po                          | 239 +++++++++++++++++++++++++++++-----
 po/hr.po                          | 238 +++++++++++++++++++++++++++++-----
 po/id.po                          | 239 +++++++++++++++++++++++++++++-----
 po/it.po                          | 239 +++++++++++++++++++++++++++++-----
 po/ja.po                          | 238 +++++++++++++++++++++++++++++-----
 po/nl.po                          | 239 +++++++++++++++++++++++++++++-----
 po/pl.po                          | 239 +++++++++++++++++++++++++++++-----
 po/pt.po                          | 244 +++++++++++++++++++++++++++++------
 po/pt_BR.po                       | 239 +++++++++++++++++++++++++++++-----
 po/ru.po                          | 239 +++++++++++++++++++++++++++++-----
 po/sk.po                          | 238 +++++++++++++++++++++++++++++-----
 po/sv.po                          | 239 +++++++++++++++++++++++++++++-----
 po/th.po                          | 238 +++++++++++++++++++++++++++++-----
 po/zh_CN.po                       | 239 +++++++++++++++++++++++++++++-----
 src/animatedsprite.h              |  24 ++--
 src/being.cpp                     |   3 -
 src/configuration.cpp             |   2 -
 src/equipment.cpp                 |   3 +-
 src/floor_item.h                  |  18 +--
 src/graphics.cpp                  |  18 ++-
 src/graphics.h                    |  20 ++-
 src/gui/browserbox.cpp            |   9 +-
 src/gui/button.cpp                |   3 +-
 src/gui/buttonbox.cpp             |   3 +-
 src/gui/buttonbox.h               |   3 +-
 src/gui/char_select.cpp           |  12 +-
 src/gui/char_server.cpp           |   9 +-
 src/gui/chat.h                    | 265 +++++++++++++++++++-------------------
 src/gui/debugwindow.cpp           |   3 +-
 src/gui/emotecontainer.h          |  14 +-
 src/gui/emotewindow.h             |   1 -
 src/gui/inttextbox.cpp            |   3 +-
 src/gui/inttextbox.h              |   3 +-
 src/gui/itempopup.cpp             | 113 ----------------
 src/gui/itempopup.h               |  51 --------
 src/gui/listbox.cpp               |   3 +-
 src/gui/login.cpp                 |  29 ++---
 src/gui/login.h                   |   9 +-
 src/gui/passwordfield.h           |   3 +-
 src/gui/playerbox.cpp             |   6 +-
 src/gui/playerbox.h               |   3 +-
 src/gui/progressbar.cpp           |   9 +-
 src/gui/progressbar.h             |  24 ++--
 src/gui/register.cpp              |  21 +--
 src/gui/register.h                |   9 +-
 src/gui/setup_video.h             |  11 +-
 src/gui/status.h                  |   1 -
 src/gui/table.cpp                 |  84 ++++--------
 src/gui/table_model.cpp           |  39 ++----
 src/gui/truetypefont.cpp          |  11 +-
 src/gui/truetypefont.h            |   2 -
 src/gui/updatewindow.cpp          |   6 +-
 src/gui/viewport.cpp              |   2 -
 src/gui/widgets/resizegrip.cpp    |   3 +-
 src/gui/window.h                  |   9 +-
 src/item.h                        |  36 ++----
 src/map.h                         |  26 ++--
 src/monster.h                     |   3 +-
 src/net/messagein.cpp             |  21 +--
 src/net/messagein.h               |  20 +--
 src/net/network.cpp               |   3 +-
 src/net/network.h                 |  54 +++-----
 src/net/partyhandler.cpp          |   3 +-
 src/net/playerhandler.cpp         |   2 +-
 src/net/tradehandler.cpp          |  38 +++---
 src/npc.cpp                       |  15 +--
 src/particlecontainer.cpp         |  21 +--
 src/particleemitter.cpp           |   3 +-
 src/particleemitter.h             |   3 +-
 src/player_relations.cpp          |  57 +++-----
 src/properties.h                  |   9 +-
 src/resources/action.h            |   6 +-
 src/resources/animation.cpp       |   9 +-
 src/resources/animation.h         |  18 +--
 src/resources/buddylist.cpp       |   2 +-
 src/resources/buddylist.h         |   2 +-
 src/resources/colordb.cpp         |  11 +-
 src/resources/image.h             |  29 ++---
 src/resources/imagewriter.h       |   2 +-
 src/resources/itemdb.cpp          |  16 +--
 src/resources/iteminfo.cpp        |  10 +-
 src/resources/monsterdb.cpp       |  16 +--
 src/resources/monsterdb.h         |   6 +-
 src/resources/monsterinfo.cpp     |   6 +-
 src/resources/monsterinfo.h       |  40 +++---
 src/resources/music.cpp           |   6 +-
 src/resources/music.h             |   6 +-
 src/resources/npcdb.cpp           |  15 +--
 src/resources/npcdb.h             |   6 +-
 src/resources/resource.cpp        |   6 +-
 src/resources/resource.h          |   6 +-
 src/resources/resourcemanager.cpp |   3 +-
 src/resources/soundeffect.cpp     |   3 +-
 src/resources/soundeffect.h       |   3 +-
 src/resources/spritedef.cpp       |  25 ++--
 src/resources/spritedef.h         |  23 ++--
 src/sprite.h                      |  12 +-
 src/utils/xml.cpp                 |   9 +-
 src/utils/xml.h                   |   9 +-
 110 files changed, 5422 insertions(+), 1801 deletions(-)
 delete mode 100644 src/gui/itempopup.cpp
 delete mode 100644 src/gui/itempopup.h

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5f244d22..a3a9f01c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -37,7 +37,11 @@ src/gui/status.cpp
 src/gui/trade.cpp
 src/gui/updatewindow.cpp
 src/net/playerhandler.cpp
+src/net/tradehandler.cpp
+src/resources/colordb.cpp
 src/resources/itemdb.cpp
+src/resources/monsterdb.cpp
+src/resources/npcdb.cpp
 src/being.cpp
 src/game.cpp
 src/main.cpp
diff --git a/po/ar.po b/po/ar.po
index baa6ca73..3710bf45 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-07-16 18:28+0000\n"
 "Last-Translator: صقر بن عبدالله <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "بيع"
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "إلغاء"
 
@@ -136,7 +136,7 @@ msgstr "إنشاء شخصيّة"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "الاسم:"
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr "الخادوم:"
 
@@ -331,9 +331,8 @@ msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
 #: ../src/gui/chat.cpp:663
-#, fuzzy
 msgid "Changing prefix to "
-msgstr "تغيير OpenGL"
+msgstr ""
 
 #: ../src/gui/chat.cpp:673
 msgid "-- Help --"
@@ -539,12 +538,12 @@ msgstr "نعم"
 msgid "No"
 msgstr "لا"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "جارِ الاتّصال..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -642,11 +641,11 @@ msgstr "انتقاء كمّيّة من المواد لإسقاطها."
 msgid "Login"
 msgstr "ولوج"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "كلمة السرّ:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr "المنفذ:"
 
@@ -658,8 +657,8 @@ msgstr ""
 msgid "Keep"
 msgstr "ترك"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "تسجيل"
 
@@ -766,49 +765,49 @@ msgstr "@@إسقاط|إسقاط@@"
 msgid "@@description|Description@@"
 msgstr "@@الوصف|الوصف@@"
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr "تأكيد:"
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "يجب أن يكون طول اسم المستخدم على الأقل %d محارف."
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "يجب أن يكون طول اسم المستخدم أقل من %d محارف."
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "يجب أن تكون طول كلمة السرّ على الأقل %d محارف."
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محارف."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr "كلمات السرّ غير متطابقة."
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "خطأ"
 
@@ -859,7 +858,6 @@ msgid "Players"
 msgstr ""
 
 #: ../src/gui/setup_colours.cpp:38
-#, fuzzy
 msgid "Color:"
 msgstr "لون الشعر:"
 
@@ -1229,58 +1227,58 @@ msgstr "أنت تقدّم:"
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1411,6 +1409,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1420,10 +1422,177 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@تجارة|متاجرة مع %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "إلغاء"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 0f69f976..71f6c6da 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-07-03 17:21+0000\n"
 "Last-Translator: Habari <thomas.becerril@gmail.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -56,8 +56,8 @@ msgstr ""
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgstr ""
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "nom"
 
@@ -179,7 +179,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr ""
 
@@ -534,12 +534,12 @@ msgstr "si"
 msgid "No"
 msgstr "no"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr ""
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -633,11 +633,11 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr ""
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr ""
 
@@ -649,8 +649,8 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr ""
 
@@ -753,49 +753,49 @@ msgstr ""
 msgid "@@description|Description@@"
 msgstr ""
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr ""
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr ""
 
@@ -1199,58 +1199,58 @@ msgstr ""
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1381,6 +1381,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1390,10 +1394,175 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+msgid "Trade with "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:128
+msgid " cancelled"
+msgstr ""
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index b8e8c402..e046aad8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-12-17 16:31+0000\n"
 "Last-Translator: Lubos <alvinx12@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -56,8 +56,8 @@ msgstr "Prodej"
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -136,7 +136,7 @@ msgstr "Vytvořit postavu"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Jméno:"
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr "Server:"
 
@@ -538,12 +538,12 @@ msgstr "Ano"
 msgid "No"
 msgstr "Ne"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -639,11 +639,11 @@ msgstr "Vyberte množství zboží, které chcete upustit."
 msgid "Login"
 msgstr ""
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr "Port:"
 
@@ -655,8 +655,8 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "Registrace"
 
@@ -760,49 +760,49 @@ msgstr ""
 msgid "@@description|Description@@"
 msgstr ""
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr ""
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr "Muž"
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr "Žena"
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Uživatelské jméno musí být nejméně %d znaků dlouhé."
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Uživatelské jméno musí být kratší než %d znaků."
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Heslo musí být kratší než %d znaků."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Chyba"
 
@@ -1218,58 +1218,58 @@ msgstr ""
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1400,6 +1400,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1409,10 +1413,176 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+msgid "Trade with "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Zrušit"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index b6468804..d3ffa234 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-12-28 14:45+0000\n"
 "Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Sælg"
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Fortryd"
 
@@ -136,7 +136,7 @@ msgstr "Lav figur."
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Navn:"
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr "Server:"
 
@@ -539,12 +539,12 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Opretter forbindelse..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -642,11 +642,11 @@ msgstr "Vælg hvor mange du vil smide,"
 msgid "Login"
 msgstr "Log Ind"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr "Port:"
 
@@ -658,8 +658,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Behold"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "Registrer"
 
@@ -766,49 +766,49 @@ msgstr "@@drop|Smid@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Beskrivelse@@"
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr "Bekræft:"
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr "Mand"
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr "Kvinde"
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Brugernavnet skal mindst være %d bogstaver langt."
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Brugernavnet skal være mindre end %d bogstaver langt."
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Adgangskoden skal mindst være %d bogstaver langt."
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr "Adgangskoder stemmer ikke overens."
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Fejl"
 
@@ -1229,58 +1229,58 @@ msgstr "Du giver:"
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1411,6 +1411,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1420,10 +1424,177 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Byt Med %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Fortryd"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 36f02ac3..e8a39a98 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-10-13 00:25+0000\n"
 "Last-Translator: Aeneas Jaißle <Unknown>\n"
 "Language-Team: German\n"
@@ -57,8 +57,8 @@ msgstr "Verkaufen"
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -136,7 +136,7 @@ msgstr "Charakter erstellen"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Name :"
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr "Server:"
 
@@ -539,12 +539,12 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Verbinde..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -642,11 +642,11 @@ msgstr "Wähle aus, wieviele Gegenstände Du wegwerfen möchtest."
 msgid "Login"
 msgstr "Anmelden"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr "Port:"
 
@@ -658,8 +658,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Erinnern"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "Registrieren"
 
@@ -766,49 +766,49 @@ msgstr "@@drop|Fallen lassen@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Beschreibung@@"
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr "Männlich"
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr "Weiblich"
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Der Nutzername muss aus mindestens %d Zeichen bestehen."
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Der Nutzername muss kürzer als %d Zeichen sein."
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Das Passwort muss aus mindestens %d bestehen."
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Das Passwort muss kürzer als %d Zeichen sein."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Fehler"
 
@@ -1231,58 +1231,58 @@ msgstr "Du gibst:"
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1413,6 +1413,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1422,10 +1426,177 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Mit %s handeln@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Abbrechen"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 3a4e4e56..93256370 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-05-10 16:51+0000\n"
 "Last-Translator: Me <Glich.Glich@googlemail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Sell"
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -136,7 +136,7 @@ msgstr "Create Character"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Name:"
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr "Server:"
 
@@ -539,12 +539,12 @@ msgstr "Yes"
 msgid "No"
 msgstr "No"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Connecting..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -642,11 +642,11 @@ msgstr "Select amount of items to drop."
 msgid "Login"
 msgstr "Login"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr "Port:"
 
@@ -658,8 +658,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Keep"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "Register"
 
@@ -766,49 +766,49 @@ msgstr "@@drop|Drop@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Description@@"
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr "Confirm:"
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "The username needs to be at least %d characters long."
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "The username needs to be less than %d characters long."
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "The password needs to be at least %d characters long."
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "The password needs to be less than %d characters long."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Error"
 
@@ -1227,58 +1227,58 @@ msgstr "You give:"
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1409,6 +1409,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1418,10 +1422,177 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Trade With %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Cancel"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/eo.po b/po/eo.po
index 9b8d53a4..d7d627c8 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-11-10 22:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -56,8 +56,8 @@ msgstr ""
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgstr ""
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr ""
 
@@ -178,7 +178,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr ""
 
@@ -533,12 +533,12 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr ""
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -631,11 +631,11 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr ""
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr ""
 
@@ -647,8 +647,8 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr ""
 
@@ -751,49 +751,49 @@ msgstr ""
 msgid "@@description|Description@@"
 msgstr ""
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr ""
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr ""
 
@@ -1196,58 +1196,58 @@ msgstr ""
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1378,6 +1378,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1387,10 +1391,175 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+msgid "Trade with "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:128
+msgid " cancelled"
+msgstr ""
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index a9750855..6e88cb57 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-10-15 01:37+0000\n"
 "Last-Translator: catalania <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Vender"
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -136,7 +136,7 @@ msgstr "Crear Personaje"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr "Servidor:"
 
@@ -539,12 +539,12 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Conectando…"
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -642,11 +642,11 @@ msgstr "Seleccione objetos para soltar."
 msgid "Login"
 msgstr "conectarse"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr "Puerto:"
 
@@ -658,8 +658,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Mantener"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "Registrar"
 
@@ -766,49 +766,49 @@ msgstr "@@drop|Tirar@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Descripción@@"
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "El nombre de usuario debe tener al menos %d caracteres."
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "El nombre de usuario puede tener como máximo %d caracteres."
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "La contraseña debe tener al menos %d caracteres."
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "La contraseña puede tener como máximo %d caracteres."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Error"
 
@@ -1229,58 +1229,58 @@ msgstr "Tu das:"
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1411,6 +1411,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1420,10 +1424,177 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Comerciar con %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Cancelar"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 16f6e5ab..472fbd83 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-12-30 10:23+0000\n"
 "Last-Translator: ville-v <villev90@gmail.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Myy"
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Peru"
 
@@ -137,7 +137,7 @@ msgstr "Luo hahmo"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -182,7 +182,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr "Palvelin:"
 
@@ -540,12 +540,12 @@ msgstr "Kyllä"
 msgid "No"
 msgstr "Ei"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -643,11 +643,11 @@ msgstr "Anna pudotettavien tavaroiden määrä."
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr "Portti:"
 
@@ -659,8 +659,8 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "Rekisteröidy"
 
@@ -767,49 +767,49 @@ msgstr "@@drop|Pudota maahan@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Kuvaus@@"
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr "Vahvista:"
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr "Miespuolinen"
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr "Naispuolinen"
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Käyttäjänimen tulee olla vähintään %d merkkiä pitkä"
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Käyttäjänimen tulee olla alle %d merkkiä pitkä."
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Salasanan tulee olla vähintään %d merkkiä pitkä"
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Virhe"
 
@@ -1230,58 +1230,58 @@ msgstr "Annat:"
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1412,6 +1412,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1421,10 +1425,177 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Vaihda tavaroita %s kanssa@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Peru"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index b1821706..7f522152 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-12-26 10:43+0000\n"
 "Last-Translator: Johan Serre <Unknown>\n"
 "Language-Team: French\n"
@@ -58,8 +58,8 @@ msgstr "Vendre"
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -137,7 +137,7 @@ msgstr "Création du personnage"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Nom :"
 
@@ -182,7 +182,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr "Serveur :"
 
@@ -540,12 +540,12 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Connexion..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -643,11 +643,11 @@ msgstr "Choisissez le nombre d'objets à lâcher."
 msgid "Login"
 msgstr "Connexion"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr "Port :"
 
@@ -659,8 +659,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Conserver"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "S'inscrire"
 
@@ -767,49 +767,49 @@ msgstr "@@drop|Lâcher@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Description@@"
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr "Vérification :"
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr "Masculin"
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr "Féminin"
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Le nom d'utilisateur doit faire au moins %d caractères."
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Le nom d'utilisateur doit faire moins de %d caractères."
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Le mot de passe doit faire au moins %d caractères."
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Le mot de passe doit faire moins de %d caractères."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe ne correspondent pas."
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Erreur"
 
@@ -1234,58 +1234,58 @@ msgstr "Vous donnez :"
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1416,6 +1416,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1425,10 +1429,177 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Troquer avec %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Annuler"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/he.po b/po/he.po
index c8a6d581..a098c887 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-10-20 00:23+0000\n"
 "Last-Translator: Ddorda <d.dorda@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "מכר"
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "ביטול"
 
@@ -137,7 +137,7 @@ msgstr "צור שחקן"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "שם:"
 
@@ -182,7 +182,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr "שרת:"
 
@@ -540,12 +540,12 @@ msgstr "כן"
 msgid "No"
 msgstr "לא"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "מתחבר..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -643,11 +643,11 @@ msgstr "בחר כמות חפצים להשליך."
 msgid "Login"
 msgstr "התחברות"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr "פורט:"
 
@@ -659,8 +659,8 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "הרשם"
 
@@ -767,49 +767,49 @@ msgstr "@@drop|השלך@@"
 msgid "@@description|Description@@"
 msgstr "@@description|תיאור@@"
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr "אשר:"
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr "זכר"
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr "נקבה"
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "שם המשתמש חייב להכיל לפחות %d תוים."
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "שם המשתמש חייב להכיל פחות מ-%d תוים."
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "הסיסמה חייבת להכיל לפחות %d תוים."
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "הסיסמה חייבת להכיל פחות מ-%d תוים."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr "הסיסמאות אינן תואמות."
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "שגיאה"
 
@@ -1230,58 +1230,58 @@ msgstr "אתה נותן:"
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1412,6 +1412,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1421,10 +1425,177 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|סחור עם %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "ביטול"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 786f7b3b..10e68177 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-12-28 23:36+0000\n"
 "Last-Translator: Dino Paskvan <dpaskvan@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -56,8 +56,8 @@ msgstr ""
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Poništi"
 
@@ -136,7 +136,7 @@ msgstr "Stvori Lika"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Ime:"
 
@@ -180,7 +180,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr ""
 
@@ -535,12 +535,12 @@ msgstr "Da"
 msgid "No"
 msgstr "Ne"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Spajanje..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -638,11 +638,11 @@ msgstr "Odaberi količinu predmeta za ispuštanje."
 msgid "Login"
 msgstr "Korisničko ime"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "Lozinka"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr ""
 
@@ -654,8 +654,8 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "Registriraj se"
 
@@ -760,49 +760,49 @@ msgstr ""
 msgid "@@description|Description@@"
 msgstr ""
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr ""
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr "Muško"
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr "Žensko"
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Greška"
 
@@ -1216,58 +1216,58 @@ msgstr ""
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1398,6 +1398,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1407,10 +1411,176 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+msgid "Trade with "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Poništi"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 084898ad..cf39a880 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-03-26 09:11+0000\n"
 "Last-Translator: ActiveFile <activefile@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Jual"
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Batal"
 
@@ -136,7 +136,7 @@ msgstr "Buat Karakter"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Nama:"
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr "Server:"
 
@@ -539,12 +539,12 @@ msgstr "Ya"
 msgid "No"
 msgstr "Tidak"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Menyambung..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -642,11 +642,11 @@ msgstr "Pilih jumlah item yang mau di buang"
 msgid "Login"
 msgstr "Login"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "Kata Sandi:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr "Port:"
 
@@ -658,8 +658,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Pertahankan"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "Mendaftar"
 
@@ -766,49 +766,49 @@ msgstr "@@drop|Buang@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Deskripsi@@"
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr "Konfirmasi:"
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Panjang username setidak-tidaknya %d karakter"
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Panjang kata-sandi setidak-tidaknya %d karakter"
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr "Kata sandi tidak sama."
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Kesalahan"
 
@@ -1229,58 +1229,58 @@ msgstr "Anda memberikan:"
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1411,6 +1411,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1420,10 +1424,177 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Dagang Dengan %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Batal"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 760ea76d..342aab49 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2007-12-03 01:45+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Italian\n"
@@ -59,8 +59,8 @@ msgstr "Vendi"
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancella"
 
@@ -138,7 +138,7 @@ msgstr "Crea Personaggio"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Nome :"
 
@@ -183,7 +183,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr "Server:"
 
@@ -541,12 +541,12 @@ msgstr "Si"
 msgid "No"
 msgstr "No"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Connessione..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -644,11 +644,11 @@ msgstr "Seleziona la quantità di oggetti da lasciare."
 msgid "Login"
 msgstr "Autenticazione"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr "Porta:"
 
@@ -660,8 +660,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Mantieni"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "Registra"
 
@@ -768,49 +768,49 @@ msgstr "@@drop|Lascia@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Descrizione@@"
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr "Conferma:"
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Il nome utente deve contenere almeno %d caratteri."
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Il nome utente deve avere meno di %d caratteri."
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "La password deve essere lunga almeno %d caratteri."
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "La password deve contenere meno di %d caratteri."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Errore"
 
@@ -1231,58 +1231,58 @@ msgstr "Dai:"
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1413,6 +1413,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1422,10 +1426,177 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Scambia Con %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Cancella"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 07dff2f7..2f0cf9f4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-06-28 16:27+0000\n"
 "Last-Translator: fate <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -56,8 +56,8 @@ msgstr ""
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "取消"
 
@@ -135,7 +135,7 @@ msgstr "キャラを作成"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "名前:"
 
@@ -180,7 +180,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr "サーバ:"
 
@@ -537,12 +537,12 @@ msgstr "はい"
 msgid "No"
 msgstr "いいえ"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "接続しています..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -640,11 +640,11 @@ msgstr ""
 msgid "Login"
 msgstr "ログイン"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr "ポート:"
 
@@ -656,8 +656,8 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr ""
 
@@ -762,49 +762,49 @@ msgstr ""
 msgid "@@description|Description@@"
 msgstr ""
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr ""
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr "パスワードが一致していません。"
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "エラー"
 
@@ -1218,58 +1218,58 @@ msgstr ""
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1400,6 +1400,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1409,10 +1413,176 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+msgid "Trade with "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "取消"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 3cbd5247..2ee556d1 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-10-10 00:04+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Dutch\n"
@@ -57,8 +57,8 @@ msgstr ""
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -136,7 +136,7 @@ msgstr "Personage Aanmaken"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Naam:"
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr "Server:"
 
@@ -539,12 +539,12 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nee"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Verbinden..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -642,11 +642,11 @@ msgstr "Selecteer het aantal exemplaren om neer te leggen"
 msgid "Login"
 msgstr "Inloggen"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "Wachtword:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr "Poort:"
 
@@ -658,8 +658,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Behouden"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "Aanmelden"
 
@@ -766,49 +766,49 @@ msgstr "@@drop|Neerleggen@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Beschrijving@@"
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr "Bevestigen:"
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "De gebruikersnaam moet uit ten minste %d tekens bestaan."
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "De gebruikersnaam moet uit minder dan %d tekens bestaan."
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Het wachtwoord moet uit ten minste %d tekens bestaan."
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Fout"
 
@@ -1225,58 +1225,58 @@ msgstr "Je geeft:"
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1407,6 +1407,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1416,10 +1420,177 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Handelen met %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Annuleren"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 55371e43..d1e98691 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-10-10 05:26+0000\n"
 "Last-Translator: Michał Trzebiatowski <Unknown>\n"
 "Language-Team: <pl@li.org>\n"
@@ -59,8 +59,8 @@ msgstr "Sprzedaj"
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -138,7 +138,7 @@ msgstr "Stwórz postać"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Imię:"
 
@@ -183,7 +183,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr "Serwer:"
 
@@ -541,12 +541,12 @@ msgstr "Tak"
 msgid "No"
 msgstr "Nie"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Łączenie..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -644,11 +644,11 @@ msgstr "Wybierz ilość przedmiotów do upuszczenia."
 msgid "Login"
 msgstr "Użytkownik"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr "Port:"
 
@@ -660,8 +660,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Zachowaj"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "Rejestruj"
 
@@ -768,49 +768,49 @@ msgstr "@@drop|Upuść@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Opis@@"
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr "Potwierdź:"
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr "Mężczyzna"
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr "Kobieta"
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Nazwa użytkownika musi być długa na conajmniej %d znaków."
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Nazwa użytkownika musi mieć mniej niż %d znaków."
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Hasło musi mieć conajmniej %d znaków."
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Hasło nie może mieć więcej jak %d znaków."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Błąd"
 
@@ -1232,58 +1232,58 @@ msgstr "Dajesz:"
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1414,6 +1414,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1423,10 +1427,177 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Targ z %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Anuluj"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 09f31b9b..72737624 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-02-03 10:14+0000\n"
 "Last-Translator: Tiago Silva <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Vender"
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -136,7 +136,7 @@ msgstr "Criar Personagem"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Nome:"
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr "Servidor:"
 
@@ -539,12 +539,12 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Conectando..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -642,11 +642,11 @@ msgstr "Seleccionar a quantidade de itens a largar."
 msgid "Login"
 msgstr "Autenticar"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr "Porta:"
 
@@ -658,8 +658,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Manter"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "Registo"
 
@@ -766,49 +766,49 @@ msgstr "@@drop|Largar@@"
 msgid "@@description|Description@@"
 msgstr "@@descrição|Descrição@@"
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "O nome de utilizador necessita de pelo menos %d caracteres."
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "O nome de utilizador só pode ter %d caracteres."
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "A password necessita de pelo menos %d caracteres."
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "A password só pode ter até %d caracteres."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr "As senhas não coincidem."
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Erro"
 
@@ -850,8 +850,9 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "Cor de Cabelo:"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
@@ -1236,58 +1237,58 @@ msgstr "Dá:"
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1418,6 +1419,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1427,10 +1432,177 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Negociar com %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Cancelar"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index aaf8de44..58ec5d1b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-12-14 21:37+0000\n"
 "Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Vender"
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -136,7 +136,7 @@ msgstr "Criar Personagem"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Nome:"
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr "Servidor:"
 
@@ -539,12 +539,12 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Conectando..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -642,11 +642,11 @@ msgstr "Selecionar montante de itens para descartar."
 msgid "Login"
 msgstr "Login"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr "Porta:"
 
@@ -658,8 +658,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Manter"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "Registrar"
 
@@ -766,49 +766,49 @@ msgstr "@@descartar|Descartar@@"
 msgid "@@description|Description@@"
 msgstr "@@descrição|Descrição@@"
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr "Homem"
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr "Mulher"
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "O nome do usuário precisa ter pelo menos %d caracteres."
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "O nome do usuário tem que ser inferior a %d caracteres."
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "A senha deve ter pelo menos %d caracteres."
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "A senha deve ser menor que %d caracteres."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Erro"
 
@@ -1229,58 +1229,58 @@ msgstr "Você dá:"
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1411,6 +1411,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1420,10 +1424,177 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@Negociar|Negociar com %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Cancelar"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 82955c54..6d1d3a98 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-01-08 11:50+0000\n"
 "Last-Translator: idle sign <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Продать"
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -136,7 +136,7 @@ msgstr "Создать персонажа"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Имя:"
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr "Сервер:"
 
@@ -539,12 +539,12 @@ msgstr "Да"
 msgid "No"
 msgstr "Нет"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Соединение..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -642,11 +642,11 @@ msgstr "Сколько предметов сбросить."
 msgid "Login"
 msgstr "Вход"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr "Порт:"
 
@@ -658,8 +658,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Оставить"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "Зарегистрироваться"
 
@@ -766,49 +766,49 @@ msgstr "@@drop|Сбросить@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Описание@@"
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr "Подтвердите:"
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Имя пользователя должно содержать не менее %d символов."
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Имя пользователя не должно содержать более %d символов."
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Пароль должен содержать не менее %d символов."
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Пароль не должен содержать более %d символов."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Ошибка"
 
@@ -1229,58 +1229,58 @@ msgstr "Вы отдаете:"
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1411,6 +1411,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1420,10 +1424,177 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Торговать с %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Отмена"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index ef9d85bf..8b0eec38 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-12-30 14:07+0000\n"
 "Last-Translator: TomasKovacik <nail@nodomain.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -56,8 +56,8 @@ msgstr ""
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Zrušiť"
 
@@ -136,7 +136,7 @@ msgstr "Vytvoriť postavu"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Meno"
 
@@ -180,7 +180,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr ""
 
@@ -535,12 +535,12 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr ""
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -638,11 +638,11 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr ""
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr ""
 
@@ -654,8 +654,8 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr ""
 
@@ -758,49 +758,49 @@ msgstr ""
 msgid "@@description|Description@@"
 msgstr ""
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr ""
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr "Muž"
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr "Žena"
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr ""
 
@@ -1209,58 +1209,58 @@ msgstr ""
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1391,6 +1391,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1400,10 +1404,176 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+msgid "Trade with "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Zrušiť"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index b0b4dc07..88148c62 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-05-07 19:04+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Sälj"
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -136,7 +136,7 @@ msgstr "Skapa karaktär"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Namn:"
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr "Server:"
 
@@ -539,12 +539,12 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Ansluter..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -642,11 +642,11 @@ msgstr "Välj antal föremål att släppa."
 msgid "Login"
 msgstr "Användarnamn"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr "Port:"
 
@@ -658,8 +658,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Behåll"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "Registrera"
 
@@ -766,49 +766,49 @@ msgstr "@@drop|Släpp@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Beskrivning@@"
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr "Bekräfta:"
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Användarnamnet måste vara minst %d tecken långt."
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Användarnamnet måste vara kortare än %d tecken."
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Lösenordet måste vara minst %d tecken långt."
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Lösenordet måste vara kortare än %d tecken."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr "Lösenorden stämmer inte överens."
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "Fel"
 
@@ -1229,58 +1229,58 @@ msgstr "Du ger:"
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1411,6 +1411,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1420,10 +1424,177 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Handla med %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Avbryt"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/th.po b/po/th.po
index 866c30ee..70a4bc2c 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-11-25 06:16+0000\n"
 "Last-Translator: Tharawut Paripaiboon <Unknown>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -56,8 +56,8 @@ msgstr ""
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "ยกเลิก"
 
@@ -136,7 +136,7 @@ msgstr "สร้างตัวละคร"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "ชื่อ:"
 
@@ -180,7 +180,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr ""
 
@@ -535,12 +535,12 @@ msgstr "ใช่"
 msgid "No"
 msgstr "ไม่"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "กำลังเชื่อมต่อ..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -634,11 +634,11 @@ msgstr ""
 msgid "Login"
 msgstr "เข้าระบบ"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr ""
 
@@ -650,8 +650,8 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "สมัครสมาชิก"
 
@@ -754,49 +754,49 @@ msgstr ""
 msgid "@@description|Description@@"
 msgstr ""
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr "ยืนยัน:"
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr "ชาย"
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr "หญิง"
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "ผิดพลาด"
 
@@ -1210,58 +1210,58 @@ msgstr ""
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1392,6 +1392,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1401,10 +1405,176 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+msgid "Trade with "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "ยกเลิก"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 05dc2b57..c69f2cf8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
 "PO-Revision-Date: 2008-09-17 14:41+0000\n"
 "Last-Translator: luojie-dune <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "出售"
 #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "取消"
 
@@ -136,7 +136,7 @@ msgstr "创建角色"
 
 #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "名称"
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "Global announcement from "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
 msgstr "服务器："
 
@@ -539,12 +539,12 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "连接中..."
 
 #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
 msgid "Unable to load emotions"
 msgstr ""
 
@@ -642,11 +642,11 @@ msgstr "请选择丢弃的物品数量"
 msgid "Login"
 msgstr "登陆"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
 msgid "Password:"
 msgstr "密码："
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
 msgid "Port:"
 msgstr "端口："
 
@@ -658,8 +658,8 @@ msgstr ""
 msgid "Keep"
 msgstr "保持"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
 msgid "Register"
 msgstr "注册"
 
@@ -766,49 +766,49 @@ msgstr "@@丢弃|丢弃@@"
 msgid "@@description|Description@@"
 msgstr "@@描述|描述@@"
 
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
 msgid "Confirm:"
 msgstr "确定"
 
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "用户名至少需要%d个字符"
 
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "用户名不能少于%d个字符"
 
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "密码需要至少%d个字符"
 
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "密码不能少于%d个字符"
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
 msgid "Error"
 msgstr "错误"
 
@@ -1229,58 +1229,58 @@ msgstr "你得到："
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
 msgid " host: "
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
 msgstr ""
 
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
@@ -1411,6 +1411,10 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
 msgstr ""
@@ -1420,10 +1424,177 @@ msgstr ""
 msgid "0x013b: Unhandled message %i"
 msgstr ""
 
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@交易|与%s交易@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "取消"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
 msgstr ""
diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index 405bf42e..ddc663f2 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -60,50 +60,42 @@ class AnimatedSprite
         /**
          * Resets the animated sprite.
          */
-        void
-        reset();
+        void reset();
 
         /**
          * Plays an action using the current direction
          */
-        void
-        play(SpriteAction action);
+        void play(SpriteAction action);
 
         /**
          * Inform the animation of the passed time so that it can output the
          * correct animation frame.
          */
-        void
-        update(int time);
+        void update(int time);
 
         /**
          * Draw the current animation frame at the coordinates given in screen
          * pixels.
          */
-        bool
-        draw(Graphics* graphics, int posX, int posY) const;
+        bool draw(Graphics* graphics, int posX, int posY) const;
 
         /**
          * gets the width in pixels of the image of the current frame
          */
-        int
-        getWidth() const;
+        int getWidth() const;
 
         /**
          * gets the height in pixels of the image of the current frame
          */
-        int
-        getHeight() const;
+        int getHeight() const;
 
         /**
          * Sets the direction.
          */
-        void
-        setDirection(SpriteDirection direction);
+        void setDirection(SpriteDirection direction);
 
     private:
-        bool
-        updateCurrentAnimation(unsigned int dt);
+        bool updateCurrentAnimation(unsigned int dt);
 
         SpriteDirection mDirection;    /**< The sprite direction. */
         int mLastTime;                 /**< The last time update was called. */
diff --git a/src/being.cpp b/src/being.cpp
index 5eb62b2d..69da1182 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -48,9 +48,6 @@
 #include "utils/tostring.h"
 #include "utils/xml.h"
 
-#define BEING_EFFECTS_FILE "effects.xml"
-#define HAIR_FILE "hair.xml"
-
 int Being::instances = 0;
 int Being::mNumberOfHairstyles = 1;
 ImageSet *Being::emotionSet = NULL;
diff --git a/src/configuration.cpp b/src/configuration.cpp
index a2ce4500..4fb6a42b 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -87,7 +87,6 @@ void ConfigurationObject::clear(void)
     mOptions.clear();
 }
 
-
 ConfigurationObject::~ConfigurationObject(void)
 {
     clear();
@@ -190,7 +189,6 @@ void ConfigurationObject::writeToXML(xmlTextWriterPtr writer)
     }
 }
 
-
 void Configuration::write()
 {
     // Do not attempt to write to file that cannot be opened for writing
diff --git a/src/equipment.cpp b/src/equipment.cpp
index f1d1d4f2..828de46b 100644
--- a/src/equipment.cpp
+++ b/src/equipment.cpp
@@ -32,8 +32,7 @@ Equipment::Equipment():
     std::fill_n(mEquipment, EQUIPMENT_SIZE, 0);
 }
 
-void
-Equipment::setEquipment(int index, int inventoryIndex)
+void Equipment::setEquipment(int index, int inventoryIndex)
 {
     mEquipment[index] = inventoryIndex;
     Item* item = player_node->getInventory()->getItem(inventoryIndex);
diff --git a/src/floor_item.h b/src/floor_item.h
index b747310b..4a4e8fb3 100644
--- a/src/floor_item.h
+++ b/src/floor_item.h
@@ -51,42 +51,36 @@ class FloorItem : public Sprite
         /**
          * Returns instance id of this item.
          */
-        unsigned int
-        getId() const { return mId; }
+        unsigned int getId() const { return mId; }
 
         /**
          * Returns the item id.
          */
-        unsigned int
-        getItemId() const { return mItem->getId(); }
+        unsigned int getItemId() const { return mItem->getId(); }
 
         /**
          * Returns the x coordinate.
          */
-        unsigned short
-        getX() const { return mX; }
+        unsigned short getX() const { return mX; }
 
         /**
          * Returns the y coordinate.
          */
-        unsigned short
-        getY() const { return mY; }
+        unsigned short getY() const { return mY; }
 
         /**
          * Returns the pixel y coordinate.
          *
          * @see Sprite::getPixelY()
          */
-        int
-        getPixelY() const { return mY * 32; }
+        int getPixelY() const { return mY * 32; }
 
         /**
          * Draws this floor item to the given graphics context.
          *
          * @see Sprite::draw(Graphics, int, int)
          */
-        void
-        draw(Graphics *graphics, int offsetX, int offsetY) const
+        void draw(Graphics *graphics, int offsetX, int offsetY) const
         {
             graphics->drawImage(mItem->getImage(),
                                 mX * 32 + offsetX,
diff --git a/src/graphics.cpp b/src/graphics.cpp
index 784e6e77..55ccc3b4 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -178,13 +178,12 @@ void Graphics::drawImagePattern(Image *image, int x, int y, int w, int h)
     }
 }
 
-void
-Graphics::drawImageRect(int x, int y, int w, int h,
-                        Image *topLeft, Image *topRight,
-                        Image *bottomLeft, Image *bottomRight,
-                        Image *top, Image *right,
-                        Image *bottom, Image *left,
-                        Image *center)
+void Graphics::drawImageRect(int x, int y, int w, int h,
+                             Image *topLeft, Image *topRight,
+                             Image *bottomLeft, Image *bottomRight,
+                             Image *top, Image *right,
+                             Image *bottom, Image *left,
+                             Image *center)
 {
     pushClipArea(gcn::Rectangle(x, y, w, h));
 
@@ -222,9 +221,8 @@ Graphics::drawImageRect(int x, int y, int w, int h,
     popClipArea();
 }
 
-void
-Graphics::drawImageRect(int x, int y, int w, int h,
-                        const ImageRect &imgRect)
+void Graphics::drawImageRect(int x, int y, int w, int h,
+                             const ImageRect &imgRect)
 {
     drawImageRect(x, y, w, h,
             imgRect.grid[0], imgRect.grid[2], imgRect.grid[6], imgRect.grid[8],
diff --git a/src/graphics.h b/src/graphics.h
index efdd1ac1..bc9a95bd 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -95,17 +95,15 @@ class Graphics : public gcn::SDLGraphics {
          * @return <code>true</code> if the image was blitted properly
          *         <code>false</code> otherwise.
          */
-        virtual bool
-        drawImage(Image *image,
-                  int srcX, int srcY,
-                  int dstX, int dstY,
-                  int width, int height,
-                  bool useColor = false);
-
-        virtual void
-        drawImagePattern(Image *image,
-                         int x, int y,
-                         int w, int h);
+        virtual bool drawImage(Image *image,
+                               int srcX, int srcY,
+                               int dstX, int dstY,
+                               int width, int height,
+                               bool useColor = false);
+
+        virtual void drawImagePattern(Image *image,
+                                      int x, int y,
+                                      int w, int h);
 
         /**
          * Draws a rectangle using images. 4 corner images, 4 side images and 1
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 8be32ebb..7621b856 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -210,8 +210,7 @@ struct MouseOverLink
     int mX, mY;
 };
 
-void
-BrowserBox::mousePressed(gcn::MouseEvent &event)
+void BrowserBox::mousePressed(gcn::MouseEvent &event)
 {
     LinkIterator i = find_if(mLinks.begin(), mLinks.end(),
             MouseOverLink(event.getX(), event.getY()));
@@ -221,8 +220,7 @@ BrowserBox::mousePressed(gcn::MouseEvent &event)
     }
 }
 
-void
-BrowserBox::mouseMoved(gcn::MouseEvent &event)
+void BrowserBox::mouseMoved(gcn::MouseEvent &event)
 {
     LinkIterator i = find_if(mLinks.begin(), mLinks.end(),
             MouseOverLink(event.getX(), event.getY()));
@@ -230,8 +228,7 @@ BrowserBox::mouseMoved(gcn::MouseEvent &event)
     mSelectedLink = (i != mLinks.end()) ? (i - mLinks.begin()) : -1;
 }
 
-void
-BrowserBox::draw(gcn::Graphics *graphics)
+void BrowserBox::draw(gcn::Graphics *graphics)
 {
     if (mOpaque)
     {
diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index 40ecd1b7..9653242c 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -122,8 +122,7 @@ Button::~Button()
     }
 }
 
-void
-Button::draw(gcn::Graphics *graphics)
+void Button::draw(gcn::Graphics *graphics)
 {
     int mode;
 
diff --git a/src/gui/buttonbox.cpp b/src/gui/buttonbox.cpp
index 903d971d..d29f3c58 100644
--- a/src/gui/buttonbox.cpp
+++ b/src/gui/buttonbox.cpp
@@ -34,8 +34,7 @@ ButtonBox::ButtonBox(const std::string &title, const std::string &buttonTxt,
     add(button);
 }
 
-void
-ButtonBox::action(const gcn::ActionEvent &event)
+void ButtonBox::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "activate")
     {
diff --git a/src/gui/buttonbox.h b/src/gui/buttonbox.h
index edde4aa4..1741f7ba 100644
--- a/src/gui/buttonbox.h
+++ b/src/gui/buttonbox.h
@@ -60,8 +60,7 @@ class ButtonBox : public Window, public gcn::ActionListener
 	 *
 	 * @param event is the event that is generated
 	 */
-	void
-	action(const gcn::ActionEvent &event);
+	void action(const gcn::ActionEvent &event);
 
     private:
 
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 08fcd2b2..750c6d6f 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -308,8 +308,7 @@ CharCreateDialog::~CharCreateDialog()
     charServerHandler.setCharCreateDialog(0);
 }
 
-void
-CharCreateDialog::action(const gcn::ActionEvent &event)
+void CharCreateDialog::action(const gcn::ActionEvent &event)
 {
     int numberOfColors = ColorDB::size();
     if (event.getId() == "create") {
@@ -340,22 +339,19 @@ CharCreateDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-std::string
-CharCreateDialog::getName()
+std::string CharCreateDialog::getName()
 {
     std::string name = mNameField->getText();
     trim(name);
     return name;
 }
 
-void
-CharCreateDialog::unlock()
+void CharCreateDialog::unlock()
 {
     mCreateButton->setEnabled(true);
 }
 
-void
-CharCreateDialog::attemptCharCreate()
+void CharCreateDialog::attemptCharCreate()
 {
     // Send character infos
     MessageOut outMsg(mNetwork);
diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp
index ff401332..d5452532 100644
--- a/src/gui/char_server.cpp
+++ b/src/gui/char_server.cpp
@@ -98,8 +98,7 @@ ServerSelectDialog::~ServerSelectDialog()
     delete mServerListModel;
 }
 
-void
-ServerSelectDialog::action(const gcn::ActionEvent &event)
+void ServerSelectDialog::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "ok") {
         mOkButton->setEnabled(false);
@@ -114,14 +113,12 @@ ServerSelectDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-int
-ServerListModel::getNumberOfElements()
+int ServerListModel::getNumberOfElements()
 {
     return n_server;
 }
 
-std::string
-ServerListModel::getElementAt(int i)
+std::string ServerListModel::getElementAt(int i)
 {
     const SERVER_INFO *si = server_info[i];
     return si->name + " (" + toString(si->online_users) + ")";
diff --git a/src/gui/chat.h b/src/gui/chat.h
index 437dc115..9e137499 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -107,149 +107,142 @@ struct CHATSKILL
  * \ingroup Interface
  */
 class ChatWindow : public Window, public gcn::ActionListener,
-		   public gcn::KeyListener
+                   public gcn::KeyListener
 {
     public:
-	/**
-	 * Constructor.
-	 */
-	ChatWindow(Network *network);
-
-	/**
-	 * Destructor: used to write back values to the config file
-	 */
-	~ChatWindow();
-
-	/**
-	 * Logic (updates components' size)
-	 */
-	void logic();
-
-	/**
-	 * Adds a line of text to our message list. Parameters:
-	 *
-	 * @param line Text message.
-	 * @parem own  Type of message (usually the owner-type).
-	 */
-	void chatLog(std::string line, int own, bool ignoreRecord = false);
-
-	/**
-	 * Calls original chat_log() after processing the packet.
-	 */
-	void chatLog(CHATSKILL);
-
-	/**
-	 * Performs action.
-	 */
-	void action(const gcn::ActionEvent &event);
-
-	/**
-	 * Request focus for typing chat message.
-	 */
-	void requestChatFocus();
-
-	/**
-	 * Checks whether ChatWindow is Focused or not.
-	 */
-	bool isInputFocused();
-
-	/**
-	 * Determines whether to send a command or an ordinary message, then
-	 * contructs packets & sends them.
-	 *
-	 * @param nick The character's name to display in front.
-	 * @param msg  The message text which is to be send.
-	 *
-	 * NOTE:
-	 * The nickname is required by the server, if not specified
-	 * the message may not be sent unless a command was intended
-	 * which requires another packet to be constructed! you can
-	 * achieve this by putting a slash ("/") infront of the
-	 * message followed by the command name and the message.
-	 * of course all slash-commands need implemented handler-
-	 * routines. ;-)
-	 * remember, a line starting with "@" is not a command that needs
-	 * to be parsed rather is sent using the normal chat-packet.
-	 *
-	 * EXAMPLE:
-	 * // for an global announcement   /- command
-	 * chatlog.chat_send("", "/announce Hello to all logged in users!");
-	 * // for simple message by a user /- message
-	 * chatlog.chat_send("Zaeiru", "Hello to all users on the screen!");
-	 */
-	void
-	chatSend(const std::string &nick, std::string msg);
-
-	/** Called when key is pressed */
-	void
-	keyPressed(gcn::KeyEvent &event);
-
-	/** Called to set current text */
-	void
-	setInputText(std::string input_str);
-
-	/** Override to reset mTmpVisible */
-	void
-	setVisible(bool visible);
+        /**
+         * Constructor.
+         */
+        ChatWindow(Network *network);
+
+        /**
+         * Destructor: used to write back values to the config file
+         */
+        ~ChatWindow();
+
+        /**
+         * Logic (updates components' size)
+         */
+        void logic();
+
+        /**
+         * Adds a line of text to our message list. Parameters:
+         *
+         * @param line Text message.
+         * @parem own  Type of message (usually the owner-type).
+         */
+        void chatLog(std::string line, int own, bool ignoreRecord = false);
+
+        /**
+         * Calls original chat_log() after processing the packet.
+         */
+        void chatLog(CHATSKILL);
+
+        /**
+         * Performs action.
+         */
+        void action(const gcn::ActionEvent &event);
+
+        /**
+         * Request focus for typing chat message.
+         */
+        void requestChatFocus();
+
+        /**
+         * Checks whether ChatWindow is Focused or not.
+         */
+        bool isInputFocused();
+
+        /**
+         * Determines whether to send a command or an ordinary message, then
+         * contructs packets & sends them.
+         *
+         * @param nick The character's name to display in front.
+         * @param msg  The message text which is to be send.
+         *
+         * NOTE:
+         * The nickname is required by the server, if not specified
+         * the message may not be sent unless a command was intended
+         * which requires another packet to be constructed! you can
+         * achieve this by putting a slash ("/") infront of the
+         * message followed by the command name and the message.
+         * of course all slash-commands need implemented handler-
+         * routines. ;-)
+         * remember, a line starting with "@" is not a command that needs
+         * to be parsed rather is sent using the normal chat-packet.
+         *
+         * EXAMPLE:
+         * // for an global announcement   /- command
+         * chatlog.chat_send("", "/announce Hello to all logged in users!");
+         * // for simple message by a user /- message
+         * chatlog.chat_send("Zaeiru", "Hello to all users on the screen!");
+         */
+        void chatSend(const std::string &nick, std::string msg);
+
+        /** Called when key is pressed */
+        void keyPressed(gcn::KeyEvent &event);
+
+        /** Called to set current text */
+        void setInputText(std::string input_str);
+
+        /** Override to reset mTmpVisible */
+        void setVisible(bool visible);
 
        /**
-	* Scrolls the chat window
-	*
-	* @param amount direction and amount to scroll.  Negative numbers scroll
-	* up, positive numbers scroll down.  The absolute amount indicates the
-	* amount of 1/8ths of chat window real estate that should be scrolled.
-	*/
-	void
-	scroll(int amount);
-
-	/**
-	 * party implements the partying chat commands
-	 *
-	 * @param command is the party command to perform
-	 * @param msg is the remainder of the message
-	 */
-	void
-	party(const std::string &command, const std::string &msg);
-
-	/**
-	 * help implements the /help command
-	 *
-	 * @param msg1 is the command that the player needs help on
-	 * @param msg2 is the sub-command relating to the command
-	 */
-	void
-	help(const std::string &msg1, const std::string &msg2);
+        * Scrolls the chat window
+        *
+        * @param amount direction and amount to scroll.  Negative numbers scroll
+        * up, positive numbers scroll down.  The absolute amount indicates the
+        * amount of 1/8ths of chat window real estate that should be scrolled.
+        */
+        void scroll(int amount);
+
+        /**
+         * party implements the partying chat commands
+         *
+         * @param command is the party command to perform
+         * @param msg is the remainder of the message
+         */
+        void party(const std::string &command, const std::string &msg);
+
+        /**
+         * help implements the /help command
+         *
+         * @param msg1 is the command that the player needs help on
+         * @param msg2 is the sub-command relating to the command
+         */
+        void help(const std::string &msg1, const std::string &msg2);
 
     private:
 
-	Network *mNetwork;
-	bool mTmpVisible;
-
-	/** One item in the chat log */
-	struct CHATLOG
-	{
-	    std::string nick;
-	    std::string text;
-	    int own;
-	};
-
-	/** Constructs failed messages for actions */
-	std::string const_msg(CHATSKILL);
-
-	gcn::TextField *mChatInput; /**< Input box for typing chat messages */
-	BrowserBox *mTextOutput;    /**< Text box for displaying chat history */
-	ScrollArea *mScrollArea;    /**< Scroll area around text output */
-
-	typedef std::list<std::string> History;
-	typedef History::iterator HistoryIterator;
-	History mHistory;           /**< Command history */
-	HistoryIterator mCurHist; /**< History iterator */
-	Recorder *mRecorder; /**< Recording class */
-	char mPartyPrefix; /**< Messages beginning with the prefix are sent to
-			      the party */
-	bool mReturnToggles; /**< Marks whether <Return> toggles the chat log
-				or not */
-	Party *mParty;
+        Network *mNetwork;
+        bool mTmpVisible;
+
+        /** One item in the chat log */
+        struct CHATLOG
+        {
+            std::string nick;
+            std::string text;
+            int own;
+        };
+
+        /** Constructs failed messages for actions */
+        std::string const_msg(CHATSKILL);
+
+        gcn::TextField *mChatInput; /**< Input box for typing chat messages */
+        BrowserBox *mTextOutput;    /**< Text box for displaying chat history */
+        ScrollArea *mScrollArea;    /**< Scroll area around text output */
+
+        typedef std::list<std::string> History;
+        typedef History::iterator HistoryIterator;
+        History mHistory;           /**< Command history */
+        HistoryIterator mCurHist; /**< History iterator */
+        Recorder *mRecorder; /**< Recording class */
+        char mPartyPrefix; /**< Messages beginning with the prefix are sent to
+                              the party */
+        bool mReturnToggles; /**< Marks whether <Return> toggles the chat log
+                                or not */
+        Party *mParty;
 };
 extern ChatWindow *chatWindow;
 
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 7fc63096..63f4762a 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -67,8 +67,7 @@ DebugWindow::DebugWindow():
     add(mParticleCountLabel);
 }
 
-void
-DebugWindow::logic()
+void DebugWindow::logic()
 {
     // Get the current mouse position
     int mouseX, mouseY;
diff --git a/src/gui/emotecontainer.h b/src/gui/emotecontainer.h
index f5922a9c..2a115f0b 100644
--- a/src/gui/emotecontainer.h
+++ b/src/gui/emotecontainer.h
@@ -33,15 +33,13 @@
 #include "../resources/imageset.h"
 
 class Image;
-class Inventory;
-class Emote;
 
 namespace gcn {
     class SelectionListener;
 }
 
 /**
- * An item container. Used to show items in inventory and trade dialog.
+ * An emote container. Used to show emotes in inventory and trade dialog.
  *
  * \ingroup GUI
  */
@@ -61,7 +59,7 @@ class EmoteContainer : public gcn::Widget,
         virtual ~EmoteContainer();
 
         /**
-         * Draws the items.
+         * Draws the emotes.
          */
         void draw(gcn::Graphics *graphics);
 
@@ -76,12 +74,12 @@ class EmoteContainer : public gcn::Widget,
         void mousePressed(gcn::MouseEvent &event);
 
         /**
-         * Returns the selected item.
+         * Returns the selected emote.
          */
         int getSelectedEmote();
 
         /**
-         * Sets selected item to NULL.
+         * Sets selected emote to NULL.
          */
         void selectNone();
 
@@ -106,12 +104,12 @@ class EmoteContainer : public gcn::Widget,
     private:
         /**
 
-         * Sets the currently selected item.  Invalid (e.g., negative) indices set `no item'.
+         * Sets the currently selected emote.  Invalid (e.g., negative) indices set `no emotr'.
          */
         void setSelectedEmoteIndex(int index);
 
         /**
-         * Find the current item index by the most recently used item ID
+         * Find the current emote index by the most recently used emote ID
          */
         void refindSelectedEmote(void);
 
diff --git a/src/gui/emotewindow.h b/src/gui/emotewindow.h
index a382e37d..dbe4efd7 100644
--- a/src/gui/emotewindow.h
+++ b/src/gui/emotewindow.h
@@ -67,7 +67,6 @@ class EmoteWindow : public Window, gcn::ActionListener,
         void widgetResized(const gcn::Event &event);
 
     private:
-
         EmoteContainer *mEmotes;
 
         gcn::Button *mUseButton;
diff --git a/src/gui/inttextbox.cpp b/src/gui/inttextbox.cpp
index df8cf24e..4cb885c3 100644
--- a/src/gui/inttextbox.cpp
+++ b/src/gui/inttextbox.cpp
@@ -29,8 +29,7 @@ IntTextBox::IntTextBox(int i):
 {
 }
 
-void
-IntTextBox::keyPressed(gcn::KeyEvent &event)
+void IntTextBox::keyPressed(gcn::KeyEvent &event)
 {
     const gcn::Key &key = event.getKey();
 
diff --git a/src/gui/inttextbox.h b/src/gui/inttextbox.h
index 9c6e8bf4..d134fcd7 100644
--- a/src/gui/inttextbox.h
+++ b/src/gui/inttextbox.h
@@ -55,8 +55,7 @@ class IntTextBox : public TextField
         /**
          * Responds to key presses.
          */
-        void
-        keyPressed(gcn::KeyEvent &event);
+        void keyPressed(gcn::KeyEvent &event);
 
     private:
         int mMin;            /**< Minimum value */
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
deleted file mode 100644
index 055cbe44..00000000
--- a/src/gui/itempopup.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *  The Legend of Mazzeroth
- *  Copyright (C) 2008, The Legend of Mazzeroth Development Team
- *
- *  This file is part of The Legend of Mazzeroth based on original code
- *  from The Mana World.
- *
- *  The Legend of Mazzeroth is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Legend of Mazzeroth is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Legend of Mazzeroth; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <guichan/widgets/label.hpp>
-
-#include "gui.h"
-#include "itempopup.h"
-
-#include "widgets/layout.h"
-
-#include "../resources/image.h"
-#include "../resources/iteminfo.h"
-#include "../resources/resourcemanager.h"
-#include "../utils/gettext.h"
-#include "../utils/strprintf.h"
-
-ItemPopup::ItemPopup()
-{
-
-    setResizable(false);
-    setTitleBarHeight(0);
-
-    // Item Name
-    mItemName = new gcn::Label("Label");
-    mItemName->setFont(gui->getFont());
-    mItemName->setPosition(2, 2);
-    mItemName->setWidth(getWidth() - 4);
-
-    // Item Description
-    mItemDesc = new TextBox();
-    mItemDesc->setEditable(false);
-    mItemDescScroll = new ScrollArea(mItemDesc);
-
-    mItemDescScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    mItemDescScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    mItemDescScroll->setDimension(gcn::Rectangle(0, 0, 196, 14));
-    mItemDescScroll->setOpaque(false);
-    mItemDescScroll->setPosition(2, 15);
-
-    // Item Effect
-    mItemEffect = new TextBox();
-    mItemEffect->setEditable(false);
-    mItemEffectScroll = new ScrollArea(mItemEffect);
-
-    mItemEffectScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    mItemEffectScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    mItemEffectScroll->setDimension(gcn::Rectangle(0, 0, 196, 14));
-    mItemEffectScroll->setOpaque(false);
-    mItemEffectScroll->setPosition(2, 35);
-
-    add(mItemName);
-    add(mItemDescScroll);
-    add(mItemEffectScroll);
-
-    setLocationRelativeTo(getParent());
-
-    // LEEOR / TODO: This causes an exception error.
-    //moveToBottom(getParent());
-
-    mItemDesc->setTextWrapped( "" );
-    mItemEffect->setTextWrapped( "" );
-}
-
-void ItemPopup::setItem(Item *item)
-{
-
-    ItemInfo const *info = item ? &item->getInfo() : NULL;
-
-    mItemName->setCaption(info->getName());
-    mItemDesc->setTextWrapped( info->getDescription() );
-    mItemEffect->setTextWrapped( info->getEffect() );
-
-    int numRowsDesc = mItemDesc->getNumberOfRows();
-    int numRowsEffect = mItemEffect->getNumberOfRows();
-
-    if(info->getEffect() == "")
-    {
-        setContentSize(200, (numRowsDesc * 14) + 30);
-    } else {
-        setContentSize(200, (numRowsDesc * 14) + (numRowsEffect*14) + 30);
-    }
-
-    mItemDescScroll->setDimension(gcn::Rectangle(2, 0, 196, numRowsDesc * 14));
-
-    mItemEffectScroll->setDimension(gcn::Rectangle(2, 0, 196, numRowsEffect * 14));
-
-    mItemDescScroll->setPosition(2, 20);
-    mItemEffectScroll->setPosition(2, (numRowsDesc * 15) + 25);
-}
-
-unsigned int ItemPopup::getNumRows()
-{
-    return mItemDesc->getNumberOfRows(), mItemEffect->getNumberOfRows();
-}
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
deleted file mode 100644
index 0082ec2c..00000000
--- a/src/gui/itempopup.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-*
- *  The Legend of Mazzeroth
- *  Copyright (C) 2008, The Legend of Mazzeroth Development Team
- *
- *  This file is part of The Legend of Mazzeroth based on original code
- *  from The Mana World.
- *
- *  The Legend of Mazzeroth is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Legend of Mazzeroth is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Legend of Mazzeroth; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _LOM_ITEMPOPUP_H__
-#define _LOM_ITEMPOPUP_H__
-
-#include "scrollarea.h"
-#include "textbox.h"
-#include "window.h"
-
-#include "../item.h"
-
-class ItemPopup : public Window
-	{
-    public:
-
-		ItemPopup();
-
-		void setItem(Item *item);
-		unsigned int getNumRows();
-
-    private:
-		gcn::Label *mItemName;
-		TextBox *mItemDesc;
-		TextBox *mItemEffect;
-		ScrollArea *mItemDescScroll;
-		ScrollArea *mItemEffectScroll;
-
-	};
-
-#endif
diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp
index 4dca66a0..7e28e1f5 100644
--- a/src/gui/listbox.cpp
+++ b/src/gui/listbox.cpp
@@ -57,8 +57,7 @@ void ListBox::draw(gcn::Graphics *graphics)
     }
 }
 
-void
-ListBox::mouseDragged(gcn::MouseEvent &event)
+void ListBox::mouseDragged(gcn::MouseEvent &event)
 {
     // Pretend mouse is pressed continuously while dragged. Causes list
     // selection to be updated as is default in many GUIs.
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 18976b46..bba69754 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -188,8 +188,7 @@ bool LoginDialog::canSubmit()
            state == LOGIN_STATE;
 }
 
-bool
-LoginDialog::isUShort(const std::string &str)
+bool LoginDialog::isUShort(const std::string &str)
 {
     if (str == "")
     {
@@ -212,8 +211,7 @@ LoginDialog::isUShort(const std::string &str)
     return true;
 }
 
-unsigned short
-LoginDialog::getUShort(const std::string &str)
+unsigned short LoginDialog::getUShort(const std::string &str)
 {
     unsigned long l = 0;
     for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end();
@@ -228,9 +226,8 @@ LoginDialog::getUShort(const std::string &str)
  * LoginDialog::DropDownList
  */
 
-void
-LoginDialog::DropDownList::saveEntry(const std::string &server,
-                     const std::string &port, int &saved)
+void LoginDialog::DropDownList::saveEntry(const std::string &server,
+                                          const std::string &port, int &saved)
 {
     if (saved < MAX_SERVER_LIST_SIZE && server != "")
     {
@@ -272,9 +269,8 @@ LoginDialog::DropDownList::DropDownList(std::string prefix,
     }
 }
 
-void
-LoginDialog::DropDownList::save(const std::string &server,
-                const std::string &port)
+void LoginDialog::DropDownList::save(const std::string &server,
+                                     const std::string &port)
 {
     int position = 0;
     saveEntry(server, port, position);
@@ -292,14 +288,12 @@ LoginDialog::DropDownList::save(const std::string &server,
     }
 }
 
-int
-LoginDialog::DropDownList::getNumberOfElements()
+int LoginDialog::DropDownList::getNumberOfElements()
 {
     return mServers.size();
 }
 
-std::string
-LoginDialog::DropDownList::getElementAt(int i)
+std::string LoginDialog::DropDownList::getElementAt(int i)
 {
     if (i < 0 || i >= getNumberOfElements())
     {
@@ -308,8 +302,7 @@ LoginDialog::DropDownList::getElementAt(int i)
     return getServerAt(i) + ":" + getPortAt(i);
 }
 
-std::string
-LoginDialog::DropDownList::getServerAt(int i)
+std::string LoginDialog::DropDownList::getServerAt(int i)
 {
     if (i < 0 || i >= getNumberOfElements())
     {
@@ -318,9 +311,7 @@ LoginDialog::DropDownList::getServerAt(int i)
     return mServers.at(i);
 }
 
-
-std::string
-LoginDialog::DropDownList::getPortAt(int i)
+std::string LoginDialog::DropDownList::getPortAt(int i)
 {
     if (i < 0 || i >= getNumberOfElements())
     {
diff --git a/src/gui/login.h b/src/gui/login.h
index 3b911424..d1d75ebc 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -74,8 +74,7 @@ class LoginDialog : public Window, public gcn::ActionListener,
          * Returns whether submit can be enabled. This is true in the login
          * state, when all necessary fields have some text.
          */
-        bool
-        canSubmit();
+        bool canSubmit();
 
 	/**
 	 * Function to decide whether string is an unsigned short or not
@@ -84,8 +83,7 @@ class LoginDialog : public Window, public gcn::ActionListener,
 	 *
 	 * @return true is str is an unsigned short, false otherwise
 	 */
-	static bool
-        isUShort(const std::string &str);
+	static bool isUShort(const std::string &str);
 
 	/**
 	 * Converts string to an unsigned short (undefined if invalid)
@@ -94,8 +92,7 @@ class LoginDialog : public Window, public gcn::ActionListener,
 	 *
 	 * @return the value str represents
 	 */
-	static unsigned short
-	getUShort(const std::string &str);
+	static unsigned short getUShort(const std::string &str);
 
         DropDown *mServerDropDown;
         gcn::TextField *mUserField;
diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h
index 9aa6ab49..e31b1779 100644
--- a/src/gui/passwordfield.h
+++ b/src/gui/passwordfield.h
@@ -31,7 +31,8 @@
  *
  * \ingroup GUI
  */
-class PasswordField : public TextField {
+class PasswordField : public TextField 
+{
     public:
         /**
          * Constructor, initializes the password field with the given string.
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index e5227e5a..92722417 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -76,8 +76,7 @@ PlayerBox::~PlayerBox()
     }
 }
 
-void
-PlayerBox::draw(gcn::Graphics *graphics)
+void PlayerBox::draw(gcn::Graphics *graphics)
 {
     if (mPlayer)
     {
@@ -90,8 +89,7 @@ PlayerBox::draw(gcn::Graphics *graphics)
     }
 }
 
-void
-PlayerBox::drawFrame(gcn::Graphics *graphics)
+void PlayerBox::drawFrame(gcn::Graphics *graphics)
 {
     int w, h, bs;
     bs = getFrameSize();
diff --git a/src/gui/playerbox.h b/src/gui/playerbox.h
index 7aec87bf..3ccb5fad 100644
--- a/src/gui/playerbox.h
+++ b/src/gui/playerbox.h
@@ -53,8 +53,7 @@ class PlayerBox : public gcn::ScrollArea
          * player to <code>NULL</code> causes the box not to draw any
          * character.
          */
-        void
-        setPlayer(const Player *player) { mPlayer = player; }
+        void setPlayer(const Player *player) { mPlayer = player; }
 
         /**
          * Draws the scroll area.
diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index 708a2991..b4117c80 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -88,8 +88,7 @@ void ProgressBar::logic()
     if (mBlueToGo < mBlue) mBlue--;
 }
 
-void
-ProgressBar::draw(gcn::Graphics *graphics)
+void ProgressBar::draw(gcn::Graphics *graphics)
 {
     static_cast<Graphics*>(graphics)->
         drawImageRect(0, 0, getWidth(), getHeight(), mBorder);
@@ -104,16 +103,14 @@ ProgressBar::draw(gcn::Graphics *graphics)
     }
 }
 
-void
-ProgressBar::setProgress(float progress)
+void ProgressBar::setProgress(float progress)
 {
     if (progress < 0.0f) mProgress = 0.0;
     else if (progress > 1.0f) mProgress = 1.0;
     else mProgress = progress;
 }
 
-void
-ProgressBar::setColor(Uint8 red, Uint8 green, Uint8 blue)
+void ProgressBar::setColor(Uint8 red, Uint8 green, Uint8 blue)
 {
     mRedToGo = red;
     mGreenToGo = green;
diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h
index a20c901f..d2ace66c 100644
--- a/src/gui/progressbar.h
+++ b/src/gui/progressbar.h
@@ -52,50 +52,42 @@ class ProgressBar : public gcn::Widget {
         /**
          * Performs progress bar logic (fading colors)
          */
-        void
-        logic();
+        void logic();
 
         /**
          * Draws the progress bar.
          */
-        void
-        draw(gcn::Graphics *graphics);
+        void draw(gcn::Graphics *graphics);
 
         /**
          * Sets the current progress.
          */
-        void
-        setProgress(float progress);
+        void setProgress(float progress);
 
         /**
          * Returns the current progress.
          */
-        float
-        getProgress() { return mProgress; }
+        float getProgress() { return mProgress; }
 
         /**
          * Change the filling of the progress bar.
          */
-        void
-        setColor(Uint8, Uint8 green, Uint8 blue);
+        void setColor(Uint8, Uint8 green, Uint8 blue);
 
         /**
          * Get The red value of color
          */
-        Uint8
-        getRed() { return mRed; }
+        Uint8 getRed() { return mRed; }
 
          /**
          * Get The red value of color
          */
-        Uint8
-        getGreen() { return mGreen; }
+        Uint8 getGreen() { return mGreen; }
 
         /**
          * Get The red value of color
          */
-        Uint8
-        getBlue() { return mBlue; }
+        Uint8 getBlue() { return mBlue; }
 
     private:
         float mProgress;
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 5d687425..568ec5ff 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -43,14 +43,12 @@
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
 
-void
-WrongDataNoticeListener::setTarget(gcn::TextField *textField)
+void WrongDataNoticeListener::setTarget(gcn::TextField *textField)
 {
     mTarget = textField;
 }
 
-void
-WrongDataNoticeListener::action(const gcn::ActionEvent &event)
+void WrongDataNoticeListener::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "ok")
     {
@@ -173,8 +171,7 @@ RegisterDialog::~RegisterDialog()
     delete mWrongDataNoticeListener;
 }
 
-void
-RegisterDialog::action(const gcn::ActionEvent &event)
+void RegisterDialog::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "cancel")
     {
@@ -263,14 +260,12 @@ RegisterDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-void
-RegisterDialog::keyPressed(gcn::KeyEvent &keyEvent)
+void RegisterDialog::keyPressed(gcn::KeyEvent &keyEvent)
 {
     mRegisterButton->setEnabled(canSubmit());
 }
 
-bool
-RegisterDialog::canSubmit()
+bool RegisterDialog::canSubmit()
 {
     return !mUserField->getText().empty() &&
            !mPasswordField->getText().empty() &&
@@ -280,8 +275,7 @@ RegisterDialog::canSubmit()
            state == REGISTER_STATE;
 }
 
-bool
-RegisterDialog::isUShort(const std::string &str)
+bool RegisterDialog::isUShort(const std::string &str)
 {
     if (str == "")
     {
@@ -304,8 +298,7 @@ RegisterDialog::isUShort(const std::string &str)
     return true;
 }
 
-unsigned short
-RegisterDialog::getUShort(const std::string &str)
+unsigned short RegisterDialog::getUShort(const std::string &str)
 {
     unsigned long l = 0;
     for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end();
diff --git a/src/gui/register.h b/src/gui/register.h
index 87a11bb9..4c1d9f88 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -84,8 +84,7 @@ class RegisterDialog : public Window, public gcn::ActionListener,
          * Returns whether submit can be enabled. This is true in the register
          * state, when all necessary fields have some text.
          */
-        bool
-        canSubmit();
+        bool canSubmit();
 
 	/**
 	 * Function to decide whether string is an unsigned short or not
@@ -94,8 +93,7 @@ class RegisterDialog : public Window, public gcn::ActionListener,
 	 *
 	 * @return true if str is an unsigned short, false otherwise
 	 */
-	static bool
-        isUShort(const std::string &str);
+	static bool isUShort(const std::string &str);
 
 	/**
 	 * Converts string to an unsigned short (undefined if invalid)
@@ -104,8 +102,7 @@ class RegisterDialog : public Window, public gcn::ActionListener,
 	 *
 	 * @return the value str represents
 	 */
-	static unsigned short
-	getUShort(const std::string &str);
+	static unsigned short getUShort(const std::string &str);
 
         gcn::TextField *mUserField;
         gcn::TextField *mPasswordField;
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index dfc3da38..370a2d2e 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -42,8 +42,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
         void action(const gcn::ActionEvent &event);
 
         /** Called when key is pressed */
-        void
-        keyPressed(gcn::KeyEvent &event);
+        void keyPressed(gcn::KeyEvent &event);
 
     private:
         bool mFullScreenEnabled;
@@ -86,12 +85,10 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
         gcn::Slider *mParticleDetailSlider;
         gcn::Label *mParticleDetailField;
 
-        void
-        updateSliders(bool originalValues);
+        void updateSliders(bool originalValues);
 
-        int
-        updateSlider(gcn::Slider *slider, gcn::TextField *field,
-                     const std::string &configName);
+        int updateSlider(gcn::Slider *slider, gcn::TextField *field,
+                         const std::string &configName);
 };
 
 #endif
diff --git a/src/gui/status.h b/src/gui/status.h
index eb4171c9..aa20d094 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -33,7 +33,6 @@
 class LocalPlayer;
 class ProgressBar;
 
-
 /**
  * The player status dialog.
  *
diff --git a/src/gui/table.cpp b/src/gui/table.cpp
index e4d7812e..264d9864 100644
--- a/src/gui/table.cpp
+++ b/src/gui/table.cpp
@@ -63,8 +63,7 @@ GuiTableActionListener::~GuiTableActionListener(void)
     }
 }
 
-void
-GuiTableActionListener::action(const gcn::ActionEvent& actionEvent)
+void GuiTableActionListener::action(const gcn::ActionEvent& actionEvent)
 {
     mTable->setSelected(mRow, mColumn);
     mTable->distributeActionEvent();
@@ -88,14 +87,12 @@ GuiTable::~GuiTable(void)
     delete mModel;
 }
 
-TableModel *
-GuiTable::getModel(void) const
+TableModel* GuiTable::getModel(void) const
 {
     return mModel;
 }
 
-void
-GuiTable::setModel(TableModel *new_model)
+void GuiTable::setModel(TableModel *new_model)
 {
     if (mModel) {
         uninstallActionListeners();
@@ -112,9 +109,7 @@ GuiTable::setModel(TableModel *new_model)
     }
 }
 
-
-void
-GuiTable::recomputeDimensions(void)
+void GuiTable::recomputeDimensions(void)
 {
     int rows_nr = mModel->getRows();
     int columns_nr = mModel->getColumns();
@@ -136,33 +131,28 @@ GuiTable::recomputeDimensions(void)
     setHeight(height);
 }
 
-void
-GuiTable::setSelected(int row, int column)
+void GuiTable::setSelected(int row, int column)
 {
     mSelectedColumn = column;
     mSelectedRow = row;
 }
 
-int
-GuiTable::getSelectedRow(void)
+int GuiTable::getSelectedRow(void)
 {
     return mSelectedRow;
 }
 
-int
-GuiTable::getSelectedColumn(void)
+int GuiTable::getSelectedColumn(void)
 {
     return mSelectedColumn;
 }
 
-void
-GuiTable::setLinewiseSelection(bool linewise)
+void GuiTable::setLinewiseSelection(bool linewise)
 {
     mLinewiseMode = linewise;
 }
 
-int
-GuiTable::getRowHeight(void)
+int GuiTable::getRowHeight(void)
 {
     if (mModel)
         return mModel->getRowHeight() + 1; // border
@@ -170,8 +160,7 @@ GuiTable::getRowHeight(void)
         return 0;
 }
 
-int
-GuiTable::getColumnWidth(int i)
+int GuiTable::getColumnWidth(int i)
 {
     if (mModel)
         return mModel->getColumnWidth(i) + 1; // border
@@ -179,16 +168,14 @@ GuiTable::getColumnWidth(int i)
         return 0;
 }
 
-void
-GuiTable::uninstallActionListeners(void)
+void GuiTable::uninstallActionListeners(void)
 {
     for (std::vector<GuiTableActionListener *>::const_iterator it = action_listeners.begin(); it != action_listeners.end(); it++)
         delete *it;
     action_listeners.clear();
 }
 
-void
-GuiTable::installActionListeners(void)
+void GuiTable::installActionListeners(void)
 {
     if (!mModel)
         return;
@@ -207,8 +194,7 @@ GuiTable::installActionListeners(void)
 }
 
 // -- widget ops
-void
-GuiTable::draw(gcn::Graphics* graphics)
+void GuiTable::draw(gcn::Graphics* graphics)
 {
     graphics->setColor(getBackgroundColor());
     graphics->fillRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight()));
@@ -282,42 +268,35 @@ GuiTable::draw(gcn::Graphics* graphics)
     }
 }
 
-void
-GuiTable::logic(void)
+void GuiTable::logic(void)
 {
 }
 
-void
-GuiTable::moveToTop(gcn::Widget *widget)
+void GuiTable::moveToTop(gcn::Widget *widget)
 {
     gcn::Widget::moveToTop(widget);
     this->mTopWidget = widget;
 }
 
-void
-GuiTable::moveToBottom(gcn::Widget *widget)
+void GuiTable::moveToBottom(gcn::Widget *widget)
 {
     gcn::Widget::moveToBottom(widget);
     if (widget == this->mTopWidget)
         this->mTopWidget = NULL;
 }
 
-gcn::Rectangle
-GuiTable::getChildrenArea(void)
+gcn::Rectangle GuiTable::getChildrenArea(void)
 {
     return gcn::Rectangle(0, 0, getWidth(), getHeight());
 }
 
 // -- KeyListener notifications
-void
-GuiTable::keyPressed(gcn::KeyEvent& keyEvent)
+void GuiTable::keyPressed(gcn::KeyEvent& keyEvent)
 {
 }
 
-
 // -- MouseListener notifications
-void
-GuiTable::mousePressed(gcn::MouseEvent& mouseEvent)
+void GuiTable::mousePressed(gcn::MouseEvent& mouseEvent)
 {
     if (mouseEvent.getButton() == gcn::MouseEvent::LEFT) {
         int row = getRowForY(mouseEvent.getY());
@@ -332,24 +311,20 @@ GuiTable::mousePressed(gcn::MouseEvent& mouseEvent)
     }
 }
 
-void
-GuiTable::mouseWheelMovedUp(gcn::MouseEvent& mouseEvent)
+void GuiTable::mouseWheelMovedUp(gcn::MouseEvent& mouseEvent)
 {
 }
 
-void
-GuiTable::mouseWheelMovedDown(gcn::MouseEvent& mouseEvent)
+void GuiTable::mouseWheelMovedDown(gcn::MouseEvent& mouseEvent)
 {
 }
         
-void
-GuiTable::mouseDragged(gcn::MouseEvent& mouseEvent)
+void GuiTable::mouseDragged(gcn::MouseEvent& mouseEvent)
 {
 }
 
 // -- TableModelListener notifications
-void
-GuiTable::modelUpdated(bool completed)
+void GuiTable::modelUpdated(bool completed)
 {
     if (completed) {
         recomputeDimensions();
@@ -360,8 +335,7 @@ GuiTable::modelUpdated(bool completed)
     }
 }
 
-gcn::Widget *
-GuiTable::getWidgetAt(int x, int y)
+gcn::Widget* GuiTable::getWidgetAt(int x, int y)
 {
     int row = getRowForY(y);
     int column = getColumnForX(x);
@@ -381,8 +355,7 @@ GuiTable::getWidgetAt(int x, int y)
         return NULL;
 }
 
-int
-GuiTable::getRowForY(int y)
+int GuiTable::getRowForY(int y)
 {
    int row = y / getRowHeight();
 
@@ -393,8 +366,7 @@ GuiTable::getRowForY(int y)
        return row;
 }
 
-int
-GuiTable::getColumnForX(int x)
+int GuiTable::getColumnForX(int x)
 {
     int column;
     int delta = 0;
@@ -412,9 +384,7 @@ GuiTable::getColumnForX(int x)
         return column;
 }
 
-
-void
-GuiTable::_setFocusHandler(gcn::FocusHandler* focusHandler)
+void GuiTable::_setFocusHandler(gcn::FocusHandler* focusHandler)
 {
     gcn::Widget::_setFocusHandler(focusHandler);
 
diff --git a/src/gui/table_model.cpp b/src/gui/table_model.cpp
index e1afef96..9911eec3 100644
--- a/src/gui/table_model.cpp
+++ b/src/gui/table_model.cpp
@@ -25,27 +25,23 @@
 
 #include "table_model.h"
 
-void
-TableModel::installListener(TableModelListener *listener)
+void TableModel::installListener(TableModelListener *listener)
 {
     listeners.insert(listener);
 }
 
-void
-TableModel::removeListener(TableModelListener *listener)
+void TableModel::removeListener(TableModelListener *listener)
 {
     listeners.erase(listener);
 }
 
-void
-TableModel::signalBeforeUpdate(void)
+void TableModel::signalBeforeUpdate(void)
 {
     for (std::set<TableModelListener *>::const_iterator it = listeners.begin(); it != listeners.end(); it++)
         (*it)->modelUpdated(false);
 }
 
-void
-TableModel::signalAfterUpdate(void)
+void TableModel::signalAfterUpdate(void)
 {
     for (std::set<TableModelListener *>::const_iterator it = listeners.begin(); it != listeners.end(); it++)
         (*it)->modelUpdated(true);
@@ -72,16 +68,14 @@ StaticTableModel::~StaticTableModel(void)
             delete *it;
 }
 
-void
-StaticTableModel::resize(void)
+void StaticTableModel::resize(void)
 {
     mRows = getRows();
     mColumns = getColumns();
     mTableModel.resize(mRows * mColumns, NULL);
 }
 
-void
-StaticTableModel::set(int row, int column, gcn::Widget *widget)
+void StaticTableModel::set(int row, int column, gcn::Widget *widget)
 {
     if (row >= mRows || row < 0
         || column >= mColumns || column < 0)
@@ -106,14 +100,12 @@ StaticTableModel::set(int row, int column, gcn::Widget *widget)
     signalAfterUpdate();
 }
 
-gcn::Widget *
-StaticTableModel::getElementAt(int row, int column)
+gcn::Widget* StaticTableModel::getElementAt(int row, int column)
 {
     return mTableModel[WIDGET_AT(row, column)];
 }
 
-void
-StaticTableModel::fixColumnWidth(int column, int width)
+void StaticTableModel::fixColumnWidth(int column, int width)
 {
     if (width < 0
         || column < 0 || column >= mColumns)
@@ -122,8 +114,7 @@ StaticTableModel::fixColumnWidth(int column, int width)
     mWidths[column] = -width; // Negate to tag as fixed
 }
 
-void
-StaticTableModel::fixRowHeight(int height)
+void StaticTableModel::fixRowHeight(int height)
 {
     if (height < 0)
         return;
@@ -131,14 +122,12 @@ StaticTableModel::fixRowHeight(int height)
     mHeight = -height;
 }
 
-int
-StaticTableModel::getRowHeight(void)
+int StaticTableModel::getRowHeight(void)
 {
     return abs(mHeight);
 }
 
-int
-StaticTableModel::getColumnWidth(int column)
+int StaticTableModel::getColumnWidth(int column)
 {
    if (column < 0 || column >= mColumns)
         return 0;
@@ -146,14 +135,12 @@ StaticTableModel::getColumnWidth(int column)
     return abs(mWidths[column]);
 }
 
-int
-StaticTableModel::getRows(void)
+int StaticTableModel::getRows(void)
 {
     return mRows;
 }
 
-int
-StaticTableModel::getColumns(void)
+int StaticTableModel::getColumns(void)
 {
     return mColumns;
 }
diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index 7f9abd3a..248afcbf 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.cpp
@@ -17,16 +17,14 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
-#include "truetypefont.h"
-
 #include <list>
 
 #include <guichan/exception.hpp>
 
+#include "truetypefont.h"
+
 #include "../graphics.h"
 #include "../resources/image.h"
 
@@ -77,7 +75,6 @@ class TextChunk
         gcn::Color color;
 };
 
-
 // Word surfaces cache
 static std::list<TextChunk> cache;
 typedef std::list<TextChunk>::iterator CacheIterator;
@@ -114,8 +111,8 @@ TrueTypeFont::~TrueTypeFont()
 }
 
 void TrueTypeFont::drawString(gcn::Graphics *graphics,
-                               const std::string &text,
-                               int x, int y)
+                              const std::string &text,
+                              int x, int y)
 {
     if (text.empty())
     {
diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
index 7a4ee9ac..67c39e6a 100644
--- a/src/gui/truetypefont.h
+++ b/src/gui/truetypefont.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_TRUETYPEFONT_H
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index fab048fc..9311b59b 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -69,8 +69,7 @@ static unsigned long fadler32(FILE *file)
 /**
  * Load the given file into a vector of strings.
  */
-std::vector<std::string>
-loadTextFile(const std::string &fileName)
+std::vector<std::string> loadTextFile(const std::string &fileName)
 {
     std::vector<std::string> lines;
     std::ifstream fin(fileName.c_str());
@@ -242,8 +241,7 @@ int UpdaterWindow::updateProgress(void *ptr,
     return 0;
 }
 
-size_t
-UpdaterWindow::memoryWrite(void *ptr, size_t size, size_t nmemb, FILE *stream)
+size_t UpdaterWindow::memoryWrite(void *ptr, size_t size, size_t nmemb, FILE *stream)
 {
     UpdaterWindow *uw = reinterpret_cast<UpdaterWindow *>(stream);
     size_t totalMem = size * nmemb;
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 5bb29987..5fcb7dc9 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -46,8 +46,6 @@
 
 extern volatile int tick_time;
 
-extern volatile int tick_time;
-
 Viewport::Viewport():
     mMap(0),
     mPixelViewX(0.0f),
diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp
index 87527f0a..6009d5f5 100644
--- a/src/gui/widgets/resizegrip.cpp
+++ b/src/gui/widgets/resizegrip.cpp
@@ -56,8 +56,7 @@ ResizeGrip::~ResizeGrip()
     }
 }
 
-void
-ResizeGrip::draw(gcn::Graphics *graphics)
+void ResizeGrip::draw(gcn::Graphics *graphics)
 {
     static_cast<Graphics*>(graphics)->drawImage(gripImage, 0, 0);
 }
diff --git a/src/gui/window.h b/src/gui/window.h
index 89cc75a5..d864290c 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -157,8 +157,7 @@ class Window : public gcn::Window, gcn::WidgetListener
          *
          * @return The parent window or <code>NULL</code> if there is none.
          */
-        Window*
-        getParentWindow() { return mParent; }
+        Window* getParentWindow() { return mParent; }
 
         /**
          * Schedule this window for deletion. It will be deleted at the start
@@ -198,14 +197,12 @@ class Window : public gcn::Window, gcn::WidgetListener
         /**
          * Sets the name of the window. This is not the window title.
          */
-        void
-        setWindowName(const std::string &name) { mWindowName = name; }
+        void setWindowName(const std::string &name) { mWindowName = name; }
 
         /**
          * Returns the name of the window. This is not the window title.
          */
-        const std::string&
-        getWindowName() { return mWindowName; }
+        const std::string& getWindowName() { return mWindowName; }
 
         /**
          * Reads the position (and the size for resizable windows) in the
diff --git a/src/item.h b/src/item.h
index eb6fed77..bb6fcbdc 100644
--- a/src/item.h
+++ b/src/item.h
@@ -46,14 +46,12 @@ class Item
         /**
          * Sets the item id, identifying the item type.
          */
-        void
-        setId(int id);
+        void setId(int id);
 
         /**
          * Returns the item id.
          */
-        int
-        getId() const { return mId; }
+        int getId() const { return mId; }
 
         /**
          * Returns the item image.
@@ -63,62 +61,52 @@ class Item
         /**
          * Sets the number of items.
          */
-        void
-        setQuantity(int quantity) { mQuantity = quantity; }
+        void setQuantity(int quantity) { mQuantity = quantity; }
 
         /**
          * Increases the number of items by the given amount.
          */
-        void
-        increaseQuantity(int amount) { mQuantity += amount; }
+        void increaseQuantity(int amount) { mQuantity += amount; }
 
         /**
          * Returns the number of items.
          */
-        int
-        getQuantity() const { return mQuantity; }
+        int getQuantity() const { return mQuantity; }
 
         /**
          * Sets whether this item is considered equipment.
          */
-        void
-        setEquipment(bool equipment) { mEquipment = equipment; }
+        void setEquipment(bool equipment) { mEquipment = equipment; }
 
         /**
          * Returns whether this item is considered equipment.
          */
-        bool
-        isEquipment() const { return mEquipment; }
+        bool isEquipment() const { return mEquipment; }
 
         /**
          * Sets whether this item is equipped.
          */
-        void
-        setEquipped(bool equipped) { mEquipped = equipped; }
+        void setEquipped(bool equipped) { mEquipped = equipped; }
 
         /**
          * Returns whether this item is equipped.
          */
-        bool
-        isEquipped() const { return mEquipped; }
+        bool isEquipped() const { return mEquipped; }
 
         /**
          * Sets the inventory index of this item.
          */
-        void
-        setInvIndex(int index) { mInvIndex = index; }
+        void setInvIndex(int index) { mInvIndex = index; }
 
         /**
          * Returns the inventory index of this item.
          */
-        int
-        getInvIndex() const { return mInvIndex; }
+        int getInvIndex() const { return mInvIndex; }
 
         /**
          * Returns information about this item type.
          */
-        const ItemInfo&
-        getInfo() const { return ItemDB::get(mId); }
+        const ItemInfo& getInfo() const { return ItemDB::get(mId); }
 
     protected:
         int mId;              /**< Item type id. */
diff --git a/src/map.h b/src/map.h
index 81d0b629..b299fdb5 100644
--- a/src/map.h
+++ b/src/map.h
@@ -182,8 +182,7 @@ class Map : public Properties
         /**
          * Finds the tile set that a tile with the given global id is part of.
          */
-        Tileset*
-        getTilesetWithGid(int gid) const;
+        Tileset* getTilesetWithGid(int gid) const;
 
         /**
          * Get tile reference.
@@ -203,26 +202,22 @@ class Map : public Properties
         /**
          * Returns the width of this map.
          */
-        int
-        getWidth() const { return mWidth; }
+        int getWidth() const { return mWidth; }
 
         /**
          * Returns the height of this map.
          */
-        int
-        getHeight() const { return mHeight; }
+        int getHeight() const { return mHeight; }
 
         /**
          * Returns the tile width of this map.
          */
-        int
-        getTileWidth() const { return mTileWidth; }
+        int getTileWidth() const { return mTileWidth; }
 
         /**
          * Returns the tile height used by this map.
          */
-        int
-        getTileHeight() const { return mTileHeight; }
+        int getTileHeight() const { return mTileHeight; }
 
         /**
          * Find a path from one location to the next.
@@ -232,14 +227,12 @@ class Map : public Properties
         /**
          * Adds a sprite to the map.
          */
-        SpriteIterator
-        addSprite(Sprite *sprite);
+        SpriteIterator addSprite(Sprite *sprite);
 
         /**
          * Removes a sprite from the map.
          */
-        void
-        removeSprite(SpriteIterator iterator);
+        void removeSprite(SpriteIterator iterator);
 
         /**
          * Adds a particle effect
@@ -266,9 +259,8 @@ class Map : public Properties
         /**
          * Draws the overlay graphic to the given graphics output.
          */
-        void
-        drawOverlay(Graphics *graphics, float scrollX, float scrollY,
-                    int detail);
+        void drawOverlay(Graphics *graphics, float scrollX, float scrollY,
+                         int detail);
 
         /**
          * Tells whether a tile is occupied by a being.
diff --git a/src/monster.h b/src/monster.h
index cb8f7f18..7a8cd2a7 100644
--- a/src/monster.h
+++ b/src/monster.h
@@ -62,8 +62,7 @@ class Monster : public Being
         /**
          * Returns the MonsterInfo, with static data about this monster.
          */
-        const MonsterInfo&
-        getInfo() const;
+        const MonsterInfo& getInfo() const;
 
         /**
          * Determine whether the mob should show it's name
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index 345e02fc..387af70c 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -38,15 +38,13 @@ MessageIn::MessageIn(const char *data, unsigned int length):
     mId = readInt16();
 }
 
-Sint8
-MessageIn::readInt8()
+Sint8 MessageIn::readInt8()
 {
     assert(mPos < mLength);
     return mData[mPos++];
 }
 
-Sint16
-MessageIn::readInt16()
+Sint16 MessageIn::readInt16()
 {
     assert(mPos + 2 <= mLength);
     mPos += 2;
@@ -57,8 +55,7 @@ MessageIn::readInt16()
 #endif
 }
 
-Sint32
-MessageIn::readInt32()
+Sint32 MessageIn::readInt32()
 {
     assert(mPos + 4 <= mLength);
     mPos += 4;
@@ -69,8 +66,7 @@ MessageIn::readInt32()
 #endif
 }
 
-void
-MessageIn::readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction)
+void MessageIn::readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction)
 {
     assert(mPos + 3 <= mLength);
 
@@ -119,8 +115,7 @@ MessageIn::readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction)
     mPos += 3;
 }
 
-void
-MessageIn::readCoordinatePair(Uint16 &srcX, Uint16 &srcY,
+void MessageIn::readCoordinatePair(Uint16 &srcX, Uint16 &srcY,
                               Uint16 &dstX, Uint16 &dstY)
 {
     assert(mPos + 5 <= mLength);
@@ -142,15 +137,13 @@ MessageIn::readCoordinatePair(Uint16 &srcX, Uint16 &srcY,
     mPos += 5;
 }
 
-void
-MessageIn::skip(unsigned int length)
+void MessageIn::skip(unsigned int length)
 {
     assert(mPos + length <= mLength);
     mPos += length;
 }
 
-std::string
-MessageIn::readString(int length)
+std::string MessageIn::readString(int length)
 {
     // Get string length
     if (length < 0) {
diff --git a/src/net/messagein.h b/src/net/messagein.h
index 81db6cdc..90804497 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.h
@@ -43,14 +43,12 @@ class MessageIn
         /**
          * Returns the message ID.
          */
-        short
-        getId() { return mId; }
+        short getId() { return mId; }
 
         /**
          * Returns the message length.
          */
-        unsigned int
-        getLength() { return mLength; }
+        unsigned int getLength() { return mLength; }
 
         Sint8 readInt8();               /**< Reads a byte. */
         Sint16 readInt16();             /**< Reads a short. */
@@ -60,30 +58,26 @@ class MessageIn
          * Reads a special 3 byte block used by eAthena, containing x and y
          * coordinates and direction.
          */
-        void
-        readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction);
+        void readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction);
 
         /**
          * Reads a special 5 byte block used by eAthena, containing a source
          * and destination coordinate pair.
          */
-        void
-        readCoordinatePair(Uint16 &srcX, Uint16 &srcY,
-                Uint16 &dstX, Uint16 &dstY);
+        void readCoordinatePair(Uint16 &srcX, Uint16 &srcY,
+                                Uint16 &dstX, Uint16 &dstY);
 
         /**
          * Skips a given number of bytes.
          */
-        void
-        skip(unsigned int length);
+        void skip(unsigned int length);
 
         /**
          * Reads a string. If a length is not given (-1), it is assumed
          * that the length of the string is stored in a short at the
          * start of the string.
          */
-        std::string
-        readString(int length = -1);
+        std::string readString(int length = -1);
 
     private:
         const char* mData;             /**< The message data. */
diff --git a/src/net/network.cpp b/src/net/network.cpp
index c9f8d1bd..60d54a7a 100644
--- a/src/net/network.cpp
+++ b/src/net/network.cpp
@@ -431,8 +431,7 @@ char *iptostring(int address)
     return asciiIP;
 }
 
-void
-Network::setError(const std::string& error)
+void Network::setError(const std::string& error)
 {
     logger->log("Network error: %s", error.c_str());
     mError = error;
diff --git a/src/net/network.h b/src/net/network.h
index 43b4dbbc..6270e0de 100644
--- a/src/net/network.h
+++ b/src/net/network.h
@@ -46,47 +46,33 @@ class Network
 
         ~Network();
 
-        bool
-        connect(const std::string &address, short port);
+        bool connect(const std::string &address, short port);
 
-        void
-        disconnect();
+        void disconnect();
 
-        void
-        registerHandler(MessageHandler *handler);
+        void registerHandler(MessageHandler *handler);
 
-        void
-        unregisterHandler(MessageHandler *handler);
+        void unregisterHandler(MessageHandler *handler);
 
-        void
-        clearHandlers();
+        void clearHandlers();
 
-        int
-        getState() const { return mState; }
+        int getState() const { return mState; }
 
-        const std::string&
-        getError() const { return mError; }
+        const std::string& getError() const { return mError; }
 
-        bool
-        isConnected() const { return mState == CONNECTED; }
+        bool isConnected() const { return mState == CONNECTED; }
 
-        int
-        getInSize() const { return mInSize; }
+        int getInSize() const { return mInSize; }
 
-        void
-        skip(int len);
+        void skip(int len);
 
-        bool
-        messageReady();
+        bool messageReady();
 
-        MessageIn
-        getNextMessage();
+        MessageIn getNextMessage();
 
-        void
-        dispatchMessages();
+        void dispatchMessages();
 
-        void
-        flush();
+        void flush();
 
         // ERROR replaced by NET_ERROR because already defined in Windows
         enum {
@@ -98,17 +84,13 @@ class Network
         };
 
     protected:
-        void
-        setError(const std::string& error);
+        void setError(const std::string& error);
 
-        Uint16
-        readWord(int pos);
+        Uint16 readWord(int pos);
 
-        bool
-        realConnect();
+        bool realConnect();
 
-        void
-        receive();
+        void receive();
 
         TCPsocket mSocket;
 
diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp
index 9b5f3080..d4b7455b 100644
--- a/src/net/partyhandler.cpp
+++ b/src/net/partyhandler.cpp
@@ -50,8 +50,7 @@ PartyHandler::PartyHandler(Party *party) : mParty(party)
     handledMessages = _messages;
 }
 
-void
-PartyHandler::handleMessage(MessageIn *msg)
+void PartyHandler::handleMessage(MessageIn *msg)
 {
     switch (msg->getId())
     {
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 83b26743..59c7d0d6 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -264,7 +264,7 @@ void PlayerHandler::handleMessage(MessageIn *msg)
                         Uint32 curGp = player_node->mGp;
                         player_node->mGp = msg->readInt32();
                         if (player_node->mGp > curGp)
-                            chatWindow->chatLog("You picked up " +
+                            chatWindow->chatLog(_("You picked up ") +
                                 toString(player_node->mGp - curGp) + " GP",
                                 BY_SERVER);
                     }
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index 746e1d06..07134746 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -32,6 +32,8 @@
 #include "../gui/confirm_dialog.h"
 #include "../gui/trade.h"
 
+#include "../utils/gettext.h"
+
 std::string tradePartnerName;
 
 /**
@@ -86,9 +88,9 @@ void TradeHandler::handleMessage(MessageIn *msg)
 
                     player_node->setTrading(true);
                     ConfirmDialog *dlg;
-                    dlg = new ConfirmDialog("Request for trade",
+                    dlg = new ConfirmDialog(_("Request for trade"),
                             tradePartnerName +
-                            " wants to trade with you, do you accept?");
+                            _(" wants to trade with you, do you accept?"));
                     dlg->addActionListener(&listener);
                 }
                 else
@@ -102,37 +104,35 @@ void TradeHandler::handleMessage(MessageIn *msg)
             switch (msg->readInt8())
             {
                 case 0: // Too far away
-                    chatWindow->chatLog("Trading isn't possible. "
-                            "Trade partner is too far away.",
+                    chatWindow->chatLog(_("Trading isn't possible. Trade partner is too far away."),
                             BY_SERVER);
                     break;
                 case 1: // Character doesn't exist
-                    chatWindow->chatLog("Trading isn't possible. "
-                            "Character doesn't exist.",
+                    chatWindow->chatLog(_("Trading isn't possible. Character doesn't exist."),
                             BY_SERVER);
                     break;
                 case 2: // Invite request check failed...
-                    chatWindow->chatLog("Trade cancelled due to an "
-                            "unknown reason.", BY_SERVER);
+                    chatWindow->chatLog(_("Trade cancelled due to an unknown reason."), 
+                                        BY_SERVER);
                     break;
                 case 3: // Trade accepted
                     tradeWindow->reset();
                     tradeWindow->setCaption(
-                            "Trade: You and " + tradePartnerName);
+                            _("Trade: You and ") + tradePartnerName);
                     tradeWindow->setVisible(true);
                     break;
                 case 4: // Trade cancelled
                     if (player_relations.hasPermission(tradePartnerName,
                                                        PlayerRelation::SPEECH_LOG))
-                        chatWindow->chatLog("Trade with " + tradePartnerName +
-                                            " cancelled", BY_SERVER);
+                        chatWindow->chatLog(_("Trade with ") + tradePartnerName +
+                                            _(" cancelled"), BY_SERVER);
                     // otherwise ignore silently
 
                     tradeWindow->setVisible(false);
                     player_node->setTrading(false);
                     break;
                 default: // Shouldn't happen as well, but to be sure
-                    chatWindow->chatLog("Unhandled trade cancel packet",
+                    chatWindow->chatLog(_("Unhandled trade cancel packet"),
                             BY_SERVER);
                     break;
             }
@@ -182,19 +182,17 @@ void TradeHandler::handleMessage(MessageIn *msg)
                         break;
                     case 1:
                         // Add item failed - player overweighted
-                        chatWindow->chatLog("Failed adding item. Trade "
-                                "partner is over weighted.",
+                        chatWindow->chatLog(_("Failed adding item. Trade partner is over weighted."),
                                 BY_SERVER);
                         break;
                     case 2:
                          // Add item failed - player has no free slot
-                         chatWindow->chatLog("Failed adding item. Trade "
-                                             "partner has no free slot.",
+                         chatWindow->chatLog(_("Failed adding item. Trade partner has no free slot."),
                                              BY_SERVER);
                          break;
                     default:
-                        chatWindow->chatLog("Failed adding item for "
-                                "unknown reason.", BY_SERVER);
+                        chatWindow->chatLog(_("Failed adding item for unknown reason."), 
+                                             BY_SERVER);
                         break;
                 }
             }
@@ -206,14 +204,14 @@ void TradeHandler::handleMessage(MessageIn *msg)
             break;
 
         case SMSG_TRADE_CANCEL:
-            chatWindow->chatLog("Trade canceled.", BY_SERVER);
+            chatWindow->chatLog(_("Trade canceled."), BY_SERVER);
             tradeWindow->setVisible(false);
             tradeWindow->reset();
             player_node->setTrading(false);
             break;
 
         case SMSG_TRADE_COMPLETE:
-            chatWindow->chatLog("Trade completed.", BY_SERVER);
+            chatWindow->chatLog(_("Trade completed."), BY_SERVER);
             tradeWindow->setVisible(false);
             tradeWindow->reset();
             player_node->setTrading(false);
diff --git a/src/npc.cpp b/src/npc.cpp
index 2aa15209..a2fb7d38 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -111,8 +111,7 @@ NPC::getType() const
     return Being::NPC;
 }
 
-void
-NPC::talk()
+void NPC::talk()
 {
     MessageOut outMsg(mNetwork);
     outMsg.writeInt16(CMSG_NPC_TALK);
@@ -121,16 +120,14 @@ NPC::talk()
     current_npc = this;
 }
 
-void
-NPC::nextDialog()
+void NPC::nextDialog()
 {
     MessageOut outMsg(mNetwork);
     outMsg.writeInt16(CMSG_NPC_NEXT_REQUEST);
     outMsg.writeInt32(mId);
 }
 
-void
-NPC::dialogChoice(char choice)
+void NPC::dialogChoice(char choice)
 {
     MessageOut outMsg(mNetwork);
     outMsg.writeInt16(CMSG_NPC_LIST_CHOICE);
@@ -142,8 +139,7 @@ NPC::dialogChoice(char choice)
  * TODO Unify the buy() and sell() methods, without sacrificing readability of
  * the code calling the method. buy(bool buySell) would be bad...
  */
-void
-NPC::buy()
+void NPC::buy()
 {
     MessageOut outMsg(mNetwork);
     outMsg.writeInt16(CMSG_NPC_BUY_SELL_REQUEST);
@@ -151,8 +147,7 @@ NPC::buy()
     outMsg.writeInt8(0);
 }
 
-void
-NPC::sell()
+void NPC::sell()
 {
     MessageOut outMsg(mNetwork);
     outMsg.writeInt16(CMSG_NPC_BUY_SELL_REQUEST);
diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp
index fbfb1505..b90db9f1 100644
--- a/src/particlecontainer.cpp
+++ b/src/particlecontainer.cpp
@@ -36,8 +36,7 @@ ParticleContainer::~ParticleContainer()
         delete mNext;
 }
 
-void
-ParticleContainer::clear()
+void ParticleContainer::clear()
 {
     clearLocally();
     if (mNext)
@@ -57,8 +56,7 @@ ParticleList::ParticleList(ParticleContainer *parent, bool delParent) :
 
 ParticleList::~ParticleList() {}
 
-void
-ParticleList::addLocally(Particle *particle)
+void ParticleList::addLocally(Particle *particle)
 {
     if (particle)
     {
@@ -68,8 +66,7 @@ ParticleList::addLocally(Particle *particle)
     }
 }
 
-void
-ParticleList::removeLocally(Particle *particle)
+void ParticleList::removeLocally(Particle *particle)
 {
     for (std::list<Particle *>::iterator it = mElements.begin();
          it != mElements.end(); it++)
@@ -79,8 +76,7 @@ ParticleList::removeLocally(Particle *particle)
         }
 }
 
-void
-ParticleList::clearLocally()
+void ParticleList::clearLocally()
 {
     for (std::list<Particle *>::iterator it = mElements.begin();
          it != mElements.end(); it++)
@@ -117,8 +113,7 @@ ParticleVector::ParticleVector(ParticleContainer *parent, bool delParent) :
 
 ParticleVector::~ParticleVector() {};
 
-void
-ParticleVector::setLocally(int index, Particle *particle)
+void ParticleVector::setLocally(int index, Particle *particle)
 {
     assert(index >= 0);
 
@@ -130,8 +125,7 @@ ParticleVector::setLocally(int index, Particle *particle)
     mIndexedElements[index] = particle;
 }
 
-void
-ParticleVector::delLocally(int index)
+void ParticleVector::delLocally(int index)
 {
     assert(index >= 0);
 
@@ -146,8 +140,7 @@ ParticleVector::delLocally(int index)
     }
 }
 
-void
-ParticleVector::clearLocally()
+void ParticleVector::clearLocally()
 {
     for (unsigned int i = 0; i < mIndexedElements.size(); i++)
         delLocally(i);
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index bdfaa5ba..fef34b22 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -329,8 +329,7 @@ ParticleEmitter::readParticleEmitterProp(xmlNodePtr propertyNode, T def)
 }
 
 
-std::list<Particle *>
-ParticleEmitter::createParticles(int tick)
+std::list<Particle *> ParticleEmitter::createParticles(int tick)
 {
     std::list<Particle *> newParticles;
 
diff --git a/src/particleemitter.h b/src/particleemitter.h
index 809a6ded..e16ee241 100644
--- a/src/particleemitter.h
+++ b/src/particleemitter.h
@@ -70,8 +70,7 @@ class ParticleEmitter
         /**
          * Sets the target of the particles that are created
          */
-        void
-        setTarget(Particle *target)
+        void setTarget(Particle *target)
         { mParticleTarget = target; };
 
     private:
diff --git a/src/player_relations.cpp b/src/player_relations.cpp
index ef00a738..5eb47433 100644
--- a/src/player_relations.cpp
+++ b/src/player_relations.cpp
@@ -91,8 +91,7 @@ PlayerRelationsManager::PlayerRelationsManager() :
 {
 }
 
-void
-PlayerRelationsManager::clear()
+void PlayerRelationsManager::clear()
 {
     std::vector<std::string> *names = getPlayers();
     for (std::vector<std::string>::const_iterator
@@ -105,8 +104,7 @@ PlayerRelationsManager::clear()
 #define PLAYER_IGNORE_STRATEGY "player-ignore-strategy"
 #define DEFAULT_PERMISSIONS "default-player-permissions"
 
-int
-PlayerRelationsManager::getPlayerIgnoreStrategyIndex(const std::string &name)
+int PlayerRelationsManager::getPlayerIgnoreStrategyIndex(const std::string &name)
 {
     std::vector<PlayerIgnoreStrategy *> *strategies = getPlayerIgnoreStrategies();
     for (unsigned int i = 0; i < strategies->size(); i++)
@@ -116,8 +114,7 @@ PlayerRelationsManager::getPlayerIgnoreStrategyIndex(const std::string &name)
     return -1;
 }
 
-void
-PlayerRelationsManager::load()
+void PlayerRelationsManager::load()
 {
     clear();
 
@@ -134,8 +131,7 @@ PlayerRelationsManager::load()
 }
 
 
-void
-PlayerRelationsManager::init()
+void PlayerRelationsManager::init()
 {
     load();
 
@@ -143,8 +139,7 @@ PlayerRelationsManager::init()
         clear(); // Yes, we still keep them around in the config file until the next update.
 }
 
-void
-PlayerRelationsManager::store()
+void PlayerRelationsManager::store()
 {
     config.setList<std::map<std::string, PlayerRelation *>::const_iterator,
                    std::pair<std::string, PlayerRelation *>,
@@ -161,8 +156,7 @@ PlayerRelationsManager::store()
     config.write();
 }
 
-void
-PlayerRelationsManager::signalUpdate(const std::string &name)
+void PlayerRelationsManager::signalUpdate(const std::string &name)
 {
     store();
 
@@ -170,8 +164,7 @@ PlayerRelationsManager::signalUpdate(const std::string &name)
         (*it)->updatedPlayer(name);
 }
 
-unsigned int
-PlayerRelationsManager::checkPermissionSilently(const std::string &player_name, unsigned int flags)
+unsigned int PlayerRelationsManager::checkPermissionSilently(const std::string &player_name, unsigned int flags)
 {
     PlayerRelation *r = mRelations[player_name];
     if (!r)
@@ -196,16 +189,14 @@ PlayerRelationsManager::checkPermissionSilently(const std::string &player_name,
     }
 }
 
-bool
-PlayerRelationsManager::hasPermission(Being *being, unsigned int flags)
+bool PlayerRelationsManager::hasPermission(Being *being, unsigned int flags)
 {
     if (being->getType() == Being::PLAYER)
         return hasPermission(being->getName(), flags) == flags;
     return true;
 }
 
-bool
-PlayerRelationsManager::hasPermission(const std::string &name, unsigned int flags)
+bool PlayerRelationsManager::hasPermission(const std::string &name, unsigned int flags)
 {
     unsigned int rejections = flags & ~checkPermissionSilently(name, flags);
     bool permitted = rejections == 0;
@@ -224,8 +215,7 @@ PlayerRelationsManager::hasPermission(const std::string &name, unsigned int flag
     return permitted;
 }
 
-void
-PlayerRelationsManager::setRelation(const std::string &player_name, PlayerRelation::relation relation)
+void PlayerRelationsManager::setRelation(const std::string &player_name, PlayerRelation::relation relation)
 {
     PlayerRelation *r = mRelations[player_name];
     if (r == NULL)
@@ -236,8 +226,7 @@ PlayerRelationsManager::setRelation(const std::string &player_name, PlayerRelati
     signalUpdate(player_name);
 }
 
-std::vector<std::string> *
-PlayerRelationsManager::getPlayers()
+std::vector<std::string> * PlayerRelationsManager::getPlayers()
 {
     std::vector<std::string> *retval = new std::vector<std::string>();
 
@@ -250,8 +239,7 @@ PlayerRelationsManager::getPlayers()
     return retval;
 }
 
-void
-PlayerRelationsManager::removePlayer(const std::string &name)
+void PlayerRelationsManager::removePlayer(const std::string &name)
 {
     if (mRelations[name])
         delete mRelations[name];
@@ -262,8 +250,7 @@ PlayerRelationsManager::removePlayer(const std::string &name)
 }
 
 
-PlayerRelation::relation
-PlayerRelationsManager::getRelation(const std::string &name)
+PlayerRelation::relation PlayerRelationsManager::getRelation(const std::string &name)
 {
     if (mRelations[name])
         return mRelations[name]->mRelation;
@@ -274,14 +261,12 @@ PlayerRelationsManager::getRelation(const std::string &name)
 ////////////////////////////////////////
 // defaults
 
-unsigned int
-PlayerRelationsManager::getDefault() const
+unsigned int PlayerRelationsManager::getDefault() const
 {
     return mDefaultPermissions;
 }
 
-void
-PlayerRelationsManager::setDefault(unsigned int permissions)
+void PlayerRelationsManager::setDefault(unsigned int permissions)
 {
     mDefaultPermissions = permissions;
 
@@ -303,8 +288,7 @@ public:
         mShortName = PLAYER_IGNORE_STRATEGY_NOP;
     }
 
-    virtual void
-    ignore(Player *player, unsigned int flags)
+    virtual void ignore(Player *player, unsigned int flags)
      {
      }
 };
@@ -318,8 +302,7 @@ public:
         mShortName = "dotdotdot";
     }
 
-    virtual void
-    ignore(Player *player, unsigned int flags)
+    virtual void ignore(Player *player, unsigned int flags)
      {
          player->setSpeech("...", 5);
      }
@@ -335,8 +318,7 @@ public:
         mShortName = "blinkname";
     }
 
-    virtual void
-    ignore(Player *player, unsigned int flags)
+    virtual void ignore(Player *player, unsigned int flags)
     {
         player->flash(200);
     }
@@ -352,8 +334,7 @@ public:
         mShortName = shortname;
     }
 
-    virtual void
-    ignore(Player *player, unsigned int flags)
+    virtual void ignore(Player *player, unsigned int flags)
      {
          player->setEmote(mEmotion, IGNORE_EMOTE_TIME);
      }
diff --git a/src/properties.h b/src/properties.h
index 86fffea3..038acd91 100644
--- a/src/properties.h
+++ b/src/properties.h
@@ -46,8 +46,7 @@ class Properties
          * @return the value of the given property or the given default when it
          *         doesn't exist.
          */
-        const std::string&
-        getProperty(const std::string &name, const std::string &def = "") const
+        const std::string& getProperty(const std::string &name, const std::string &def = "") const
         {
             PropertyMap::const_iterator i = mProperties.find(name);
             return (i != mProperties.end()) ? i->second : def;
@@ -81,8 +80,7 @@ class Properties
          * @return <code>true</code> when a property is defined,
          *         <code>false</code> otherwise.
          */
-        bool
-        hasProperty(const std::string &name) const
+        bool hasProperty(const std::string &name) const
         {
             return (mProperties.find(name) != mProperties.end());
         }
@@ -93,8 +91,7 @@ class Properties
          * @param name  The name of the property.
          * @param value The value of the property.
          */
-        void
-        setProperty(const std::string &name, const std::string &value)
+        void setProperty(const std::string &name, const std::string &value)
         {
             mProperties[name] = value;
         }
diff --git a/src/resources/action.h b/src/resources/action.h
index 09eb066e..5f159a00 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -44,11 +44,9 @@ class Action
          */
         ~Action();
 
-        void
-        setAnimation(int direction, Animation *animation);
+        void setAnimation(int direction, Animation *animation);
 
-        Animation*
-        getAnimation(int direction) const;
+        Animation* getAnimation(int direction) const;
 
     protected:
         typedef std::map<int, Animation*> Animations;
diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp
index 596c5fac..5721c7f0 100644
--- a/src/resources/animation.cpp
+++ b/src/resources/animation.cpp
@@ -30,22 +30,19 @@ Animation::Animation():
 {
 }
 
-void
-Animation::addFrame(Image *image, unsigned int delay, int offsetX, int offsetY)
+void Animation::addFrame(Image *image, unsigned int delay, int offsetX, int offsetY)
 {
     Frame frame = { image, delay, offsetX, offsetY };
     mFrames.push_back(frame);
     mDuration += delay;
 }
 
-void
-Animation::addTerminator()
+void Animation::addTerminator()
 {
     addFrame(NULL, 0, 0, 0);
 }
 
-bool
-Animation::isTerminator(const Frame &candidate)
+bool Animation::isTerminator(const Frame &candidate)
 {
     return (candidate.image == NULL);
 }
diff --git a/src/resources/animation.h b/src/resources/animation.h
index 8dfe8614..93e100bd 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -54,39 +54,33 @@ class Animation
         /**
          * Appends a new animation at the end of the sequence.
          */
-        void
-        addFrame(Image *image, unsigned int delay, int offsetX, int offsetY);
+        void addFrame(Image *image, unsigned int delay, int offsetX, int offsetY);
 
         /**
          * Appends an animation terminator that states that the animation
          * should not loop.
          */
-        void
-        addTerminator();
+        void addTerminator();
 
         /**
          * Returns the frame at the specified index.
          */
-        Frame*
-        getFrame(int index) { return &(mFrames[index]); }
+        Frame* getFrame(int index) { return &(mFrames[index]); }
 
         /**
          * Returns the length of this animation in frames.
          */
-        unsigned int
-        getLength() const { return mFrames.size(); }
+        unsigned int getLength() const { return mFrames.size(); }
 
         /**
          * Returns the duration of this animation.
          */
-        int
-        getDuration() const { return mDuration; }
+        int getDuration() const { return mDuration; }
 
         /**
          * Determines whether the given animation frame is a terminator.
          */
-        static bool
-        isTerminator(const Frame &phase);
+        static bool isTerminator(const Frame &phase);
 
     protected:
         std::vector<Frame> mFrames;
diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp
index 1bd98680..8c02735a 100644
--- a/src/resources/buddylist.cpp
+++ b/src/resources/buddylist.cpp
@@ -111,7 +111,7 @@ bool BuddyList::removeBuddy(const std::string buddy)
     return false;
 }
 
-int  BuddyList::getNumberOfElements()
+int BuddyList::getNumberOfElements()
 {
     return mBuddylist.size();
 }
diff --git a/src/resources/buddylist.h b/src/resources/buddylist.h
index 6a3de8c4..092abc6a 100644
--- a/src/resources/buddylist.h
+++ b/src/resources/buddylist.h
@@ -52,7 +52,7 @@ class BuddyList : public gcn::ListModel {
         /**
          * Returns the number of buddy on the list
          */
-        int  getNumberOfElements();
+        int getNumberOfElements();
 
         /**
          * Returns the buddy of the number or null
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index bdc6211a..f80ca6b3 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -27,6 +27,7 @@
 #include "../log.h"
 
 #include "../utils/dtor.h"
+#include "../utils/gettext.h"
 #include "../utils/xml.h"
 
 #define HAIR_COLOR_FILE "colors.xml"
@@ -52,7 +53,7 @@ void ColorDB::load()
 
     if (!root || !xmlStrEqual(root->name, BAD_CAST "colors"))
     {
-        logger->log("Trying TMW's color file, %s.", TMW_COLOR_FILE);
+        logger->log(_("Trying TMW's color file, %s."), TMW_COLOR_FILE);
 
         TMWHair = true;
 
@@ -62,7 +63,7 @@ void ColorDB::load()
         root = doc->rootNode();
         if (!root || !xmlStrEqual(root->name, BAD_CAST "colors"))
         {
-            logger->log("ColorDB: Failed");
+            logger->log(_("ColorDB: Failed"));
             mColors[0] = mFail;
             mLoaded = true;
 
@@ -79,7 +80,7 @@ void ColorDB::load()
 
             if (mColors.find(id) != mColors.end())
             {
-                logger->log("ColorDB: Redefinition of dye ID %d", id);
+                logger->log(_("ColorDB: Redefinition of dye ID %d"), id);
             }
 
             TMWHair ? mColors[id] = XML::getProperty(node, "value", "#FFFFFF") :
@@ -94,7 +95,7 @@ void ColorDB::load()
 
 void ColorDB::unload()
 {
-    logger->log("Unloading color database...");
+    logger->log(_("Unloading color database..."));
 
     mColors.clear();
     mLoaded = false;
@@ -109,7 +110,7 @@ std::string& ColorDB::get(int id)
 
     if (i == mColors.end())
     {
-        logger->log("ColorDB: Error, unknown dye ID# %d", id);
+        logger->log(_("ColorDB: Error, unknown dye ID# %d"), id);
         return mFail;
     }
     else
diff --git a/src/resources/image.h b/src/resources/image.h
index 6eb33ed9..a2e52d3d 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -55,8 +55,7 @@ class Image : public Resource
         /**
          * Destructor.
          */
-        virtual
-        ~Image();
+        virtual ~Image();
 
         /**
          * Loads an image from a buffer in memory.
@@ -89,21 +88,17 @@ class Image : public Resource
         /**
          * Frees the resources created by SDL.
          */
-        virtual void
-        unload();
+        virtual void unload();
 
         /**
          * Returns the width of the image.
          */
-        virtual int
-        getWidth() const { return mBounds.w; }
-
+        virtual int getWidth() const { return mBounds.w; }
 
         /**
          * Returns the height of the image.
          */
-        virtual int
-        getHeight() const { return mBounds.h; }
+        virtual int getHeight() const { return mBounds.h; }
 
         /**
          * Creates a new image with the desired clipping rectangle.
@@ -111,20 +106,17 @@ class Image : public Resource
          * @return <code>NULL</code> if creation failed and a valid
          *         object otherwise.
          */
-        virtual Image*
-        getSubImage(int x, int y, int width, int height);
+        virtual Image* getSubImage(int x, int y, int width, int height);
 
         /**
          * Sets the alpha value of this image.
          */
-        void
-        setAlpha(float alpha);
+        void setAlpha(float alpha);
 
         /**
          * Returns the alpha value of this image.
          */
-        float
-        getAlpha();
+        float getAlpha();
 
 #ifdef USE_OPENGL
         /**
@@ -134,7 +126,6 @@ class Image : public Resource
         static void setLoadAsOpenGL(bool useOpenGL);
 #endif
 
-
     protected:
         /**
          * Constructor.
@@ -146,8 +137,7 @@ class Image : public Resource
         /**
          * Returns the first power of two equal or bigger than the input.
          */
-        static int
-        powerOfTwo(int input);
+        static int powerOfTwo(int input);
 #endif
         Image(SDL_Surface *image);
 
@@ -193,8 +183,7 @@ class SubImage : public Image
          * @return <code>NULL</code> if creation failed and a valid
          *         image otherwise.
          */
-        Image*
-        getSubImage(int x, int y, int width, int height);
+        Image* getSubImage(int x, int y, int width, int height);
 
     private:
         Image *mParent;
diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h
index 632e2ae4..0dcc0c33 100644
--- a/src/resources/imagewriter.h
+++ b/src/resources/imagewriter.h
@@ -27,5 +27,5 @@ class ImageWriter
 {
     public:
         static bool writePNG(SDL_Surface *surface,
-                const std::string &filename);
+                             const std::string &filename);
 };
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 027b9e16..270083ef 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -49,10 +49,10 @@ void ItemDB::load()
     if (mLoaded)
         return;
 
-    logger->log("Initializing item database...");
+    logger->log(_("Initializing item database..."));
 
     mUnknown = new ItemInfo();
-    mUnknown->setName("Unknown item");
+    mUnknown->setName(_("Unknown item"));
     mUnknown->setImageName("");
     mUnknown->setSprite("error.xml", GENDER_MALE);
     mUnknown->setSprite("error.xml", GENDER_FEMALE);
@@ -62,7 +62,7 @@ void ItemDB::load()
 
     if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "items"))
     {
-        logger->error("ItemDB: Error while loading items.xml!");
+        logger->error(_("ItemDB: Error while loading items.xml!"));
     }
 
     for_each_xml_child_node(node, rootNode)
@@ -74,12 +74,12 @@ void ItemDB::load()
 
         if (id == 0)
         {
-            logger->log("ItemDB: Invalid or missing item ID in items.xml!");
+            logger->log(_("ItemDB: Invalid or missing item ID in items.xml!"));
             continue;
         }
         else if (mItemInfos.find(id) != mItemInfos.end())
         {
-            logger->log("ItemDB: Redefinition of item ID %d", id);
+            logger->log(_("ItemDB: Redefinition of item ID %d"), id);
         }
 
         int type = XML::getProperty(node, "type", 0);
@@ -139,7 +139,7 @@ void ItemDB::load()
 
 void ItemDB::unload()
 {
-    logger->log("Unloading item database...");
+    logger->log(_("Unloading item database..."));
 
     delete mUnknown;
     mUnknown = NULL;
@@ -157,7 +157,7 @@ const ItemInfo& ItemDB::get(int id)
 
     if (i == mItemInfos.end())
     {
-        logger->log("ItemDB: Error, unknown item ID# %d", id);
+        logger->log(_("ItemDB: Error, unknown item ID# %d"), id);
         return *mUnknown;
     }
     else
@@ -196,7 +196,7 @@ void loadSoundRef(ItemInfo *itemInfo, xmlNodePtr node)
     }
     else
     {
-        logger->log("ItemDB: Ignoring unknown sound event '%s'",
+        logger->log(_("ItemDB: Ignoring unknown sound event '%s'"),
                 event.c_str());
     }
 }
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 6f669376..4c04678a 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -22,8 +22,7 @@
 #include "itemdb.h"
 #include "iteminfo.h"
 
-const std::string&
-ItemInfo::getSprite(Gender gender) const
+const std::string& ItemInfo::getSprite(Gender gender) const
 {
     if (mView)
     {
@@ -66,15 +65,12 @@ void ItemInfo::setWeaponType(int type)
     }
 }
 
-void
-ItemInfo::addSound(EquipmentSoundEvent event, const std::string &filename)
+void ItemInfo::addSound(EquipmentSoundEvent event, const std::string &filename)
 {
     mSounds[event].push_back("sfx/" + filename);
 }
 
-
-const std::string&
-ItemInfo::getSound(EquipmentSoundEvent event) const
+const std::string& ItemInfo::getSound(EquipmentSoundEvent event) const
 {
     static const std::string empty;
     std::map< EquipmentSoundEvent, std::vector<std::string> >::const_iterator i;
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 7e2d7a1d..92009826 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -25,6 +25,7 @@
 #include "../log.h"
 
 #include "../utils/dtor.h"
+#include "../utils/gettext.h"
 #include "../utils/xml.h"
 
 namespace
@@ -34,23 +35,22 @@ namespace
     bool mLoaded = false;
 }
 
-void
-MonsterDB::load()
+void MonsterDB::load()
 {
     if (mLoaded)
         return;
 
     mUnknown.addSprite("error.xml");
-    mUnknown.setName("unnamed");
+    mUnknown.setName(_("unnamed"));
 
-    logger->log("Initializing monster database...");
+    logger->log(_("Initializing monster database..."));
 
     XML::Document doc("monsters.xml");
     xmlNodePtr rootNode = doc.rootNode();
 
     if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "monsters"))
     {
-        logger->error("Monster Database: Error while loading monster.xml!");
+        logger->error(_("Monster Database: Error while loading monster.xml!"));
     }
 
     //iterate <monster>s
@@ -81,7 +81,7 @@ MonsterDB::load()
         }
         else
         {
-            logger->log("MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one",
+            logger->log(_("MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"),
                         targetCursor.c_str(), currentInfo->getName().c_str());
             currentInfo->setTargetCursorSize(Being::TC_MEDIUM);
         }
@@ -118,7 +118,7 @@ MonsterDB::load()
                 }
                 else
                 {
-                    logger->log("MonsterDB: Warning, sound effect %s for unknown event %s of monster %s",
+                    logger->log(_("MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"),
                                 filename, event.c_str(), currentInfo->getName().c_str());
                 }
             }
@@ -156,7 +156,7 @@ const MonsterInfo &MonsterDB::get(int id)
 
     if (i == mMonsterInfos.end())
     {
-        logger->log("MonsterDB: Warning, unknown monster ID %d requested", id);
+        logger->log(_("MonsterDB: Warning, unknown monster ID %d requested"), id);
         return mUnknown;
     }
     else
diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h
index f1d69e72..2e186c15 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/monsterdb.h
@@ -31,11 +31,9 @@
  */
 namespace MonsterDB
 {
-    void
-    load();
+    void load();
 
-    void
-    unload();
+    void unload();
 
     const MonsterInfo& get(int id);
 
diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp
index 4a71a122..faa759af 100644
--- a/src/resources/monsterinfo.cpp
+++ b/src/resources/monsterinfo.cpp
@@ -36,8 +36,7 @@ MonsterInfo::~MonsterInfo()
 }
 
 
-void
-MonsterInfo::addSound(MonsterSoundEvent event, std::string filename)
+void MonsterInfo::addSound(MonsterSoundEvent event, std::string filename)
 {
     if (mSounds.find(event) == mSounds.end())
     {
@@ -48,8 +47,7 @@ MonsterInfo::addSound(MonsterSoundEvent event, std::string filename)
 }
 
 
-std::string
-MonsterInfo::getSound(MonsterSoundEvent event) const
+std::string MonsterInfo::getSound(MonsterSoundEvent event) const
 {
     std::map<MonsterSoundEvent, std::vector<std::string>* >::const_iterator i;
 
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index 05a78c5a..8d36cc06 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -56,43 +56,35 @@ class MonsterInfo
          */
         ~MonsterInfo();
 
-        void
-        setName(std::string name) { mName = name; }
+        void setName(std::string name) { mName = name; }
 
-        void
-        addSprite(std::string filename) { mSprites.push_back(filename); }
+        void addSprite(std::string filename) { mSprites.push_back(filename); }
 
-        void
-        setTargetCursorSize(Being::TargetCursorSize targetCursorSize)
+        void setTargetCursorSize(Being::TargetCursorSize targetCursorSize)
         { mTargetCursorSize = targetCursorSize; }
 
-        void
-        addSound(MonsterSoundEvent event, std::string filename);
+        void addSound(MonsterSoundEvent event, std::string filename);
 
-        void
-        addParticleEffect(std::string filename);
+        void addParticleEffect(std::string filename);
 
-        const std::string&
-        getName() const { return mName; }
+        const std::string& getName() const 
+        { return mName; }
 
-        const std::list<std::string>&
-        getSprites() const { return mSprites; }
+        const std::list<std::string>& getSprites() const 
+        { return mSprites; }
 
-        Being::TargetCursorSize
-        getTargetCursorSize() const { return mTargetCursorSize; }
+        Being::TargetCursorSize getTargetCursorSize() const 
+        { return mTargetCursorSize; }
 
-        std::string
-        getSound(MonsterSoundEvent event) const;
+        std::string getSound(MonsterSoundEvent event) const;
 
-        std::string 
-        getAttackParticleEffect() const { return mAttackParticle; }
+        std::string getAttackParticleEffect() const { return mAttackParticle; }
 
-        void 
-        addAttackParticleEffect(const std::string &particleEffect)
+        void addAttackParticleEffect(const std::string &particleEffect)
         { mAttackParticle = particleEffect; }
 
-        const std::list<std::string>&
-        getParticleEffects() const { return mParticleEffects; }
+        const std::list<std::string>& getParticleEffects() const 
+        { return mParticleEffects; }
 
     private:
         std::string mName;
diff --git a/src/resources/music.cpp b/src/resources/music.cpp
index 2386aa43..ed71d62c 100644
--- a/src/resources/music.cpp
+++ b/src/resources/music.cpp
@@ -55,8 +55,7 @@ Resource *Music::load(void *buffer, unsigned bufferSize)
     }
 }
 
-bool
-Music::play(int loops)
+bool Music::play(int loops)
 {
     /*
      * Warning: loops should be always set to -1 (infinite) with current
@@ -71,8 +70,7 @@ Music::play(int loops)
     return mChannel != -1;
 }
 
-void
-Music::stop()
+void Music::stop()
 {
     /*
      * Warning: very dungerous trick, it could try to stop channels occupied
diff --git a/src/resources/music.h b/src/resources/music.h
index d50150b8..322cfecd 100644
--- a/src/resources/music.h
+++ b/src/resources/music.h
@@ -56,14 +56,12 @@ class Music : public Resource
          * @return <code>true</code> if the playback started properly
          *         <code>false</code> otherwise.
          */
-        virtual bool
-        play(int loops);
+        virtual bool play(int loops);
 
         /**
          * Stops the music.
          */
-        virtual void
-        stop();
+        virtual void stop();
 
     protected:
         /**
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 3ae58067..bfa22214 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -25,6 +25,7 @@
 #include "../log.h"
 
 #include "../utils/dtor.h"
+#include "../utils/gettext.h"
 #include "../utils/xml.h"
 
 namespace
@@ -44,14 +45,14 @@ void NPCDB::load()
     unknownSprite->variant = 0;
     mUnknown.sprites.push_back(unknownSprite);
 
-    logger->log("Initializing NPC database...");
+    logger->log(_("Initializing NPC database..."));
 
     XML::Document doc("npcs.xml");
     xmlNodePtr rootNode = doc.rootNode();
 
     if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "npcs"))
     {
-        logger->error("NPC Database: Error while loading items.xml!");
+        logger->error(_("NPC Database: Error while loading npcs.xml!"));
     }
 
     //iterate <monster>s
@@ -63,7 +64,7 @@ void NPCDB::load()
         int id = XML::getProperty(npcNode, "id", 0);
         if (id == 0)
         {
-            logger->log("NPC Database: NPC with missing ID in npcs.xml!");
+            logger->log(_("NPC Database: NPC with missing ID in npcs.xml!"));
             continue;
         }
 
@@ -90,8 +91,7 @@ void NPCDB::load()
     mLoaded = true;
 }
 
-void
-NPCDB::unload()
+void NPCDB::unload()
 {
     for (   NPCInfosIterator i = mNPCInfos.begin();
             i != mNPCInfos.end();
@@ -116,14 +116,13 @@ NPCDB::unload()
     mLoaded = false;
 }
 
-const NPCInfo&
-NPCDB::get(int id)
+const NPCInfo& NPCDB::get(int id)
 {
     NPCInfosIterator i = mNPCInfos.find(id);
 
     if (i == mNPCInfos.end())
     {
-        logger->log("NPCDB: Warning, unknown NPC ID %d requested", id);
+        logger->log(_("NPCDB: Warning, unknown NPC ID %d requested"), id);
         return mUnknown;
     }
     else
diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h
index b4539866..1883d747 100644
--- a/src/resources/npcdb.h
+++ b/src/resources/npcdb.h
@@ -45,11 +45,9 @@ typedef std::map<int, NPCInfo*> NPCInfos;
  */
 namespace NPCDB
 {
-    void
-    load();
+    void load();
 
-    void
-    unload();
+    void unload();
 
     const NPCInfo& get(int id);
 
diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp
index e9310905..82562691 100644
--- a/src/resources/resource.cpp
+++ b/src/resources/resource.cpp
@@ -28,14 +28,12 @@ Resource::~Resource()
 {
 }
 
-void
-Resource::incRef()
+void Resource::incRef()
 {
     mRefCount++;
 }
 
-void
-Resource::decRef()
+void Resource::decRef()
 {
     // Reference may not already have reached zero
     assert(mRefCount != 0);
diff --git a/src/resources/resource.h b/src/resources/resource.h
index e85e3147..168fd70a 100644
--- a/src/resources/resource.h
+++ b/src/resources/resource.h
@@ -41,8 +41,7 @@ class Resource
         /**
          * Increments the internal reference count.
          */
-        void
-        incRef();
+        void incRef();
 
         /**
          * Decrements the reference count and deletes the object
@@ -51,8 +50,7 @@ class Resource
          * @return <code>true</code> if the object was deleted
          *         <code>false</code> otherwise.
          */
-        void
-        decRef();
+        void decRef();
 
         /**
          * Return the path identifying this resource.
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index a317e445..99b84506 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -418,8 +418,7 @@ void *ResourceManager::loadFile(const std::string &fileName, int &fileSize)
     return buffer;
 }
 
-std::vector<std::string>
-ResourceManager::loadTextFile(const std::string &fileName)
+std::vector<std::string> ResourceManager::loadTextFile(const std::string &fileName)
 {
     int contentsLength;
     char *fileContents = (char*)loadFile(fileName, contentsLength);
diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp
index e21fd2b0..f7b2b874 100644
--- a/src/resources/soundeffect.cpp
+++ b/src/resources/soundeffect.cpp
@@ -47,8 +47,7 @@ Resource *SoundEffect::load(void *buffer, unsigned bufferSize)
     }
 }
 
-bool
-SoundEffect::play(int loops, int volume)
+bool SoundEffect::play(int loops, int volume)
 {
     Mix_VolumeChunk(mChunk, volume);
 
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index c3ff6668..b9abefd7 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -58,8 +58,7 @@ class SoundEffect : public Resource
          * @return <code>true</code> if the playback started properly
          *         <code>false</code> otherwise.
          */
-        virtual bool
-        play(int loops, int volume);
+        virtual bool play(int loops, int volume);
 
     protected:
         /**
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index b4193fd3..41b1e789 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -32,8 +32,7 @@
 #include "../log.h"
 #include "../utils/xml.h"
 
-Action*
-SpriteDef::getAction(SpriteAction action) const
+Action* SpriteDef::getAction(SpriteAction action) const
 {
     Actions::const_iterator i = mActions.find(action);
 
@@ -146,8 +145,7 @@ void SpriteDef::loadImageSet(xmlNodePtr node, std::string const &palettes)
     mImageSets[name] = imageSet;
 }
 
-void
-SpriteDef::loadAction(xmlNodePtr node, int variant_offset)
+void SpriteDef::loadAction(xmlNodePtr node, int variant_offset)
 {
     const std::string actionName = XML::getProperty(node, "name", "");
     const std::string imageSetName = XML::getProperty(node, "imageset", "");
@@ -187,10 +185,9 @@ SpriteDef::loadAction(xmlNodePtr node, int variant_offset)
     }
 }
 
-void
-SpriteDef::loadAnimation(xmlNodePtr animationNode,
-                         Action *action, ImageSet *imageSet,
-                         int variant_offset)
+void SpriteDef::loadAnimation(xmlNodePtr animationNode,
+                              Action *action, ImageSet *imageSet,
+                              int variant_offset)
 {
     const std::string directionName =
         XML::getProperty(animationNode, "direction", "");
@@ -267,8 +264,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
     } // for frameNode
 }
 
-void
-SpriteDef::includeSprite(xmlNodePtr includeNode)
+void SpriteDef::includeSprite(xmlNodePtr includeNode)
 {
     // TODO: Perform circular dependency check, since it's easy to crash the
     // client this way.
@@ -289,8 +285,7 @@ SpriteDef::includeSprite(xmlNodePtr includeNode)
     loadSprite(rootNode, 0);
 }
 
-void
-SpriteDef::substituteAction(SpriteAction complete, SpriteAction with)
+void SpriteDef::substituteAction(SpriteAction complete, SpriteAction with)
 {
     if (mActions.find(complete) == mActions.end())
     {
@@ -324,8 +319,7 @@ SpriteDef::~SpriteDef()
     }
 }
 
-SpriteAction
-SpriteDef::makeSpriteAction(const std::string& action)
+SpriteAction SpriteDef::makeSpriteAction(const std::string& action)
 {
     if (action == "" || action == "default") {
         return ACTION_DEFAULT;
@@ -377,8 +371,7 @@ SpriteDef::makeSpriteAction(const std::string& action)
     }
 }
 
-SpriteDirection
-SpriteDef::makeSpriteDirection(const std::string& direction)
+SpriteDirection SpriteDef::makeSpriteDirection(const std::string& direction)
 {
     if (direction == "" || direction == "default") {
         return DIRECTION_DEFAULT;
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 4b712340..033de6cd 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -103,22 +103,19 @@ class SpriteDef : public Resource
         /**
          * Loads an action element.
          */
-        void
-        loadAction(xmlNodePtr node, int variant_offset);
+        void loadAction(xmlNodePtr node, int variant_offset);
 
         /**
          * Loads an animation element.
          */
-        void
-        loadAnimation(xmlNodePtr animationNode,
-                      Action *action, ImageSet *imageSet,
-                      int variant_offset);
+        void loadAnimation(xmlNodePtr animationNode,
+                           Action *action, ImageSet *imageSet,
+                           int variant_offset);
 
         /**
          * Include another sprite into this one.
          */
-        void
-        includeSprite(xmlNodePtr includeNode);
+        void includeSprite(xmlNodePtr includeNode);
 
         /**
          * Complete missing actions by copying existing ones.
@@ -129,21 +126,17 @@ class SpriteDef : public Resource
          * When there are no animations defined for the action "complete", its
          * animations become a copy of those of the action "with".
          */
-        void
-        substituteAction(SpriteAction complete, SpriteAction with);
+        void substituteAction(SpriteAction complete, SpriteAction with);
 
         /**
          * Converts a string into a SpriteAction enum.
          */
-        static SpriteAction
-        makeSpriteAction(const std::string &action);
+        static SpriteAction makeSpriteAction(const std::string &action);
 
         /**
          * Converts a string into a SpriteDirection enum.
          */
-        static SpriteDirection
-        makeSpriteDirection(const std::string &direction);
-
+        static SpriteDirection makeSpriteDirection(const std::string &direction);
 
         typedef std::map<std::string, ImageSet*> ImageSets;
         typedef ImageSets::iterator ImageSetIterator;
diff --git a/src/sprite.h b/src/sprite.h
index 0e0a95db..52825db2 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -44,30 +44,26 @@ class Sprite
          * would support setting a translation offset. It already does this
          * partly with the clipping rectangle support.
          */
-        virtual void
-        draw(Graphics *graphics, int offsetX, int offsetY) const = 0;
+        virtual void draw(Graphics *graphics, int offsetX, int offsetY) const = 0;
 
         /**
          * Returns the horizontal size of the sprites graphical representation
          * in pixels or 0 when it is undefined.
          */
-        virtual int
-        getWidth() const
+        virtual int getWidth() const
         { return 0; }
 
         /**
          * Returns the vertical size of the sprites graphical representation
          * in pixels or 0 when it is undefined.
          */
-        virtual int
-        getHeight() const
+        virtual int getHeight() const
         { return 0; }
 
         /**
          * Returns the pixel Y coordinate of the sprite.
          */
-        virtual int
-        getPixelY() const = 0;
+        virtual int getPixelY() const = 0;
 };
 
 #endif
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index e511ced3..db78d08c 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -61,8 +61,7 @@ namespace XML
         return mDoc ? xmlDocGetRootElement(mDoc) : 0;
     }
 
-    int
-    getProperty(xmlNodePtr node, const char* name, int def)
+    int getProperty(xmlNodePtr node, const char* name, int def)
     {
         int &ret = def;
 
@@ -75,8 +74,7 @@ namespace XML
         return ret;
     }
 
-    double
-    getFloatProperty(xmlNodePtr node, const char* name, double def)
+    double getFloatProperty(xmlNodePtr node, const char* name, double def)
     {
         double &ret = def;
 
@@ -89,8 +87,7 @@ namespace XML
         return ret;
     }
 
-    std::string
-    getProperty(xmlNodePtr node, const char *name, const std::string &def)
+    std::string getProperty(xmlNodePtr node, const char *name, const std::string &def)
     {
         xmlChar *prop = xmlGetProp(node, BAD_CAST name);
         if (prop) {
diff --git a/src/utils/xml.h b/src/utils/xml.h
index 9e691963..403fe6d9 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -71,20 +71,17 @@ namespace XML
     /**
      * Gets an integer property from an xmlNodePtr.
      */
-    int
-    getProperty(xmlNodePtr node, const char *name, int def);
+    int getProperty(xmlNodePtr node, const char *name, int def);
 
     /**
      * Gets an floating point property from an xmlNodePtr.
      */
-    double
-    getFloatProperty(xmlNodePtr node, const char *name, double def);
+    double getFloatProperty(xmlNodePtr node, const char *name, double def);
 
     /**
      * Gets a string property from an xmlNodePtr.
      */
-    std::string
-    getProperty(xmlNodePtr node, const char *name, const std::string &def);
+    std::string getProperty(xmlNodePtr node, const char *name, const std::string &def);
 
     /**
      * Finds the first child node with the given name
-- 
cgit v1.2.3-70-g09d2


From 731dcee8bec7e32d576b0e6a9d98b9a21050362e Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 13 Jan 2009 22:07:29 +0100
Subject: Merged Tab and TabbedArea from mainline

Changes mostly done by David Athay.

Currently these widgets are only used in the setup window, where they
replace the previously used TabbedContainer.
---
 data/graphics/gui/CMakeLists.txt  |   2 +
 data/graphics/gui/Makefile.am     |   2 +
 data/graphics/gui/tab.png         | Bin 0 -> 427 bytes
 data/graphics/gui/tabselected.png | Bin 0 -> 407 bytes
 src/CMakeLists.txt                |   6 +-
 src/Makefile.am                   |   7 +-
 src/gui/setup.cpp                 |  22 +++---
 src/gui/setup.h                   |   2 +-
 src/gui/setup_audio.cpp           |   1 +
 src/gui/setup_colours.cpp         |   3 +
 src/gui/setup_joystick.cpp        |   2 +
 src/gui/setup_keyboard.cpp        |   1 +
 src/gui/setup_players.cpp         |   1 +
 src/gui/setup_video.cpp           |   1 +
 src/gui/tabbedcontainer.cpp       | 127 ------------------------------
 src/gui/tabbedcontainer.h         |  74 ------------------
 src/gui/widgets/tab.cpp           | 130 +++++++++++++++++++++++++++++++
 src/gui/widgets/tab.h             |  60 ++++++++++++++
 src/gui/widgets/tabbedarea.cpp    | 160 ++++++++++++++++++++++++++++++++++++++
 src/gui/widgets/tabbedarea.h      |  92 ++++++++++++++++++++++
 20 files changed, 476 insertions(+), 217 deletions(-)
 create mode 100644 data/graphics/gui/tab.png
 create mode 100644 data/graphics/gui/tabselected.png
 delete mode 100644 src/gui/tabbedcontainer.cpp
 delete mode 100644 src/gui/tabbedcontainer.h
 create mode 100644 src/gui/widgets/tab.cpp
 create mode 100644 src/gui/widgets/tab.h
 create mode 100644 src/gui/widgets/tabbedarea.cpp
 create mode 100644 src/gui/widgets/tabbedarea.h

diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 71031113..e5ecaa12 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -32,6 +32,8 @@ SET (FILES
     slider.png
     speech_bubble.png
     speech_bubble.xml
+    tab.png
+    tabselected.png
     target-cursor-blue-l.png
     target-cursor-blue-m.png
     target-cursor-blue-s.png
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index b2c499f0..1878fe5a 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -38,6 +38,8 @@ gui_DATA =				\
 	slider.png			\
 	speech_bubble.png		\
 	speechbubble.xml		\
+	tab.png				\
+	tabselected.png			\
 	target-cursor-blue-l.png	\
 	target-cursor-blue-m.png	\
 	target-cursor-blue-s.png	\
diff --git a/data/graphics/gui/tab.png b/data/graphics/gui/tab.png
new file mode 100644
index 00000000..71de8c8b
Binary files /dev/null and b/data/graphics/gui/tab.png differ
diff --git a/data/graphics/gui/tabselected.png b/data/graphics/gui/tabselected.png
new file mode 100644
index 00000000..98dd41c6
Binary files /dev/null and b/data/graphics/gui/tabselected.png differ
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9875257d..657d8e6b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -55,6 +55,10 @@ SET(SRCS
     gui/widgets/resizegrip.h
     gui/widgets/layout.cpp
     gui/widgets/layout.h
+    gui/widgets/tab.cpp
+    gui/widgets/tab.h
+    gui/widgets/tabbedarea.cpp
+    gui/widgets/tabbedarea.h
     gui/browserbox.cpp
     gui/browserbox.h
     gui/buddywindow.cpp
@@ -163,8 +167,6 @@ SET(SRCS
     gui/speechbubble.h
     gui/status.cpp
     gui/status.h
-    gui/tabbedcontainer.cpp
-    gui/tabbedcontainer.h
     gui/table.cpp
     gui/table.h
     gui/table_model.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 96be8465..a54bb5c8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,6 +5,10 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/widgets/layout.h \
               gui/widgets/resizegrip.cpp \
 	      gui/widgets/resizegrip.h \
+	      gui/widgets/tab.cpp \
+	      gui/widgets/tab.h \
+	      gui/widgets/tabbedarea.cpp \
+	      gui/widgets/tabbedarea.h \
 	      gui/browserbox.cpp \
 	      gui/browserbox.h \
 	      gui/button.cpp \
@@ -127,8 +131,7 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/speechbubble.h \
 	      gui/status.cpp \
 	      gui/status.h \
-	      gui/tabbedcontainer.cpp \
-	      gui/tabbedcontainer.h \
+	      gui/table.h \
 	      gui/table.cpp \
 	      gui/table.h \
 	      gui/table_model.cpp \
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 551fe5bb..bd5a25f9 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -30,7 +30,8 @@
 #include "setup_keyboard.h"
 #include "setup_players.h"
 #include "setup_video.h"
-#include "tabbedcontainer.h"
+
+#include "widgets/tabbedarea.h"
 
 #include "../utils/dtor.h"
 #include "../utils/gettext.h"
@@ -48,7 +49,7 @@ extern Window *emoteWindow;
 extern Window *tradeWindow;
 
 Setup::Setup():
-    Window("Setup")
+    Window(_("Setup"))
 {
     setCloseButton(true);
     int width = 310;
@@ -71,34 +72,33 @@ Setup::Setup():
             btn->setEnabled(statusWindow != NULL);
     }
 
-    TabbedContainer *panel = new TabbedContainer(width, 5, 20, 45, 5, 3);
-    panel->setDimension(gcn::Rectangle(5, 5, width, height - 40));
-    panel->setOpaque(false);
+    TabbedArea *panel = new TabbedArea();
+    panel->setDimension(gcn::Rectangle(5, 5, width - 10, height - 40));
 
     SetupTab *tab;
 
     tab = new Setup_Video();
-    panel->addTab(tab, _("Video"));
+    panel->addTab(_("Video"), tab);
     mTabs.push_back(tab);
 
     tab = new Setup_Audio();
-    panel->addTab(tab, _("Audio"));
+    panel->addTab(_("Audio"), tab);
     mTabs.push_back(tab);
 
     tab = new Setup_Joystick();
-    panel->addTab(tab, _("Joystick"));
+    panel->addTab(_("Joystick"), tab);
     mTabs.push_back(tab);
 
     tab = new Setup_Keyboard();
-    panel->addTab(tab, _("Keyboard"));
+    panel->addTab(_("Keyboard"), tab);
     mTabs.push_back(tab);
 
     tab = new Setup_Colours();
-    panel->addTab(tab, _("Colors"));
+    panel->addTab(_("Colors"), tab);
     mTabs.push_back(tab);
 
     tab = new Setup_Players();
-    panel->addTab(tab, _("Players"));
+    panel->addTab(_("Players"), tab);
     mTabs.push_back(tab);
 
     add(panel);
diff --git a/src/gui/setup.h b/src/gui/setup.h
index 1ad93cac..8a775093 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -48,7 +48,7 @@ class Setup : public Window, public gcn::ActionListener
         /**
          * Destructor.
          */
-        virtual ~Setup();
+        ~Setup();
 
         /**
          * Event handling method.
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index bb824f33..eaa3ddba 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -41,6 +41,7 @@ Setup_Audio::Setup_Audio():
     mMusicSlider(new Slider(0, 128))
 {
     setOpaque(false);
+    setDimension(gcn::Rectangle(0, 0, 290, 255));
 
     gcn::Label *sfxLabel = new gcn::Label(_("Sfx volume"));
     gcn::Label *musicLabel = new gcn::Label(_("Music volume"));
diff --git a/src/gui/setup_colours.cpp b/src/gui/setup_colours.cpp
index b542839a..33c7d86b 100644
--- a/src/gui/setup_colours.cpp
+++ b/src/gui/setup_colours.cpp
@@ -38,6 +38,9 @@ Setup_Colours::Setup_Colours() :
     mColourLabel(_("Color:")),
     mSelected(-1)
 {
+    setOpaque(false);
+    setDimension(gcn::Rectangle(0, 0, 290, 255));
+
     mColourBox = new gcn::ListBox(textColour);
     mScroll = new ScrollArea(mColourBox);
 
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index b55ccb7e..1457bc2f 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -38,6 +38,8 @@ Setup_Joystick::Setup_Joystick():
     mJoystickEnabled(new CheckBox(_("Enable joystick")))
 {
     setOpaque(false);
+    setDimension(gcn::Rectangle(0, 0, 290, 255));
+
     mJoystickEnabled->setPosition(10, 10);
     mCalibrateLabel->setPosition(10, 25);
     mCalibrateButton->setPosition(10, 30 + mCalibrateLabel->getHeight());
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 75fa542f..24d12049 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -73,6 +73,7 @@ Setup_Keyboard::Setup_Keyboard():
 {
     keyboard.setSetupKeyboard(this);
     setOpaque(false);
+    setDimension(gcn::Rectangle(0, 0, 290, 255));
 
     refreshKeys();
 
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 0e960b84..e7770959 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -220,6 +220,7 @@ Setup_Players::Setup_Players():
     mIgnoreActionChoicesBox(new gcn::DropDown(new IgnoreChoicesListModel()))
 {
     setOpaque(false);
+    setDimension(gcn::Rectangle(0, 0, 290, 255));
 
     int table_width = NAME_COLUMN_WIDTH + RELATION_CHOICE_COLUMN_WIDTH;
     mPlayerTableTitleModel->fixColumnWidth(NAME_COLUMN, NAME_COLUMN_WIDTH);
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index e424c43f..78e26e5e 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -136,6 +136,7 @@ Setup_Video::Setup_Video():
     mParticleDetailField(new gcn::Label(""))
 {
     setOpaque(false);
+    setDimension(gcn::Rectangle(0, 0, 290, 255));
 
     ScrollArea *scrollArea = new ScrollArea(mModeList);
     gcn::Label *alphaLabel = new gcn::Label(_("Gui opacity"));
diff --git a/src/gui/tabbedcontainer.cpp b/src/gui/tabbedcontainer.cpp
deleted file mode 100644
index f8bc451d..00000000
--- a/src/gui/tabbedcontainer.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "button.h"
-#include "tabbedcontainer.h"
-
-#include "../utils/dtor.h"
-#include "../utils/tostring.h"
-
-TabbedContainer::TabbedContainer(int width, int padX, int buttonHeight,
-                                 int height, int padY, int buttonsPerRow):
-    mActiveContent(0),
-    mWidth(width),
-    mPadX(padX),
-    mButtonHeight(buttonHeight),
-    mHeight(height),
-    mPadY(padY),
-    mButtonsPerRow(buttonsPerRow),
-
-    mButtonWidth((width - (buttonsPerRow - 1) * padX) / buttonsPerRow - padX)
-{
-}
-
-TabbedContainer::~TabbedContainer()
-{
-    delete_all(mTabs);
-    mTabs.clear();
-    mContents.clear();
-}
-
-void TabbedContainer::addTab(gcn::Widget *widget, const std::string &caption)
-{
-    int tabNumber = mTabs.size();
-
-    Button *tab = new Button(caption, toString(tabNumber), this);
-
-    tab->setSize(mButtonWidth, mButtonHeight);
-    add(tab, (mButtonWidth + mPadX) * (tabNumber % mButtonsPerRow),
-             (mButtonHeight + mPadY) * (tabNumber / mButtonsPerRow));
-
-    mTabs[caption] = tab;
-
-    mContents.push_back(widget);
-    widget->setPosition(0, mHeight);
-
-    // If this is the first tab in this container, make it visible
-    if (!mActiveContent) {
-        mActiveContent = widget;
-        add(mActiveContent);
-        tab->setLogged(true);
-    }
-
-    mWidgets[widget] = caption;
-}
-
-void TabbedContainer::removeTab(const std::string &caption)
-{
-    gcn::ActionEvent actionEvent(this, "0");
-    action(actionEvent);
-    remove(mTabs[caption]);
-    mTabs.erase(caption);
-}
-
-void TabbedContainer::logic()
-{
-    if (mActiveContent) {
-        mActiveContent->setSize(
-                getWidth() - 2 * mActiveContent->getFrameSize(),
-                getHeight() - mHeight - 2 * mActiveContent->getFrameSize());
-    }
-
-    Container::logic();
-}
-
-void TabbedContainer::action(const gcn::ActionEvent &event)
-{
-    int tabNo;
-    std::stringstream ss(event.getId());
-    ss >> tabNo;
-
-    gcn::Widget *newContent = mContents[tabNo];
-
-    if (newContent) {
-        if (mActiveContent) {
-            // Unhighlight old tab
-            ((Button*)mTabs[mWidgets[mActiveContent]])->setLogged(false);
-            remove(mActiveContent);
-        }
-        mActiveContent = newContent;
-        // Highlight new tab
-        ((Button*)mTabs[mWidgets[mActiveContent]])->setLogged(true);
-        add(newContent);
-    }
-}
-
-void TabbedContainer::setOpaque(bool opaque)
-{
-    Container::setOpaque(opaque);
-}
-
-short TabbedContainer::getNumberOfTabs()
-{
-    return mTabs.size();
-}
-
-std::string TabbedContainer::getActiveWidget()
-{
-    return mWidgets[mActiveContent];
-}
diff --git a/src/gui/tabbedcontainer.h b/src/gui/tabbedcontainer.h
deleted file mode 100644
index 2fc41247..00000000
--- a/src/gui/tabbedcontainer.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _TMW_TABPANE_H
-#define _TMW_TABPANE_H
-
-#include <iosfwd>
-#include <map>
-#include <vector>
-
-#include <guichan/actionlistener.hpp>
-
-#include <guichan/widgets/container.hpp>
-
-#include "../guichanfwd.h"
-
-class TabbedContainer : public gcn::Container, public gcn::ActionListener
-{
-    public:
-        TabbedContainer(int width, int padX, int buttonHeight,
-                        int height, int padY, int buttonsPerRow);
-        ~TabbedContainer();
-
-        void addTab(gcn::Widget *widget, const std::string &caption);
-
-        void removeTab(const std::string &caption);
-
-        void logic();
-
-        void action(const gcn::ActionEvent &event);
-
-        void setOpaque(bool opaque);
-
-        short getNumberOfTabs();
-
-        std::string getActiveWidget();
-
-    private:
-        typedef std::vector<gcn::Widget*> Widgets;
-        typedef Widgets::iterator WidgetIterator;
-        std::map<std::string, gcn::Widget*> mTabs; // tabs mapped to their channel name
-        Widgets mContents;  // The contents of the tabs
-
-        std::map<gcn::Widget*, std::string> mWidgets;
-        gcn::Widget *mActiveContent;
-
-        int mWidth;         /**< The total width of all buttons */
-        int mPadX;          /**< The horizontal gap between buttons */
-        int mButtonHeight;  /**< The height of each button */
-        int mHeight;        /**< Height of the panel */
-        int mPadY;          /**< The vertical gap between buttons */
-        int mButtonsPerRow; /**< The number of buttons on each row */
-        int mButtonWidth;   /**< The width of each button */
-};
-
-#endif
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
new file mode 100644
index 00000000..c53ac85c
--- /dev/null
+++ b/src/gui/widgets/tab.cpp
@@ -0,0 +1,130 @@
+/*
+ *  The Mana World
+ *  Copyright 2008 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <algorithm>
+
+#include "tab.h"
+
+#include "tabbedarea.h"
+
+#include "../../graphics.h"
+
+#include "../../resources/image.h"
+#include "../../resources/resourcemanager.h"
+
+#include "../../utils/dtor.h"
+
+int Tab::mInstances = 0;
+
+enum{
+    TAB_STANDARD,    // 0
+    TAB_HIGHLIGHTED, // 1
+    TAB_SELECTED,     // 2
+    TAB_UNUSED,       // 3
+    TAB_COUNT        // 4 - Must be last.
+};
+
+struct TabData
+{
+    char const *file;
+    int gridX;
+    int gridY;
+};
+
+static TabData const data[TAB_COUNT] = {
+    {"graphics/gui/tab.png", 0, 0},
+    {"graphics/gui/tab.png", 9, 4},
+    {"graphics/gui/tabselected.png", 16, 19},
+    {"graphics/gui/tab.png", 25, 23}
+};
+
+ImageRect Tab::tabImg[TAB_COUNT];
+
+Tab::Tab() : gcn::Tab()
+{
+    init();
+}
+
+Tab::~Tab()
+{
+    mInstances--;
+
+    if (mInstances == 0)
+    {
+        for (int mode = 0; mode < TAB_COUNT; mode++)
+        {
+            for_each(tabImg[mode].grid, tabImg[mode].grid + 9, dtor<Image*>());
+        }
+    }
+}
+
+void Tab::init()
+{
+    setFrameSize(0);
+
+    if (mInstances == 0)
+    {
+        // Load the skin
+        ResourceManager *resman = ResourceManager::getInstance();
+        Image *tab[TAB_COUNT];
+
+        int a, x, y, mode;
+
+        for (mode = 0; mode < TAB_COUNT; mode++)
+        {
+            tab[mode] = resman->getImage(data[mode].file);
+            a = 0;
+            for (y = 0; y < 3; y++) {
+                for (x = 0; x < 3; x++) {
+                    tabImg[mode].grid[a] = tab[mode]->getSubImage(
+                            data[x].gridX, data[y].gridY,
+                            data[x + 1].gridX - data[x].gridX + 1,
+                            data[y + 1].gridY - data[y].gridY + 1);
+                    a++;
+                }
+            }
+            tab[mode]->decRef();
+        }
+    }
+    mInstances++;
+}
+
+void Tab::draw(gcn::Graphics *graphics)
+{
+    int mode;
+
+    // check which type of tab to draw
+    if (mTabbedArea && mTabbedArea->isTabSelected(this))
+    {
+        mode = TAB_SELECTED;
+    }
+    else
+    {
+        mode = TAB_STANDARD;
+    }
+
+    // draw tab
+    static_cast<Graphics*>(graphics)->
+        drawImageRect(0, 0, getWidth(), getHeight(), tabImg[mode]);
+
+    // draw label
+    drawChildren(graphics);
+}
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
new file mode 100644
index 00000000..42964b0f
--- /dev/null
+++ b/src/gui/widgets/tab.h
@@ -0,0 +1,60 @@
+/*
+ *  The Mana World
+ *  Copyright 2008 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _TMW_TAB_H
+#define _TMW_TAB_H
+
+#include <guichan/widgets/tab.hpp>
+
+class ImageRect;
+
+/**
+ * A tab, the same as the guichan tab in 0.8, but extended to allow transparancy
+ */
+class Tab : public gcn::Tab
+{
+    public:
+        /**
+         * Constructor.
+         */
+        Tab();
+
+        /**
+         * Destructor.
+         */
+        ~Tab();
+
+        /**
+         * Draw the tabbed area.
+         */
+        void draw(gcn::Graphics *graphics);
+
+    private:
+        /** Load images if no other instances exist yet */
+        void init();
+
+        static ImageRect tabImg[4];    /**< Tab state graphics */
+        static int mInstances;         /**< Number of tab instances */
+};
+
+#endif
+
+
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
new file mode 100644
index 00000000..205fdc99
--- /dev/null
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -0,0 +1,160 @@
+/*
+ *  The Mana World
+ *  Copyright 2008 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "tabbedarea.h"
+#include "tab.h"
+
+#include <guichan/widgets/container.hpp>
+
+TabbedArea::TabbedArea() : gcn::TabbedArea()
+{
+    mWidgetContainer->setOpaque(false);
+}
+
+int TabbedArea::getNumberOfTabs()
+{
+    return mTabs.size();
+}
+
+Tab* TabbedArea::getTab(const std::string &name)
+{
+    TabContainer::iterator itr = mTabs.begin(), itr_end = mTabs.end();
+    while (itr != itr_end)
+    {
+        if ((*itr).first->getCaption() == name)
+        {
+            return static_cast<Tab*>((*itr).first);
+        }
+        ++itr;
+    }
+    return NULL;
+}
+
+void TabbedArea::draw(gcn::Graphics *graphics)
+{
+    if (mTabs.empty())
+    {
+        return;
+    }
+
+    drawChildren(graphics);
+}
+
+gcn::Widget* TabbedArea::getWidget(const std::string &name)
+{
+    TabContainer::iterator itr = mTabs.begin(), itr_end = mTabs.end();
+    while (itr != itr_end)
+    {
+        if ((*itr).first->getCaption() == name)
+        {
+            return (*itr).second;
+        }
+        ++itr;
+    }
+
+    return NULL;
+}
+
+void TabbedArea::addTab(const std::string &caption, gcn::Widget *widget)
+{
+    Tab* tab = new Tab();
+    tab->setCaption(caption);
+    mTabsToDelete.push_back(tab);
+
+    addTab(tab, widget);
+}
+
+void TabbedArea::addTab(Tab *tab, gcn::Widget *widget)
+{
+    tab->setTabbedArea(this);
+    tab->addActionListener(this);
+
+    mTabContainer->add(tab);
+    mTabs.push_back(std::pair<Tab*, gcn::Widget*>(tab, widget));
+
+    if (mSelectedTab == NULL)
+    {
+        setSelectedTab(tab);
+    }
+
+    adjustTabPositions();
+    adjustSize();
+}
+
+void TabbedArea::removeTab(Tab *tab)
+{
+    int tabIndexToBeSelected = 0;
+
+    if (tab == mSelectedTab)
+    {
+        int index = getSelectedTabIndex();
+
+        if (index == (int)mTabs.size() - 1
+                 && mTabs.size() == 1)
+        {
+            tabIndexToBeSelected = -1;
+        }
+        else
+        {
+            tabIndexToBeSelected = index - 1;
+        }
+    }
+
+    TabContainer::iterator iter;
+    for (iter = mTabs.begin(); iter != mTabs.end(); iter++)
+    {
+        if (iter->first == tab)
+        {
+            mTabContainer->remove(tab);
+            mTabs.erase(iter);
+            break;
+        }
+    }
+
+    std::vector<gcn::Tab*>::iterator iter2;
+    for (iter2 = mTabsToDelete.begin(); iter2 != mTabsToDelete.end(); iter2++)
+    {
+        if (*iter2 == tab)
+        {
+            mTabsToDelete.erase(iter2);
+            delete tab;
+            break;
+        }
+    }
+
+    if (tabIndexToBeSelected == -1)
+    {
+        mSelectedTab = NULL;
+        mWidgetContainer->clear();
+    }
+    else
+    {
+        setSelectedTab(tabIndexToBeSelected);
+    }
+
+    adjustSize();
+    adjustTabPositions();
+}
+
+void TabbedArea::logic()
+{
+    logicChildren();
+}
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
new file mode 100644
index 00000000..2199264b
--- /dev/null
+++ b/src/gui/widgets/tabbedarea.h
@@ -0,0 +1,92 @@
+/*
+ *  The Mana World
+ *  Copyright 2008 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _TMW_TABBEDAREA_H
+#define _TMW_TABBEDAREA_H
+
+#include <guichan/widget.hpp>
+#include <guichan/widgets/tabbedarea.hpp>
+
+#include <string>
+
+class Tab;
+
+/**
+ * A tabbed area, the same as the guichan tabbed area in 0.8, but extended
+ */
+class TabbedArea : public gcn::TabbedArea
+{
+    public:
+        /**
+         * Constructor.
+         */
+        TabbedArea();
+
+        /**
+         * Draw the tabbed area.
+         */
+        void draw(gcn::Graphics *graphics);
+
+        /**
+         * Return how many tabs have been created
+         */
+        int getNumberOfTabs();
+
+        /**
+         * Return tab with specified name as caption
+         */
+        Tab* getTab(const std::string &name);
+
+        /**
+         * Returns the widget with the tab that has specified caption
+         */
+        gcn::Widget* getWidget(const std::string &name);
+
+        /**
+         * Add a tab
+         * @param caption The Caption to display
+         * @param widget The widget to show when tab is selected
+         */
+        void addTab(const std::string &caption, gcn::Widget *widget);
+
+        /**
+         * Add a tab
+         * @param tab The tab
+         * @param widget The widget to display
+         */
+        void addTab(Tab *tab, gcn::Widget *widget);
+
+        /**
+         * Overload the remove tab function as its broken in guichan 0.8
+         */
+        void removeTab(Tab *tab);
+
+        /**
+         * Overload the logic function since it's broken in guichan 0.8
+         */
+        void logic();
+
+    private:
+        typedef std::vector< std::pair<gcn::Tab*, gcn::Widget*> > TabContainer;
+};
+
+#endif
+
-- 
cgit v1.2.3-70-g09d2


From 0a18932056e2a72f41cdd14c831344ad80cfb35b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 15 Jan 2009 19:48:00 -0700
Subject: Added emote database, which is loosely based off of the NPC database.
 Also changed all emotes to be animated sprites now, and to load from
 emotes.xml. This gives us a bit more flexibility to not only add more emotes
 in the future, but allowing them to be animated as well.

NOTE: This commit, unlike the previous emote commits, breaks emotes if
you don't have the xml file. This will be available on Aethyra soon, but
is not rolled into an update at the moment.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 po/POTFILES.in                     |   1 +
 src/CMakeLists.txt                 |   2 +
 src/Makefile.am                    |   3 +-
 src/being.cpp                      |  26 ++++---
 src/being.h                        |   4 +-
 src/gui/emotecontainer.cpp         |  29 +++++---
 src/gui/emotecontainer.h           |   6 +-
 src/gui/emoteshortcutcontainer.cpp |  42 +++++++----
 src/gui/emoteshortcutcontainer.h   |   7 +-
 src/gui/emotewindow.cpp            |  10 +--
 src/gui/emotewindow.h              |   2 +-
 src/main.cpp                       |   7 +-
 src/npc.cpp                        |   3 +-
 src/npc.h                          |   3 +-
 src/resources/emotedb.cpp          | 148 +++++++++++++++++++++++++++++++++++++
 src/resources/emotedb.h            |  62 ++++++++++++++++
 src/resources/npcdb.cpp            |   2 +-
 17 files changed, 301 insertions(+), 56 deletions(-)
 create mode 100644 src/resources/emotedb.cpp
 create mode 100644 src/resources/emotedb.h

diff --git a/po/POTFILES.in b/po/POTFILES.in
index a3a9f01c..534bdd70 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -39,6 +39,7 @@ src/gui/updatewindow.cpp
 src/net/playerhandler.cpp
 src/net/tradehandler.cpp
 src/resources/colordb.cpp
+src/resources/emotedb.cpp
 src/resources/itemdb.cpp
 src/resources/monsterdb.cpp
 src/resources/npcdb.cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 657d8e6b..dbdd64b6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -233,6 +233,8 @@ SET(SRCS
     resources/colordb.h
     resources/dye.cpp
     resources/dye.h
+    resources/emotedb.cpp
+    resources/emotedb.h
     resources/image.cpp
     resources/image.h
     resources/imageloader.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index a54bb5c8..5c519832 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -131,7 +131,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/speechbubble.h \
 	      gui/status.cpp \
 	      gui/status.h \
-	      gui/table.h \
 	      gui/table.cpp \
 	      gui/table.h \
 	      gui/table_model.cpp \
@@ -200,6 +199,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      resources/colordb.h \
 	      resources/dye.cpp \
 	      resources/dye.h \
+	      resources/emotedb.cpp \
+	      resources/emotedb.h \
 	      resources/image.cpp \
 	      resources/image.h \
 	      resources/imageloader.cpp \
diff --git a/src/being.cpp b/src/being.cpp
index 69da1182..883344d8 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -35,6 +35,7 @@
 #include "sound.h"
 #include "text.h"
 
+#include "resources/emotedb.h"
 #include "resources/imageset.h"
 #include "resources/itemdb.h"
 #include "resources/iteminfo.h"
@@ -50,7 +51,7 @@
 
 int Being::instances = 0;
 int Being::mNumberOfHairstyles = 1;
-ImageSet *Being::emotionSet = NULL;
+std::vector<AnimatedSprite*> Being::emotionSet;
 
 static const int X_SPEECH_OFFSET = 18;
 static const int Y_SPEECH_OFFSET = 60;
@@ -87,10 +88,18 @@ Being::Being(int id, int job, Map *map):
 
     if (instances == 0)
     {
-        // Load the emotion set
-        ResourceManager *rm = ResourceManager::getInstance();
-        emotionSet = rm->getImageSet("graphics/sprites/emotions.png", 30, 32);
-        if (!emotionSet) logger->error(_("Unable to load emotions"));
+        // Setup emote sprites
+        for (int i = 0; i <= EmoteDB::getLast(); i++)
+        {
+            EmoteInfo info = EmoteDB::get(i);
+
+            if (info.sprites != EmoteDB::getUnknown().sprites)
+            {
+                std::string file = "graphics/sprites/" + info.sprites.front()->sprite;
+                int variant = info.sprites.front()->variant;
+                emotionSet.push_back(AnimatedSprite::load(file, variant));
+            }
+        }
 
         // Hairstyles are encoded as negative numbers.  Count how far negative we can go.
         int hairstyles = 1;
@@ -117,8 +126,7 @@ Being::~Being()
 
     if (instances == 0)
     {
-        emotionSet->decRef();
-        emotionSet = NULL;
+        delete_all(emotionSet);
     }
 
     delete mSpeechBubble;
@@ -448,8 +456,8 @@ void Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
     const int py = mPy + offsetY - 60;
     const int emotionIndex = mEmotion - 1;
 
-    if (emotionIndex >= 0 && emotionIndex < (int) emotionSet->size())
-        graphics->drawImage(emotionSet->get(emotionIndex), px, py);
+    if (emotionIndex >= 0 && emotionIndex < EmoteDB::getLast())
+        emotionSet[emotionIndex]->draw(graphics, px, py);
 }
 
 void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
diff --git a/src/being.h b/src/being.h
index 54c9d717..4534b1ea 100644
--- a/src/being.h
+++ b/src/being.h
@@ -431,8 +431,8 @@ class Being : public Sprite
         // Speech Bubble components
         SpeechBubble *mSpeechBubble;
 
-        static int instances;           /**< Number of Being instances */
-        static ImageSet *emotionSet;    /**< Emoticons used by beings */
+        static int instances;                              /**< Number of Being instances */
+        static std::vector<AnimatedSprite*> emotionSet;    /**< Emoticons used by beings */
 };
 
 #endif
diff --git a/src/gui/emotecontainer.cpp b/src/gui/emotecontainer.cpp
index c3e20c41..691211ca 100644
--- a/src/gui/emotecontainer.cpp
+++ b/src/gui/emotecontainer.cpp
@@ -25,14 +25,17 @@
 #include "emotecontainer.h"
 #include "emoteshortcut.h"
 
+#include "../animatedsprite.h"
 #include "../configuration.h"
 #include "../graphics.h"
 #include "../log.h"
 
+#include "../resources/emotedb.h"
 #include "../resources/image.h"
 #include "../resources/iteminfo.h"
 #include "../resources/resourcemanager.h"
 
+#include "../utils/dtor.h"
 #include "../utils/gettext.h"
 #include "../utils/tostring.h"
 
@@ -46,15 +49,25 @@ EmoteContainer::EmoteContainer():
 {
     ResourceManager *resman = ResourceManager::getInstance();
 
-    mEmoteImg = resman->getImageSet("graphics/sprites/emotions.png", 30, 32);
-    if (!mEmoteImg) logger->error(_("Unable to load emotions"));
+    // Setup emote sprites
+    for (int i = 0; i <= EmoteDB::getLast(); i++)
+    {
+        EmoteInfo info = EmoteDB::get(i);
+
+        if (info.sprites != EmoteDB::getUnknown().sprites)
+        { 
+            std::string file = "graphics/sprites/" + info.sprites.front()->sprite;
+            int variant = info.sprites.front()->variant;
+            mEmoteImg.push_back(AnimatedSprite::load(file, variant));
+        }
+    }
 
     mSelImg = resman->getImage("graphics/gui/selection.png");
     if (!mSelImg) logger->error(_("Unable to load selection.png"));
 
     mSelImg->setAlpha(config.getValue("guialpha", 0.8));
 
-    mMaxEmote = mEmoteImg->size(); 
+    mMaxEmote = EmoteDB::getLast() + 1;
 
     addMouseListener(this);
     addWidgetListener(this);
@@ -62,11 +75,8 @@ EmoteContainer::EmoteContainer():
 
 EmoteContainer::~EmoteContainer()
 {
-    if (mEmoteImg)
-    {
-       mEmoteImg->decRef();
-       mEmoteImg = NULL;
-    }
+    delete_all(mEmoteImg);
+
     if (!mSelImg)
     {
        mSelImg->decRef();
@@ -90,8 +100,7 @@ void EmoteContainer::draw(gcn::Graphics *graphics)
         int emoteY = ((i) / columns) * gridHeight;
            
         // Draw emote icon
-        static_cast<Graphics*>(graphics)->drawImage(
-                    mEmoteImg->get(i), emoteX, emoteY);
+        mEmoteImg[i]->draw(static_cast<Graphics*>(graphics), emoteX, emoteY);
 
         // Draw selection image below selected item
         if (mSelectedEmoteIndex == i)
diff --git a/src/gui/emotecontainer.h b/src/gui/emotecontainer.h
index 2a115f0b..2231e01a 100644
--- a/src/gui/emotecontainer.h
+++ b/src/gui/emotecontainer.h
@@ -23,6 +23,7 @@
 #define _AETHYRA_EMOTECONTAINER_H__
 
 #include <list>
+#include <vector>
 
 #include <guichan/mouselistener.hpp>
 #include <guichan/widget.hpp>
@@ -30,8 +31,7 @@
 
 #include "../guichanfwd.h"
 
-#include "../resources/imageset.h"
-
+class AnimatedSprite;
 class Image;
 
 namespace gcn {
@@ -123,7 +123,7 @@ class EmoteContainer : public gcn::Widget,
          */
         void distributeValueChangedEvent(void);
 
-        ImageSet *mEmoteImg;
+        std::vector<AnimatedSprite*> mEmoteImg;
         Image *mSelImg;
         int mSelectedEmoteIndex;
 
diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
index de9f8bab..edaa8602 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -21,6 +21,7 @@
 
 #include "emoteshortcutcontainer.h"
 
+#include "../animatedsprite.h"
 #include "../emoteshortcut.h"
 #include "../graphics.h"
 #include "../inventory.h"
@@ -30,12 +31,16 @@
 #include "../localplayer.h"
 #include "../log.h"
 
+#include "../resources/emotedb.h"
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
 
+#include "../utils/dtor.h"
 #include "../utils/gettext.h"
 #include "../utils/tostring.h"
 
+static const int MAX_ITEMS = 12;
+
 EmoteShortcutContainer::EmoteShortcutContainer():
     mEmoteClicked(false),
     mEmoteMoved(0)
@@ -48,10 +53,21 @@ EmoteShortcutContainer::EmoteShortcutContainer():
     ResourceManager *resman = ResourceManager::getInstance();
 
     mBackgroundImg = resman->getImage("graphics/gui/item_shortcut_bgr.png");
-    mEmoteImg = resman->getImageSet("graphics/sprites/emotions.png", 30, 32);
-    if (!mEmoteImg) logger->error(_("Unable to load emotions"));
 
-    mMaxItems = emoteShortcut->getEmoteCount(); 
+    // Setup emote sprites
+    for (int i = 0; i <= EmoteDB::getLast(); i++)
+    {
+        EmoteInfo info = EmoteDB::get(i);
+
+        if (info.sprites != EmoteDB::getUnknown().sprites)
+        { 
+            std::string file = "graphics/sprites/" + info.sprites.front()->sprite;
+            int variant = info.sprites.front()->variant;
+            mEmoteImg.push_back(AnimatedSprite::load(file, variant));
+        }
+    }
+
+    mMaxItems = MAX_ITEMS;
 
     mBoxHeight = mBackgroundImg->getHeight();
     mBoxWidth = mBackgroundImg->getWidth();
@@ -60,11 +76,8 @@ EmoteShortcutContainer::EmoteShortcutContainer():
 EmoteShortcutContainer::~EmoteShortcutContainer()
 {
     mBackgroundImg->decRef();
-    if (mEmoteImg)
-    {
-        mEmoteImg->decRef();
-        mEmoteImg=NULL;
-    }
+
+    delete_all(mEmoteImg);
 }
 
 void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
@@ -88,21 +101,20 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
 
         if (emoteShortcut->getEmote(i))
         {
-            static_cast<Graphics*>(graphics)->drawImage(
-                                   mEmoteImg->get(emoteShortcut->getEmote(i) - 1), emoteX + 2, emoteY + 10);
+            mEmoteImg[emoteShortcut->getEmote(i) - 1]->draw(g, emoteX + 2, emoteY + 10);
         }
 
     }
     if (mEmoteMoved)
     {
         // Draw the emote image being dragged by the cursor.
-        Image* image = mEmoteImg->get(mEmoteMoved-1);
-        if (image)
+        AnimatedSprite* sprite = mEmoteImg[mEmoteMoved - 1];
+        if (sprite)
         {
-            const int tPosX = mCursorPosX - (image->getWidth() / 2);
-            const int tPosY = mCursorPosY - (image->getHeight() / 2);
+            const int tPosX = mCursorPosX - (sprite->getWidth() / 2);
+            const int tPosY = mCursorPosY - (sprite->getHeight() / 2);
 
-            g->drawImage(image, tPosX, tPosY);
+            sprite->draw(g, tPosX, tPosY);
         }
     }
 }
diff --git a/src/gui/emoteshortcutcontainer.h b/src/gui/emoteshortcutcontainer.h
index 5b3f61cd..f8a07dcc 100644
--- a/src/gui/emoteshortcutcontainer.h
+++ b/src/gui/emoteshortcutcontainer.h
@@ -22,6 +22,8 @@
 #ifndef _AETHYRA_EMOTESHORTCUTCONTAINER_H__
 #define _AETHYRA_EMOTESHORTCUTCONTAINER_H__
 
+#include <vector>
+
 #include <guichan/mouselistener.hpp>
 #include <guichan/widget.hpp>
 #include <guichan/widgetlistener.hpp>
@@ -30,8 +32,7 @@
 
 #include "../guichanfwd.h"
 
-#include "../resources/imageset.h"
-
+class AnimatedSprite;
 class Image;
 
 /**
@@ -73,7 +74,7 @@ class EmoteShortcutContainer : public ShortcutContainer
         void mouseReleased(gcn::MouseEvent &event);
 
     private:
-        ImageSet *mEmoteImg;
+        std::vector<AnimatedSprite*> mEmoteImg;
 
         bool mEmoteClicked;
         int mEmoteMoved;
diff --git a/src/gui/emotewindow.cpp b/src/gui/emotewindow.cpp
index af9648ef..9639d9b6 100644
--- a/src/gui/emotewindow.cpp
+++ b/src/gui/emotewindow.cpp
@@ -48,13 +48,13 @@ EmoteWindow::EmoteWindow():
     mEmotes = new EmoteContainer();
     mEmotes->addSelectionListener(this);
 
-    mInvenScroll = new ScrollArea(mEmotes);
-    mInvenScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mEmoteScroll = new ScrollArea(mEmotes);
+    mEmoteScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
 
     draw();
 
     add(mUseButton);
-    add(mInvenScroll);
+    add(mEmoteScroll);
 
     mUseButton->setSize(60, mUseButton->getHeight());
 
@@ -80,8 +80,8 @@ void EmoteWindow::draw()
 
     mUseButton->setPosition(8, height - 8 - mUseButton->getHeight());
 
-    mInvenScroll->setSize(width - 16, mUseButton->getY() - 18);
-    mInvenScroll->setPosition(8,  10);
+    mEmoteScroll->setSize(width - 16, mUseButton->getY() - 18);
+    mEmoteScroll->setPosition(8,  10);
 
     setMinHeight(130);
 }
diff --git a/src/gui/emotewindow.h b/src/gui/emotewindow.h
index dbe4efd7..a996db99 100644
--- a/src/gui/emotewindow.h
+++ b/src/gui/emotewindow.h
@@ -70,7 +70,7 @@ class EmoteWindow : public Window, gcn::ActionListener,
         EmoteContainer *mEmotes;
 
         gcn::Button *mUseButton;
-        gcn::ScrollArea *mInvenScroll;
+        gcn::ScrollArea *mEmoteScroll;
 };
 
 extern EmoteWindow *emoteWindow;
diff --git a/src/main.cpp b/src/main.cpp
index 61b90b12..a1109092 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -74,6 +74,7 @@
 #include "net/network.h"
 
 #include "resources/colordb.h"
+#include "resources/emotedb.h"
 #include "resources/image.h"
 #include "resources/itemdb.h"
 #include "resources/monsterdb.h"
@@ -402,7 +403,7 @@ void init_engine(const Options &options)
 
     // Initialize the item shortcuts.
     itemShortcut = new ItemShortcut();
-      
+
     // Initialize the emote shortcuts.
     emoteShortcut = new EmoteShortcut();
 
@@ -437,7 +438,6 @@ void exit_engine()
 {
     // Before config.write() since it writes the shortcuts to the config
     delete itemShortcut;
-    
     delete emoteShortcut;
 
     config.write();
@@ -453,6 +453,7 @@ void exit_engine()
 
     // Unload XML databases
     ColorDB::unload();
+    EmoteDB::unload();
     ItemDB::unload();
     MonsterDB::unload();
     NPCDB::unload();
@@ -903,6 +904,8 @@ int main(int argc, char *argv[])
                     ItemDB::load();
                     MonsterDB::load();
                     NPCDB::load();
+                    EmoteDB::load();
+
                     state = CHAR_CONNECT_STATE;
                     break;
 
diff --git a/src/npc.cpp b/src/npc.cpp
index a2fb7d38..a9aa216c 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -105,8 +105,7 @@ void NPC::setSprite(int slot, int id, std::string color)
     Being::setSprite(slot, id, color);
 }
 
-Being::Type
-NPC::getType() const
+Being::Type NPC::getType() const
 {
     return Being::NPC;
 }
diff --git a/src/npc.h b/src/npc.h
index 6e150e2b..af1dfc66 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -39,8 +39,7 @@ class NPC : public Player
         void setGender(Gender gender);
         void setSprite(int slot, int id, std::string color);
 
-        virtual Type
-        getType() const;
+        virtual Type getType() const;
 
         void talk();
         void nextDialog();
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
new file mode 100644
index 00000000..03096eff
--- /dev/null
+++ b/src/resources/emotedb.cpp
@@ -0,0 +1,148 @@
+/*
+ *  Aethyra
+ *  Copyright 2009 Aethyra Development Team
+ *
+ *  This file is part of Aethyra.
+ *
+ *  Aethyra is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  Aethyra is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Aethyra; if not, write to the Free Software Foundation, 
+ *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "emotedb.h"
+#include "resourcemanager.h"
+
+#include "../log.h"
+
+#include "../utils/dtor.h"
+#include "../utils/gettext.h"
+#include "../utils/xml.h"
+
+namespace
+{
+    EmoteInfos mEmoteInfos;
+    EmoteInfo mUnknown;
+    bool mLoaded = false;
+    int mLastEmote = 0;
+}
+
+void EmoteDB::load()
+{
+    if (mLoaded)
+        return;
+
+    mLastEmote = 0;
+
+    EmoteSprite *unknownSprite = new EmoteSprite;
+    unknownSprite->sprite = "error.xml";
+    unknownSprite->name = "unknown";
+    unknownSprite->variant = 0;
+    mUnknown.sprites.push_back(unknownSprite);
+
+    logger->log(_("Initializing emote database..."));
+
+    XML::Document doc("emotes.xml");
+    xmlNodePtr rootNode = doc.rootNode();
+
+    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "emotes"))
+    {
+        logger->log(_("Emote Database: Error while loading emotes.xml!"));
+        return;
+    }
+
+    //iterate <emote>s
+    for_each_xml_child_node(emoteNode, rootNode)
+    {
+        if (!xmlStrEqual(emoteNode->name, BAD_CAST "emote"))
+            continue;
+
+        int id = XML::getProperty(emoteNode, "id", -1);
+        if (id == -1)
+        {
+            logger->log(_("Emote Database: Emote with missing ID in emotes.xml!"));
+            continue;
+        }
+
+        EmoteInfo *currentInfo = new EmoteInfo;
+
+        for_each_xml_child_node(spriteNode, emoteNode)
+        {
+            if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite"))
+            {
+                EmoteSprite *currentSprite = new EmoteSprite;
+                currentSprite->sprite = (const char*) spriteNode->xmlChildrenNode->content;
+                currentSprite->variant = XML::getProperty(spriteNode, "variant", 0);
+                currentInfo->sprites.push_back(currentSprite);
+            }
+            else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx"))
+            {
+                std::string particlefx = (const char*) spriteNode->xmlChildrenNode->content;
+                currentInfo->particles.push_back(particlefx);
+            }
+        }
+        mEmoteInfos[id] = currentInfo;
+        if (id > mLastEmote) mLastEmote = id;
+    }
+
+    mLoaded = true;
+}
+
+void EmoteDB::unload()
+{
+    for (   EmoteInfosIterator i = mEmoteInfos.begin();
+            i != mEmoteInfos.end();
+            i++)
+    {
+        while (!i->second->sprites.empty())
+        {
+            delete i->second->sprites.front();
+            i->second->sprites.pop_front();
+        }
+        delete i->second;
+    }
+
+    mEmoteInfos.clear();
+
+    while (!mUnknown.sprites.empty())
+    {
+        delete mUnknown.sprites.front();
+        mUnknown.sprites.pop_front();
+    }
+
+    mLoaded = false;
+}
+
+const EmoteInfo& EmoteDB::get(int id)
+{
+    EmoteInfosIterator i = mEmoteInfos.find(id);
+
+    if (i == mEmoteInfos.end())
+    {
+        logger->log(_("EmoteDB: Warning, unknown emote ID %d requested"), id);
+        return mUnknown;
+    }
+    else
+    {
+        return *(i->second);
+    }
+}
+
+const EmoteInfo& EmoteDB::getUnknown()
+{
+    return mUnknown;
+}
+
+const int& EmoteDB::getLast()
+{
+    return mLastEmote;
+}
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
new file mode 100644
index 00000000..9e904cc1
--- /dev/null
+++ b/src/resources/emotedb.h
@@ -0,0 +1,62 @@
+/*
+ *  Aethyra
+ *  Copyright 2009 Aethyra Development Team
+ *
+ *  This file is part of Aethyra.
+ *
+ *  Aethyra is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  Aethyra is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Aethyra; if not, write to the Free Software Foundation, 
+ *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _AETHYRA_EMOTE_DB_H
+#define _AETHYRA_EMOTE_DB_H
+
+#include <list>
+#include <map>
+#include <string>
+
+struct EmoteSprite
+{
+    std::string sprite;
+    std::string name;
+    int variant;
+};
+
+struct EmoteInfo
+{
+    std::list<EmoteSprite*> sprites;
+    std::list<std::string> particles;
+};
+
+typedef std::map<int, EmoteInfo*> EmoteInfos;
+
+/**
+ * Emote information database.
+ */
+namespace EmoteDB
+{
+    void load();
+
+    void unload();
+
+    const EmoteInfo& get(int id);
+
+    const EmoteInfo& getUnknown();
+
+    const int& getLast();
+
+    typedef EmoteInfos::iterator EmoteInfosIterator;
+}
+
+#endif
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index bfa22214..0908d67d 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -55,7 +55,7 @@ void NPCDB::load()
         logger->error(_("NPC Database: Error while loading npcs.xml!"));
     }
 
-    //iterate <monster>s
+    //iterate <npc>s
     for_each_xml_child_node(npcNode, rootNode)
     {
         if (!xmlStrEqual(npcNode->name, BAD_CAST "npc"))
-- 
cgit v1.2.3-70-g09d2


From 600e10515e127d6393f0756cb72e5a63303557a2 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 15 Jan 2009 22:01:00 -0700
Subject: Integrated the ItemPopup class from Legends of Mazzeroth.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/CMakeLists.txt          |   2 +
 src/Makefile.am             |   2 +
 src/gui/inventorywindow.cpp |   1 +
 src/gui/itemcontainer.cpp   |  41 ++++++++++++++-
 src/gui/itemcontainer.h     |  16 ++++++
 src/gui/itempopup.cpp       | 119 ++++++++++++++++++++++++++++++++++++++++++++
 src/gui/itempopup.h         |  48 ++++++++++++++++++
 7 files changed, 228 insertions(+), 1 deletion(-)
 create mode 100644 src/gui/itempopup.cpp
 create mode 100644 src/gui/itempopup.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dbdd64b6..43e5cb95 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -101,6 +101,8 @@ SET(SRCS
     gui/inventorywindow.h
     gui/itemcontainer.cpp
     gui/itemcontainer.h
+    gui/itempopup.cpp
+    gui/itempopup.h
     gui/itemshortcutcontainer.cpp
     gui/itemshortcutcontainer.h
     gui/itemshortcutwindow.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 5c519832..9a3fa3b9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,6 +59,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/inventorywindow.h \
 	      gui/itemcontainer.cpp \
 	      gui/itemcontainer.h \
+	      gui/itempopup.cpp \
+	      gui/itempopup.h \
 	      gui/itemshortcutcontainer.cpp \
 	      gui/itemshortcutcontainer.h \
 	      gui/item_amount.cpp \
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 8c5edec4..f52745bf 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -28,6 +28,7 @@
 #include "inventorywindow.h"
 #include "item_amount.h"
 #include "itemcontainer.h"
+#include "itempopup.h"
 #include "scrollarea.h"
 #include "viewport.h"
 
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 26ca3379..2cc0bef3 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -48,6 +48,8 @@ ItemContainer::ItemContainer(Inventory *inventory, int offset):
     mLastSelectedItemId(NO_ITEM),
     mOffset(offset)
 {
+    mItemPopup = new ItemPopup();
+
     ResourceManager *resman = ResourceManager::getInstance();
 
     mSelImg = resman->getImage("graphics/gui/selection.png");
@@ -222,7 +224,7 @@ void ItemContainer::distributeValueChangedEvent()
 
 void ItemContainer::mousePressed(gcn::MouseEvent &event)
 {
-    int button = event.getButton();
+    const int button = event.getButton();
 
     if (button == gcn::MouseEvent::LEFT || button == gcn::MouseEvent::RIGHT)
     {
@@ -240,3 +242,40 @@ void ItemContainer::mousePressed(gcn::MouseEvent &event)
             itemShortcut->setItemSelected(item->getId());
     }
 }
+
+// Show ItemTooltip
+void ItemContainer::mouseMoved(gcn::MouseEvent &event)
+{
+    Item *item = mInventory->getItem( getSlotIndex(event.getX(), event.getY() ) );
+
+    if( item )
+    {
+        mItemPopup->setPosition(getParent()->getParent()->getX() + 
+                                getParent()->getParent()->getWidth(), 
+                                getParent()->getParent()->getY());
+
+        mItemPopup->setItem(item->getInfo());
+
+        mItemPopup->setVisible(true);
+    }
+    else
+    {
+        mItemPopup->setVisible(false);
+    }
+}
+
+// Hide ItemTooltip
+void ItemContainer::mouseExited(gcn::MouseEvent &event)
+{
+    mItemPopup->setVisible(false);
+}
+
+int ItemContainer::getSlotIndex(const int posX, const int posY) const
+{
+    int columns = getWidth() / gridWidth;
+    int index = posX / gridWidth + ((posY / gridHeight) * columns) + mOffset;
+
+    return (index);
+}
+
+
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index 8927b001..223a3677 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -28,6 +28,8 @@
 #include <guichan/widget.hpp>
 #include <guichan/widgetlistener.hpp>
 
+#include "itempopup.h"
+
 #include "../guichanfwd.h"
 
 class Image;
@@ -107,6 +109,9 @@ class ItemContainer : public gcn::Widget,
         }
 
     private:
+        void mouseExited(gcn::MouseEvent &event);
+        void mouseMoved(gcn::MouseEvent &event);
+
         /**
 
          * Sets the currently selected item.  Invalid (e.g., negative) indices set `no item'.
@@ -128,6 +133,15 @@ class ItemContainer : public gcn::Widget,
          */
         void distributeValueChangedEvent(void);
 
+        /**
+         * Gets the slot index based on the cursor position.
+         *
+         * @param posX The X Coordinate position.
+         * @param posY The Y Coordinate position.
+         * @return The slot index on success, -1 on failure.
+         */
+        int getSlotIndex(const int posX, const int posY) const;
+
         Inventory *mInventory;
         Image *mSelImg;
         int mSelectedItemIndex;
@@ -136,6 +150,8 @@ class ItemContainer : public gcn::Widget,
         int mMaxItems;
         int mOffset;
 
+        ItemPopup *mItemPopup;
+
         std::list<gcn::SelectionListener*> mListeners;
 
         static const int gridWidth;
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
new file mode 100644
index 00000000..1402a148
--- /dev/null
+++ b/src/gui/itempopup.cpp
@@ -0,0 +1,119 @@
+/*
+ *  The Mana World
+ *  Copyright (C) 2008  The Legend of Mazzeroth Development Team
+ *  Copyright (C) 2008  The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "itempopup.h"
+#include <guichan/widgets/label.hpp>
+#include "widgets/layout.h"
+
+#include "gui.h"
+
+#include "../resources/image.h"
+#include "../resources/resourcemanager.h"
+#include "../resources/iteminfo.h"
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
+
+
+ItemPopup::ItemPopup()
+{
+    setResizable(false);
+    setCaption("");
+    setTitleBarHeight(0);
+    loadSkin("graphics/gui/gui.xml");
+
+    // Item Name
+    mItemName = new gcn::Label("Label");
+    mItemName->setFont(gui->getFont());
+    mItemName->setPosition(2, 2);
+    mItemName->setWidth(getWidth() - 4);
+
+    // Item Description
+    mItemDesc = new TextBox();
+    mItemDesc->setEditable(false);
+    mItemDesc->setMinWidth(170);
+    mItemDescScroll = new ScrollArea(mItemDesc);
+
+    mItemDescScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mItemDescScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mItemDescScroll->setDimension(gcn::Rectangle(0, 0, 196, 14));
+    mItemDescScroll->setOpaque(false);
+    mItemDescScroll->setPosition(2, 15);
+
+    // Item Effect
+    mItemEffect = new TextBox();
+    mItemEffect->setEditable(false);
+    mItemEffect->setMinWidth(170);
+    mItemEffectScroll = new ScrollArea(mItemEffect);
+
+    mItemEffectScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mItemEffectScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mItemEffectScroll->setDimension(gcn::Rectangle(0, 0, 196, 14));
+    mItemEffectScroll->setOpaque(false);
+    mItemEffectScroll->setPosition(2, 35);
+
+    add(mItemName);
+    add(mItemDescScroll);
+    add(mItemEffectScroll);
+
+    setLocationRelativeTo(getParent());
+
+    // LEEOR / TODO: This causes an exception error.
+    //moveToBottom(getParent());
+
+    mItemDesc->setTextWrapped( "" );
+    mItemEffect->setTextWrapped( "" );
+}
+
+void ItemPopup::setItem(const ItemInfo &item)
+{
+    const gcn::Rectangle &area = getChildrenArea();
+    const int width = area.width;
+
+    mItemDesc->setMinWidth(width - 30);
+    mItemEffect->setMinWidth(width - 30);
+
+    mItemName->setCaption(item.getName());
+    mItemDesc->setTextWrapped(item.getDescription());
+    mItemEffect->setTextWrapped(item.getEffect());
+
+    int numRowsDesc = mItemDesc->getNumberOfRows();
+    int numRowsEffect = mItemEffect->getNumberOfRows();
+
+    if(item.getEffect() == "")
+    {
+        setContentSize(200, (numRowsDesc * 14) + 30);
+    } else {
+        setContentSize(200, (numRowsDesc * 14) + (numRowsEffect * 14) + 30);
+    }
+
+    mItemDescScroll->setDimension(gcn::Rectangle(2, 0, 196, numRowsDesc * 14));
+
+    mItemEffectScroll->setDimension(gcn::Rectangle(2, 0, 196, numRowsEffect * 14));
+
+    mItemDescScroll->setPosition(2, 20);
+    mItemEffectScroll->setPosition(2, (numRowsDesc * 15) + 25);
+}
+
+unsigned int ItemPopup::getNumRows()
+{
+    return mItemDesc->getNumberOfRows(), mItemEffect->getNumberOfRows();
+}
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
new file mode 100644
index 00000000..8da0b32a
--- /dev/null
+++ b/src/gui/itempopup.h
@@ -0,0 +1,48 @@
+/*
+ *  The Mana World
+ *  Copyright (C) 2008  The Legend of Mazzeroth Development Team
+ *  Copyright (C) 2008  The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _TMW_ITEMPOPUP_H__
+#define _TMW_ITEMPOPUP_H__
+
+#include "textbox.h"
+#include "scrollarea.h"
+#include "window.h"
+
+#include "../item.h"
+
+class ItemPopup : public Window
+{
+    public:
+        ItemPopup();
+
+        void setItem(const ItemInfo &item);
+        unsigned int getNumRows();
+
+    private:
+        gcn::Label *mItemName;
+        TextBox *mItemDesc;
+        TextBox *mItemEffect;
+        ScrollArea *mItemDescScroll;
+        ScrollArea *mItemEffectScroll;
+};
+
+#endif // _TMW_ITEMPOPUP_H__
-- 
cgit v1.2.3-70-g09d2


From ecc18d3a2ed44d4b4e6ccfe879771686b2616bb4 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 15 Jan 2009 22:58:07 -0700
Subject: A little bit of code cleanup/simplification.

TODO: Figure out how the itempopup transparency is broken and fix it
(broken on code import). Best guess would be that the window is attached
to a widget which is then attached to a window, causing a break in
updates to the transparency code.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/inventorywindow.cpp |  1 -
 src/gui/itemcontainer.h     |  4 ++--
 src/gui/itempopup.cpp       | 17 ++++++++---------
 src/gui/itempopup.h         |  2 +-
 src/gui/scrollarea.cpp      | 18 ++++++++++++------
 5 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index f52745bf..8c5edec4 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -28,7 +28,6 @@
 #include "inventorywindow.h"
 #include "item_amount.h"
 #include "itemcontainer.h"
-#include "itempopup.h"
 #include "scrollarea.h"
 #include "viewport.h"
 
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index 223a3677..7f0e5386 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -108,6 +108,8 @@ class ItemContainer : public gcn::Widget,
             mListeners.remove(listener);
         }
 
+        ItemPopup *mItemPopup;
+
     private:
         void mouseExited(gcn::MouseEvent &event);
         void mouseMoved(gcn::MouseEvent &event);
@@ -150,8 +152,6 @@ class ItemContainer : public gcn::Widget,
         int mMaxItems;
         int mOffset;
 
-        ItemPopup *mItemPopup;
-
         std::list<gcn::SelectionListener*> mListeners;
 
         static const int gridWidth;
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index 1402a148..a0df3eed 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -20,23 +20,24 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "itempopup.h"
 #include <guichan/widgets/label.hpp>
-#include "widgets/layout.h"
 
 #include "gui.h"
+#include "itempopup.h"
+
+#include "widgets/layout.h"
 
 #include "../resources/image.h"
-#include "../resources/resourcemanager.h"
 #include "../resources/iteminfo.h"
+#include "../resources/resourcemanager.h"
+
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
 
-
 ItemPopup::ItemPopup()
 {
     setResizable(false);
-    setCaption("");
+    setShowTitle(false);
     setTitleBarHeight(0);
     loadSkin("graphics/gui/gui.xml");
 
@@ -49,7 +50,6 @@ ItemPopup::ItemPopup()
     // Item Description
     mItemDesc = new TextBox();
     mItemDesc->setEditable(false);
-    mItemDesc->setMinWidth(170);
     mItemDescScroll = new ScrollArea(mItemDesc);
 
     mItemDescScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
@@ -61,7 +61,6 @@ ItemPopup::ItemPopup()
     // Item Effect
     mItemEffect = new TextBox();
     mItemEffect->setEditable(false);
-    mItemEffect->setMinWidth(170);
     mItemEffectScroll = new ScrollArea(mItemEffect);
 
     mItemEffectScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
@@ -88,8 +87,8 @@ void ItemPopup::setItem(const ItemInfo &item)
     const gcn::Rectangle &area = getChildrenArea();
     const int width = area.width;
 
-    mItemDesc->setMinWidth(width - 30);
-    mItemEffect->setMinWidth(width - 30);
+    mItemDesc->setMinWidth(width - 10);
+    mItemEffect->setMinWidth(width - 10);
 
     mItemName->setCaption(item.getName());
     mItemDesc->setTextWrapped(item.getDescription());
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index 8da0b32a..5b7a911a 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -23,8 +23,8 @@
 #ifndef _TMW_ITEMPOPUP_H__
 #define _TMW_ITEMPOPUP_H__
 
-#include "textbox.h"
 #include "scrollarea.h"
+#include "textbox.h"
 #include "window.h"
 
 #include "../item.h"
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index ba119a61..07b4027b 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -108,8 +108,10 @@ void ScrollArea::init()
         int vsgridy[4] = {0, 4, 15, 19};
         a = 0;
 
-        for (y = 0; y < 3; y++) {
-            for (x = 0; x < 3; x++) {
+        for (y = 0; y < 3; y++) 
+        {
+            for (x = 0; x < 3; x++) 
+            {
                 vMarker.grid[a] = vscroll->getSubImage(
                         vsgridx[x], vsgridy[y],
                         vsgridx[x + 1] - vsgridx[x],
@@ -200,7 +202,8 @@ void ScrollArea::drawFrame(gcn::Graphics *graphics)
     int w = getWidth() + bs * 2;
     int h = getHeight() + bs * 2;
 
-    if (mOpaque) {
+    if (mOpaque) 
+    {
         static_cast<Graphics*>(graphics)->
             drawImageRect(0, 0, w, h, background);
     }
@@ -210,10 +213,12 @@ void ScrollArea::setOpaque(bool opaque)
 {
     mOpaque = opaque;
 
-    if (mOpaque) {
+    if (mOpaque) 
+    {
         setFrameSize(2);
     }
-    else {
+    else 
+    {
         setFrameSize(0);
     }
 }
@@ -223,7 +228,8 @@ void ScrollArea::drawButton(gcn::Graphics *graphics, BUTTON_DIR dir)
     int state = 0;
     gcn::Rectangle dim;
 
-    switch(dir) {
+    switch(dir) 
+    {
         case UP:
             state = mUpButtonPressed ? 1 : 0;
             dim = getUpButtonDimension();
-- 
cgit v1.2.3-70-g09d2


From 29a65dd896255e6e173201dcc0d50bfc273afb61 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 15 Jan 2009 23:23:12 -0700
Subject: Fixed Item Popup window transparency (double setting of the skin)

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/inventorywindow.cpp | 2 +-
 src/gui/itemcontainer.cpp   | 2 +-
 src/gui/itemcontainer.h     | 4 ++--
 src/gui/itempopup.cpp       | 4 ++--
 src/gui/window.cpp          | 9 ++++++---
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 8c5edec4..4f7c4ae7 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -44,7 +44,7 @@
 InventoryWindow::InventoryWindow():
     Window(_("Inventory"))
 {
-    setWindowName("Inventory");
+    setWindowName(_("Inventory"));
     setResizable(true);
     setCloseButton(true);
     setMinWidth(240);
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 2cc0bef3..7d9b3f70 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -255,7 +255,7 @@ void ItemContainer::mouseMoved(gcn::MouseEvent &event)
                                 getParent()->getParent()->getY());
 
         mItemPopup->setItem(item->getInfo());
-
+        mItemPopup->setOpaque(false);
         mItemPopup->setVisible(true);
     }
     else
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index 7f0e5386..223a3677 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -108,8 +108,6 @@ class ItemContainer : public gcn::Widget,
             mListeners.remove(listener);
         }
 
-        ItemPopup *mItemPopup;
-
     private:
         void mouseExited(gcn::MouseEvent &event);
         void mouseMoved(gcn::MouseEvent &event);
@@ -152,6 +150,8 @@ class ItemContainer : public gcn::Widget,
         int mMaxItems;
         int mOffset;
 
+        ItemPopup *mItemPopup;
+
         std::list<gcn::SelectionListener*> mListeners;
 
         static const int gridWidth;
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index a0df3eed..5f7dc736 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -34,12 +34,12 @@
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
 
-ItemPopup::ItemPopup()
+ItemPopup::ItemPopup():
+    Window()
 {
     setResizable(false);
     setShowTitle(false);
     setTitleBarHeight(0);
-    loadSkin("graphics/gui/gui.xml");
 
     // Item Name
     mItemName = new gcn::Label("Label");
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index e82a370e..f6f5f4b8 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -82,7 +82,8 @@ Window::Window(const std::string& caption, bool modal, Window *parent, const std
 {
     logger->log("Window::Window(\"%s\")", caption.c_str());
 
-    if (!windowContainer) {
+    if (!windowContainer) 
+    {
         throw GCN_EXCEPTION("Window::Window(): no windowContainer set");
     }
 
@@ -126,12 +127,14 @@ Window::~Window()
     const std::string &name = mWindowName;
 
     // Saving X, Y and Width and Height for resizables in the config
-    if (!name.empty()) {
+    if (!name.empty())
+    {
         config.setValue(name + "WinX", getX());
         config.setValue(name + "WinY", getY());
         config.setValue(name + "Visible", isVisible());
 
-        if (mGrip) {
+        if (mGrip) 
+        {
             config.setValue(name + "WinWidth", getWidth());
             config.setValue(name + "WinHeight", getHeight());
         }
-- 
cgit v1.2.3-70-g09d2


From 50335c6b1470c45753d720cebdf4af830ba7a46c Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 16 Jan 2009 08:36:33 -0700
Subject: Made emotes load in only one location, as well as fixing the code on
 the being so that the last emote draws (which got broken).

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/being.cpp                      | 11 ++++-------
 src/being.h                        |  2 ++
 src/gui/emotecontainer.cpp         | 10 ++--------
 src/gui/emoteshortcutcontainer.cpp |  9 +--------
 4 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index 883344d8..98aaeec2 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -93,12 +93,9 @@ Being::Being(int id, int job, Map *map):
         {
             EmoteInfo info = EmoteDB::get(i);
 
-            if (info.sprites != EmoteDB::getUnknown().sprites)
-            {
-                std::string file = "graphics/sprites/" + info.sprites.front()->sprite;
-                int variant = info.sprites.front()->variant;
-                emotionSet.push_back(AnimatedSprite::load(file, variant));
-            }
+            std::string file = "graphics/sprites/" + info.sprites.front()->sprite;
+            int variant = info.sprites.front()->variant;
+            emotionSet.push_back(AnimatedSprite::load(file, variant));
         }
 
         // Hairstyles are encoded as negative numbers.  Count how far negative we can go.
@@ -456,7 +453,7 @@ void Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
     const int py = mPy + offsetY - 60;
     const int emotionIndex = mEmotion - 1;
 
-    if (emotionIndex >= 0 && emotionIndex < EmoteDB::getLast())
+    if (emotionIndex >= 0 && emotionIndex <= EmoteDB::getLast())
         emotionSet[emotionIndex]->draw(graphics, px, py);
 }
 
diff --git a/src/being.h b/src/being.h
index 4534b1ea..6dbcdfdd 100644
--- a/src/being.h
+++ b/src/being.h
@@ -351,6 +351,8 @@ class Being : public Sprite
          */
         void controlParticle(Particle *particle);
 
+        AnimatedSprite* getEmote(int index) { return emotionSet[index]; }
+
         void setEmote(Uint8 emotion, Uint8 emote_time)
         {
             mEmotion = emotion;
diff --git a/src/gui/emotecontainer.cpp b/src/gui/emotecontainer.cpp
index 691211ca..cba744dd 100644
--- a/src/gui/emotecontainer.cpp
+++ b/src/gui/emotecontainer.cpp
@@ -28,6 +28,7 @@
 #include "../animatedsprite.h"
 #include "../configuration.h"
 #include "../graphics.h"
+#include "../localplayer.h"
 #include "../log.h"
 
 #include "../resources/emotedb.h"
@@ -52,14 +53,7 @@ EmoteContainer::EmoteContainer():
     // Setup emote sprites
     for (int i = 0; i <= EmoteDB::getLast(); i++)
     {
-        EmoteInfo info = EmoteDB::get(i);
-
-        if (info.sprites != EmoteDB::getUnknown().sprites)
-        { 
-            std::string file = "graphics/sprites/" + info.sprites.front()->sprite;
-            int variant = info.sprites.front()->variant;
-            mEmoteImg.push_back(AnimatedSprite::load(file, variant));
-        }
+        mEmoteImg.push_back(player_node->getEmote(i));
     }
 
     mSelImg = resman->getImage("graphics/gui/selection.png");
diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
index edaa8602..a7347bb0 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -57,14 +57,7 @@ EmoteShortcutContainer::EmoteShortcutContainer():
     // Setup emote sprites
     for (int i = 0; i <= EmoteDB::getLast(); i++)
     {
-        EmoteInfo info = EmoteDB::get(i);
-
-        if (info.sprites != EmoteDB::getUnknown().sprites)
-        { 
-            std::string file = "graphics/sprites/" + info.sprites.front()->sprite;
-            int variant = info.sprites.front()->variant;
-            mEmoteImg.push_back(AnimatedSprite::load(file, variant));
-        }
+        mEmoteImg.push_back(player_node->getEmote(i));
     }
 
     mMaxItems = MAX_ITEMS;
-- 
cgit v1.2.3-70-g09d2


From 9639b93433510e6fb33b39644413fd28d4762b36 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 16 Jan 2009 08:52:38 -0700
Subject: Trimmed out some now unneeded fields in the inventory window.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/inventorywindow.cpp | 59 ++-------------------------------------------
 src/gui/inventorywindow.h   |  6 -----
 2 files changed, 2 insertions(+), 63 deletions(-)

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 4f7c4ae7..5ac966e3 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -63,28 +63,18 @@ InventoryWindow::InventoryWindow():
     mTotalWeight = toString(player_node->mTotalWeight);
     mMaxWeight = toString(player_node->mMaxWeight);
 
-    mItemName = _("Name:");
-    mItemNameLabel = new TextBox();
-    mItemDescription = _("Description:");
-    mItemDescriptionLabel = new TextBox();
-    mItemEffect = _("Effect:");
-    mItemEffectLabel = new TextBox();
     mWeight = _("Weight: ") + mTotalWeight + " g / " +
               mMaxWeight + _(" g Slots: ") + 
               toString(player_node->getInventory()->getNumberOfSlotsUsed()) + 
               "/" + toString(player_node->getInventory()->getInventorySize());
     mWeightLabel = new TextBox();
     mWeightLabel->setPosition(8, 8);
-    mItemEffectLabel = new TextBox();
 
     draw();
 
     add(mUseButton);
     add(mDropButton);
     add(mInvenScroll);
-    add(mItemNameLabel);
-    add(mItemDescriptionLabel);
-    add(mItemEffectLabel);
     add(mWeightLabel);
 
     mUseButton->setSize(60, mUseButton->getHeight());
@@ -150,29 +140,6 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
 
 void InventoryWindow::valueChanged(const gcn::SelectionEvent &event)
 {
-    const Item *item = mItems->getSelectedItem();
-
-    // Update name, effect and description
-    if (!item)
-    {
-        mItemName = _("Name:");
-        mItemNameLabel->setTextWrapped(mItemName);
-        mItemEffect = _("Effect:");
-        mItemEffectLabel->setTextWrapped(mItemEffect);
-        mItemDescription = _("Description:");
-        mItemDescriptionLabel->setTextWrapped(mItemDescription);
-    }
-    else
-    {
-        const ItemInfo& itemInfo = item->getInfo();
-        mItemName = _("Name: ") + itemInfo.getName();
-        mItemNameLabel->setTextWrapped(mItemName);
-        mItemEffect = _("Effect: ") + itemInfo.getEffect();
-        mItemEffectLabel->setTextWrapped(mItemEffect);
-        mItemDescription = _("Description: ") + itemInfo.getDescription();
-        mItemDescriptionLabel->setTextWrapped(mItemDescription);
-    }
-
     draw();
 }
 
@@ -210,33 +177,11 @@ void InventoryWindow::draw()
     mDropButton->setPosition(8 + mUseButton->getWidth() + 5,
             mUseButton->getY());
 
-    mItemNameLabel->setMinWidth(width - 16);
-    mItemNameLabel->setTextWrapped(mItemName);
-    mItemNameLabel->setDimension(gcn::Rectangle(8,
-            mUseButton->getY() - 5 - (mItemNameLabel->getNumberOfRows()*15),
-            width - 16,
-            (mItemNameLabel->getNumberOfRows()*15)));
-    mItemEffectLabel->setMinWidth(width - 16);
-    mItemEffectLabel->setTextWrapped(mItemEffect);
-    mItemEffectLabel->setDimension(gcn::Rectangle(8,
-            mItemNameLabel->getY() - 5 - (mItemEffectLabel->getNumberOfRows()*15),
-            width - 16,
-            (mItemEffectLabel->getNumberOfRows()*15)));
-    mItemDescriptionLabel->setMinWidth(width - 16);
-    mItemDescriptionLabel->setTextWrapped(mItemDescription);
-    mItemDescriptionLabel->setDimension(gcn::Rectangle(8,
-            mItemEffectLabel->getY() - 5 - (mItemDescriptionLabel->getNumberOfRows()*15),
-            width - 16,
-            (mItemDescriptionLabel->getNumberOfRows()*15)));
-
     mInvenScroll->setSize(width - 16,
-            mItemDescriptionLabel->getY() - (mWeightLabel->getNumberOfRows()*15) - 18);
+            mUseButton->getY() - (mWeightLabel->getNumberOfRows()*15) - 18);
     mInvenScroll->setPosition(8, (mWeightLabel->getNumberOfRows()*15) + 10);
 
-    setMinHeight(130 + (mWeightLabel->getNumberOfRows()*15) + 
-                       (mItemDescriptionLabel->getNumberOfRows()*15) +
-                       (mItemEffectLabel->getNumberOfRows()*15) +
-                       (mItemNameLabel->getNumberOfRows()*15));
+    setMinHeight(130 + (mWeightLabel->getNumberOfRows()*15));
 }
 
 void InventoryWindow::widgetResized(const gcn::Event &event)
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index c308ac25..989a5c1d 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -84,17 +84,11 @@ class InventoryWindow : public Window, gcn::ActionListener,
 
         ItemContainer *mItems;
 
-        std::string mItemName;
-        std::string mItemDescription;
-        std::string mItemEffect;
         std::string mWeight;
         std::string mTotalWeight;
         std::string mMaxWeight;
         gcn::Button *mUseButton, *mDropButton;
         gcn::ScrollArea *mInvenScroll;
-        TextBox *mItemNameLabel;
-        TextBox *mItemDescriptionLabel;
-        TextBox *mItemEffectLabel;
         TextBox *mWeightLabel;
 };
 
-- 
cgit v1.2.3-70-g09d2


From d78fb807d9b3a985d7c9b79ae29e6642dc831a5f Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 16 Jan 2009 09:22:35 -0700
Subject: Fixed a potential crash when the emotes aren't loaded, or there are
 less than 12 emotes.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/emoteshortcutcontainer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
index a7347bb0..f7917f85 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -60,7 +60,7 @@ EmoteShortcutContainer::EmoteShortcutContainer():
         mEmoteImg.push_back(player_node->getEmote(i));
     }
 
-    mMaxItems = MAX_ITEMS;
+    mMaxItems = EmoteDB::getLast() < MAX_ITEMS ? EmoteDB::getLast() : MAX_ITEMS;
 
     mBoxHeight = mBackgroundImg->getHeight();
     mBoxWidth = mBackgroundImg->getWidth();
-- 
cgit v1.2.3-70-g09d2


From 3109508feb630fa7e62fbdb47ede3e7e4d9c5cf5 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 16 Jan 2009 11:55:39 -0700
Subject: Revised trade window to use the window layout code. Loosely based on
 the trade window in TMW's mainline client.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/trade.cpp | 161 +++++++++++++++++++++++-------------------------------
 src/gui/trade.h   |   2 -
 2 files changed, 67 insertions(+), 96 deletions(-)

diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index f6e1c5ea..4ae81e44 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -32,6 +32,8 @@
 #include "textfield.h"
 #include "trade.h"
 
+#include "widgets/layout.h"
+
 #include "../inventory.h"
 #include "../item.h"
 #include "../localplayer.h"
@@ -46,12 +48,12 @@
 #include "../utils/tostring.h"
 
 TradeWindow::TradeWindow(Network *network):
-    Window("Trade: You"),
+    Window(_("Trade: You")),
     mNetwork(network),
     mMyInventory(new Inventory(INVENTORY_SIZE)),
     mPartnerInventory(new Inventory(INVENTORY_SIZE))
 {
-    setWindowName("Trade");
+    setWindowName(_("Trade"));
     setDefaultSize(115, 227, 342, 209);
     setResizable(true);
 
@@ -63,47 +65,43 @@ TradeWindow::TradeWindow(Network *network):
     mCancelButton = new Button(_("Cancel"), "cancel", this);
     mTradeButton = new Button(_("Trade"), "trade", this);
 
+    mTradeButton->setEnabled(false);
+
     mMyItemContainer = new ItemContainer(mMyInventory.get(), 2);
+    mMyItemContainer->setWidth(160);
     mMyItemContainer->addSelectionListener(this);
-    mMyItemContainer->setPosition(2, 2);
 
     mMyScroll = new ScrollArea(mMyItemContainer);
-    mMyScroll->setPosition(8, 8);
 
     mPartnerItemContainer = new ItemContainer(mPartnerInventory.get(), 2);
+    mPartnerItemContainer->setWidth(160);
     mPartnerItemContainer->addSelectionListener(this);
-    mPartnerItemContainer->setPosition(2, 58);
 
     mPartnerScroll = new ScrollArea(mPartnerItemContainer);
-    mPartnerScroll->setPosition(8, 64);
 
     mMoneyLabel = new gcn::Label(strprintf(_("You get %d GP."), 0));
     mMoneyLabel2 = new gcn::Label(_("You give:"));
     mMoneyField = new TextField;
     mMoneyField->setWidth(50);
 
-    mAddButton->adjustSize();
-    mOkButton->adjustSize();
-    mCancelButton->adjustSize();
-    mTradeButton->adjustSize();
-
-    mTradeButton->setEnabled(false);
-
-    mItemNameLabel = new gcn::Label(strprintf(_("Name: %s"), ""));
-    mItemDescriptionLabel = new gcn::Label(
-        strprintf(_("Description: %s"), ""));
-
-    add(mMyScroll);
-    add(mPartnerScroll);
-    add(mAddButton);
-    add(mOkButton);
-    add(mCancelButton);
-    add(mTradeButton);
-    add(mItemNameLabel);
-    add(mItemDescriptionLabel);
-    add(mMoneyLabel2);
-    add(mMoneyField);
-    add(mMoneyLabel);
+    place(1, 0, mMoneyLabel);
+    place(0, 1, mMyScroll).setPadding(3);
+    place(1, 1, mPartnerScroll).setPadding(3);
+    ContainerPlacer place;
+    place = getPlacer(0, 0);
+    place(0, 0, mMoneyLabel2);
+    place(1, 0, mMoneyField);
+    place = getPlacer(0, 2);
+    place(0, 0, mAddButton);
+    place(1, 0, mOkButton);
+    place(2, 0, mTradeButton);
+    place(3, 0, mCancelButton);
+    Layout &layout = getLayout();
+    layout.extend(0, 2, 2, 1);
+    layout.setRowHeight(1, Layout::AUTO_SET);
+    layout.setRowHeight(2, 0);
+    layout.setColWidth(0, Layout::AUTO_SET);
+    layout.setColWidth(1, Layout::AUTO_SET);
 
     loadWindowState();
 }
@@ -114,43 +112,13 @@ TradeWindow::~TradeWindow()
 
 void TradeWindow::widgetResized(const gcn::Event &event)
 {
-    Window::widgetResized(event);
+    mMyItemContainer->setWidth(mMyScroll->getWidth());
+    mPartnerItemContainer->setWidth(mPartnerScroll->getWidth());
 
-    const gcn::Rectangle &area = getChildrenArea();
-    const int width = area.width;
-    const int height = area.height;
-
-    mMoneyLabel2->setPosition(8, height - 8 - mMoneyLabel2->getHeight());
-    mMoneyField->setPosition(
-        8 + mMoneyLabel2->getWidth(),
-        height - 8 - mMoneyField->getHeight());
-    mMoneyLabel->setPosition(
-        mMoneyField->getX() + mMoneyField->getWidth() + 6,
-        mMoneyLabel2->getY());
-
-    mCancelButton->setPosition(width - 54, height - 8 - mCancelButton->getHeight());
-    mTradeButton->setPosition(mCancelButton->getX() - 41, mCancelButton->getY());
-    mOkButton->setPosition(mTradeButton->getX() - 24, mCancelButton->getY());
-    mAddButton->setPosition(mOkButton->getX() - 31, mCancelButton->getY());
-
-    mItemDescriptionLabel->setPosition(8,
-        mOkButton->getY() - mItemDescriptionLabel->getHeight() - 4);
-    mItemNameLabel->setPosition(8,
-        mItemDescriptionLabel->getY() - mItemNameLabel->getHeight() - 4);
-
-    const int remaining = mItemNameLabel->getY() - 4 - 8 - 8;
-    const int itemContainerHeight = remaining / 2;
-
-    mMyItemContainer->setSize(width - 24 - 12 - 1,
-        (INVENTORY_SIZE * 24) / (width / 24) - 1);
-    mMyScroll->setSize(width - 16, itemContainerHeight);
-
-    mPartnerItemContainer->setSize(width - 24 - 12 - 1,
-        (INVENTORY_SIZE * 24) / (width / 24) - 1);
-    mPartnerScroll->setSize(width - 16, itemContainerHeight);
-    mPartnerScroll->setPosition(8, 8 + itemContainerHeight + 8);
+    Window::widgetResized(event);
 }
 
+
 void TradeWindow::addMoney(int amount)
 {
     mMoneyLabel->setCaption(strprintf(_("You get %d GP."), amount));
@@ -159,38 +127,40 @@ void TradeWindow::addMoney(int amount)
 
 void TradeWindow::addItem(int id, bool own, int quantity, bool equipment)
 {
-    if (own) {
+    if (own) 
+    {
+        mMyItemContainer->setWidth(mMyScroll->getWidth());
         mMyInventory->addItem(id, quantity, equipment);
-    } else {
+    }
+    else
+    {
+        mPartnerItemContainer->setWidth(mPartnerScroll->getWidth());
         mPartnerInventory->addItem(id, quantity, equipment);
     }
 }
 
 void TradeWindow::removeItem(int id, bool own)
 {
-    if (own) {
+    if (own) 
         mMyInventory->removeItem(id);
-    } else {
+    else
         mPartnerInventory->removeItem(id);
-    }
 }
 
 void TradeWindow::changeQuantity(int index, bool own, int quantity)
 {
-    if (own) {
+    if (own)
         mMyInventory->getItem(index)->setQuantity(quantity);
-    } else {
+    else
         mPartnerInventory->getItem(index)->setQuantity(quantity);
-    }
 }
 
 void TradeWindow::increaseQuantity(int index, bool own, int quantity)
 {
-    if (own) {
+    if (own)
         mMyInventory->getItem(index)->increaseQuantity(quantity);
-    } else {
+    else
         mPartnerInventory->getItem(index)->increaseQuantity(quantity);
-    }
 }
 
 void TradeWindow::reset()
@@ -213,21 +183,30 @@ void TradeWindow::setTradeButton(bool enabled)
 
 void TradeWindow::receivedOk(bool own)
 {
-    if (own) {
+    if (own)
+    {
         mOkMe = true;
-        if (mOkOther) {
+        if (mOkOther)
+        {
             mTradeButton->setEnabled(true);
             mOkButton->setEnabled(false);
-        } else {
+        }
+        else
+        {
             mTradeButton->setEnabled(false);
             mOkButton->setEnabled(false);
         }
-    } else {
+    }
+    else
+    {
         mOkOther = true;
-        if (mOkMe) {
+        if (mOkMe)
+        {
             mTradeButton->setEnabled(true);
             mOkButton->setEnabled(false);
-        } else {
+        }
+        else
+        {
             mTradeButton->setEnabled(false);
             mOkButton->setEnabled(true);
         }
@@ -251,20 +230,9 @@ void TradeWindow::valueChanged(const gcn::SelectionEvent &event)
      */
     if (event.getSource() == mMyItemContainer &&
             (item = mMyItemContainer->getSelectedItem()))
-    {
         mPartnerItemContainer->selectNone();
-    }
     else if ((item = mPartnerItemContainer->getSelectedItem()))
-    {
         mMyItemContainer->selectNone();
-    }
-
-    // Update name and description
-    ItemInfo const *info = item ? &item->getInfo() : NULL;
-    mItemNameLabel->setCaption(strprintf(_("Name: %s"),
-        info ? info->getName().c_str() : ""));
-    mItemDescriptionLabel->setCaption(strprintf(_("Description: %s"),
-        info ? info->getDescription().c_str() : ""));
 }
 
 void TradeWindow::action(const gcn::ActionEvent &event)
@@ -279,16 +247,19 @@ void TradeWindow::action(const gcn::ActionEvent &event)
         if (mMyInventory->getFreeSlot() < 1)
             return;
 
-        if (mMyInventory->contains(item)) {
+        if (mMyInventory->contains(item))
+        {
             chatWindow->chatLog(_("Failed adding item. You can not "
                         "overlap one kind of item on the window."), BY_SERVER);
             return;
         }
 
-        if (item->getQuantity() == 1) {
+        if (item->getQuantity() == 1)
+        {
             tradeItem(item, 1);
         }
-        else {
+        else
+        {
             // Choose amount of items to trade
             new ItemAmountWindow(AMOUNT_TRADE_ADD, this, item);
         }
@@ -310,7 +281,9 @@ void TradeWindow::action(const gcn::ActionEvent &event)
             outMsg.writeInt16(CMSG_TRADE_ITEM_ADD_REQUEST);
             outMsg.writeInt16(0);
             outMsg.writeInt32(tempInt);
-        } else {
+        }
+        else
+        {
             mMoneyField->setText("");
         }
         mMoneyField->setEnabled(false);
diff --git a/src/gui/trade.h b/src/gui/trade.h
index fafe138a..ec7a2a39 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -128,8 +128,6 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
         ItemContainer *mMyItemContainer;
         ItemContainer *mPartnerItemContainer;
 
-        gcn::Label *mItemNameLabel;
-        gcn::Label *mItemDescriptionLabel;
         gcn::Label *mMoneyLabel;
         gcn::Label *mMoneyLabel2;
         gcn::Button *mAddButton, *mOkButton, *mCancelButton, *mTradeButton;
-- 
cgit v1.2.3-70-g09d2


From bc5b68fffde0f06095bdbc2dfe3fc70ce6b8c43e Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 16 Jan 2009 13:01:23 -0700
Subject: Adjusted character selection screen to be a bit more translation
 friendly, as well as modified the character creation screen to use the layout
 code.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/char_select.cpp | 84 ++++++++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 46 deletions(-)

diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 750c6d6f..c15f3359 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -82,6 +82,7 @@ CharSelectDialog::CharSelectDialog(Network *network,
 {
     // Control that shows the Player
     mPlayerBox = new PlayerBox;
+    mPlayerBox->setWidth(74);
 
     mNameLabel = new gcn::Label(strprintf(_("Name: %s"), ""));
     mLevelLabel = new gcn::Label(strprintf(_("Level: %d"), 0));
@@ -98,19 +99,21 @@ CharSelectDialog::CharSelectDialog(Network *network,
     ContainerPlacer place;
     place = getPlacer(0, 0);
 
-    place(0, 0, mPlayerBox, 6, 3);
-    place(0, 3, mNameLabel, 2);
-    place(0, 4, mLevelLabel, 2);
-    place(0, 5, mJobLevelLabel, 2);
-    place(0, 6, mMoneyLabel, 2);
-    place(0, 7, mPreviousButton);
-    place(1, 7, mNextButton);
-    place(0, 8, mNewCharButton);
-    place(1, 8, mDelCharButton);
-    place(3, 8, mSelectButton);
-    place(4, 8, mCancelButton);
-
-    reflowLayout(195, 220);
+    place(0, 0, mPlayerBox, 1, 6).setPadding(3);
+    place(1, 0, mNewCharButton);
+    place(2, 0, mDelCharButton);
+    place(1, 1, mNameLabel, 5);
+    place(1, 2, mLevelLabel, 5);
+    place(1, 3, mJobLevelLabel, 5);
+    place(1, 4, mMoneyLabel, 5);
+    place.getCell().matchColWidth(1, 4);
+    place = getPlacer(0, 2);
+    place(0, 0, mPreviousButton);
+    place(1, 0, mNextButton);
+    place(4, 0, mSelectButton);
+    place(5, 0, mCancelButton);
+
+    reflowLayout(250, 0);
 
     setLocationRelativeTo(getParent());
     setVisible(true);
@@ -222,7 +225,8 @@ bool CharSelectDialog::selectByName(const std::string &name)
     unsigned int oldPos = mCharInfo->getPos();
 
     mCharInfo->select(0);
-    do {
+    do 
+    {
         LocalPlayer *player = mCharInfo->getEntry();
 
         if (player && player->getName() == name)
@@ -259,41 +263,29 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network,
     mCancelButton = new Button(_("Cancel"), "cancel", this);
     mPlayerBox = new PlayerBox(mPlayer);
 
-    mNameField->setActionEventId("create");
-
-    int w = 200;
-    int h = 150;
-    setContentSize(w, h);
-    mPlayerBox->setDimension(gcn::Rectangle(80, 30, 110, 85));
-    mNameLabel->setPosition(5, 5);
-    mNameField->setDimension(
-            gcn::Rectangle(45, 5, w - 45 - 7, mNameField->getHeight()));
-    mPrevHairColorButton->setPosition(90, 35);
-    mNextHairColorButton->setPosition(165, 35);
-    mHairColorLabel->setPosition(5, 40);
-    mPrevHairStyleButton->setPosition(90, 64);
-    mNextHairStyleButton->setPosition(165, 64);
-    mHairStyleLabel->setPosition(5, 70);
-    mCancelButton->setPosition(
-            w - 5 - mCancelButton->getWidth(),
-            h - 5 - mCancelButton->getHeight());
-    mCreateButton->setPosition(
-            mCancelButton->getX() - 5 - mCreateButton->getWidth(),
-            h - 5 - mCancelButton->getHeight());
+    mPlayerBox->setWidth(74);
 
+    mNameField->setActionEventId("create");
     mNameField->addActionListener(this);
 
-    add(mPlayerBox);
-    add(mNameField);
-    add(mNameLabel);
-    add(mNextHairColorButton);
-    add(mPrevHairColorButton);
-    add(mHairColorLabel);
-    add(mNextHairStyleButton);
-    add(mPrevHairStyleButton);
-    add(mHairStyleLabel);
-    add(mCreateButton);
-    add(mCancelButton);
+    ContainerPlacer place;
+    place = getPlacer(0, 0);
+
+    place(0, 0, mNameLabel, 1);
+    place(1, 0, mNameField, 6);
+    place(0, 1, mHairStyleLabel, 1);
+    place(1, 1, mPrevHairStyleButton);
+    place(2, 1, mPlayerBox, 1, 8).setPadding(3);
+    place(3, 1, mNextHairStyleButton);
+    place(0, 2, mHairColorLabel, 1);
+    place(1, 2, mPrevHairColorButton);
+    place(3, 2, mNextHairColorButton);
+    place.getCell().matchColWidth(0, 2);
+    place = getPlacer(0, 2);
+    place(4, 0, mCreateButton);
+    place(5, 0, mCancelButton);
+
+    reflowLayout(225, 0);
 
     setLocationRelativeTo(getParent());
     setVisible(true);
-- 
cgit v1.2.3-70-g09d2


From 02010c3e8e2ee08bf49b360fd091dd8b2abc6b15 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 16 Jan 2009 13:16:23 -0700
Subject: Some small layout tweaks, as well as making a few dialogs more
 consistent UI-wise (continue-like functionality is always in the bottom right
 corner, with canceling to the left of it).

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/char_select.cpp  | 52 +++++++++++++++++++++++++++---------------------
 src/gui/login.cpp        | 14 ++++++-------
 src/gui/updatewindow.cpp |  4 ++--
 3 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index c15f3359..7bfa3c7a 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -68,7 +68,8 @@ CharDeleteConfirm::CharDeleteConfirm(CharSelectDialog *m):
 void CharDeleteConfirm::action(const gcn::ActionEvent &event)
 {
     //ConfirmDialog::action(event);
-    if (event.getId() == "yes") {
+    if (event.getId() == "yes")
+    {
         master->attemptCharDelete();
     }
     ConfirmDialog::action(event);
@@ -110,8 +111,8 @@ CharSelectDialog::CharSelectDialog(Network *network,
     place = getPlacer(0, 2);
     place(0, 0, mPreviousButton);
     place(1, 0, mNextButton);
-    place(4, 0, mSelectButton);
-    place(5, 0, mCancelButton);
+    place(4, 0, mCancelButton);
+    place(5, 0, mSelectButton);
 
     reflowLayout(250, 0);
 
@@ -180,7 +181,8 @@ void CharSelectDialog::updatePlayerInfo()
             mSelectButton->setEnabled(true);
         }
     }
-    else {
+    else
+    {
         mNameLabel->setCaption(strprintf(_("Name: %s"), ""));
         mLevelLabel->setCaption(strprintf(_("Level: %d"), 0));
         mJobLevelLabel->setCaption(strprintf(_("Job Level: %d"), 0));
@@ -282,8 +284,8 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network,
     place(3, 2, mNextHairColorButton);
     place.getCell().matchColWidth(0, 2);
     place = getPlacer(0, 2);
-    place(4, 0, mCreateButton);
-    place(5, 0, mCancelButton);
+    place(4, 0, mCancelButton);
+    place(5, 0, mCreateButton);
 
     reflowLayout(225, 0);
 
@@ -303,32 +305,36 @@ CharCreateDialog::~CharCreateDialog()
 void CharCreateDialog::action(const gcn::ActionEvent &event)
 {
     int numberOfColors = ColorDB::size();
-    if (event.getId() == "create") {
-        if (getName().length() >= 4) {
+    if (event.getId() == "create") 
+    {
+        if (getName().length() >= 4) 
+        {
             // Attempt to create the character
             mCreateButton->setEnabled(false);
             attemptCharCreate();
         }
-        else {
+        else 
+        {
             new OkDialog("Error",
                     "Your name needs to be at least 4 characters.", this);
         }
     }
-    else if (event.getId() == "cancel") {
+    else if (event.getId() == "cancel")
         scheduleDelete();
-    }
-    else if (event.getId() == "nextcolor") {
-        mPlayer->setHairStyle(mPlayer->getHairStyle(), (mPlayer->getHairColor() + 1) % numberOfColors);
-    }
-    else if (event.getId() == "prevcolor") {
-        mPlayer->setHairStyle(mPlayer->getHairStyle(), (mPlayer->getHairColor() + numberOfColors - 1) % numberOfColors);
-    }
-    else if (event.getId() == "nextstyle") {
-        mPlayer->setHairStyle(mPlayer->getHairStyle() + 1, mPlayer->getHairColor());
-    }
-    else if (event.getId() == "prevstyle") {
-        mPlayer->setHairStyle(mPlayer->getHairStyle() + mPlayer->getNumOfHairstyles() - 1, mPlayer->getHairColor());
-    }
+    else if (event.getId() == "nextcolor")
+        mPlayer->setHairStyle(mPlayer->getHairStyle(), 
+                             (mPlayer->getHairColor() + 1) % numberOfColors);
+    else if (event.getId() == "prevcolor")
+        mPlayer->setHairStyle(mPlayer->getHairStyle(), 
+                             (mPlayer->getHairColor() + numberOfColors - 1) % 
+                              numberOfColors);
+    else if (event.getId() == "nextstyle")
+        mPlayer->setHairStyle(mPlayer->getHairStyle() + 1, 
+                              mPlayer->getHairColor());
+    else if (event.getId() == "prevstyle")
+        mPlayer->setHairStyle(mPlayer->getHairStyle() + 
+                              mPlayer->getNumOfHairstyles() - 1, 
+                              mPlayer->getHairColor());
 }
 
 std::string CharCreateDialog::getName()
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index bba69754..eddae739 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -99,15 +99,15 @@ LoginDialog::LoginDialog(LoginData *loginData):
     place(0, 2, serverLabel);
     place(0, 3, portLabel);
     place(0, 4, dropdownLabel);
-    place(1, 0, mUserField, 3).setPadding(2);
-    place(1, 1, mPassField, 3).setPadding(2);
-    place(1, 2, mServerField, 3).setPadding(2);
-    place(1, 3, mPortField, 3).setPadding(2);
-    place(1, 4, mServerDropDown, 3).setPadding(2);
+    place(1, 0, mUserField, 3).setPadding(1);
+    place(1, 1, mPassField, 3).setPadding(1);
+    place(1, 2, mServerField, 3).setPadding(1);
+    place(1, 3, mPortField, 3).setPadding(1);
+    place(1, 4, mServerDropDown, 3).setPadding(1);
     place(0, 5, mKeepCheck, 4);
     place(0, 6, mRegisterButton).setHAlign(LayoutCell::LEFT);
-    place(2, 6, mOkButton);
-    place(3, 6, mCancelButton);
+    place(2, 6, mCancelButton);
+    place(3, 6, mOkButton);
     reflowLayout(250, 0);
 
     setLocationRelativeTo(getParent());
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 9311b59b..ba802876 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -123,8 +123,8 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost,
     place(0, 0, mScrollArea, 5, 3).setPadding(3);
     place(0, 3, mLabel, 5);
     place(0, 4, mProgressBar, 5);
-    place(0, 5, mCancelButton);
-    place(1, 5, mPlayButton);
+    place(3, 5, mCancelButton);
+    place(4, 5, mPlayButton);
 
     reflowLayout(320, 240);
 
-- 
cgit v1.2.3-70-g09d2


From b9d0f267913c61cd6b490171768bd88c3a472563 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 16 Jan 2009 15:16:14 -0700
Subject: Candidate release for 0.0.27.1 (Windows needs to get colors fixed,
 and then this build might be official)

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 CMakeLists.txt                     |  2 +-
 aethyra.cbp                        | 17 +++++++++++++----
 configure.ac                       |  2 +-
 data/help/header.txt               |  2 +-
 data/help/team.txt                 |  6 ++++++
 src/gui/emotecontainer.cpp         |  4 +---
 src/gui/emoteshortcutcontainer.cpp |  2 --
 src/main.cpp                       |  2 +-
 src/resources/emotedb.cpp          |  5 -----
 src/resources/emotedb.h            |  2 --
 src/winver.h                       |  4 ++--
 11 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ac379de..365f0944 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 PROJECT(AETHYRA)
 
-SET(VERSION 0.0.27)
+SET(VERSION 0.0.27.1)
 
 # where to look for cmake modules
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)
diff --git a/aethyra.cbp b/aethyra.cbp
index 67d8d7d2..68d4a609 100644
--- a/aethyra.cbp
+++ b/aethyra.cbp
@@ -167,10 +167,10 @@
 		<Unit filename="src\gui\item_amount.h" />
 		<Unit filename="src\gui\itemcontainer.cpp" />
 		<Unit filename="src\gui\itemcontainer.h" />
+		<Unit filename="src\gui\itempopup.cpp" />
+		<Unit filename="src\gui\itempopup.h" />
 		<Unit filename="src\gui\itemshortcutcontainer.cpp" />
 		<Unit filename="src\gui\itemshortcutcontainer.h" />
-		<Unit filename="src\gui\itemshortcutwindow.cpp" />
-		<Unit filename="src\gui\itemshortcutwindow.h" />
 		<Unit filename="src\gui\linkhandler.h" />
 		<Unit filename="src\gui\listbox.cpp" />
 		<Unit filename="src\gui\listbox.h" />
@@ -202,6 +202,8 @@
 		<Unit filename="src\gui\register.h" />
 		<Unit filename="src\gui\scrollarea.cpp" />
 		<Unit filename="src\gui\scrollarea.h" />
+		<Unit filename="src\gui\sdlinput.cpp" />
+		<Unit filename="src\gui\sdlinput.h" />
 		<Unit filename="src\gui\sell.cpp" />
 		<Unit filename="src\gui\sell.h" />
 		<Unit filename="src\gui\setup.cpp" />
@@ -235,8 +237,6 @@
 		<Unit filename="src\gui\speechbubble.h" />
 		<Unit filename="src\gui\status.cpp" />
 		<Unit filename="src\gui\status.h" />
-		<Unit filename="src\gui\tabbedcontainer.cpp" />
-		<Unit filename="src\gui\tabbedcontainer.h" />
 		<Unit filename="src\gui\table.cpp" />
 		<Unit filename="src\gui\table.h" />
 		<Unit filename="src\gui\table_model.cpp" />
@@ -255,8 +255,14 @@
 		<Unit filename="src\gui\viewport.h" />
 		<Unit filename="src\gui\widgets\dropdown.cpp" />
 		<Unit filename="src\gui\widgets\dropdown.h" />
+		<Unit filename="src\gui\widgets\layout.cpp" />
+		<Unit filename="src\gui\widgets\layout.h" />
 		<Unit filename="src\gui\widgets\resizegrip.cpp" />
 		<Unit filename="src\gui\widgets\resizegrip.h" />
+		<Unit filename="src\gui\widgets\tab.cpp" />
+		<Unit filename="src\gui\widgets\tab.h" />
+		<Unit filename="src\gui\widgets\tabbedarea.cpp" />
+		<Unit filename="src\gui\widgets\tabbedarea.h" />
 		<Unit filename="src\gui\window.cpp" />
 		<Unit filename="src\gui\window.h" />
 		<Unit filename="src\gui\windowcontainer.cpp" />
@@ -358,6 +364,8 @@
 		<Unit filename="src\resources\colordb.h" />
 		<Unit filename="src\resources\dye.cpp" />
 		<Unit filename="src\resources\dye.h" />
+		<Unit filename="src\resources\emotedb.cpp" />
+		<Unit filename="src\resources\emotedb.h" />
 		<Unit filename="src\resources\image.cpp" />
 		<Unit filename="src\resources\image.h" />
 		<Unit filename="src\resources\imageloader.cpp" />
@@ -407,6 +415,7 @@
 		<Unit filename="src\utils\base64.h" />
 		<Unit filename="src\utils\dtor.h" />
 		<Unit filename="src\utils\fastsqrt.h" />
+		<Unit filename="src\utils\gettext.h" />
 		<Unit filename="src\utils\mutex.h" />
 		<Unit filename="src\utils\strprintf.cpp" />
 		<Unit filename="src\utils\strprintf.h" />
diff --git a/configure.ac b/configure.ac
index e4acb4df..468a85d2 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([Aethyra], [SVN-0.0.27], [irarice@gmail.com], [aethyra])
+AC_INIT([Aethyra], [0.0.27.1], [irarice@gmail.com], [aethyra])
 AC_CONFIG_HEADERS([config.h:config.h.in])
 AC_LANG_CPLUSPLUS
 
diff --git a/data/help/header.txt b/data/help/header.txt
index f70426fe..38604d70 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -2,7 +2,7 @@
 ##1                                 AETHYRA
 ##1               ==========================================
 
-           ##2Version:##6 Aethyra GIT 0.0.27              ##2Date:##7 December 2008
+           ##2Version:##6 Aethyra GIT 0.0.27.1              ##2Date:##16 January 2008
  
 ##2                    Website: http://www.aethyra.org
  
diff --git a/data/help/team.txt b/data/help/team.txt
index dfd00d4b..6b2fae88 100644
--- a/data/help/team.txt
+++ b/data/help/team.txt
@@ -17,6 +17,8 @@
 
   ##9Kraant Developer
             <kraant@gmail.com>
+
+  ##9Forge Developer
  
 ##2 Artists:
 
@@ -32,6 +34,8 @@
 
   ##9GonzoDark Mapper
 
+  ##9Solo Mapper
+
 ##2 Content Development: 
 
   ##9Moose
@@ -42,6 +46,8 @@
 
   ##9SoftLace1
 
+  ##9Mr. and Mrs. Solo
+
   ##9Srauls
  
 ##2 Misc. thanks:
diff --git a/src/gui/emotecontainer.cpp b/src/gui/emotecontainer.cpp
index cba744dd..fa63d4bb 100644
--- a/src/gui/emotecontainer.cpp
+++ b/src/gui/emotecontainer.cpp
@@ -23,10 +23,10 @@
 #include <guichan/selectionlistener.hpp>
 
 #include "emotecontainer.h"
-#include "emoteshortcut.h"
 
 #include "../animatedsprite.h"
 #include "../configuration.h"
+#include "../emoteshortcut.h"
 #include "../graphics.h"
 #include "../localplayer.h"
 #include "../log.h"
@@ -69,8 +69,6 @@ EmoteContainer::EmoteContainer():
 
 EmoteContainer::~EmoteContainer()
 {
-    delete_all(mEmoteImg);
-
     if (!mSelImg)
     {
        mSelImg->decRef();
diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
index f7917f85..f5ee9843 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -69,8 +69,6 @@ EmoteShortcutContainer::EmoteShortcutContainer():
 EmoteShortcutContainer::~EmoteShortcutContainer()
 {
     mBackgroundImg->decRef();
-
-    delete_all(mEmoteImg);
 }
 
 void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
diff --git a/src/main.cpp b/src/main.cpp
index a1109092..ea120fc4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -748,7 +748,7 @@ int main(int argc, char *argv[])
     gcn::Label *versionLabel = new gcn::Label(PACKAGE_VERSION);
     top->add(versionLabel, 2, 2);
 #endif
-    ProgressBar *progressBar = new ProgressBar(0.0f, 100, 20);
+    ProgressBar *progressBar = new ProgressBar(0.0f, 100, 20, 168, 116, 31);
     gcn::Label *progressLabel = new gcn::Label();
     top->add(progressBar, 5, top->getHeight() - 5 - progressBar->getHeight());
     top->add(progressLabel, 15 + progressBar->getWidth(),
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index 03096eff..2f43822d 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -137,11 +137,6 @@ const EmoteInfo& EmoteDB::get(int id)
     }
 }
 
-const EmoteInfo& EmoteDB::getUnknown()
-{
-    return mUnknown;
-}
-
 const int& EmoteDB::getLast()
 {
     return mLastEmote;
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index 9e904cc1..73354ec0 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -52,8 +52,6 @@ namespace EmoteDB
 
     const EmoteInfo& get(int id);
 
-    const EmoteInfo& getUnknown();
-
     const int& getLast();
 
     typedef EmoteInfos::iterator EmoteInfosIterator;
diff --git a/src/winver.h b/src/winver.h
index f56d0c6b..ac53cd73 100644
--- a/src/winver.h
+++ b/src/winver.h
@@ -2,5 +2,5 @@
 #define VER_MAJOR 0
 #define VER_MINOR 0
 #define VER_RELEASE 27
-#define VER_BUILD 0
-#define PACKAGE_VERSION "0.0.27"
+#define VER_BUILD 1
+#define PACKAGE_VERSION "0.0.27.1"
-- 
cgit v1.2.3-70-g09d2


From 96e52fbc4a48a141e4d4cb4a06249eb66ae38d2b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 16 Jan 2009 15:27:43 -0700
Subject: Updated translation files to prep for new build.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 po/ar.po    | 316 +++++++++++++++++++++++++++++++-----------------------------
 po/ca.po    | 294 ++++++++++++++++++++++++++++---------------------------
 po/cs.po    | 304 ++++++++++++++++++++++++++++-----------------------------
 po/da.po    | 316 +++++++++++++++++++++++++++++++-----------------------------
 po/de.po    | 316 +++++++++++++++++++++++++++++++-----------------------------
 po/en_GB.po | 316 +++++++++++++++++++++++++++++++-----------------------------
 po/eo.po    | 289 +++++++++++++++++++++++++++---------------------------
 po/es.po    | 316 +++++++++++++++++++++++++++++++-----------------------------
 po/fi.po    | 316 +++++++++++++++++++++++++++++++-----------------------------
 po/fr.po    | 316 +++++++++++++++++++++++++++++++-----------------------------
 po/he.po    | 316 +++++++++++++++++++++++++++++++-----------------------------
 po/hr.po    | 314 ++++++++++++++++++++++++++++++-----------------------------
 po/id.po    | 316 +++++++++++++++++++++++++++++++-----------------------------
 po/it.po    | 316 +++++++++++++++++++++++++++++++-----------------------------
 po/ja.po    | 314 ++++++++++++++++++++++++++++++-----------------------------
 po/nl.po    | 314 ++++++++++++++++++++++++++++++-----------------------------
 po/pl.po    | 316 +++++++++++++++++++++++++++++++-----------------------------
 po/pt.po    | 316 +++++++++++++++++++++++++++++++-----------------------------
 po/pt_BR.po | 316 +++++++++++++++++++++++++++++++-----------------------------
 po/ru.po    | 316 +++++++++++++++++++++++++++++++-----------------------------
 po/sk.po    | 314 ++++++++++++++++++++++++++++++-----------------------------
 po/sv.po    | 316 +++++++++++++++++++++++++++++++-----------------------------
 po/th.po    | 294 ++++++++++++++++++++++++++++---------------------------
 po/zh_CN.po | 316 +++++++++++++++++++++++++++++++-----------------------------
 24 files changed, 3820 insertions(+), 3673 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index 3710bf45..fa5aef7b 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-07-16 18:28+0000\n"
 "Last-Translator: صقر بن عبدالله <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "مغادرة"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "الوصف: %s"
@@ -53,12 +52,12 @@ msgstr "إيقاف"
 msgid "Sell"
 msgstr "بيع"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "إلغاء"
 
@@ -70,13 +69,12 @@ msgstr ""
 msgid "Are you sure you want to delete this character?"
 msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "إنتقاء الشخصيّة"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "الاسم: %s"
@@ -86,69 +84,68 @@ msgstr "الاسم: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "المستوى: %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "المستوى: %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "النقود: %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "السّابق"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "التّالي"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "جديد"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "حذف"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "موافق"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "إنشاء شخصيّة"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "الاسم:"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "لون الشعر:"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "قصّة الشعر:"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "إنشاء"
 
@@ -542,12 +539,7 @@ msgstr "لا"
 msgid "Connecting..."
 msgstr "جارِ الاتّصال..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -557,7 +549,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "استخدام"
 
@@ -574,8 +566,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "الجردة"
 
@@ -583,49 +575,24 @@ msgstr "الجردة"
 msgid "Drop"
 msgstr "إسقاط"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "الوصف: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "التأثير: %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "الاسم:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "التأثير: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "الوصف: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr "تجريد من العتاد"
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr "استعمال العتاد"
 
@@ -677,7 +644,7 @@ msgid "Shortcut"
 msgstr "اختصار"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "تثبيت"
 
@@ -807,7 +774,7 @@ msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محار
 msgid "Passwords do not match."
 msgstr "كلمات السرّ غير متطابقة."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "خطأ"
 
@@ -815,20 +782,20 @@ msgstr "خطأ"
 msgid "Sound"
 msgstr "صوت"
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr "حجم صوت المؤثرّات"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr "حجم صوت الموسيقا"
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "تطبيق"
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "تصفير النوافذ"
 
@@ -861,11 +828,11 @@ msgstr ""
 msgid "Color:"
 msgstr "لون الشعر:"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr "إضغط على الزرّ لبدأ المعايرة"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr "معايرة"
 
@@ -873,28 +840,28 @@ msgstr "معايرة"
 msgid "Enable joystick"
 msgstr "تفعيل عصا الألعاب"
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr "إيقاف"
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr "تدوير العصا"
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "حذف"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -939,7 +906,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -979,105 +946,105 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr "حدّ FPS:"
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr "عتمة واجهة المستخدم"
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr "نصف قطر اللفّ"
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr "كسل اللفّ"
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr "مؤثّرات محيطة"
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr "واقف"
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr "منخفض"
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr "مرتفع"
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 #, fuzzy
 msgid "fullscreen"
 msgstr "ملء الشاشة"
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr "جارِ ملء الشاشة"
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr "تغيير OpenGL"
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
@@ -1206,24 +1173,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "إضافة"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "إضافة"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr "أنت تحصل على %d GP."
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr "أنت تقدّم:"
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1509,6 +1480,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1635,177 +1623,197 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "جارِ الاتّصال..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "جارِ الاتّصال..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "جارِ الاتّصال..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "الاسم: %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "جارِ الاتّصال..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "الوصف: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "التأثير: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "الاسم:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "التأثير: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "الوصف: %s"
+
 #~ msgid "Unregister"
 #~ msgstr "إلغاء التسجيل"
 
diff --git a/po/ca.po b/po/ca.po
index 71f6c6da..0415ed64 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-07-03 17:21+0000\n"
 "Last-Translator: Habari <thomas.becerril@gmail.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "sortir"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr ""
@@ -52,12 +51,12 @@ msgstr ""
 msgid "Sell"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr ""
 
@@ -69,13 +68,12 @@ msgstr ""
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr ""
@@ -85,69 +83,68 @@ msgstr ""
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "ok"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "nom"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr ""
 
@@ -538,12 +535,7 @@ msgstr "no"
 msgid "Connecting..."
 msgstr ""
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -553,7 +545,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr ""
 
@@ -570,8 +562,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
@@ -579,45 +571,24 @@ msgstr ""
 msgid "Drop"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-msgid "Description:"
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-msgid "Effect:"
-msgstr ""
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "nom"
-
-#: ../src/gui/inventorywindow.cpp:170
-msgid "Effect: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:172
-msgid "Description: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr ""
 
@@ -669,7 +640,7 @@ msgid "Shortcut"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr ""
 
@@ -795,7 +766,7 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr ""
 
@@ -803,20 +774,20 @@ msgstr ""
 msgid "Sound"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr ""
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
@@ -848,11 +819,11 @@ msgstr ""
 msgid "Color:"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr ""
 
@@ -860,27 +831,27 @@ msgstr ""
 msgid "Enable joystick"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -925,7 +896,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -965,103 +936,103 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "fullscreen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
@@ -1178,24 +1149,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr ""
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr ""
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1479,6 +1454,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1604,169 +1596,173 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 msgid "Trying to connect to account server..."
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 msgid "Trying to connect to char server..."
 msgstr ""
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 msgid "Trying to connect to map server..."
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, c-format
 msgid "Map: %s"
 msgstr ""
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 msgid "Connecting to map server..."
 msgstr ""
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "nom"
diff --git a/po/cs.po b/po/cs.po
index e046aad8..edceaf79 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-12-17 16:31+0000\n"
 "Last-Translator: Lubos <alvinx12@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -33,7 +33,6 @@ msgstr ""
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Popis: %s"
@@ -52,12 +51,12 @@ msgstr ""
 msgid "Sell"
 msgstr "Prodej"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -69,14 +68,13 @@ msgstr "Potvrďte vymazání postavy"
 msgid "Are you sure you want to delete this character?"
 msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 #, fuzzy
 msgid "Select Character"
 msgstr "Vytvořit postavu"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "Jméno: %s"
@@ -86,69 +84,68 @@ msgstr "Jméno: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Úroveň: %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Úroveň: %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "Peníze: %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "Předchozí"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "Další"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "Nová"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "Odstranit"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "Vytvořit postavu"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Jméno:"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "Barva vlasů:"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "Styl vlasů:"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "Vytvořit"
 
@@ -542,12 +539,7 @@ msgstr "Ne"
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -557,7 +549,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr ""
 
@@ -574,8 +566,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventář"
 
@@ -583,47 +575,24 @@ msgstr "Inventář"
 msgid "Drop"
 msgstr "Upustit"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Popis: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-msgid "Effect:"
-msgstr ""
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Jméno:"
-
-#: ../src/gui/inventorywindow.cpp:170
-msgid "Effect: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Popis: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr "Vybavit"
 
@@ -675,7 +644,7 @@ msgid "Shortcut"
 msgstr "Zkratka"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "Nastavení"
 
@@ -802,7 +771,7 @@ msgstr "Heslo musí být kratší než %d znaků."
 msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "Chyba"
 
@@ -810,20 +779,20 @@ msgstr "Chyba"
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr ""
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
@@ -857,11 +826,11 @@ msgstr ""
 msgid "Color:"
 msgstr "Barva vlasů:"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr "Kalibrovat"
 
@@ -869,28 +838,28 @@ msgstr "Kalibrovat"
 msgid "Enable joystick"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "Odstranit"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -935,7 +904,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -975,103 +944,103 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "fullscreen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
@@ -1197,24 +1166,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr ""
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr ""
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1499,6 +1472,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1625,177 +1615,189 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Připojuji se..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Připojuji se..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Připojuji se..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Jméno: %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Připojuji se..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Popis: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Jméno:"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Popis: %s"
+
 #~ msgid "Remember Username"
 #~ msgstr "Zapamatovat uživatelské jméno"
 
diff --git a/po/da.po b/po/da.po
index d3ffa234..87afa59d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-12-28 14:45+0000\n"
 "Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Afslut"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
@@ -53,12 +52,12 @@ msgstr "Stop"
 msgid "Sell"
 msgstr "Sælg"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Fortryd"
 
@@ -70,13 +69,12 @@ msgstr "Er du sikker på at du vil slette denne figur?"
 msgid "Are you sure you want to delete this character?"
 msgstr "Er du sikker på at du vil slette denne figur?"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Vælg Bruger"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "Navn; %s"
@@ -86,69 +84,68 @@ msgstr "Navn; %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau: %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Niveau: %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "Penge: %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "Næste"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "Opret"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "Slet"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "O.k."
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "Lav figur."
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "Hårfarve:"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "Frisure:"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "Opret"
 
@@ -543,12 +540,7 @@ msgstr "Nej"
 msgid "Connecting..."
 msgstr "Opretter forbindelse..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -558,7 +550,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "Brug"
 
@@ -575,8 +567,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventarliste"
 
@@ -584,49 +576,24 @@ msgstr "Inventarliste"
 msgid "Drop"
 msgstr "Smid"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Beskrivelse: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Effekt: %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Navn:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Effekt: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Beskrivelse: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr "Tag af"
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr "Tag på"
 
@@ -678,7 +645,7 @@ msgid "Shortcut"
 msgstr "Genvej"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "Opsætning"
 
@@ -808,7 +775,7 @@ msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
 msgid "Passwords do not match."
 msgstr "Adgangskoder stemmer ikke overens."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "Fejl"
 
@@ -816,20 +783,20 @@ msgstr "Fejl"
 msgid "Sound"
 msgstr "Lyd"
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr "Lydstyrke på effekter"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr "Lydstyrke på musik"
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Anvend"
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Nulstil vinduer"
 
@@ -863,11 +830,11 @@ msgstr ""
 msgid "Color:"
 msgstr "Hårfarve:"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr "Tryk på knappen for at starte justeringen."
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr "Justering"
 
@@ -875,28 +842,28 @@ msgstr "Justering"
 msgid "Enable joystick"
 msgstr "Aktiver joystick"
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr "Stop"
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr "Roter joystick"
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "Slet"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -941,7 +908,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -981,105 +948,105 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr "FPS grænse:"
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr "Gennemsigtighed"
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr "Følsomhed på mus"
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr "Acceleration på mus"
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr "Omgivende FX"
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr "fra"
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr "lav"
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr "høj"
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 #, fuzzy
 msgid "fullscreen"
 msgstr "Fuld Skærm"
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr "Skifter til fuld skærm"
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr "Skrifter til OpenGL"
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
@@ -1208,24 +1175,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Tilføj"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Tilføj"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr "Du får %d GP."
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr "Du giver:"
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1511,6 +1482,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1637,177 +1625,197 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Opretter forbindelse..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Opretter forbindelse..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Opretter forbindelse..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Navn; %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Opretter forbindelse..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Beskrivelse: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Effekt: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Navn:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Effekt: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Beskrivelse: %s"
+
 #~ msgid "Remember Username"
 #~ msgstr "Husk dette brugernavn."
 
diff --git a/po/de.po b/po/de.po
index e8a39a98..ed92c46d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-10-13 00:25+0000\n"
 "Last-Translator: Aeneas Jaißle <Unknown>\n"
 "Language-Team: German\n"
@@ -33,7 +33,6 @@ msgstr "Beenden"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
@@ -53,12 +52,12 @@ msgstr "Stopp"
 msgid "Sell"
 msgstr "Verkaufen"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -70,13 +69,12 @@ msgstr "Bestätige Charakter-Löschung"
 msgid "Are you sure you want to delete this character?"
 msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Spielfigur auswählen"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "Name : %s"
@@ -86,69 +84,68 @@ msgstr "Name : %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Stufe: %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "Geld: %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "Zurück"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "Weiter"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "Neu"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "Charakter erstellen"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Name :"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "Haarfarbe"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "Frisur"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "Erstellen"
 
@@ -543,12 +540,7 @@ msgstr "Nein"
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -558,7 +550,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "Benutzen"
 
@@ -575,8 +567,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventar"
 
@@ -584,49 +576,24 @@ msgstr "Inventar"
 msgid "Drop"
 msgstr "Wegwerfen"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Beschreibung: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Effekt: %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Name :"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Effekt: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Beschreibung: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr "Ablegen"
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr "Ausrüsten"
 
@@ -678,7 +645,7 @@ msgid "Shortcut"
 msgstr "Tastenkürzel"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "Einstellungen"
 
@@ -808,7 +775,7 @@ msgstr "Das Passwort muss kürzer als %d Zeichen sein."
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "Fehler"
 
@@ -816,20 +783,20 @@ msgstr "Fehler"
 msgid "Sound"
 msgstr "Ton"
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr "Lautstärke der Klangeffekte"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr "Latustärke der Musik"
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Anwenden"
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
@@ -863,11 +830,11 @@ msgstr ""
 msgid "Color:"
 msgstr "Haarfarbe"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr "Knopf drücken um die Kalibrierung zu starten"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr "Kalibrieren"
 
@@ -875,28 +842,28 @@ msgstr "Kalibrieren"
 msgid "Enable joystick"
 msgstr "Joystick aktivieren"
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr "Kreise den Steuerknüppel"
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "Löschen"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -941,7 +908,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -981,107 +948,107 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr "FPS-Limit:"
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr "GUI Transparenz"
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr "Scroll-Radius"
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr "Scroll-Trägheit"
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr "Hintergrundeffekte"
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr "Aus"
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr "Niedrig"
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr "Hoch"
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 #, fuzzy
 msgid "fullscreen"
 msgstr "Vollbild"
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr "Wechsle zum Vollbildmodus"
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr "Ändere OpenGL"
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
@@ -1210,24 +1177,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Hinzufügen"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr "Du erhälst %d GP."
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr "Du gibst:"
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1513,6 +1484,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1639,177 +1627,197 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Verbinde..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Verbinde..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Verbinde..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Name : %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Verbinde..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Beschreibung: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Effekt: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Name :"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Effekt: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Beschreibung: %s"
+
 #~ msgid "Remember Username"
 #~ msgstr "Benutzernamen merken"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 93256370..b6713923 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-05-10 16:51+0000\n"
 "Last-Translator: Me <Glich.Glich@googlemail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Exit"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Description: %s"
@@ -53,12 +52,12 @@ msgstr "Stop"
 msgid "Sell"
 msgstr "Sell"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -70,13 +69,12 @@ msgstr ""
 msgid "Are you sure you want to delete this character?"
 msgstr "Are you sure you want to delete this character?"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Select Character"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "Name: %s"
@@ -86,69 +84,68 @@ msgstr "Name: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Level: %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "Money: %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "Previous"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "Next"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "New"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "Delete"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "Create Character"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Name:"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "Hair Colour:"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "Hair Style:"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "Create"
 
@@ -543,12 +540,7 @@ msgstr "No"
 msgid "Connecting..."
 msgstr "Connecting..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -558,7 +550,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "Use"
 
@@ -575,8 +567,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventory"
 
@@ -584,49 +576,24 @@ msgstr "Inventory"
 msgid "Drop"
 msgstr "Drop"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Description: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Effect: %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Name:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Effect: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Description: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr "Unequip"
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr "Equip"
 
@@ -678,7 +645,7 @@ msgid "Shortcut"
 msgstr "Shortcut"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "Setup"
 
@@ -808,7 +775,7 @@ msgstr "The password needs to be less than %d characters long."
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "Error"
 
@@ -816,20 +783,20 @@ msgstr "Error"
 msgid "Sound"
 msgstr "Sound"
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr "Sfx volume"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr "Music volume"
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Apply"
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Reset Windows"
 
@@ -861,11 +828,11 @@ msgstr ""
 msgid "Color:"
 msgstr "Colour:"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr "Press the button to start calibration"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr "Calibrate"
 
@@ -873,28 +840,28 @@ msgstr "Calibrate"
 msgid "Enable joystick"
 msgstr "Enable joystick"
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr "Stop"
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr "Rotate the stick"
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "Delete"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -939,7 +906,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -979,105 +946,105 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr "FPS Limit:"
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr "Gui opacity"
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr "Scroll radius"
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr "Scroll laziness"
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr "Ambient FX"
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr "off"
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr "low"
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr "high"
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 #, fuzzy
 msgid "fullscreen"
 msgstr "Full screen"
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr "Switching to full screen"
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr "Restart needed for changes to take effect."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr "Changing OpenGL"
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applying change to OpenGL requires restart."
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Restart needed for changes to take effect."
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Restart needed for changes to take effect."
@@ -1206,24 +1173,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Add"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Add"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr "You get %d GP."
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr "You give:"
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1509,6 +1480,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1635,177 +1623,197 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Connecting..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Connecting..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Connecting..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Name: %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Connecting..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Description: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Effect: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Name:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Effect: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Description: %s"
+
 #~ msgid "Unregister"
 #~ msgstr "Unregister"
 
diff --git a/po/eo.po b/po/eo.po
index d7d627c8..eb490c33 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-11-10 22:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -33,7 +33,6 @@ msgstr ""
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr ""
@@ -52,12 +51,12 @@ msgstr ""
 msgid "Sell"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr ""
 
@@ -69,13 +68,12 @@ msgstr ""
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr ""
@@ -85,69 +83,68 @@ msgstr ""
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr ""
 
@@ -537,12 +534,7 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -552,7 +544,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr ""
 
@@ -569,8 +561,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
@@ -578,44 +570,24 @@ msgstr ""
 msgid "Drop"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-msgid "Description:"
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-msgid "Effect:"
-msgstr ""
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-msgid "Name: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:170
-msgid "Effect: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:172
-msgid "Description: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr ""
 
@@ -667,7 +639,7 @@ msgid "Shortcut"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr ""
 
@@ -793,7 +765,7 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr ""
 
@@ -801,20 +773,20 @@ msgstr ""
 msgid "Sound"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr ""
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
@@ -846,11 +818,11 @@ msgstr ""
 msgid "Color:"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr ""
 
@@ -858,27 +830,27 @@ msgstr ""
 msgid "Enable joystick"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -922,7 +894,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -962,103 +934,103 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "fullscreen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
@@ -1175,24 +1147,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr ""
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr ""
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1476,6 +1452,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1601,169 +1594,169 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 msgid "Trying to connect to account server..."
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 msgid "Trying to connect to char server..."
 msgstr ""
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 msgid "Trying to connect to map server..."
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, c-format
 msgid "Map: %s"
 msgstr ""
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 msgid "Connecting to map server..."
 msgstr ""
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 6e88cb57..217e924a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-10-15 01:37+0000\n"
 "Last-Translator: catalania <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Salir"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descripción: %s"
@@ -53,12 +52,12 @@ msgstr "Detener"
 msgid "Sell"
 msgstr "Vender"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -70,13 +69,12 @@ msgstr ""
 msgid "Are you sure you want to delete this character?"
 msgstr "¿Seguro que quieres borrar este personaje?"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Seleccionar personaje"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "Nombre: %s"
@@ -86,69 +84,68 @@ msgstr "Nombre: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nivel: %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "Dinero: %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "Nuevo"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "Aceptar"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "Crear Personaje"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "Color de pelo:"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "corte de pelo"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "Crear"
 
@@ -543,12 +540,7 @@ msgstr "No"
 msgid "Connecting..."
 msgstr "Conectando…"
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -558,7 +550,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "Usar"
 
@@ -575,8 +567,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventario"
 
@@ -584,49 +576,24 @@ msgstr "Inventario"
 msgid "Drop"
 msgstr "tirar"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Descripción: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Efecto: %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Nombre:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Efecto: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Descripción: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr "quitarselo"
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr "Equipar"
 
@@ -678,7 +645,7 @@ msgid "Shortcut"
 msgstr "Atajos"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "Configuración"
 
@@ -808,7 +775,7 @@ msgstr "La contraseña puede tener como máximo %d caracteres."
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "Error"
 
@@ -816,20 +783,20 @@ msgstr "Error"
 msgid "Sound"
 msgstr "Sonido"
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr "Volumen efectos"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr "Volumen musica"
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Aplicar"
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Reiniciar ventanas"
 
@@ -863,11 +830,11 @@ msgstr ""
 msgid "Color:"
 msgstr "Color de pelo:"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr "Presione el botón para comenzar la calibración"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr "Calibrar"
 
@@ -875,28 +842,28 @@ msgstr "Calibrar"
 msgid "Enable joystick"
 msgstr "Activar joystick"
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr "Detener"
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr "Gire el stick"
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "Eliminar"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -941,7 +908,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -981,105 +948,105 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr "Límite de FPS:"
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr "Transparencia menus"
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr "Ratio de scroll"
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr "Velocidad de scroll"
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr "Efectos ambientales"
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr "desactivado"
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr "bajo"
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr "alto"
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 #, fuzzy
 msgid "fullscreen"
 msgstr "Pantalla completa"
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr "Cambiar a pantalla completa"
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr "Se necesita reiniciar para aplicar los cambios."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr "Cambiar a OpenGL"
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr "Se necesita reiniciar para aplicar los cambios hechos a OpenGL."
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Se necesita reiniciar para aplicar los cambios."
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Se necesita reiniciar para aplicar los cambios."
@@ -1208,24 +1175,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Añadir"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Añadir"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr "Tu consigues %d GP."
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr "Tu das:"
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1511,6 +1482,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1637,177 +1625,197 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Conectando…"
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Conectando…"
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Conectando…"
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nombre: %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Conectando…"
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Descripción: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Efecto: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Nombre:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Efecto: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Descripción: %s"
+
 #~ msgid "Unregister"
 #~ msgstr "Cancelar Cuenta"
 
diff --git a/po/fi.po b/po/fi.po
index 472fbd83..1bd73914 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-12-30 10:23+0000\n"
 "Last-Translator: ville-v <villev90@gmail.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Sulje"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Kuvaus: %s"
@@ -53,12 +52,12 @@ msgstr "Lopeta"
 msgid "Sell"
 msgstr "Myy"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Peru"
 
@@ -70,14 +69,13 @@ msgstr "Vahvista hahmon poistopyyntö"
 msgid "Are you sure you want to delete this character?"
 msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 #, fuzzy
 msgid "Select Character"
 msgstr "Luo hahmo"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "Nimi: %s"
@@ -87,69 +85,68 @@ msgstr "Nimi: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Taso: %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Taso: %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "Rahatilanne: %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "Uusi"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "Luo hahmo"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "Hiusten väri:"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "Hiustyyli:"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "Luo"
 
@@ -544,12 +541,7 @@ msgstr "Ei"
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -559,7 +551,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "Käytä"
 
@@ -576,8 +568,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Tavaraluettelo"
 
@@ -585,49 +577,24 @@ msgstr "Tavaraluettelo"
 msgid "Drop"
 msgstr "Pudota"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Kuvaus: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Vaikutus: %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Nimi:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Vaikutus: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Kuvaus: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr "Ota käyttöön"
 
@@ -679,7 +646,7 @@ msgid "Shortcut"
 msgstr "Pikavalinnat"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "Asetukset"
 
@@ -809,7 +776,7 @@ msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "Virhe"
 
@@ -817,20 +784,20 @@ msgstr "Virhe"
 msgid "Sound"
 msgstr "Ääni"
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr "Äänitehosteiden voimakkuus"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr "Musiikin voimakkuus"
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Käytä"
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
@@ -864,11 +831,11 @@ msgstr ""
 msgid "Color:"
 msgstr "Hiusten väri:"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr "Kalibroi"
 
@@ -876,28 +843,28 @@ msgstr "Kalibroi"
 msgid "Enable joystick"
 msgstr "Peliohjaintuki päälle"
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr "Lopeta"
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr "Käytä ohjain ääriasennoissaan pyörittämällä"
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "Poista"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -942,7 +909,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -982,105 +949,105 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr "Piirtonopeusrajoitin (kuvaa / sekunti)"
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr "Käyttöliittymän läpinäkyvyys"
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr "Kameran perässälaahaus"
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr "Kameran perässälaahauksen tiukkuus"
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr "Taustaäänet"
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr "pois päältä"
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr "matala"
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr "korkea"
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 #, fuzzy
 msgid "fullscreen"
 msgstr "Kokoruututila"
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr "Kokoruututilaan siirtyminen"
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr "Vaihdetaan OpenGL -toimintatilaan"
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetusten muutokset vaativat ohjelman uudelleenkäynnistyksen"
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
@@ -1209,24 +1176,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Lisää"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Lisää"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr "Sait %d GP"
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr "Annat:"
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1512,6 +1483,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1638,177 +1626,197 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Yhdistetään..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Yhdistetään..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Yhdistetään..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nimi: %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Yhdistetään..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Kuvaus: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Vaikutus: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Nimi:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Vaikutus: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Kuvaus: %s"
+
 #~ msgid "Remember Username"
 #~ msgstr "Muista käyttäjätunnus"
 
diff --git a/po/fr.po b/po/fr.po
index 7f522152..9201ff5c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-12-26 10:43+0000\n"
 "Last-Translator: Johan Serre <Unknown>\n"
 "Language-Team: French\n"
@@ -34,7 +34,6 @@ msgstr "Quitter"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Description : %s"
@@ -54,12 +53,12 @@ msgstr "Stop"
 msgid "Sell"
 msgstr "Vendre"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -71,13 +70,12 @@ msgstr "Confirmer la suppression du personnage"
 msgid "Are you sure you want to delete this character?"
 msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Choix du personnage"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "Nom : %s"
@@ -87,69 +85,68 @@ msgstr "Nom : %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Niveau : %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "Argent : %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "Précédent"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "Suivant"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "Nouveau"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "Création du personnage"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Nom :"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "Couleur des cheveux"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "Coiffure :"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "Créer"
 
@@ -544,12 +541,7 @@ msgstr "Non"
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -559,7 +551,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "Utiliser"
 
@@ -576,8 +568,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventaire"
 
@@ -585,49 +577,24 @@ msgstr "Inventaire"
 msgid "Drop"
 msgstr "Lâcher"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Description : %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Effet : %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Nom :"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Effet : %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Description : %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr "Retirer"
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr "Équiper"
 
@@ -679,7 +646,7 @@ msgid "Shortcut"
 msgstr "Raccourci"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "Configuration"
 
@@ -809,7 +776,7 @@ msgstr "Le mot de passe doit faire moins de %d caractères."
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe ne correspondent pas."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "Erreur"
 
@@ -817,20 +784,20 @@ msgstr "Erreur"
 msgid "Sound"
 msgstr "Son"
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr "Volume des effets sonores"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr "Volume de la musique"
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Appliquer"
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
@@ -864,11 +831,11 @@ msgstr ""
 msgid "Color:"
 msgstr "Couleur des cheveux"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr "Presser le bouton pour démarrer la calibration"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr "Calibrer"
 
@@ -876,28 +843,28 @@ msgstr "Calibrer"
 msgid "Enable joystick"
 msgstr "Activer le joystick"
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr "Stop"
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr "Tourner le joystick"
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "Supprimer"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -942,7 +909,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -982,108 +949,108 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr "Limite FPS :"
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr "Opacité de l'interface"
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr "Rayon du scrolling"
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr "Paresse du scrolling"
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr "Effets ambiants"
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr "aucun"
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr "léger"
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr "complet"
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 #, fuzzy
 msgid "fullscreen"
 msgstr "Plein écran"
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr "Passage en plein écran"
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr "Changement OpenGL"
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
@@ -1213,24 +1180,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Ajouter"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Ajouter"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr "Vous obtenez %d PO."
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr "Vous donnez :"
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1516,6 +1487,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1642,177 +1630,197 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Connexion..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Connexion..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Connexion..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nom : %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Connexion..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Description : %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Effet : %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Nom :"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Effet : %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Description : %s"
+
 #~ msgid "Remember Username"
 #~ msgstr "Se souvenir du nom d'utilisateur"
 
diff --git a/po/he.po b/po/he.po
index a098c887..2d77d9f1 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-10-20 00:23+0000\n"
 "Last-Translator: Ddorda <d.dorda@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "יציאה"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "תיאור: %s"
@@ -53,12 +52,12 @@ msgstr "עצור"
 msgid "Sell"
 msgstr "מכר"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "ביטול"
 
@@ -70,14 +69,13 @@ msgstr "אשר מחיקת שחקן"
 msgid "Are you sure you want to delete this character?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 #, fuzzy
 msgid "Select Character"
 msgstr "צור שחקן"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "שם: %s"
@@ -87,69 +85,68 @@ msgstr "שם: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "רמה: %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "רמה: %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "זהב: %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "הקודם"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "הבא"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "חדש"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "מחק"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "אישור"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "צור שחקן"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "שם:"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "צבע שיער:"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "תיספורת:"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "צור"
 
@@ -544,12 +541,7 @@ msgstr "לא"
 msgid "Connecting..."
 msgstr "מתחבר..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -559,7 +551,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "השתמש"
 
@@ -576,8 +568,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "ציוד"
 
@@ -585,49 +577,24 @@ msgstr "ציוד"
 msgid "Drop"
 msgstr "השלך"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "תיאור: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "השפעה: %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "שם:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "השפעה: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "תיאור: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr "הורד"
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr "החזק"
 
@@ -679,7 +646,7 @@ msgid "Shortcut"
 msgstr "קיצור-דרך"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "הגדרות"
 
@@ -809,7 +776,7 @@ msgstr "הסיסמה חייבת להכיל פחות מ-%d תוים."
 msgid "Passwords do not match."
 msgstr "הסיסמאות אינן תואמות."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "שגיאה"
 
@@ -817,20 +784,20 @@ msgstr "שגיאה"
 msgid "Sound"
 msgstr "צליל"
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr "עוצמת SFX"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr "עוצמת מוזיקה"
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "אשר"
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "אתחל חלונות"
 
@@ -864,11 +831,11 @@ msgstr ""
 msgid "Color:"
 msgstr "צבע שיער:"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr "לחץ על הכפתור בכדי להתחיל בכיול"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr "כייל"
 
@@ -876,28 +843,28 @@ msgstr "כייל"
 msgid "Enable joystick"
 msgstr "אפשר ג'ויסטיק"
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr "עצור"
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr "סובב את המקל"
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "מחק"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -942,7 +909,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -982,105 +949,105 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr "הגבלת FPS:"
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr "אטימות Gui"
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr "תווך גלילה"
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr "עצלנות גלילה"
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr "אופף FX"
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr "כבוי"
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr "נמוך"
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr "גבוה"
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 #, fuzzy
 msgid "fullscreen"
 msgstr "מסך מלא"
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr "מחליף למסך מלא"
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr "משנה OpenGL"
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr "אישור שינויים עבור OpenGL דורש איתחול."
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
@@ -1209,24 +1176,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "הוסף"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "הוסף"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr "אתה מקבל %d זהב."
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr "אתה נותן:"
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1512,6 +1483,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1638,177 +1626,197 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "מתחבר..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "מתחבר..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "מתחבר..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "שם: %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "מתחבר..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "תיאור: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "השפעה: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "שם:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "השפעה: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "תיאור: %s"
+
 #~ msgid "Remember Username"
 #~ msgstr "זכור שם משתמש"
 
diff --git a/po/hr.po b/po/hr.po
index 10e68177..3eba733c 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-12-28 23:36+0000\n"
 "Last-Translator: Dino Paskvan <dpaskvan@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Izlaz"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Opis: %s"
@@ -52,12 +51,12 @@ msgstr ""
 msgid "Sell"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Poništi"
 
@@ -69,14 +68,13 @@ msgstr "Potvrdi Brisanje Lika"
 msgid "Are you sure you want to delete this character?"
 msgstr "Da li ste sigurni da želite obrisati ovog lika?"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 #, fuzzy
 msgid "Select Character"
 msgstr "Stvori Lika"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "Ime: %s"
@@ -86,69 +84,68 @@ msgstr "Ime: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Nivo: %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nivo: %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "Novac: %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "Prethodni"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "Slijedeći"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "Novi"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "Obriši"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "U redu"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "Stvori Lika"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Ime:"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "Boja kose:"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "Frizura:"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "Stvori"
 
@@ -539,12 +536,7 @@ msgstr "Ne"
 msgid "Connecting..."
 msgstr "Spajanje..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -554,7 +546,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "Upotrijebi"
 
@@ -571,8 +563,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Zalihe"
 
@@ -580,49 +572,24 @@ msgstr "Zalihe"
 msgid "Drop"
 msgstr "Ispusti"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Opis: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Učinak: %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Ime:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Učinak: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Opis: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr "Skini opremu"
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr "Opremi"
 
@@ -674,7 +641,7 @@ msgid "Shortcut"
 msgstr "Kratica"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "Podešavanje"
 
@@ -802,7 +769,7 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "Greška"
 
@@ -810,20 +777,20 @@ msgstr "Greška"
 msgid "Sound"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr ""
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
@@ -857,11 +824,11 @@ msgstr ""
 msgid "Color:"
 msgstr "Boja kose:"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr ""
 
@@ -869,28 +836,28 @@ msgstr ""
 msgid "Enable joystick"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "Obriši"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -935,7 +902,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -975,103 +942,103 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "fullscreen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
@@ -1195,24 +1162,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr ""
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr ""
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1497,6 +1468,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1623,177 +1611,197 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Spajanje..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Spajanje..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Spajanje..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Ime: %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Spajanje..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Opis: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Učinak: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Ime:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Učinak: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Opis: %s"
+
 #~ msgid "Remember Username"
 #~ msgstr "Zapamti korisničko ime"
 
diff --git a/po/id.po b/po/id.po
index cf39a880..0ee3c5b4 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-03-26 09:11+0000\n"
 "Last-Translator: ActiveFile <activefile@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Keluar"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Deskripsi: %s"
@@ -53,12 +52,12 @@ msgstr "Berhenti"
 msgid "Sell"
 msgstr "Jual"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Batal"
 
@@ -70,13 +69,12 @@ msgstr ""
 msgid "Are you sure you want to delete this character?"
 msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Pilih Karakter"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "Nama: %s"
@@ -86,69 +84,68 @@ msgstr "Nama: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Tingkatan: %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "Uang: %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "Berikutnya"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "Buat baru"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "Hapus"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "Buat Karakter"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Nama:"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "Warna Rambut:"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "Gaya Rambut:"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "Buat"
 
@@ -543,12 +540,7 @@ msgstr "Tidak"
 msgid "Connecting..."
 msgstr "Menyambung..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -558,7 +550,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "Gunakan"
 
@@ -575,8 +567,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventaris"
 
@@ -584,49 +576,24 @@ msgstr "Inventaris"
 msgid "Drop"
 msgstr "Jatuh"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Deskripsi: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Efek: %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Nama:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Efek: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Deskripsi: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr ""
 
@@ -678,7 +645,7 @@ msgid "Shortcut"
 msgstr "Tombol Singkat"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "Atur"
 
@@ -808,7 +775,7 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr "Kata sandi tidak sama."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "Kesalahan"
 
@@ -816,20 +783,20 @@ msgstr "Kesalahan"
 msgid "Sound"
 msgstr "Suara"
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr "Volume sfx"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr "Volume Musik"
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Terapkan"
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
@@ -863,11 +830,11 @@ msgstr ""
 msgid "Color:"
 msgstr "Warna Rambut:"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr "Tekan tombol untuk memulai kalibrasi"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr "Kalibrasi"
 
@@ -875,28 +842,28 @@ msgstr "Kalibrasi"
 msgid "Enable joystick"
 msgstr "Membolehkan joistik"
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr "Berhenti"
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr "Memutar tongkat"
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "Hapus"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -941,7 +908,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -981,105 +948,105 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr "Batas FPS"
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr "Radius gulungan"
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr "mati"
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr "rendah"
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr "tinggi"
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 #, fuzzy
 msgid "fullscreen"
 msgstr "Layar penuh"
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr "Mengganti ke layar penuh"
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr "Mengubah OpenGL"
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
@@ -1208,24 +1175,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Tambah"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Tambah"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr "Anda mendapatkan %d GP."
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr "Anda memberikan:"
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1511,6 +1482,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1637,177 +1625,197 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Menyambung..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Menyambung..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Menyambung..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nama: %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Menyambung..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Deskripsi: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Efek: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Nama:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Efek: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Deskripsi: %s"
+
 #~ msgid "Unregister"
 #~ msgstr "Tidak terdaftar"
 
diff --git a/po/it.po b/po/it.po
index 342aab49..1df6f016 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2007-12-03 01:45+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Italian\n"
@@ -35,7 +35,6 @@ msgstr "Esci"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descrizione : %s"
@@ -55,12 +54,12 @@ msgstr "Ferma"
 msgid "Sell"
 msgstr "Vendi"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancella"
 
@@ -72,13 +71,12 @@ msgstr ""
 msgid "Are you sure you want to delete this character?"
 msgstr "Sei sicuro di voler cancellare questo personaggio?"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Scelta Personaggio"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "Nome : %s"
@@ -88,69 +86,68 @@ msgstr "Nome : %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Livello: %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Livello: %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "Monete: %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "Precedente"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "Prossimo"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "Nuovo"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "Elimina"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "Crea Personaggio"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Nome :"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "Colore Capelli"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "Stile Capelli:"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "Create"
 
@@ -545,12 +542,7 @@ msgstr "No"
 msgid "Connecting..."
 msgstr "Connessione..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -560,7 +552,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "Usa"
 
@@ -577,8 +569,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventario"
 
@@ -586,49 +578,24 @@ msgstr "Inventario"
 msgid "Drop"
 msgstr "Lascia"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Descrizione : %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Effetto : %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Nome :"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Effetto : %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Descrizione : %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr "Rimuovi"
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr "Equipaggia"
 
@@ -680,7 +647,7 @@ msgid "Shortcut"
 msgstr "Scorciatoia"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "Impostazioni"
 
@@ -810,7 +777,7 @@ msgstr "La password deve contenere meno di %d caratteri."
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "Errore"
 
@@ -818,20 +785,20 @@ msgstr "Errore"
 msgid "Sound"
 msgstr "Suono"
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr "Volume effetti sonori"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr "Volume musica"
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Applica"
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Resetta finestre"
 
@@ -865,11 +832,11 @@ msgstr ""
 msgid "Color:"
 msgstr "Colore Capelli"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr "Premi il pulsante per cominciare la calibrazione"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr "Calibra"
 
@@ -877,28 +844,28 @@ msgstr "Calibra"
 msgid "Enable joystick"
 msgstr "Abilita joystick"
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr "Ferma"
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr "Ruota la manopola"
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "Elimina"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -943,7 +910,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -983,105 +950,105 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr "Limita FPS:"
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr "Opacità IU"
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr "Raggio dello scroll"
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr "Lentezza dello scroll"
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr "Suoni ambientali"
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr "Spento"
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr "Basso"
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr "Alto"
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 #, fuzzy
 msgid "fullscreen"
 msgstr "Schermo intero"
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr "Modalità a schermo intero"
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr "Modifica OpenGL"
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
@@ -1210,24 +1177,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Aggiungi"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Aggiungi"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr "Ottieni %d GP."
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr "Dai:"
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1513,6 +1484,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1639,177 +1627,197 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Connessione..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Connessione..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Connessione..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nome : %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Connessione..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Descrizione : %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Effetto : %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Nome :"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Effetto : %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Descrizione : %s"
+
 #~ msgid "Unregister"
 #~ msgstr "Cancella registrazione"
 
diff --git a/po/ja.po b/po/ja.po
index 2f0cf9f4..4e4ba8b8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-06-28 16:27+0000\n"
 "Last-Translator: fate <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "終了"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "名状: %s"
@@ -52,12 +51,12 @@ msgstr ""
 msgid "Sell"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "取消"
 
@@ -69,13 +68,12 @@ msgstr ""
 msgid "Are you sure you want to delete this character?"
 msgstr "このキャラは消してもいいですか?"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "キャラを選択"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "名前: %s"
@@ -85,69 +83,68 @@ msgstr "名前: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "レベル: %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "GP: %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "前へ"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "次へ"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "新規"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "削除"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "了解"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "キャラを作成"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "名前:"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "髪の色："
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "髪型："
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "作成"
 
@@ -541,12 +538,7 @@ msgstr "いいえ"
 msgid "Connecting..."
 msgstr "接続しています..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -556,7 +548,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "使う"
 
@@ -573,8 +565,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
@@ -582,49 +574,24 @@ msgstr ""
 msgid "Drop"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "名状: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "効用: %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "名前:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "効用: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "名状: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr ""
 
@@ -676,7 +643,7 @@ msgid "Shortcut"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "セットアップ"
 
@@ -804,7 +771,7 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr "パスワードが一致していません。"
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "エラー"
 
@@ -812,20 +779,20 @@ msgstr "エラー"
 msgid "Sound"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr ""
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
@@ -859,11 +826,11 @@ msgstr ""
 msgid "Color:"
 msgstr "髪の色："
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr ""
 
@@ -871,28 +838,28 @@ msgstr ""
 msgid "Enable joystick"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "削除"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -937,7 +904,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -977,103 +944,103 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "fullscreen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
@@ -1197,24 +1164,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr ""
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr ""
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1499,6 +1470,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1625,177 +1613,197 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "接続しています..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "接続しています..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "接続しています..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "名前: %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "接続しています..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "名状: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "効用: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "名前:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "効用: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "名状: %s"
+
 #~ msgid "Unregister"
 #~ msgstr "登録削除"
 
diff --git a/po/nl.po b/po/nl.po
index 2ee556d1..96247edc 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-10-10 00:04+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Dutch\n"
@@ -33,7 +33,6 @@ msgstr "Afsluiten"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beschrijving: %s"
@@ -53,12 +52,12 @@ msgstr "Stoppen"
 msgid "Sell"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -70,13 +69,12 @@ msgstr ""
 msgid "Are you sure you want to delete this character?"
 msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Kies Personage"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "Naam: %s"
@@ -86,69 +84,68 @@ msgstr "Naam: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Level: %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "Geld: %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "Vorige"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "Volgende"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "Nieuw"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "Oké"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "Personage Aanmaken"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Naam:"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "Haarkleur:"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "Haarstijl:"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -543,12 +540,7 @@ msgstr "Nee"
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -558,7 +550,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "Gebruiken"
 
@@ -575,8 +567,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventaris"
 
@@ -584,49 +576,24 @@ msgstr "Inventaris"
 msgid "Drop"
 msgstr "Neerleggen"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Beschrijving: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Effect: %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Naam:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Effect: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Beschrijving: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr "Afdoen"
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr "Uitrusten"
 
@@ -678,7 +645,7 @@ msgid "Shortcut"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "Configureren"
 
@@ -808,7 +775,7 @@ msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "Fout"
 
@@ -816,20 +783,20 @@ msgstr "Fout"
 msgid "Sound"
 msgstr "Geluid"
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr "Volume van geluiden"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr "Muziek volume"
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Toepassen"
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
@@ -863,11 +830,11 @@ msgstr ""
 msgid "Color:"
 msgstr "Haarkleur:"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr "Druk op de knop om het kalibreren te starten"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr "Kalibreren"
 
@@ -875,28 +842,28 @@ msgstr "Kalibreren"
 msgid "Enable joystick"
 msgstr "Joystick activeren"
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr "Stoppen"
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr "Maak rondjes met de stick"
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "Verwijderen"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -941,7 +908,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -981,105 +948,105 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr "FPS limiet:"
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr "Dekking van de GUI"
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr "Scroll radius"
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr "Scroll vertraging"
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr "Omgevingseffecten"
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr "uit"
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr "laag"
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr "hoog"
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 #, fuzzy
 msgid "fullscreen"
 msgstr "Volledig scherm"
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr "Overgaan naar volledig scherm"
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr "Veranderen van OpenGL"
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
@@ -1204,24 +1171,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr ""
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr "Je geeft:"
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1507,6 +1478,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1633,177 +1621,197 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Verbinden..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Verbinden..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Verbinden..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Naam: %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Verbinden..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Beschrijving: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Effect: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Naam:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Effect: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Beschrijving: %s"
+
 #~ msgid "Unregister"
 #~ msgstr "Registreren"
 
diff --git a/po/pl.po b/po/pl.po
index d1e98691..9c409ecb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-10-10 05:26+0000\n"
 "Last-Translator: Michał Trzebiatowski <Unknown>\n"
 "Language-Team: <pl@li.org>\n"
@@ -35,7 +35,6 @@ msgstr "Wyjdź"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Opis: %s"
@@ -55,12 +54,12 @@ msgstr "Zatrzymaj"
 msgid "Sell"
 msgstr "Sprzedaj"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -72,13 +71,12 @@ msgstr ""
 msgid "Are you sure you want to delete this character?"
 msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Wybierz postać"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "Imię: %s"
@@ -88,69 +86,68 @@ msgstr "Imię: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Poziom: %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Poziom: %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "Pieniądze: %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "Następny"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "Nowa"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "Usuń"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "Stwórz postać"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Imię:"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "Kolor włosów:"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "Fryzura:"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "Stwórz"
 
@@ -545,12 +542,7 @@ msgstr "Nie"
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -560,7 +552,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "Użyj"
 
@@ -577,8 +569,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inwentarz"
 
@@ -586,49 +578,24 @@ msgstr "Inwentarz"
 msgid "Drop"
 msgstr "Upuść"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Opis: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Efekt: %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Imię:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Efekt: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Opis: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr "Zdejmij"
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr "Załóż"
 
@@ -680,7 +647,7 @@ msgid "Shortcut"
 msgstr "Skrót"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "Konfiguracja"
 
@@ -810,7 +777,7 @@ msgstr "Hasło nie może mieć więcej jak %d znaków."
 msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "Błąd"
 
@@ -818,20 +785,20 @@ msgstr "Błąd"
 msgid "Sound"
 msgstr "Dźwięk"
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr "Głośność efektów dźwiękowych"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr "Głośność muzyki"
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Zastosuj"
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Zresetuj okna"
 
@@ -865,11 +832,11 @@ msgstr ""
 msgid "Color:"
 msgstr "Kolor włosów:"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr "Wciśnij przycisk aby rozpocząć kalibrację"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr "Kalibruj"
 
@@ -877,28 +844,28 @@ msgstr "Kalibruj"
 msgid "Enable joystick"
 msgstr "Włącz joystick"
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr "Obróć drążek"
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "Usuń"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -943,7 +910,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -983,106 +950,106 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr "Limit FPS:"
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr "Przezroczystość GUI"
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr "Skok przy przewijaniu ekranu"
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr "Opóźnienie przy przewijaniu ekranu"
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr "Dźwięki otoczenia"
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr "wyłączone"
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr "niskie"
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr "wysokie"
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 #, fuzzy
 msgid "fullscreen"
 msgstr "Pełen ekran"
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr "Przełączanie na pełen ekran"
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr "Zmień ustawienia OpenGL"
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Zastosowywanie zmian w konfiguracji OpenGL wymaga ponownego uruchomienia."
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
@@ -1211,24 +1178,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Dodaj"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Dodaj"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr "Otrzymujesz %d GP"
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr "Dajesz:"
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1514,6 +1485,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1640,177 +1628,197 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Łączenie..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Łączenie..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Łączenie..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Imię: %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Łączenie..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Opis: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Efekt: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Imię:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Efekt: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Opis: %s"
+
 #~ msgid "Unregister"
 #~ msgstr "Wyrejestruj"
 
diff --git a/po/pt.po b/po/pt.po
index 72737624..fffa1efc 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-02-03 10:14+0000\n"
 "Last-Translator: Tiago Silva <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Sair"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
@@ -53,12 +52,12 @@ msgstr "Parar"
 msgid "Sell"
 msgstr "Vender"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -70,13 +69,12 @@ msgstr ""
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem a certeza que quer apagar este personagem"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Seleccione um Personagem"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
@@ -86,69 +84,68 @@ msgstr "Nome: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nível: %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "Dinheiro: %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "Novo"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "Cor de Cabelo:"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "Estilo do Cabelo:"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "Criar"
 
@@ -543,12 +540,7 @@ msgstr "Não"
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -558,7 +550,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "Usar"
 
@@ -575,8 +567,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventário"
 
@@ -584,49 +576,24 @@ msgstr "Inventário"
 msgid "Drop"
 msgstr "Largar"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Descrição: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Efeito: %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Nome:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Efeito: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Descrição: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr "Equipar"
 
@@ -678,7 +645,7 @@ msgid "Shortcut"
 msgstr "Atalho"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "Configuração"
 
@@ -808,7 +775,7 @@ msgstr "A password só pode ter até %d caracteres."
 msgid "Passwords do not match."
 msgstr "As senhas não coincidem."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "Erro"
 
@@ -816,20 +783,20 @@ msgstr "Erro"
 msgid "Sound"
 msgstr "Som"
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr "Volume dos Efeitos"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr "Volume da Música"
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Aplicar"
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Reiniciar Janelas"
 
@@ -863,11 +830,11 @@ msgstr ""
 msgid "Color:"
 msgstr "Cor de Cabelo:"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr "Pressione o botão para começar a calibragem"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr "Calibrar"
 
@@ -875,28 +842,28 @@ msgstr "Calibrar"
 msgid "Enable joystick"
 msgstr "Habilitar Joystick"
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr "Parar"
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr "Rode o manipulo"
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "Eliminar"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -941,7 +908,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -981,105 +948,105 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr "Limite de FPS:"
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr "Opacidade do Interface"
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr "Efeitos Ambientais"
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr "desligado"
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr "baixo"
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr "elevado"
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 #, fuzzy
 msgid "fullscreen"
 msgstr "Ecrã completo"
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr "Mudar para ecrã completo"
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr "É necessário reiniciar para as alterações terem efeito."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr "Mudando OpenGL"
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr "É necessário reiniciar para as alterações ao OpenGl terem efeito."
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "É necessário reiniciar para as alterações terem efeito."
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "É necessário reiniciar para as alterações terem efeito."
@@ -1216,24 +1183,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Adicionar"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Adicionar"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr "Recebe %d GP."
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr "Dá:"
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1519,6 +1490,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1645,177 +1633,197 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nome: %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Descrição: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Efeito: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Nome:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Efeito: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Descrição: %s"
+
 #~ msgid "Unregister"
 #~ msgstr "Remover o Registo"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 58ec5d1b..c8550606 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-12-14 21:37+0000\n"
 "Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Sair"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
@@ -53,12 +52,12 @@ msgstr "Parar"
 msgid "Sell"
 msgstr "Vender"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -70,13 +69,12 @@ msgstr "Confimar exclusão do personagem"
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem certeza de que deseja excluir este personagem?"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Selecionar personagem"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
@@ -86,69 +84,68 @@ msgstr "Nome: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nível: %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "Dinheiro: %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "Próximo"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "Novo"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "Excluir"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "Cor do Cabelo:"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "Estilo do Cabelo:"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "Criar"
 
@@ -543,12 +540,7 @@ msgstr "Não"
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -558,7 +550,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "Usar"
 
@@ -575,8 +567,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventório"
 
@@ -584,49 +576,24 @@ msgstr "Inventório"
 msgid "Drop"
 msgstr "Descartar"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Descrição: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Efeito: %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Nome:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Efeito: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Descrição: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr "Equipar"
 
@@ -678,7 +645,7 @@ msgid "Shortcut"
 msgstr "Atalho"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "Configurar"
 
@@ -808,7 +775,7 @@ msgstr "A senha deve ser menor que %d caracteres."
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "Erro"
 
@@ -816,20 +783,20 @@ msgstr "Erro"
 msgid "Sound"
 msgstr "Som"
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr "Volume Sfx"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr "Volume da Música"
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Aplicar"
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
@@ -863,11 +830,11 @@ msgstr ""
 msgid "Color:"
 msgstr "Cor do Cabelo:"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr "Aperto o botão para começar a calibração"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr "Calibrar"
 
@@ -875,28 +842,28 @@ msgstr "Calibrar"
 msgid "Enable joystick"
 msgstr "Habilitar joystick"
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr "Parar"
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "Excluir"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -941,7 +908,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -981,105 +948,105 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr "Limite FPS:"
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr "Opacidade da GUI"
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr "desligado"
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr "baixo"
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr "alto"
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 #, fuzzy
 msgid "fullscreen"
 msgstr "Tela cheia"
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr "Mudando para Tela cheia"
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr "Trocando OpenGL"
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicando mudança a OpenGL requer reiniciar o jogo."
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
@@ -1208,24 +1175,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Adicionar"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Adicionar"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr "Voc pegou %d GP."
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr "Você dá:"
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1511,6 +1482,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1637,177 +1625,197 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nome: %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Descrição: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Efeito: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Nome:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Efeito: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Descrição: %s"
+
 #~ msgid "Remember Username"
 #~ msgstr "Lembrar nome de usuário"
 
diff --git a/po/ru.po b/po/ru.po
index 6d1d3a98..f1dc2710 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-01-08 11:50+0000\n"
 "Last-Translator: idle sign <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Выход"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Описание: %s"
@@ -53,12 +52,12 @@ msgstr "Стоп"
 msgid "Sell"
 msgstr "Продать"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -70,13 +69,12 @@ msgstr ""
 msgid "Are you sure you want to delete this character?"
 msgstr "Вы уверены, что хотите удалить этого персонажа?"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Выбор персонажа"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "Имя: %s"
@@ -86,69 +84,68 @@ msgstr "Имя: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Уровень: %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "Деньги: %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "Следующий"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "Новый"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "Удалить"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "Создать персонажа"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Имя:"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "Цвет волос:"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "Стрижка:"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "Создать"
 
@@ -543,12 +540,7 @@ msgstr "Нет"
 msgid "Connecting..."
 msgstr "Соединение..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -558,7 +550,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "Использовать"
 
@@ -575,8 +567,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Инвентарь"
 
@@ -584,49 +576,24 @@ msgstr "Инвентарь"
 msgid "Drop"
 msgstr "Сбросить"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Описание: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Эффект: %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Имя:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Эффект: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Описание: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr "Снять"
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr "Надеть"
 
@@ -678,7 +645,7 @@ msgid "Shortcut"
 msgstr "Клавиша"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "Настройка"
 
@@ -808,7 +775,7 @@ msgstr "Пароль не должен содержать более %d симв
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "Ошибка"
 
@@ -816,20 +783,20 @@ msgstr "Ошибка"
 msgid "Sound"
 msgstr "Звук"
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr "Громкость эффектов"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr "Громкость музыки"
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Применить"
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Восстановить расположение окон"
 
@@ -863,11 +830,11 @@ msgstr ""
 msgid "Color:"
 msgstr "Цвет волос:"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr "Нажмите кнопку, чтобы начать калибровку"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr "Калибровать"
 
@@ -875,28 +842,28 @@ msgstr "Калибровать"
 msgid "Enable joystick"
 msgstr "Использовать джойстик"
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr "Стоп"
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr "Вращайте рукоять"
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "Удалить"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -941,7 +908,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -981,105 +948,105 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr "Ограничение кадр/с:"
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr "Прозрачность интерфейса"
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr "Радиус прокрутки"
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr "Заторможенность прокрутки"
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr "Эффекты окружающей среды"
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr "выкл"
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr "низ."
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr "выс."
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 #, fuzzy
 msgid "fullscreen"
 msgstr "На полный экран"
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr "Переключение в полноэкранный режим"
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr "Переключение на OpenGL"
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr "Переход к OpenGL требует перезагрузки игры."
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
@@ -1208,24 +1175,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Добавить"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Добавить"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr "Вы получили %d GP."
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr "Вы отдаете:"
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1511,6 +1482,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1637,177 +1625,197 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Соединение..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Соединение..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Соединение..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Имя: %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Соединение..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Описание: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Эффект: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Имя:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Эффект: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Описание: %s"
+
 #~ msgid "Unregister"
 #~ msgstr "Удалить регистрацию"
 
diff --git a/po/sk.po b/po/sk.po
index 8b0eec38..3c98e8d8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-12-30 14:07+0000\n"
 "Last-Translator: TomasKovacik <nail@nodomain.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Ukončiť"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Popis: %s"
@@ -52,12 +51,12 @@ msgstr ""
 msgid "Sell"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Zrušiť"
 
@@ -69,14 +68,13 @@ msgstr "Potvrdte zmazanie postavy"
 msgid "Are you sure you want to delete this character?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 #, fuzzy
 msgid "Select Character"
 msgstr "Vytvoriť postavu"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr ""
@@ -86,69 +84,68 @@ msgstr ""
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Level: %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "Peniaze: %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "Predchádzajúci"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "Nasledujúci"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "Nový"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "Vymazať"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "Ano"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "Vytvoriť postavu"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Meno"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "Farba vlasov:"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "Štýl vlasov:"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "Vytvoriť"
 
@@ -539,12 +536,7 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -554,7 +546,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr ""
 
@@ -571,8 +563,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
@@ -580,49 +572,24 @@ msgstr ""
 msgid "Drop"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Popis: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Effekt: %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Meno"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Effekt: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Popis: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr ""
 
@@ -674,7 +641,7 @@ msgid "Shortcut"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr ""
 
@@ -800,7 +767,7 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr ""
 
@@ -808,20 +775,20 @@ msgstr ""
 msgid "Sound"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr ""
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
@@ -855,11 +822,11 @@ msgstr ""
 msgid "Color:"
 msgstr "Farba vlasov:"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr ""
 
@@ -867,28 +834,28 @@ msgstr ""
 msgid "Enable joystick"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "Vymazať"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -933,7 +900,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -973,103 +940,103 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "fullscreen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
@@ -1188,24 +1155,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr ""
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr ""
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1490,6 +1461,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1616,173 +1604,193 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 msgid "Trying to connect to account server..."
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 msgid "Trying to connect to char server..."
 msgstr ""
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 msgid "Trying to connect to map server..."
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, c-format
 msgid "Map: %s"
 msgstr ""
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 msgid "Connecting to map server..."
 msgstr ""
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Popis: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Effekt: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Meno"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Effekt: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Popis: %s"
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Účet a správa postáv"
 
diff --git a/po/sv.po b/po/sv.po
index 88148c62..85e7588d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-05-07 19:04+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "Avsluta"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
@@ -53,12 +52,12 @@ msgstr "Stopp"
 msgid "Sell"
 msgstr "Sälj"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -70,13 +69,12 @@ msgstr ""
 msgid "Are you sure you want to delete this character?"
 msgstr "Är du säker på att du vill ta bort den här karaktären?"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Välj karaktär"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "Namn: %s"
@@ -86,69 +84,68 @@ msgstr "Namn: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nivå: %d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "Pengar: %d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "Föregående"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "Nästa"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "Ny"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "Ta bort"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "Skapa karaktär"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "Namn:"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "Hårfärg:"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "Frisyr:"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "Skapa"
 
@@ -543,12 +540,7 @@ msgstr "Nej"
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -558,7 +550,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "Använd"
 
@@ -575,8 +567,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventarium"
 
@@ -584,49 +576,24 @@ msgstr "Inventarium"
 msgid "Drop"
 msgstr "Släpp"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "Beskrivning: %s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "Effekt: %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "Namn:"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "Effekt: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "Beskrivning: %s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr "Avrusta"
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr "Utrusta"
 
@@ -678,7 +645,7 @@ msgid "Shortcut"
 msgstr "Genväg"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "Inställningar"
 
@@ -808,7 +775,7 @@ msgstr "Lösenordet måste vara kortare än %d tecken."
 msgid "Passwords do not match."
 msgstr "Lösenorden stämmer inte överens."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "Fel"
 
@@ -816,20 +783,20 @@ msgstr "Fel"
 msgid "Sound"
 msgstr "Ljud"
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr "Volym för ljudeffekter"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr "Musikvolym"
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "Verkställ"
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "Återställ fönster"
 
@@ -863,11 +830,11 @@ msgstr ""
 msgid "Color:"
 msgstr "Hårfärg:"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr "Klicka på knappen för att starta kalibreringen"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr "Kalibrera"
 
@@ -875,28 +842,28 @@ msgstr "Kalibrera"
 msgid "Enable joystick"
 msgstr "Aktivera joystick"
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr "Rotera spaken"
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "Ta bort"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -941,7 +908,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -981,105 +948,105 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr "FPS-gräns:"
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr "Genomskinlighet"
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr "Rullningsradie"
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr "Tröghet för rullning"
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr "Omgivande FX"
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr "av"
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr "låg"
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr "hög"
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 #, fuzzy
 msgid "fullscreen"
 msgstr "Helskärm"
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr "Byte till helskärm"
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr "Ändrar OpenGL"
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ändringar i OpenGL kräver omstart."
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
@@ -1208,24 +1175,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "Lägg till"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "Lägg till"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr "Du får %d GP."
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr "Du ger:"
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1511,6 +1482,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1637,177 +1625,197 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Ansluter..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Ansluter..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Ansluter..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Namn: %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Ansluter..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Beskrivning: %s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "Effekt: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "Namn:"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "Effekt: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "Beskrivning: %s"
+
 #~ msgid "Unregister"
 #~ msgstr "Avregistrera"
 
diff --git a/po/th.po b/po/th.po
index 70a4bc2c..cc7f58df 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-11-25 06:16+0000\n"
 "Last-Translator: Tharawut Paripaiboon <Unknown>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "ออก"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr ""
@@ -52,12 +51,12 @@ msgstr ""
 msgid "Sell"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "ยกเลิก"
 
@@ -69,14 +68,13 @@ msgstr "ยืนยันการลบตัวละคร"
 msgid "Are you sure you want to delete this character?"
 msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 #, fuzzy
 msgid "Select Character"
 msgstr "สร้างตัวละคร"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "ชื่อ: %s"
@@ -86,69 +84,68 @@ msgstr "ชื่อ: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "ก่อนหน้า"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "ถัดไป"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "สร้างใหม่"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "ลบทิ้ง"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "ตกลง"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "สร้างตัวละคร"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "ชื่อ:"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "สีผม:"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "ทรงผม:"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "สร้าง"
 
@@ -539,12 +536,7 @@ msgstr "ไม่"
 msgid "Connecting..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -554,7 +546,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "ใช้"
 
@@ -571,8 +563,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
@@ -580,45 +572,24 @@ msgstr ""
 msgid "Drop"
 msgstr "ทิ้ง"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-msgid "Description:"
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-msgid "Effect:"
-msgstr ""
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "ชื่อ:"
-
-#: ../src/gui/inventorywindow.cpp:170
-msgid "Effect: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:172
-msgid "Description: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr ""
 
@@ -670,7 +641,7 @@ msgid "Shortcut"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "ตั้งค่า"
 
@@ -796,7 +767,7 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "ผิดพลาด"
 
@@ -804,20 +775,20 @@ msgstr "ผิดพลาด"
 msgid "Sound"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr ""
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr ""
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr ""
 
@@ -851,11 +822,11 @@ msgstr ""
 msgid "Color:"
 msgstr "สีผม:"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr ""
 
@@ -863,28 +834,28 @@ msgstr ""
 msgid "Enable joystick"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "ลบทิ้ง"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -929,7 +900,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -969,103 +940,103 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "fullscreen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
@@ -1189,24 +1160,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr ""
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr ""
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1491,6 +1466,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1617,177 +1609,181 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "ชื่อ: %s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "ชื่อ:"
+
 #~ msgid "Change Password"
 #~ msgstr "เปลี่ยนรหัสผ่าน"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c69f2cf8..2cc1d038 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 11:01-0700\n"
+"POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-09-17 14:41+0000\n"
 "Last-Translator: luojie-dune <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -33,7 +33,6 @@ msgstr "退出"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
 #: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
-#: ../src/gui/trade.cpp:94 ../src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "描述：%s"
@@ -53,12 +52,12 @@ msgstr "停止"
 msgid "Sell"
 msgstr "出售"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "取消"
 
@@ -70,13 +69,12 @@ msgstr ""
 msgid "Are you sure you want to delete this character?"
 msgstr "你确定想删除这个较色"
 
-#: ../src/gui/char_select.cpp:80
+#: ../src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "选择较色"
 
-#: ../src/gui/char_select.cpp:86 ../src/gui/char_select.cpp:169
-#: ../src/gui/char_select.cpp:181 ../src/gui/trade.cpp:92
-#: ../src/gui/trade.cpp:264
+#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
+#: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
 msgstr "名字：%s"
@@ -86,69 +84,68 @@ msgstr "名字：%s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:87 ../src/gui/char_select.cpp:170
-#: ../src/gui/char_select.cpp:182 ../src/gui/status.cpp:49
+#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:187 ../src/gui/status.cpp:49
 #: ../src/gui/status.cpp:230
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:171
-#: ../src/gui/char_select.cpp:183
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
+#: ../src/gui/char_select.cpp:188
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "等级：%d"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:184
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Money: %d"
 msgstr "金钱：%d"
 
-#: ../src/gui/char_select.cpp:91
+#: ../src/gui/char_select.cpp:93
 msgid "Previous"
 msgstr "上一页"
 
-#: ../src/gui/char_select.cpp:92
+#: ../src/gui/char_select.cpp:94
 msgid "Next"
 msgstr "下一页"
 
-#: ../src/gui/char_select.cpp:93
+#: ../src/gui/char_select.cpp:95
 msgid "New"
 msgstr "新建"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
 msgid "Delete"
 msgstr "删除"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:62
+#: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
 msgstr "OK"
 
-#: ../src/gui/char_select.cpp:172
+#: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:241
+#: ../src/gui/char_select.cpp:247
 msgid "Create Character"
 msgstr "创建角色"
 
-#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
-#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
+#: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
 msgid "Name:"
 msgstr "名称"
 
-#: ../src/gui/char_select.cpp:254
+#: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
 msgstr "头发颜色"
 
-#: ../src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
 msgstr "发型"
 
-#: ../src/gui/char_select.cpp:258
+#: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "建立"
 
@@ -543,12 +540,7 @@ msgstr "否"
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:93
-msgid "Unable to load emotions"
-msgstr ""
-
-#: ../src/gui/emotecontainer.cpp:53
+#: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
 msgstr ""
 
@@ -558,7 +550,7 @@ msgid "Emote"
 msgstr ""
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:262 ../src/gui/skill.cpp:132
+#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
 msgid "Use"
 msgstr "使用"
 
@@ -575,8 +567,8 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/menuwindow.cpp:65
-#: ../src/gui/menuwindow.cpp:109
+#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "清单"
 
@@ -584,49 +576,24 @@ msgstr "清单"
 msgid "Drop"
 msgstr "丢弃"
 
-#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:162
-#, fuzzy
-msgid "Description:"
-msgstr "描述：%s"
-
-#: ../src/gui/inventorywindow.cpp:70 ../src/gui/inventorywindow.cpp:160
-#, fuzzy
-msgid "Effect:"
-msgstr "影响: %s"
-
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:110
+#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:168
-#, fuzzy
-msgid "Name: "
-msgstr "名称"
-
-#: ../src/gui/inventorywindow.cpp:170
-#, fuzzy
-msgid "Effect: "
-msgstr "影响: %s"
-
-#: ../src/gui/inventorywindow.cpp:172
-#, fuzzy
-msgid "Description: "
-msgstr "描述：%s"
-
-#: ../src/gui/inventorywindow.cpp:255
+#: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
 msgstr "卸下装备"
 
-#: ../src/gui/inventorywindow.cpp:258
+#: ../src/gui/inventorywindow.cpp:203
 msgid "Equip"
 msgstr "装备"
 
@@ -678,7 +645,7 @@ msgid "Shortcut"
 msgstr "快捷键"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/main.cpp:756
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
 msgid "Setup"
 msgstr "安装"
 
@@ -808,7 +775,7 @@ msgstr "密码不能少于%d个字符"
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
 msgstr "错误"
 
@@ -816,20 +783,20 @@ msgstr "错误"
 msgid "Sound"
 msgstr "声音"
 
-#: ../src/gui/setup_audio.cpp:45
+#: ../src/gui/setup_audio.cpp:46
 msgid "Sfx volume"
 msgstr "音效声量"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Music volume"
 msgstr "音乐声量"
 
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:116
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:116
 msgid "Apply"
 msgstr "应用"
 
 #. Disable this button when the windows aren't created yet
-#: ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:70 ../src/gui/setup.cpp:126
+#: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
 msgstr "重置窗口"
 
@@ -863,11 +830,11 @@ msgstr ""
 msgid "Color:"
 msgstr "头发颜色"
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
 msgstr "按下开始校准按钮"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
 msgid "Calibrate"
 msgstr "校准"
 
@@ -875,28 +842,28 @@ msgstr "校准"
 msgid "Enable joystick"
 msgstr "启用游戏杆"
 
-#: ../src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:75
 msgid "Stop"
 msgstr "停止"
 
-#: ../src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
 msgstr "旋转手柄"
 
-#: ../src/gui/setup_keyboard.cpp:87
+#: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:93
+#: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
 msgstr "删除"
 
-#: ../src/gui/setup_keyboard.cpp:114
+#: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
@@ -941,7 +908,7 @@ msgstr ""
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:244
+#: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
 msgstr ""
 
@@ -981,105 +948,105 @@ msgstr ""
 msgid "FPS Limit:"
 msgstr "FPS限制"
 
-#: ../src/gui/setup_video.cpp:141
+#: ../src/gui/setup_video.cpp:142
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: ../src/gui/setup_video.cpp:209
+#: ../src/gui/setup_video.cpp:210
 msgid "Scroll radius"
 msgstr "滚动半径"
 
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:218
 msgid "Scroll laziness"
 msgstr "拉动极限"
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:226
 msgid "Ambient FX"
 msgstr "环境音效"
 
-#: ../src/gui/setup_video.cpp:232 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
 msgid "off"
 msgstr "离线"
 
-#: ../src/gui/setup_video.cpp:235 ../src/gui/setup_video.cpp:251
-#: ../src/gui/setup_video.cpp:494 ../src/gui/setup_video.cpp:508
+#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
 msgid "low"
 msgstr "低"
 
-#: ../src/gui/setup_video.cpp:238 ../src/gui/setup_video.cpp:257
-#: ../src/gui/setup_video.cpp:497 ../src/gui/setup_video.cpp:514
+#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
 msgid "high"
 msgstr "高"
 
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:254 ../src/gui/setup_video.cpp:511
+#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:260 ../src/gui/setup_video.cpp:517
+#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:320
+#: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:322
 #, fuzzy
 msgid "fullscreen"
 msgstr "全屏"
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:329
+#: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
 msgstr "切换到全屏"
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:331
 msgid "Restart needed for changes to take effect."
 msgstr "只有改变生效后才能重启"
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:342
+#: ../src/gui/setup_video.cpp:343
 msgid "Changing OpenGL"
 msgstr "改变成OpenGL"
 
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:344
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
-#: ../src/gui/setup_video.cpp:420 ../src/main.cpp:394
+#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:434
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "只有改变生效后才能重启"
 
-#: ../src/gui/setup_video.cpp:451
+#: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:453
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "只有改变生效后才能重启"
@@ -1208,24 +1175,28 @@ msgstr ""
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:61
-msgid "Add"
-msgstr "添加"
+#: ../src/gui/trade.cpp:51
+msgid "Trade: You"
+msgstr ""
 
-#: ../src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:156 ../src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:63
+msgid "Add"
+msgstr "添加"
+
+#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
 msgstr "你得到%d GP."
 
-#: ../src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:83
 msgid "You give:"
 msgstr "你得到："
 
-#: ../src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1511,6 +1482,23 @@ msgstr ""
 msgid "ColorDB: Error, unknown dye ID# %d"
 msgstr ""
 
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
 msgstr ""
@@ -1637,177 +1625,197 @@ msgstr ""
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:206
+#: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:208
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:211
+#: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:221
+#: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:223
+#: ../src/main.cpp:224
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:260
+#: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:262
+#: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:266
+#: ../src/main.cpp:267
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:268
+#: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:281
+#: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:301
+#: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:311
+#: ../src/main.cpp:312
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:425
+#: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:467
+#: ../src/main.cpp:468
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:469
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:484 ../src/main.cpp:487
+#: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:488
+#: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:584
+#: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "连接中..."
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:639
+#: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "连接中..."
 
-#: ../src/main.cpp:661
+#: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:667
+#: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "连接中..."
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "名字：%s"
 
-#: ../src/main.cpp:798
+#: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:831
+#: ../src/main.cpp:832
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1034
+#: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "连接中..."
 
-#: ../src/main.cpp:1042
+#: ../src/main.cpp:1045
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1050
+#: ../src/main.cpp:1053
 msgid "Connecting to account server..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "描述：%s"
+
+#, fuzzy
+#~ msgid "Effect:"
+#~ msgstr "影响: %s"
+
+#, fuzzy
+#~ msgid "Name: "
+#~ msgstr "名称"
+
+#, fuzzy
+#~ msgid "Effect: "
+#~ msgstr "影响: %s"
+
+#, fuzzy
+#~ msgid "Description: "
+#~ msgstr "描述：%s"
+
 #~ msgid "Unregister"
 #~ msgstr "注销"
 
-- 
cgit v1.2.3-70-g09d2


From 9fe5ab08903ba9902725b500f588afd9ed58f2da Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 16 Jan 2009 16:22:58 -0700
Subject: Added po files to the windows install script.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 packaging/windows/setup.nsi | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index cd01486d..d37a5cce 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -9,7 +9,7 @@ SetCompressor /SOLID lzma
 
 ; HM NIS Edit helper defines
 !define PRODUCT_NAME "Aethyra"
-!define PRODUCT_VERSION "0.0.27"
+!define PRODUCT_VERSION "0.0.27.1"
 !define PRODUCT_PUBLISHER "Aethyra Development Team"
 !define PRODUCT_WEB_SITE "http://aethyra.org"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\aethyra.exe"
@@ -155,6 +155,7 @@ Section "Core files (required)" SecCore
   CreateDirectory "$INSTDIR\data\graphics\gui"
   CreateDirectory "$INSTDIR\data\graphics\images"
   CreateDirectory "$INSTDIR\docs"
+  CreateDirectory "$INSTDIR\po"
 
   SetOverwrite ifnewer
   SetOutPath "$INSTDIR"
@@ -178,6 +179,10 @@ Section "Core files (required)" SecCore
   File /nonfatal "${AETHYRAROOT}\data\music\*.ogg"
   SetOutPath "$INSTDIR\docs"
   File "${AETHYRAROOT}\docs\FAQ.txt"
+  SetOutPath "$INSTDIR\po"
+  File "${AETHYRAROOT}\po\aethyra.pot"
+  File "${AETHYRAROOT}\po\LINGUAS"
+  File "${AETHYRAROOT}\po\*.po"
 SectionEnd
 
 Section -AdditionalIcons
-- 
cgit v1.2.3-70-g09d2


From 1ac350cb425249f37961206a04427e084d2fa833 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 16 Jan 2009 16:46:32 -0700
Subject: Fixed the installing of the dejavu ttf file (previous commit forgot
 it)

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 packaging/windows/setup.nsi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index d37a5cce..c380e7b7 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -148,6 +148,7 @@ Section "Core files (required)" SecCore
   CreateShortCut "$SMPROGRAMS\Aethyra\Aethyra.lnk" "$INSTDIR\aethyra.exe"
   CreateShortCut "$DESKTOP\Aethyra.lnk" "$INSTDIR\aethyra.exe"
   CreateDirectory "$INSTDIR\data"
+  CreateDirectory "$INSTDIR\data\fonts"
   CreateDirectory "$INSTDIR\data\graphics"
   CreateDirectory "$INSTDIR\data\help"
   CreateDirectory "$INSTDIR\data\icons"
@@ -166,6 +167,8 @@ Section "Core files (required)" SecCore
   File "${AETHYRAROOT}\COPYING"
   File "${AETHYRAROOT}\NEWS"
   File "${AETHYRAROOT}\README"
+  SetOutPath "$INSTDIR\data\fonts"
+  File "${AETHYRAROOT}\data\fonts\*.ttf"
   SetOutPath "$INSTDIR\data\graphics\gui"
   File "${AETHYRAROOT}\data\graphics\gui\*.png"
   File "${AETHYRAROOT}\data\graphics\gui\*.xml"
-- 
cgit v1.2.3-70-g09d2


From 7398e19f1bbf44ee732b6739f6620cdcb6c3b554 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 17 Jan 2009 17:50:11 -0700
Subject: Added a few XML files for "translation". Idea obtained from
 IchigoBlack, where these "translation" strings can be used to tell the client
 to use a separate XML file than the English one, so that item descriptions,
 monster names, etc. which are obtained from updates can be translated as
 well. Ex. instead of pointing to items.xml for Spanish, tell the client to
 translate that string to items.es.xml, or for monsters.xml, tell it to point
 to monsters.zh.xml for Chinese.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/skill.cpp           | 2 +-
 src/resources/itemdb.cpp    | 2 +-
 src/resources/monsterdb.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 2ff82030..44f77253 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -36,7 +36,7 @@
 #include "../utils/strprintf.h"
 #include "../utils/xml.h"
 
-static const char *SKILLS_FILE = "skills.xml";
+static const char *SKILLS_FILE = _("skills.xml");
 
 struct SkillInfo {
     std::string name;
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 270083ef..7091abed 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -57,7 +57,7 @@ void ItemDB::load()
     mUnknown->setSprite("error.xml", GENDER_MALE);
     mUnknown->setSprite("error.xml", GENDER_FEMALE);
 
-    XML::Document doc("items.xml");
+    XML::Document doc(_("items.xml"));
     xmlNodePtr rootNode = doc.rootNode();
 
     if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "items"))
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 92009826..4ee7b89e 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -45,7 +45,7 @@ void MonsterDB::load()
 
     logger->log(_("Initializing monster database..."));
 
-    XML::Document doc("monsters.xml");
+    XML::Document doc(_("monsters.xml"));
     xmlNodePtr rootNode = doc.rootNode();
 
     if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "monsters"))
-- 
cgit v1.2.3-70-g09d2


From 577c13f6fd14160984614ba5cdfc37661c9fada4 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 17 Jan 2009 20:15:15 -0700
Subject: Cleaned up chat code a bit.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/chat.cpp | 339 +++++++++++++++++++++++++++++++++----------------------
 src/gui/chat.h   |   6 +-
 2 files changed, 211 insertions(+), 134 deletions(-)

diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 3c569ded..fa969d17 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -100,9 +100,9 @@ ChatWindow::~ChatWindow()
     delete mRecorder;
 }
 
-void ChatWindow::logic()
+void ChatWindow::widgetResized(const gcn::Event &event)
 {
-    // todo: only do this when the size changes (updateWidgets?)
+    Window::widgetResized(event);
 
     const gcn::Rectangle area = getChildrenArea();
 
@@ -112,8 +112,7 @@ void ChatWindow::logic()
     mChatInput->setWidth(area.width - 2 * mChatInput->getFrameSize());
     mScrollArea->setWidth(area.width - 2 * mScrollArea->getFrameSize());
     mScrollArea->setHeight(area.height - 2 * mScrollArea->getFrameSize() -
-                           mChatInput->getHeight() - 5);
-    mScrollArea->logic();
+            mChatInput->getHeight() - 5);
 }
 
 void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
@@ -128,10 +127,13 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
 
 
     std::string::size_type pos = line.find(" : ");
-    if (pos != std::string::npos) {
+    if (pos != std::string::npos)
+    {
         tmp.nick = line.substr(0, pos);
         tmp.text = line.substr(pos + 3);
-    } else {
+    }
+    else
+    {
         // Fix the owner of welcome message.
         if (line.substr(0, 7) == _("Welcome"))
         {
@@ -140,7 +142,8 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
     }
 
     std::string lineColor = "##C";
-    switch (own) {
+    switch (own) 
+    {
         case BY_GM:
             if (tmp.nick.empty())
             {
@@ -149,8 +152,8 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
             }
             else
             {
-                tmp.nick = std::string(_("Global announcement from ") + tmp.nick
-                        + std::string(": "));
+                tmp.nick = strprintf(_("Global announcement from %s: "),
+                                     tmp.nick.c_str());
                 lineColor = "##1"; // Equiv. to BrowserBox::RED
             }
             break;
@@ -205,11 +208,14 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
     // adding a row, otherwise the max will always be a row higher
     // at comparison.
     if (mScrollArea->getVerticalScrollAmount() ==
-        mScrollArea->getVerticalMaxScroll()) {
+        mScrollArea->getVerticalMaxScroll()) 
+    {
         mTextOutput->addRow(line);
         mScrollArea->setVerticalScrollAmount(mScrollArea->
                                              getVerticalMaxScroll());
-    } else {
+    }
+    else
+    {
         mTextOutput->addRow(line);
     }
 
@@ -223,12 +229,15 @@ void ChatWindow::chatLog(CHATSKILL act)
 
 void ChatWindow::action(const gcn::ActionEvent & event)
 {
-    if (event.getId() == "chatinput") {
+    if (event.getId() == "chatinput")
+    {
         std::string message = mChatInput->getText();
 
-        if (!message.empty()) {
+        if (!message.empty())
+        {
             // If message different from previous, put it in the history
-            if (mHistory.empty() || message != mHistory.back()) {
+            if (mHistory.empty() || message != mHistory.back())
+            {
                 mHistory.push_back(message);
             }
             // Reset history iterator
@@ -240,7 +249,9 @@ void ChatWindow::action(const gcn::ActionEvent & event)
             // Clear the text from the chat input
             mChatInput->setText("");
         }
-        if (message.empty() || !mReturnToggles) {
+
+        if (message.empty() || !mReturnToggles)
+        {
             // Remove focus and hide input
             mFocusHandler->focusNone();
 
@@ -256,7 +267,8 @@ void ChatWindow::action(const gcn::ActionEvent & event)
 void ChatWindow::requestChatFocus()
 {
     // Make sure chatWindow is visible
-    if (!isVisible()) {
+    if (!isVisible())
+    {
         setVisible(true);
 
         /*
@@ -266,6 +278,7 @@ void ChatWindow::requestChatFocus()
          */
         mTmpVisible = true;
     }
+
     // Give focus to the chat input
     mChatInput->setVisible(true);
     mChatInput->requestFocus();
@@ -276,6 +289,40 @@ bool ChatWindow::isInputFocused()
     return mChatInput->isFocused();
 }
 
+void ChatWindow::whisper(const std::string &nick, std::string msg)
+{
+    std::string recvnick = "";
+
+    if (msg.substr(0, 1) == "\"")
+    {
+        const std::string::size_type pos = msg.find('"', 1);
+        if (pos != std::string::npos)
+        {
+            recvnick = msg.substr(1, pos - 1);
+            msg.erase(0, pos + 2);
+        }
+    }
+    else
+    {
+        const std::string::size_type pos = msg.find(" ");
+        if (pos != std::string::npos)
+        {
+            recvnick = msg.substr(0, pos);
+            msg.erase(0, pos + 1);
+        }
+    }
+
+    MessageOut outMsg(mNetwork);
+    outMsg.writeInt16(CMSG_CHAT_WHISPER);
+    outMsg.writeInt16(msg.length() + 28);
+    outMsg.writeString(recvnick, 24);
+    outMsg.writeString(msg, msg.length());
+
+    chatLog(strprintf(_("Whispering to %s: %s"),
+                        recvnick.c_str(), msg.c_str()),
+                        BY_PLAYER);
+}
+
 void ChatWindow::chatSend(const std::string &nick, std::string msg)
 {
     /* Some messages are managed client side, while others
@@ -283,11 +330,13 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
      * those if elses should be replaced by protocol calls */
 
     // Send party message
-    if (msg.at(0) == mPartyPrefix) {
+    if (msg.at(0) == mPartyPrefix) 
+    {
         msg.erase(0, 1);
         std::size_t length = msg.length() + 1;
 
-        if (length == 0) {
+        if (length == 0)
+        {
             chatLog(_("Trying to send a blank party message."), BY_SERVER);
             return;
         }
@@ -298,8 +347,10 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
         outMsg.writeString(msg, length);
         return;
     }
+
     // Prepare ordinary message
-    if (msg.substr(0, 1) != "/") {
+    if (msg.substr(0, 1) != "/") 
+    {
         // The server never tells you about your own GM status, so work around
         // this for now by intercepting it here. NOTE: This assumes that the 
         // assert works, when it's not guaranteed to.
@@ -318,14 +369,19 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
         outMsg.writeString(msg, msg.length() + 1);
         return;
     }
+
     msg.erase(0, 1);
     trim(msg);
 
     std::size_t space = msg.find(" ");
     std::string command = msg.substr(0, space);
-    if (space == std::string::npos) {
+
+    if (space == std::string::npos)
+    {
         msg = "";
-    } else {
+    }
+    else
+    {
         msg = msg.substr(space);
         trim(msg);
     }
@@ -336,7 +392,6 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
         outMsg.writeInt16(0x0099);
         outMsg.writeInt16(msg.length() + 4);
         outMsg.writeString(msg, msg.length());
-        return;
     }
     else if (command == "help") 
     {
@@ -344,6 +399,7 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
         trim(msg);
         std::size_t space = msg.find(" ");
         std::string msg1;
+
         if (space == std::string::npos)
         {
             msg1 = "";
@@ -353,10 +409,12 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
             msg1 = msg.substr(space + 1, msg.length());
             msg = msg.substr(0, space);
         }
+
         if (msg != "" && msg.at(0) == '/')
         {
             msg.erase(0, 1);
         }
+
         trim(msg1);
         help(msg, msg1);
     }
@@ -367,126 +425,123 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
         where << map_path << " " << player_node->mX << "," << player_node->mY;
         chatLog(where.str(), BY_SERVER);
     }
-    if (command == "who") {
+    else if (command == "who")
+    {
         MessageOut outMsg(mNetwork);
         outMsg.writeInt16(0x00c1);
-        return;
     }
-    if (command == "clear") {
+    else if (command == "clear")
         mTextOutput->clearRows();
-        return;
-    }
-    if (command == "whisper" || command == "msg" || command == "w") {
-        std::string recvnick = "";
-
-        if (msg.substr(0, 1) == "\"") {
-            const std::string::size_type pos = msg.find('"', 1);
-            if (pos != std::string::npos) {
-                recvnick = msg.substr(1, pos - 1);
-                msg.erase(0, pos + 2);
-            }
-        } else {
-            const std::string::size_type pos = msg.find(" ");
-            if (pos != std::string::npos) {
-                recvnick = msg.substr(0, pos);
-                msg.erase(0, pos + 1);
-            }
-        }
-
-        MessageOut outMsg(mNetwork);
-        outMsg.writeInt16(CMSG_CHAT_WHISPER);
-        outMsg.writeInt16(msg.length() + 28);
-        outMsg.writeString(recvnick, 24);
-        outMsg.writeString(msg, msg.length());
-
-        chatLog(_("Whispering to ") + recvnick + " : " + msg, BY_PLAYER);
-        return;
-    }
-    if (command == "record") {
+    else if (command == "whisper" || command == "msg" || command == "w")
+        whisper(nick, msg);
+    else if (command == "record")
         mRecorder->respond(msg);
-        return;
-    }
-    if (command == "toggle") {
-        if (msg == "") {
+    else if (command == "toggle")
+    {
+        if (msg == "")
+        {
             chatLog(mReturnToggles ? _("Return toggles chat.")
                     : _("Message closes chat."), BY_SERVER);
             return;
         }
+
         msg = msg.substr(0, 1);
-        if (msg == "1" || msg == "y" || msg == "t" || msg == "Y" || msg == "T") {
+
+        if (msg == "1" || 
+            msg == "y" || msg == "Y" || 
+            msg == "t" || msg == "T")
+        {
             chatLog(_("Return now toggles chat."), BY_SERVER);
             mReturnToggles = true;
             return;
         }
-        if (msg == "0" || msg == "n" || msg == "f" || msg == "N" || msg == "F") {
+        else if (msg == "0" || 
+                 msg == "n" || msg == "N" || 
+                 msg == "f" || msg == "F")
+        {
             chatLog(_("Message now closes chat."), BY_SERVER);
             mReturnToggles = false;
             return;
         }
-        chatLog(_("Options to /toggle are \"yes\", \"no\", \"true\", \"false\", "
-                "\"1\", \"0\"."), BY_SERVER);
-        return;
+        else
+            chatLog(_("Options to /toggle are \"yes\", \"no\", \"true\", "
+                      "\"false\", \"1\", \"0\"."), BY_SERVER);
     }
-    if (command == "party") {
-        if (msg == "") {
+    else if (command == "party")
+    {
+        if (msg == "")
+        {
             chatLog(_("Unknown party command... Type \"/help\" party for more "
                     "information."), BY_SERVER);
             return;
         }
+
         const std::string::size_type space = msg.find(" ");
         std::string rest = (space == std::string::npos ? ""
                             : msg.substr(space + 1, msg.length()));
-        if (rest != "") {
+
+        if (rest != "")
+        {
             msg = msg.substr(0, space);
-            while (msg != "" && msg[0] == ' ') {
-                msg = msg.substr(1, msg.length());
-            }
+            trim(msg);
         }
+
         party(msg, rest);
         return;
     }
-    if (command == "cast") {
+    else if (command == "cast")
+    {
         /*
          * This will eventually be replaced by a GUI, so
          * we don't need to get too sophisticated
          */
-        if (extensions.aethyra_spells) {
+        if (extensions.aethyra_spells)
+        {
             MessageOut outMsg(mNetwork);
-            if (msg == "heal") {
+            if (msg == "heal")
+            {
                 outMsg.writeInt16(0x03f3);
                 outMsg.writeInt16(0x01);
                 outMsg.writeInt32(0);
                 outMsg.writeInt8(0);
                 outMsg.writeInt8(0);
                 outMsg.writeString("", 24);
-            } else if (msg == "gather") {
+            }
+            else if (msg == "gather")
+            {
                 outMsg.writeInt16(0x03f3);
                 outMsg.writeInt16(0x02);
                 outMsg.writeInt32(0);
                 outMsg.writeInt8(0);
                 outMsg.writeInt8(0);
                 outMsg.writeString("", 24);
-            } else {
-                chatLog(_("No such spell!"), BY_SERVER);
             }
-        } else {
-            chatLog(_("The current server doesn't support spells"), BY_SERVER);
+            else
+                chatLog(_("No such spell!"), BY_SERVER);
         }
-        return;
+        else
+            chatLog(_("The current server doesn't support spells"), BY_SERVER);
     }
-    if (command == "present") {
+    else if (command == "present")
+    {
         Beings & beings = beingManager->getAll();
         std::string response = "";
+
         for (BeingIterator bi = beings.begin(), be = beings.end();
-             bi != be; ++bi) {
-            if ((*bi)->getType() == Being::PLAYER) {
-                if (response != "") {
+             bi != be; ++bi)
+        {
+            if ((*bi)->getType() == Being::PLAYER)
+            {
+                if (response != "")
+                {
                     response += ", ";
                 }
                 response += (*bi)->getName();
             }
         }
-        if (mRecorder->isRecording()) {
+
+        if (mRecorder->isRecording())
+        {
             // Get the current system time
             time_t t;
             time(&t);
@@ -502,19 +557,25 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
 
             mRecorder->record(timeStr.str() + _("Present: ") + response + ".");
             chatLog(_("Attendance written to record log."), BY_SERVER, true);
-        } else {
+        }
+        else
+        {
             chatLog(_("Present: ") + response, BY_SERVER);
         }
-        return;
     }
-    chatLog(_("Unknown command"), BY_SERVER);
+    else
+    {
+        chatLog(_("Unknown command"), BY_SERVER);
+    }
 }
 
 std::string ChatWindow::const_msg(CHATSKILL act)
 {
     std::string msg;
-    if (act.success == SKILL_FAILED && act.skill == SKILL_BASIC) {
-        switch (act.bskill) {
+    if (act.success == SKILL_FAILED && act.skill == SKILL_BASIC)
+    {
+        switch (act.bskill)
+        {
             case BSKILL_TRADE:
                 msg = _("Trade failed!");
                 break;
@@ -537,7 +598,8 @@ std::string ChatWindow::const_msg(CHATSKILL act)
 
         msg += " ";
 
-        switch (act.reason) {
+        switch (act.reason)
+        {
             case RFAIL_SKILLDEP:
                 msg += _("You have not yet reached a high enough lvl!");
                 break;
@@ -572,8 +634,11 @@ std::string ChatWindow::const_msg(CHATSKILL act)
                 msg += _("Huh? What's that?");
                 break;
         }
-    } else {
-        switch (act.skill) {
+    }
+    else
+    {
+        switch (act.skill)
+        {
             case SKILL_WARP :
                 msg = _("Warp failed...");
                 break;
@@ -585,6 +650,7 @@ std::string ChatWindow::const_msg(CHATSKILL act)
                 break;
         }
     }
+
     return msg;
 }
 
@@ -608,10 +674,14 @@ void ChatWindow::keyPressed(gcn::KeyEvent & event)
     {
         // Move forward through the history
         HistoryIterator prevHist = mCurHist++;
-        if (mCurHist != mHistory.end()) {
+
+        if (mCurHist != mHistory.end())
+        {
             mChatInput->setText(*mCurHist);
             mChatInput->setCaretPosition(mChatInput->getText().length());
-        } else {
+        }
+        else
+        {
             mCurHist = prevHist;
         }
     }
@@ -645,33 +715,41 @@ void ChatWindow::setVisible(bool isVisible)
 
 void ChatWindow::party(const std::string & command, const std::string & rest)
 {
-    if (command == "prefix") {
-        if (rest == "") {
+    if (command == "prefix")
+    {
+        if (rest == "")
+        {
             char temp[2] = ".";
             *temp = mPartyPrefix;
             chatLog(_("The current party prefix is ") + std::string(temp),
                     BY_SERVER);
-            return;
         }
-        if (rest.length() != 1) {
+        else if (rest.length() != 1)
+        {
             chatLog(_("Party prefix must be one character long."), BY_SERVER);
-        } else {
-            if (rest == "/") {
+        }
+        else
+        {
+            if (rest == "/")
+            {
                 chatLog(_("Cannot use a '/' as the prefix."), BY_SERVER);
-            } else {
+            }
+            else
+            {
                 mPartyPrefix = rest.at(0);
                 chatLog(_("Changing prefix to ") + rest, BY_SERVER);
             }
         }
-        return;
     }
-    mParty->respond(command, rest);
+    else
+        mParty->respond(command, rest);
 }
 
 void ChatWindow::help(const std::string & msg1, const std::string & msg2)
 {
     chatLog(_("-- Help --"), BY_SERVER);
-    if (msg1 == "") {
+    if (msg1 == "") 
+    {
         chatLog(_("/announce: Global announcement (GM only)"), BY_SERVER);
         chatLog(_("/clear: Clears this window"), BY_SERVER);
         chatLog(_("/help: Display this help"), BY_SERVER);
@@ -687,66 +765,62 @@ void ChatWindow::help(const std::string & msg1, const std::string & msg2)
                     " to <nick>"), BY_SERVER);
         chatLog(_("/who: Display number of online users"), BY_SERVER);
         chatLog(_("For more information, type /help <command>"), BY_SERVER);
-        return;
     }
-    if (msg1 == "announce")
+    else if (msg1 == "announce")
     {
         chatLog(_("Command: /announce <msg>"), BY_SERVER);
         chatLog(_("*** only available to a GM ***"), BY_SERVER);
         chatLog(_("This command sends the message <msg> to "
                     "all players currently online."), BY_SERVER);
-        return;
     }
-    if (msg1 == "clear")
+    else if (msg1 == "clear")
     {
         chatLog(_("Command: /clear"), BY_SERVER);
         chatLog(_("This command clears the chat log of previous chat."),
                 BY_SERVER);
-        return;
     }
-    if (msg1 == "help")
+    else if (msg1 == "help")
     {
         chatLog(_("Command: /help"), BY_SERVER);
         chatLog(_("This command displays a list of all commands available."),
                 BY_SERVER);
         chatLog(_("Command: /help <command>"), BY_SERVER);
         chatLog(_("This command displays help on <command>."), BY_SERVER);
-        return;
     }
-    if (msg1 == "party") 
+    else if (msg1 == "party") 
     {
         mParty->help(msg2);
-        return;
     }
-    if (msg1 == "present") 
+    else if (msg1 == "present") 
     {
         chatLog(_("Command: /present"), BY_SERVER);
-        chatLog(_("This command gets a list of players within hearing and sends it to either the record log if recording, or the chat log otherwise."), BY_SERVER);
-        return;
+        chatLog(_("This command gets a list of players within hearing and "
+                  "sends it to either the record log if recording, or the chat "
+                  "log otherwise."), BY_SERVER);
     }
-    if (msg1 == "record") 
+    else if (msg1 == "record") 
     {
         mRecorder->help(msg2);
-        return;
     }
-    if (msg1 == "toggle") 
+    else if (msg1 == "toggle") 
     {
         chatLog(_("Command: /toggle <state>"), BY_SERVER);
-        chatLog(_("This command sets whether the return key should toggle the chat log, or whether the chat log turns off automatically."),
-                BY_SERVER);
-        chatLog(_("<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0\", \"no\", \"false\" to turn the toggle off."), BY_SERVER);
+        chatLog(_("This command sets whether the return key should toggle the" 
+                  "chat log, or whether the chat log turns off automatically."),
+                  BY_SERVER);
+        chatLog(_("<state> can be one of \"1\", \"yes\", \"true\" to "
+                  "turn the toggle on, or \"0\", \"no\", \"false\" to turn the "
+                  "toggle off."), BY_SERVER);
         chatLog(_("Command: /toggle"), BY_SERVER);
         chatLog(_("This command displays the return toggle status."), BY_SERVER);
-        return;
     }
-    if (msg1 == "where")
+    else if (msg1 == "where")
     {
         chatLog(_("Command: /where"), BY_SERVER);
         chatLog(_("This command displays the name of the current map."),
                 BY_SERVER);
-        return;
     }
-    if (msg1 == "whisper" || msg1 == "msg" || msg1 == "w")
+    else if (msg1 == "whisper" || msg1 == "msg" || msg1 == "w")
     {
         chatLog(_("Command: /msg <nick> <msg>"), BY_SERVER);
         chatLog(_("Command: /whisper <nick> <msg>"), BY_SERVER);
@@ -754,16 +828,17 @@ void ChatWindow::help(const std::string & msg1, const std::string & msg2)
         chatLog(_("This command sends the message <msg> to <nick>."),
                 BY_SERVER);
         chatLog(_("If the <nick> has spaces in it, enclose it in "
-                "double quotes (\")."), BY_SERVER);
-        return;
+                  "double quotes (\")."), BY_SERVER);
     }
-    if (msg1 == "who")
+    else if (msg1 == "who")
     {
         chatLog(_("Command: /who"), BY_SERVER);
         chatLog(_("This command displays the number of players currently "
-                "online."), BY_SERVER);
-        return;
+                  "online."), BY_SERVER);
+    }
+    else
+    {
+        chatLog(_("Unknown command."), BY_SERVER);
+        chatLog(_("Type /help for a list of commands."), BY_SERVER);
     }
-    chatLog(_("Unknown command."), BY_SERVER);
-    chatLog(_("Type /help for a list of commands."), BY_SERVER);
 }
diff --git a/src/gui/chat.h b/src/gui/chat.h
index 9e137499..f7d05df1 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -121,9 +121,9 @@ class ChatWindow : public Window, public gcn::ActionListener,
         ~ChatWindow();
 
         /**
-         * Logic (updates components' size)
+         * Called whenever the widget changes size.
          */
-        void logic();
+        void widgetResized(const gcn::Event &event);
 
         /**
          * Adds a line of text to our message list. Parameters:
@@ -218,6 +218,8 @@ class ChatWindow : public Window, public gcn::ActionListener,
         Network *mNetwork;
         bool mTmpVisible;
 
+        void whisper(const std::string &nick, std::string msg);
+
         /** One item in the chat log */
         struct CHATLOG
         {
-- 
cgit v1.2.3-70-g09d2


From 3a1afa91e94733fd32b5d4229ca2a94831909eb1 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 17 Jan 2009 20:36:58 -0700
Subject: Updated git ignore rules.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 .gitignore | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4f353fe4..6cddf3cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,53 @@
 # files created by autoreconf
+ABOUT-NLS
 Makefile.in
 aclocal.m4
 autom4te.cache
+config.guess
 config.h.in
+config.rpath
+config.sub
 configure
 depcomp
 install-sh
+m4/
 missing
+po/Makefile.in.in
+po/Makevars.template
+po/Rules-quot
+po/boldquot.sed
+po/en@boldquot.header
+po/en@quot.header
+po/insert-header.sin
+po/quot.sed
+po/remove-potcdate.*
 
 # files created by configure
 Makefile
 config.h
 config.log
 config.status
-src/.deps
+po/POTFILES
+.deps
 stamp-h1
 
 # files created during build
 *.o
-src/tmw
+*.gmo
+.dirstamp
+po/stamp-po
+src/aethyra
+
+# files created during Windows build
+.objs
+*.dll
+aethyra.exe
+aethyra.depend
+aethyra.layout
+
+# files copied in on Windows
+include/*
+lib/*
+packaging/windows/upx/*
+data/music/*.ogg
+
-- 
cgit v1.2.3-70-g09d2


From efa25a6392ddd4f987620c43b65204340831b55d Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 17 Jan 2009 21:16:21 -0700
Subject: Repaired recorder functions.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/recorder.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/recorder.h b/src/recorder.h
index 9f30184f..fe49810f 100644
--- a/src/recorder.h
+++ b/src/recorder.h
@@ -38,7 +38,7 @@ class Recorder : public ButtonBoxListener
 	void help() const;
 	void help(const std::string &args) const;
 	void buttonBoxRespond();
-	bool isRecording() const {return mStream;}
+	bool isRecording() const {return mStream.is_open();}
         virtual ~Recorder();
     private:
 	ChatWindow *mChat;
-- 
cgit v1.2.3-70-g09d2


From 4cb16f79b2ebc8b9681c9e0a81558ef177cd6031 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 17 Jan 2009 21:42:55 -0700
Subject: While the old behavior works, I think most people would appreciate
 not having to specify a full file path. Now, if you invoke the /record
 command, you only need to specify a file name, and it'll save a log to the
 .aethyra directory. Should help stop failures based on not having the
 priveleges to write to that location.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/recorder.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/recorder.cpp b/src/recorder.cpp
index 7bf618c5..57f030b2 100644
--- a/src/recorder.cpp
+++ b/src/recorder.cpp
@@ -19,6 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <physfs.h>
+
 #include "recorder.h"
 
 #include "gui/buttonbox.h"
@@ -73,7 +75,9 @@ void Recorder::respond(const std::string &msg)
 	 * recorded.
 	 */
 	mChat->chatLog("Starting to record...", BY_SERVER);
-	mStream.open(msg.c_str(), std::ios_base::trunc);
+        std::string file = std::string(PHYSFS_getUserDir()) + "/.aethyra/" + msgCopy;
+        
+	mStream.open(file.c_str(), std::ios_base::trunc);
 	if (mStream.is_open())
 	{
 	    mButtonBox->setVisible(true);
-- 
cgit v1.2.3-70-g09d2


From 8446b826926ebbdb584cdfcd3dc5e4eb5bd142f1 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 18 Jan 2009 13:06:34 -0700
Subject: Fixed the minimap so that it properly remembers if it was open on
 closing, rather than opening every time the client loads.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/game.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index a9e59586..7791d641 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -19,8 +19,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "game.h"
-
 #include <fstream>
 #include <physfs.h>
 #include <sstream>
@@ -34,6 +32,7 @@
 #include "emoteshortcut.h"
 #include "engine.h"
 #include "flooritemmanager.h"
+#include "game.h"
 #include "graphics.h"
 #include "itemshortcut.h"
 #include "joystick.h"
@@ -230,10 +229,11 @@ void createGuiWindows(Network *network)
     emoteShortcutWindow->setVisible((bool) config.getValue(
         emoteShortcutWindow->getWindowName() + "Visible", true));
 
+    if (!(bool) config.getValue("MinimapVisible", true))
+        minimap->toggle();
+
     if (config.getValue("logToChat", 0))
-    {
         logger->setChatWindow(chatWindow);
-    }
 }
 
 /**
-- 
cgit v1.2.3-70-g09d2


From 8c79a56c0f3710e20888d1031f179dc98f37e0a4 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Wed, 7 Jan 2009 15:22:44 +0000
Subject: Add dialogs to input text and numbers for scripts

---
 src/CMakeLists.txt           |   4 ++
 src/Makefile.am              |   4 ++
 src/game.cpp                 |  11 +++-
 src/gui/npcintegerdialog.cpp | 125 +++++++++++++++++++++++++++++++++++++++++++
 src/gui/npcintegerdialog.h   |  82 ++++++++++++++++++++++++++++
 src/gui/npcstringdialog.cpp  |  77 ++++++++++++++++++++++++++
 src/gui/npcstringdialog.h    |  78 +++++++++++++++++++++++++++
 src/net/npchandler.cpp       |  22 ++++++++
 src/net/protocol.h           |   5 +-
 src/npc.cpp                  |  18 +++++++
 src/npc.h                    |   2 +
 11 files changed, 426 insertions(+), 2 deletions(-)
 create mode 100644 src/gui/npcintegerdialog.cpp
 create mode 100644 src/gui/npcintegerdialog.h
 create mode 100644 src/gui/npcstringdialog.cpp
 create mode 100644 src/gui/npcstringdialog.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 43e5cb95..6bb1a2f3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -120,8 +120,12 @@ SET(SRCS
     gui/minimap.h
     gui/ministatus.cpp
     gui/ministatus.h
+    gui/npcintegerdialog.cpp
+    gui/npcintegerdialog.h
     gui/npclistdialog.cpp
     gui/npclistdialog.h
+    gui/npcstringdialog.cpp
+    gui/npcstringdialog.h
     gui/npc_text.cpp
     gui/npc_text.h
     gui/ok_dialog.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 9a3fa3b9..2bb11268 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -76,8 +76,12 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/minimap.h \
 	      gui/ministatus.cpp \
 	      gui/ministatus.h \
+	      gui/npcintegerdialog.cpp \
+	      gui/npcintegerdialog.h \
 	      gui/npclistdialog.cpp \
 	      gui/npclistdialog.h \
+	      gui/npcstringdialog.cpp \
+	      gui/npcstringdialog.h \
 	      gui/npc_text.cpp \
 	      gui/npc_text.h \
 	      gui/ok_dialog.cpp \
diff --git a/src/game.cpp b/src/game.cpp
index 7791d641..ec5bc267 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -60,7 +60,9 @@
 #include "gui/menuwindow.h"
 #include "gui/minimap.h"
 #include "gui/ministatus.h"
+#include "gui/npcintegerdialog.h"
 #include "gui/npclistdialog.h"
+#include "gui/npcstringdialog.h"
 #include "gui/npc_text.h"
 #include "gui/ok_dialog.h"
 #include "gui/sdlinput.h"
@@ -118,8 +120,10 @@ SellDialog *sellDialog;
 BuySellDialog *buySellDialog;
 InventoryWindow *inventoryWindow;
 EmoteWindow *emoteWindow;
+NpcIntegerDialog *npcIntegerDialog;
 NpcListDialog *npcListDialog;
 NpcTextDialog *npcTextDialog;
+NpcStringDialog *npcStringDialog;
 SkillDialog *skillDialog;
 Setup* setupWindow;
 Minimap *minimap;
@@ -203,7 +207,9 @@ void createGuiWindows(Network *network)
     inventoryWindow = new InventoryWindow();
     emoteWindow = new EmoteWindow();
     npcTextDialog = new NpcTextDialog();
+    npcIntegerDialog = new NpcIntegerDialog();
     npcListDialog = new NpcListDialog();
+    npcStringDialog = new NpcStringDialog();
     skillDialog = new SkillDialog();
     setupWindow = new Setup();
     minimap = new Minimap();
@@ -251,8 +257,10 @@ void destroyGuiWindows()
     delete buySellDialog;
     delete inventoryWindow;
     delete emoteWindow;
+    delete npcIntegerDialog;
     delete npcListDialog;
     delete npcTextDialog;
+    delete npcStringDialog;
     delete skillDialog;
     delete setupWindow;
     delete minimap;
@@ -648,7 +656,8 @@ void Game::handleInput()
 		default:
 		    break;
 	    }
-	    if (keyboard.isEnabled() && !chatWindow->isInputFocused())
+            if (keyboard.isEnabled() && !chatWindow->isInputFocused()
+                && !npcStringDialog->isInputFocused())
 	    {
 		const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
 		// Do not activate shortcuts if tradewindow is visible
diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp
new file mode 100644
index 00000000..f5b6ac5b
--- /dev/null
+++ b/src/gui/npcintegerdialog.cpp
@@ -0,0 +1,125 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "npcintegerdialog.h"
+
+#include <limits>
+#include <sstream>
+
+#include "button.h"
+#include "textfield.h"
+
+#include "../npc.h"
+
+#include "../utils/gettext.h"
+#include "../utils/tostring.h"
+
+#include "widgets/layout.h"
+
+NpcIntegerDialog::NpcIntegerDialog():
+    Window(_("NPC Number Request"))
+{
+    mDecButton = new Button("-", "decvalue", this);
+    mIncButton = new Button("+", "incvalue", this);
+    mValueField = new TextField();
+    okButton = new Button(_("OK"), "ok", this);
+    cancelButton = new Button(_("Cancel"), "cancel", this);
+
+    mDecButton->setSize(20, 20);
+    mIncButton->setSize(20, 20);
+
+    place(0, 0, mDecButton);
+    place(1, 0, mValueField, 3);
+    place(4, 0, mIncButton);
+    place(2, 1, okButton);
+    place(3, 1, cancelButton, 2);
+    reflowLayout(175, 0);
+
+    setLocationRelativeTo(getParent());
+
+    mValueField->setActionEventId("valuefield");
+    mValueField->addKeyListener(this);
+}
+
+void NpcIntegerDialog::prepDialog(const int min, const int def, const int max)
+{
+    mMin = min;
+    mMax = max;
+    mDefault = def;
+    mValue = def;
+
+    mValueField->setText(toString(mValue));
+}
+
+int NpcIntegerDialog::getValue()
+{
+    return mValue;
+}
+
+void NpcIntegerDialog::action(const gcn::ActionEvent &event)
+{
+    int finish = 0;
+
+    if (event.getId() == "ok")
+    {
+        finish = 1;
+    }
+    else if (event.getId() == "cancel")
+    {
+        finish = 1;
+        mValue = mDefault;
+    }
+    else if (event.getId() == "decvalue" && mValue < mMin)
+    {
+        mValue--;
+    }
+    else if (event.getId() == "incvalue" && mValue > mMax)
+    {
+        mValue++;
+    }
+
+    mValueField->setText(toString(mValue));
+
+    if (finish)
+    {
+        setVisible(false);
+        current_npc->integerInput(mValue);
+        current_npc = 0;
+    }
+}
+
+void NpcIntegerDialog::keyPressed(gcn::KeyEvent &event)
+{
+    std::stringstream tempValue(mValueField->getText());
+    int value;
+    tempValue >> value;
+    if (value < mMin)
+    {
+        value = mMin;
+    }
+    if (value > mMax)
+    {
+        value = mMax;
+    }
+
+    mValue = value;
+    mValueField->setText(toString(value));
+}
diff --git a/src/gui/npcintegerdialog.h b/src/gui/npcintegerdialog.h
new file mode 100644
index 00000000..a45d57c4
--- /dev/null
+++ b/src/gui/npcintegerdialog.h
@@ -0,0 +1,82 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _TMW_GUI_NPCINTEGERDIALOG_H
+#define _TMW_GUI_NPCINTEGERDIALOG_H
+
+#include <iosfwd>
+#include <vector>
+
+#include <guichan/actionlistener.hpp>
+#include <guichan/keylistener.hpp>
+
+#include "window.h"
+
+#include "../guichanfwd.h"
+
+/**
+ * The npc integer input dialog.
+ *
+ * \ingroup Interface
+ */
+class NpcIntegerDialog : public Window, public gcn::ActionListener,
+                         public gcn::KeyListener
+{
+    public:
+        /**
+         * Constructor.
+         *
+         * @see Window::Window
+         */
+        NpcIntegerDialog();
+
+        /**
+         * Called when receiving actions from the widgets.
+         */
+        void action(const gcn::ActionEvent &event);
+
+        /** Called when key is pressed */
+        void keyPressed(gcn::KeyEvent &event);
+
+        /**
+         * Returns the current value.
+         */
+        int getValue();
+
+        /**
+         * Prepares the NPC dialog.
+         *
+         * @param min The minimum value to allow
+         * @param def The default value
+         * @param max The maximum value to allow
+         */
+        void prepDialog(const int min, const int def, const int max);
+
+    private:
+        int mMin, mMax, mDefault, mValue;
+        gcn::Button *mDecButton;
+        gcn::Button *mIncButton;
+        gcn::TextField *mValueField;
+        gcn::Button *okButton;
+        gcn::Button *cancelButton;
+};
+
+#endif // _TMW_GUI_NPCINTEGERDIALOG_H
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
new file mode 100644
index 00000000..6bca961c
--- /dev/null
+++ b/src/gui/npcstringdialog.cpp
@@ -0,0 +1,77 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "npcstringdialog.h"
+
+#include <limits>
+#include <sstream>
+
+#include "button.h"
+#include "textfield.h"
+
+#include "../npc.h"
+
+#include "../utils/gettext.h"
+#include "../utils/tostring.h"
+
+#include "widgets/layout.h"
+
+NpcStringDialog::NpcStringDialog():
+    Window(_("NPC Text Request"))
+{
+    mValueField = new TextField("The Mana World"); // Just a sizing value :)
+    okButton = new Button(_("OK"), "ok", this);
+    cancelButton = new Button(_("Cancel"), "cancel", this);
+
+    place(0, 0, mValueField, 3);
+    place(1, 1, okButton);
+    place(2, 1, cancelButton);
+    reflowLayout(175, 0);
+
+    setLocationRelativeTo(getParent());
+}
+
+std::string NpcStringDialog::getValue()
+{
+    return mValueField->getText();
+}
+
+void NpcStringDialog::setValue(const std::string &value)
+{
+    mValueField->setText(value);
+}
+
+void NpcStringDialog::action(const gcn::ActionEvent &event)
+{
+    if (event.getId() == "cancel")
+    {
+        mValueField->setText("");
+    }
+
+    setVisible(false);
+    current_npc->stringInput(mValueField->getText());
+    current_npc = 0;
+}
+
+bool NpcStringDialog::isInputFocused()
+{
+    return mValueField->isFocused();
+}
diff --git a/src/gui/npcstringdialog.h b/src/gui/npcstringdialog.h
new file mode 100644
index 00000000..22054994
--- /dev/null
+++ b/src/gui/npcstringdialog.h
@@ -0,0 +1,78 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _TMW_GUI_NPCSTRINGDIALOG_H
+#define _TMW_GUI_NPCSTRINGDIALOG_H
+
+#include <iosfwd>
+#include <vector>
+
+#include <guichan/actionlistener.hpp>
+#include <guichan/keylistener.hpp>
+
+#include "window.h"
+
+#include "../guichanfwd.h"
+
+/**
+ * The npc integer input dialog.
+ *
+ * \ingroup Interface
+ */
+class NpcStringDialog : public Window, public gcn::ActionListener
+{
+    public:
+        /**
+         * Constructor.
+         *
+         * @see Window::Window
+         */
+        NpcStringDialog();
+
+        /**
+         * Called when receiving actions from the widgets.
+         */
+        void action(const gcn::ActionEvent &event);
+
+        /**
+         * Returns the current value.
+         */
+        std::string getValue();
+
+        /**
+         * Chnages the current value.
+         *
+         * @param value The new value
+         */
+        void setValue(const std::string &value);
+
+        /**
+         * Checks whether NpcStringDialog is Focused or not.
+         */
+        bool isInputFocused();
+
+    private:
+        gcn::TextField *mValueField;
+        gcn::Button *okButton;
+        gcn::Button *cancelButton;
+};
+
+#endif // _TMW_GUI_NPCSTRINGDIALOG_H
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 4f3c4354..c597e31c 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -28,10 +28,14 @@
 #include "../npc.h"
 
 #include "../gui/npc_text.h"
+#include "../gui/npcintegerdialog.h"
 #include "../gui/npclistdialog.h"
+#include "../gui/npcstringdialog.h"
 
+extern NpcIntegerDialog *npcIntegerDialog;
 extern NpcListDialog *npcListDialog;
 extern NpcTextDialog *npcTextDialog;
+extern NpcStringDialog *npcStringDialog;
 
 NPCHandler::NPCHandler()
 {
@@ -40,6 +44,8 @@ NPCHandler::NPCHandler()
         SMSG_NPC_MESSAGE,
         SMSG_NPC_NEXT,
         SMSG_NPC_CLOSE,
+        SMSG_NPC_INT_INPUT,
+        SMSG_NPC_STR_INPUT,
         0
     };
     handledMessages = _messages;
@@ -79,5 +85,21 @@ void NPCHandler::handleMessage(MessageIn *msg)
         case SMSG_NPC_NEXT:
             // Next button in NPC dialog, currently unused
             break;
+
+        case SMSG_NPC_INT_INPUT:
+            // Request for an integer
+            id = msg->readInt32();
+            current_npc = dynamic_cast<NPC*>(beingManager->findBeing(id));
+            npcIntegerDialog->prepDialog(0, 0, 2147483647);
+            npcIntegerDialog->setVisible(true);
+            break;
+
+        case SMSG_NPC_STR_INPUT:
+            // Request for a string
+            id = msg->readInt32();
+            current_npc = dynamic_cast<NPC*>(beingManager->findBeing(id));
+            npcStringDialog->setValue("");
+            npcStringDialog->setVisible(true);
+            break;
     }
 }
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 783283ba..0538abf4 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -79,7 +79,8 @@
 #define SMSG_NPC_SELL                0x00c7
 #define SMSG_NPC_BUY_RESPONSE        0x00ca
 #define SMSG_NPC_SELL_RESPONSE       0x00cb
-
+#define SMSG_NPC_INT_INPUT           0x0142 /**< Integer input */
+#define SMSG_NPC_STR_INPUT           0x01d4 /**< String input */
 #define SMSG_PLAYER_CHAT             0x008e /**< Player talks */
 #define SMSG_WHISPER                 0x0097 /**< Whisper Recieved */
 #define SMSG_WHISPER_RESPONSE        0x0098
@@ -128,6 +129,8 @@
 #define CMSG_NPC_LIST_CHOICE         0x00b8
 #define CMSG_NPC_NEXT_REQUEST        0x00b9
 #define CMSG_NPC_SELL_REQUEST        0x00c9
+#define CMSG_NPC_INT_RESPONSE        0x0143
+#define CMSG_NPC_STR_RESPONSE        0x01d5
 #define CMSG_SKILL_LEVELUP_REQUEST   0x0112
 #define CMSG_STAT_UPDATE_REQUEST     0x00bb
 #define CMSG_TRADE_ITEM_ADD_REQUEST  0x00e8
diff --git a/src/npc.cpp b/src/npc.cpp
index a9aa216c..ae5ca476 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -134,6 +134,24 @@ void NPC::dialogChoice(char choice)
     outMsg.writeInt8(choice);
 }
 
+void NPC::integerInput(int value)
+{
+    MessageOut outMsg(mNetwork);
+    outMsg.writeInt16(CMSG_NPC_INT_RESPONSE);
+    outMsg.writeInt32(mId);
+    outMsg.writeInt32(value);
+}
+
+void NPC::stringInput(const std::string &value)
+{
+    MessageOut outMsg(mNetwork);
+    outMsg.writeInt16(CMSG_NPC_STR_RESPONSE);
+    outMsg.writeInt16(value.length() + 8);
+    outMsg.writeInt32(mId);
+    outMsg.writeString(value, value.length());
+    outMsg.writeInt8(0); // Just to be safe
+}
+
 /*
  * TODO Unify the buy() and sell() methods, without sacrificing readability of
  * the code calling the method. buy(bool buySell) would be bad...
diff --git a/src/npc.h b/src/npc.h
index af1dfc66..1cb9a90f 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -44,6 +44,8 @@ class NPC : public Player
         void talk();
         void nextDialog();
         void dialogChoice(char choice);
+        void integerInput(int value);
+        void stringInput(const std::string &value);
 
         void buy();
         void sell();
-- 
cgit v1.2.3-70-g09d2


From 4e481047718a4728549ae65128e42912b747c86d Mon Sep 17 00:00:00 2001
From: David Athay <ko2fan@gmail.com>
Date: Sun, 18 Jan 2009 20:04:39 +0000
Subject: Updated some apple specific code

---
 src/gui/truetypefont.h                 |   4 +
 themanaworld.xcodeproj/project.pbxproj | 181 ++++++++++++++++++++++++---------
 2 files changed, 135 insertions(+), 50 deletions(-)

diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
index 67c39e6a..3d5d52ff 100644
--- a/src/gui/truetypefont.h
+++ b/src/gui/truetypefont.h
@@ -26,7 +26,11 @@
 
 #include <guichan/font.hpp>
 #include <guichan/graphics.hpp>
+#ifndef __APPLE__
 #include <SDL/SDL_ttf.h>
+#else
+#include <SDL_ttf.h>
+#endif
 
 /**
  * A wrapper around SDL_ttf for allowing the use of TrueType fonts.
diff --git a/themanaworld.xcodeproj/project.pbxproj b/themanaworld.xcodeproj/project.pbxproj
index 5bd59f57..f2dadea7 100644
--- a/themanaworld.xcodeproj/project.pbxproj
+++ b/themanaworld.xcodeproj/project.pbxproj
@@ -28,7 +28,6 @@
 		924A3A120C07A60B0066885E /* resizegrip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 924A3A100C07A60B0066885E /* resizegrip.cpp */; };
 		924A40570C085EF50066885E /* items.xsd in Copy Data Files */ = {isa = PBXBuildFile; fileRef = 924A401C0C085ED80066885E /* items.xsd */; };
 		924A405A0C085F950066885E /* bg_quad_dis.png in Copy GUI Files */ = {isa = PBXBuildFile; fileRef = 924A3E600C085ED70066885E /* bg_quad_dis.png */; };
-		924A405B0C085F950066885E /* browserfont.png in Copy GUI Files */ = {isa = PBXBuildFile; fileRef = 924A3E610C085ED70066885E /* browserfont.png */; };
 		924A405C0C085F950066885E /* button.png in Copy GUI Files */ = {isa = PBXBuildFile; fileRef = 924A3E620C085ED70066885E /* button.png */; };
 		924A405D0C085F950066885E /* button_disabled.png in Copy GUI Files */ = {isa = PBXBuildFile; fileRef = 924A3E630C085ED70066885E /* button_disabled.png */; };
 		924A405E0C085F950066885E /* buttonhi.png in Copy GUI Files */ = {isa = PBXBuildFile; fileRef = 924A3E640C085ED70066885E /* buttonhi.png */; };
@@ -54,7 +53,6 @@
 		924A40720C085F950066885E /* radioout.png in Copy GUI Files */ = {isa = PBXBuildFile; fileRef = 924A3E7A0C085ED70066885E /* radioout.png */; };
 		924A40730C085F950066885E /* resize.png in Copy GUI Files */ = {isa = PBXBuildFile; fileRef = 924A3E7B0C085ED70066885E /* resize.png */; };
 		924A40740C085F950066885E /* rpgfont_wider.png in Copy GUI Files */ = {isa = PBXBuildFile; fileRef = 924A3E7C0C085ED70066885E /* rpgfont_wider.png */; };
-		924A40750C085F950066885E /* sansserif8.png in Copy GUI Files */ = {isa = PBXBuildFile; fileRef = 924A3E7D0C085ED70066885E /* sansserif8.png */; };
 		924A40760C085F950066885E /* selection.png in Copy GUI Files */ = {isa = PBXBuildFile; fileRef = 924A3E7E0C085ED70066885E /* selection.png */; };
 		924A40770C085F950066885E /* slider.png in Copy GUI Files */ = {isa = PBXBuildFile; fileRef = 924A3E7F0C085ED70066885E /* slider.png */; };
 		924A40780C085F950066885E /* target-cursor-blue-l.png in Copy GUI Files */ = {isa = PBXBuildFile; fileRef = 924A3E800C085ED70066885E /* target-cursor-blue-l.png */; };
@@ -85,9 +83,31 @@
 		924A42090C0861EC0066885E /* team.txt in Copy Help Files */ = {isa = PBXBuildFile; fileRef = 924A40130C085ED80066885E /* team.txt */; };
 		924A425A0C0871EC0066885E /* The Mana World.icns in Resources */ = {isa = PBXBuildFile; fileRef = 924A42590C0871EC0066885E /* The Mana World.icns */; };
 		925350030BC12A3200115FD5 /* imageset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 925350010BC12A3200115FD5 /* imageset.cpp */; };
+		926A294A0F23BD88005D6466 /* layout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 926A29440F23BD88005D6466 /* layout.cpp */; };
+		926A294B0F23BD88005D6466 /* tab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 926A29460F23BD88005D6466 /* tab.cpp */; };
+		926A294C0F23BD88005D6466 /* tabbedarea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 926A29480F23BD88005D6466 /* tabbedarea.cpp */; };
+		926A29560F23BD9E005D6466 /* npcintegerdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 926A294E0F23BD9E005D6466 /* npcintegerdialog.cpp */; };
+		926A29570F23BD9E005D6466 /* npcstringdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 926A29500F23BD9E005D6466 /* npcstringdialog.cpp */; };
+		926A29580F23BD9E005D6466 /* sdlinput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 926A29520F23BD9E005D6466 /* sdlinput.cpp */; };
+		926A29590F23BD9E005D6466 /* truetypefont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 926A29540F23BD9E005D6466 /* truetypefont.cpp */; };
+		926A297A0F23C155005D6466 /* SDL_ttf.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 926A29790F23C155005D6466 /* SDL_ttf.framework */; };
+		926A29800F23C18E005D6466 /* tab.png in Resources */ = {isa = PBXBuildFile; fileRef = 926A297E0F23C18E005D6466 /* tab.png */; };
+		926A29810F23C18E005D6466 /* tabselected.png in Resources */ = {isa = PBXBuildFile; fileRef = 926A297F0F23C18E005D6466 /* tabselected.png */; };
+		926A29850F23C1C8005D6466 /* windows.txt in Resources */ = {isa = PBXBuildFile; fileRef = 926A29840F23C1C8005D6466 /* windows.txt */; };
 		926F9CF80DB005FA00AACD26 /* itemshortcut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 926F9CF60DB005FA00AACD26 /* itemshortcut.cpp */; };
 		926F9D450DB00AFC00AACD26 /* itemshortcutcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 926F9D410DB00AFC00AACD26 /* itemshortcutcontainer.cpp */; };
 		926F9D460DB00AFC00AACD26 /* itemshortcutwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 926F9D430DB00AFC00AACD26 /* itemshortcutwindow.cpp */; };
+		9273BDFC0EF33DFD008E56E1 /* COPYING in Resources */ = {isa = PBXBuildFile; fileRef = 9273BDFB0EF33DFD008E56E1 /* COPYING */; };
+		9273BDFF0EF33E1A008E56E1 /* AUTHORS in Resources */ = {isa = PBXBuildFile; fileRef = 9273BDFD0EF33E1A008E56E1 /* AUTHORS */; };
+		9273BE000EF33E1A008E56E1 /* README in Resources */ = {isa = PBXBuildFile; fileRef = 9273BDFE0EF33E1A008E56E1 /* README */; };
+		9273BE080EF33FB3008E56E1 /* particlecontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9273BE040EF33FB3008E56E1 /* particlecontainer.cpp */; };
+		9273BE090EF33FB3008E56E1 /* statuseffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9273BE060EF33FB3008E56E1 /* statuseffect.cpp */; };
+		9273BE2D0EF3403E008E56E1 /* Clouds Calling.ogg in Copy Music Files */ = {isa = PBXBuildFile; fileRef = 9273BE0B0EF33FFF008E56E1 /* Clouds Calling.ogg */; };
+		9273BE2E0EF3403E008E56E1 /* Faith.ogg in Copy Music Files */ = {isa = PBXBuildFile; fileRef = 9273BE0C0EF33FFF008E56E1 /* Faith.ogg */; };
+		9273BE2F0EF3403E008E56E1 /* finalman_and_yakslem-cavesong.ogg in Copy Music Files */ = {isa = PBXBuildFile; fileRef = 9273BE0D0EF33FFF008E56E1 /* finalman_and_yakslem-cavesong.ogg */; };
+		9273BE300EF3403E008E56E1 /* Magick - Real.ogg in Copy Music Files */ = {isa = PBXBuildFile; fileRef = 9273BE0E0EF33FFF008E56E1 /* Magick - Real.ogg */; };
+		9273BE310EF3403E008E56E1 /* The Mana World - Snow Village.ogg in Copy Music Files */ = {isa = PBXBuildFile; fileRef = 9273BE0F0EF33FFF008E56E1 /* The Mana World - Snow Village.ogg */; };
+		9273BE320EF3403E008E56E1 /* The Mana World - The Forest.ogg in Copy Music Files */ = {isa = PBXBuildFile; fileRef = 9273BE100EF33FFF008E56E1 /* The Mana World - The Forest.ogg */; };
 		9294DA9B0C17E70400FCEDE9 /* physfs.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3FAB0BAEE55B000DAB7F /* physfs.c */; };
 		9294DA9C0C17E70600FCEDE9 /* physfs_byteorder.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3FAD0BAEE55B000DAB7F /* physfs_byteorder.c */; };
 		9294DAA10C17E73200FCEDE9 /* libpng.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9294DAA00C17E73200FCEDE9 /* libpng.framework */; };
@@ -103,7 +123,6 @@
 		92A4CCF30D1DA5C600CA28FB /* macosx.c in Sources */ = {isa = PBXBuildFile; fileRef = 92A4CCF20D1DA5C600CA28FB /* macosx.c */; };
 		92A4CCF90D1DA81A00CA28FB /* posix.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3FB50BAEE55B000DAB7F /* posix.c */; };
 		92A4CCFC0D1DA89800CA28FB /* physfs_unicode.c in Sources */ = {isa = PBXBuildFile; fileRef = 92A4CCFB0D1DA89800CA28FB /* physfs_unicode.c */; };
-		92A4CCFF0D1DA8E500CA28FB /* LICENSE.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 92A4CCFE0D1DA8E500CA28FB /* LICENSE.rtf */; };
 		92BC3FF60BAEE55B000DAB7F /* animatedsprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3ECA0BAEE55A000DAB7F /* animatedsprite.cpp */; };
 		92BC3FF70BAEE55B000DAB7F /* being.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3ECC0BAEE55A000DAB7F /* being.cpp */; };
 		92BC3FF80BAEE55B000DAB7F /* beingmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3ECE0BAEE55A000DAB7F /* beingmanager.cpp */; };
@@ -114,7 +133,6 @@
 		92BC40050BAEE55B000DAB7F /* flooritemmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3EEA0BAEE55A000DAB7F /* flooritemmanager.cpp */; };
 		92BC40060BAEE55B000DAB7F /* game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3EEC0BAEE55A000DAB7F /* game.cpp */; };
 		92BC40070BAEE55B000DAB7F /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3EEE0BAEE55A000DAB7F /* graphics.cpp */; };
-		92BC40080BAEE55B000DAB7F /* box.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3EF10BAEE55A000DAB7F /* box.cpp */; };
 		92BC40090BAEE55B000DAB7F /* browserbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3EF30BAEE55A000DAB7F /* browserbox.cpp */; };
 		92BC400A0BAEE55B000DAB7F /* buddywindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3EF50BAEE55A000DAB7F /* buddywindow.cpp */; };
 		92BC400B0BAEE55B000DAB7F /* button.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3EF70BAEE55A000DAB7F /* button.cpp */; };
@@ -122,7 +140,6 @@
 		92BC400D0BAEE55B000DAB7F /* buysell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3EFB0BAEE55A000DAB7F /* buysell.cpp */; };
 		92BC400E0BAEE55B000DAB7F /* char_select.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3EFD0BAEE55A000DAB7F /* char_select.cpp */; };
 		92BC400F0BAEE55B000DAB7F /* char_server.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3EFF0BAEE55A000DAB7F /* char_server.cpp */; };
-		92BC40100BAEE55B000DAB7F /* chargedialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F010BAEE55A000DAB7F /* chargedialog.cpp */; };
 		92BC40110BAEE55B000DAB7F /* chat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F030BAEE55A000DAB7F /* chat.cpp */; };
 		92BC40120BAEE55B000DAB7F /* chatinput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F050BAEE55A000DAB7F /* chatinput.cpp */; };
 		92BC40130BAEE55B000DAB7F /* checkbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F070BAEE55A000DAB7F /* checkbox.cpp */; };
@@ -133,7 +150,6 @@
 		92BC40180BAEE55B000DAB7F /* focushandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F110BAEE55A000DAB7F /* focushandler.cpp */; };
 		92BC40190BAEE55B000DAB7F /* gccontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F130BAEE55A000DAB7F /* gccontainer.cpp */; };
 		92BC401A0BAEE55B000DAB7F /* gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F150BAEE55A000DAB7F /* gui.cpp */; };
-		92BC401B0BAEE55B000DAB7F /* hbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F170BAEE55A000DAB7F /* hbox.cpp */; };
 		92BC401C0BAEE55B000DAB7F /* help.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F190BAEE55A000DAB7F /* help.cpp */; };
 		92BC401D0BAEE55B000DAB7F /* inttextbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F1B0BAEE55A000DAB7F /* inttextbox.cpp */; };
 		92BC401E0BAEE55B000DAB7F /* inventorywindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F1D0BAEE55A000DAB7F /* inventorywindow.cpp */; };
@@ -144,7 +160,6 @@
 		92BC40230BAEE55B000DAB7F /* menuwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F280BAEE55A000DAB7F /* menuwindow.cpp */; };
 		92BC40240BAEE55B000DAB7F /* minimap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F2A0BAEE55A000DAB7F /* minimap.cpp */; };
 		92BC40250BAEE55B000DAB7F /* ministatus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F2C0BAEE55A000DAB7F /* ministatus.cpp */; };
-		92BC40260BAEE55B000DAB7F /* newskill.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F2E0BAEE55A000DAB7F /* newskill.cpp */; };
 		92BC40270BAEE55B000DAB7F /* npc_text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F300BAEE55A000DAB7F /* npc_text.cpp */; };
 		92BC40280BAEE55B000DAB7F /* npclistdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F320BAEE55A000DAB7F /* npclistdialog.cpp */; };
 		92BC40290BAEE55B000DAB7F /* ok_dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F340BAEE55A000DAB7F /* ok_dialog.cpp */; };
@@ -165,12 +180,10 @@
 		92BC40380BAEE55B000DAB7F /* skill.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F540BAEE55A000DAB7F /* skill.cpp */; };
 		92BC40390BAEE55B000DAB7F /* slider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F560BAEE55A000DAB7F /* slider.cpp */; };
 		92BC403A0BAEE55B000DAB7F /* status.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F580BAEE55A000DAB7F /* status.cpp */; };
-		92BC403B0BAEE55B000DAB7F /* tabbedcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F5A0BAEE55B000DAB7F /* tabbedcontainer.cpp */; };
 		92BC403C0BAEE55B000DAB7F /* textbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F5C0BAEE55B000DAB7F /* textbox.cpp */; };
 		92BC403D0BAEE55B000DAB7F /* textfield.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F5E0BAEE55B000DAB7F /* textfield.cpp */; };
 		92BC403E0BAEE55B000DAB7F /* trade.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F600BAEE55B000DAB7F /* trade.cpp */; };
 		92BC403F0BAEE55B000DAB7F /* updatewindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F620BAEE55B000DAB7F /* updatewindow.cpp */; };
-		92BC40400BAEE55B000DAB7F /* vbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F640BAEE55B000DAB7F /* vbox.cpp */; };
 		92BC40410BAEE55B000DAB7F /* viewport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F660BAEE55B000DAB7F /* viewport.cpp */; };
 		92BC40420BAEE55B000DAB7F /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F680BAEE55B000DAB7F /* window.cpp */; };
 		92BC40430BAEE55B000DAB7F /* windowcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3F6A0BAEE55B000DAB7F /* windowcontainer.cpp */; };
@@ -266,7 +279,6 @@
 				92024E170CF1C11D006B55CB /* item_shortcut_bgr.png in Copy GUI Files */,
 				92024E150CF1C0DA006B55CB /* close_button.png in Copy GUI Files */,
 				924A405A0C085F950066885E /* bg_quad_dis.png in Copy GUI Files */,
-				924A405B0C085F950066885E /* browserfont.png in Copy GUI Files */,
 				924A405C0C085F950066885E /* button.png in Copy GUI Files */,
 				924A405D0C085F950066885E /* button_disabled.png in Copy GUI Files */,
 				924A405E0C085F950066885E /* buttonhi.png in Copy GUI Files */,
@@ -293,7 +305,6 @@
 				924A40720C085F950066885E /* radioout.png in Copy GUI Files */,
 				924A40730C085F950066885E /* resize.png in Copy GUI Files */,
 				924A40740C085F950066885E /* rpgfont_wider.png in Copy GUI Files */,
-				924A40750C085F950066885E /* sansserif8.png in Copy GUI Files */,
 				924A40760C085F950066885E /* selection.png in Copy GUI Files */,
 				924A40770C085F950066885E /* slider.png in Copy GUI Files */,
 				924A40780C085F950066885E /* target-cursor-blue-l.png in Copy GUI Files */,
@@ -346,6 +357,22 @@
 			name = "Copy Help Files";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		9273BE3C0EF34050008E56E1 /* Copy Music Files */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = data/music;
+			dstSubfolderSpec = 7;
+			files = (
+				9273BE2D0EF3403E008E56E1 /* Clouds Calling.ogg in Copy Music Files */,
+				9273BE2E0EF3403E008E56E1 /* Faith.ogg in Copy Music Files */,
+				9273BE2F0EF3403E008E56E1 /* finalman_and_yakslem-cavesong.ogg in Copy Music Files */,
+				9273BE300EF3403E008E56E1 /* Magick - Real.ogg in Copy Music Files */,
+				9273BE310EF3403E008E56E1 /* The Mana World - Snow Village.ogg in Copy Music Files */,
+				9273BE320EF3403E008E56E1 /* The Mana World - The Forest.ogg in Copy Music Files */,
+			);
+			name = "Copy Music Files";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		92EEA0090D2E20D100DDE300 /* Copy Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -404,7 +431,6 @@
 		924A3A100C07A60B0066885E /* resizegrip.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = resizegrip.cpp; sourceTree = "<group>"; };
 		924A3A110C07A60B0066885E /* resizegrip.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = resizegrip.h; sourceTree = "<group>"; };
 		924A3E600C085ED70066885E /* bg_quad_dis.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bg_quad_dis.png; sourceTree = "<group>"; };
-		924A3E610C085ED70066885E /* browserfont.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = browserfont.png; sourceTree = "<group>"; };
 		924A3E620C085ED70066885E /* button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = button.png; sourceTree = "<group>"; };
 		924A3E630C085ED70066885E /* button_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = button_disabled.png; sourceTree = "<group>"; };
 		924A3E640C085ED70066885E /* buttonhi.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = buttonhi.png; sourceTree = "<group>"; };
@@ -430,7 +456,6 @@
 		924A3E7A0C085ED70066885E /* radioout.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = radioout.png; sourceTree = "<group>"; };
 		924A3E7B0C085ED70066885E /* resize.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = resize.png; sourceTree = "<group>"; };
 		924A3E7C0C085ED70066885E /* rpgfont_wider.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = rpgfont_wider.png; sourceTree = "<group>"; };
-		924A3E7D0C085ED70066885E /* sansserif8.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sansserif8.png; sourceTree = "<group>"; };
 		924A3E7E0C085ED70066885E /* selection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = selection.png; sourceTree = "<group>"; };
 		924A3E7F0C085ED70066885E /* slider.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = slider.png; sourceTree = "<group>"; };
 		924A3E800C085ED70066885E /* target-cursor-blue-l.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "target-cursor-blue-l.png"; sourceTree = "<group>"; };
@@ -467,12 +492,45 @@
 		924A42600C0874D00066885E /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		925350010BC12A3200115FD5 /* imageset.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = imageset.cpp; sourceTree = "<group>"; };
 		925350020BC12A3200115FD5 /* imageset.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = imageset.h; sourceTree = "<group>"; };
+		926A29440F23BD88005D6466 /* layout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = layout.cpp; sourceTree = "<group>"; };
+		926A29450F23BD88005D6466 /* layout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = layout.h; sourceTree = "<group>"; };
+		926A29460F23BD88005D6466 /* tab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tab.cpp; sourceTree = "<group>"; };
+		926A29470F23BD88005D6466 /* tab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tab.h; sourceTree = "<group>"; };
+		926A29480F23BD88005D6466 /* tabbedarea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tabbedarea.cpp; sourceTree = "<group>"; };
+		926A29490F23BD88005D6466 /* tabbedarea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tabbedarea.h; sourceTree = "<group>"; };
+		926A294E0F23BD9E005D6466 /* npcintegerdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = npcintegerdialog.cpp; sourceTree = "<group>"; };
+		926A294F0F23BD9E005D6466 /* npcintegerdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = npcintegerdialog.h; sourceTree = "<group>"; };
+		926A29500F23BD9E005D6466 /* npcstringdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = npcstringdialog.cpp; sourceTree = "<group>"; };
+		926A29510F23BD9E005D6466 /* npcstringdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = npcstringdialog.h; sourceTree = "<group>"; };
+		926A29520F23BD9E005D6466 /* sdlinput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sdlinput.cpp; sourceTree = "<group>"; };
+		926A29530F23BD9E005D6466 /* sdlinput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sdlinput.h; sourceTree = "<group>"; };
+		926A29540F23BD9E005D6466 /* truetypefont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = truetypefont.cpp; sourceTree = "<group>"; };
+		926A29550F23BD9E005D6466 /* truetypefont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = truetypefont.h; sourceTree = "<group>"; };
+		926A295A0F23BDB1005D6466 /* gettext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gettext.h; sourceTree = "<group>"; };
+		926A295B0F23BDB1005D6466 /* mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mutex.h; sourceTree = "<group>"; };
+		926A29790F23C155005D6466 /* SDL_ttf.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_ttf.framework; path = /Library/Frameworks/SDL_ttf.framework; sourceTree = "<absolute>"; };
+		926A297E0F23C18E005D6466 /* tab.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tab.png; sourceTree = "<group>"; };
+		926A297F0F23C18E005D6466 /* tabselected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tabselected.png; sourceTree = "<group>"; };
+		926A29840F23C1C8005D6466 /* windows.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = windows.txt; sourceTree = "<group>"; };
 		926F9CF60DB005FA00AACD26 /* itemshortcut.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = itemshortcut.cpp; path = src/itemshortcut.cpp; sourceTree = "<group>"; };
 		926F9CF70DB005FA00AACD26 /* itemshortcut.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = itemshortcut.h; path = src/itemshortcut.h; sourceTree = "<group>"; };
 		926F9D410DB00AFC00AACD26 /* itemshortcutcontainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = itemshortcutcontainer.cpp; sourceTree = "<group>"; };
 		926F9D420DB00AFC00AACD26 /* itemshortcutcontainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = itemshortcutcontainer.h; sourceTree = "<group>"; };
 		926F9D430DB00AFC00AACD26 /* itemshortcutwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = itemshortcutwindow.cpp; sourceTree = "<group>"; };
 		926F9D440DB00AFC00AACD26 /* itemshortcutwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = itemshortcutwindow.h; sourceTree = "<group>"; };
+		9273BDFB0EF33DFD008E56E1 /* COPYING */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = COPYING; sourceTree = "<group>"; };
+		9273BDFD0EF33E1A008E56E1 /* AUTHORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AUTHORS; sourceTree = "<group>"; };
+		9273BDFE0EF33E1A008E56E1 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
+		9273BE040EF33FB3008E56E1 /* particlecontainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = particlecontainer.cpp; path = src/particlecontainer.cpp; sourceTree = "<group>"; };
+		9273BE050EF33FB3008E56E1 /* particlecontainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = particlecontainer.h; path = src/particlecontainer.h; sourceTree = "<group>"; };
+		9273BE060EF33FB3008E56E1 /* statuseffect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = statuseffect.cpp; path = src/statuseffect.cpp; sourceTree = "<group>"; };
+		9273BE070EF33FB3008E56E1 /* statuseffect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = statuseffect.h; path = src/statuseffect.h; sourceTree = "<group>"; };
+		9273BE0B0EF33FFF008E56E1 /* Clouds Calling.ogg */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Clouds Calling.ogg"; sourceTree = "<group>"; };
+		9273BE0C0EF33FFF008E56E1 /* Faith.ogg */ = {isa = PBXFileReference; lastKnownFileType = file; path = Faith.ogg; sourceTree = "<group>"; };
+		9273BE0D0EF33FFF008E56E1 /* finalman_and_yakslem-cavesong.ogg */ = {isa = PBXFileReference; lastKnownFileType = file; path = "finalman_and_yakslem-cavesong.ogg"; sourceTree = "<group>"; };
+		9273BE0E0EF33FFF008E56E1 /* Magick - Real.ogg */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Magick - Real.ogg"; sourceTree = "<group>"; };
+		9273BE0F0EF33FFF008E56E1 /* The Mana World - Snow Village.ogg */ = {isa = PBXFileReference; lastKnownFileType = file; path = "The Mana World - Snow Village.ogg"; sourceTree = "<group>"; };
+		9273BE100EF33FFF008E56E1 /* The Mana World - The Forest.ogg */ = {isa = PBXFileReference; lastKnownFileType = file; path = "The Mana World - The Forest.ogg"; sourceTree = "<group>"; };
 		9294DAA00C17E73200FCEDE9 /* libpng.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libpng.framework; path = /Library/Frameworks/libpng.framework; sourceTree = "<absolute>"; };
 		92A4CC9D0D1C622E00CA28FB /* dye.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dye.cpp; path = src/resources/dye.cpp; sourceTree = "<group>"; };
 		92A4CCE00D1DA58D00CA28FB /* dir.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dir.c; sourceTree = "<group>"; };
@@ -487,7 +545,6 @@
 		92A4CCF10D1DA5A800CA28FB /* physfs_platforms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = physfs_platforms.h; sourceTree = "<group>"; };
 		92A4CCF20D1DA5C600CA28FB /* macosx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = macosx.c; sourceTree = "<group>"; };
 		92A4CCFB0D1DA89800CA28FB /* physfs_unicode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = physfs_unicode.c; sourceTree = "<group>"; };
-		92A4CCFE0D1DA8E500CA28FB /* LICENSE.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = LICENSE.rtf; sourceTree = "<group>"; };
 		92BC3ECA0BAEE55A000DAB7F /* animatedsprite.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = animatedsprite.cpp; path = src/animatedsprite.cpp; sourceTree = "<group>"; };
 		92BC3ECB0BAEE55A000DAB7F /* animatedsprite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = animatedsprite.h; path = src/animatedsprite.h; sourceTree = "<group>"; };
 		92BC3ECC0BAEE55A000DAB7F /* being.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = being.cpp; path = src/being.cpp; sourceTree = "<group>"; };
@@ -509,8 +566,6 @@
 		92BC3EED0BAEE55A000DAB7F /* game.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = game.h; path = src/game.h; sourceTree = "<group>"; };
 		92BC3EEE0BAEE55A000DAB7F /* graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = graphics.cpp; path = src/graphics.cpp; sourceTree = "<group>"; };
 		92BC3EEF0BAEE55A000DAB7F /* graphics.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = graphics.h; path = src/graphics.h; sourceTree = "<group>"; };
-		92BC3EF10BAEE55A000DAB7F /* box.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = box.cpp; sourceTree = "<group>"; };
-		92BC3EF20BAEE55A000DAB7F /* box.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = box.h; sourceTree = "<group>"; };
 		92BC3EF30BAEE55A000DAB7F /* browserbox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = browserbox.cpp; sourceTree = "<group>"; };
 		92BC3EF40BAEE55A000DAB7F /* browserbox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = browserbox.h; sourceTree = "<group>"; };
 		92BC3EF50BAEE55A000DAB7F /* buddywindow.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = buddywindow.cpp; sourceTree = "<group>"; };
@@ -525,8 +580,6 @@
 		92BC3EFE0BAEE55A000DAB7F /* char_select.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = char_select.h; sourceTree = "<group>"; };
 		92BC3EFF0BAEE55A000DAB7F /* char_server.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = char_server.cpp; sourceTree = "<group>"; };
 		92BC3F000BAEE55A000DAB7F /* char_server.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = char_server.h; sourceTree = "<group>"; };
-		92BC3F010BAEE55A000DAB7F /* chargedialog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = chargedialog.cpp; sourceTree = "<group>"; };
-		92BC3F020BAEE55A000DAB7F /* chargedialog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = chargedialog.h; sourceTree = "<group>"; };
 		92BC3F030BAEE55A000DAB7F /* chat.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = chat.cpp; sourceTree = "<group>"; };
 		92BC3F040BAEE55A000DAB7F /* chat.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = chat.h; sourceTree = "<group>"; };
 		92BC3F050BAEE55A000DAB7F /* chatinput.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = chatinput.cpp; sourceTree = "<group>"; };
@@ -547,8 +600,6 @@
 		92BC3F140BAEE55A000DAB7F /* gccontainer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = gccontainer.h; sourceTree = "<group>"; };
 		92BC3F150BAEE55A000DAB7F /* gui.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = gui.cpp; sourceTree = "<group>"; };
 		92BC3F160BAEE55A000DAB7F /* gui.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = gui.h; sourceTree = "<group>"; };
-		92BC3F170BAEE55A000DAB7F /* hbox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hbox.cpp; sourceTree = "<group>"; };
-		92BC3F180BAEE55A000DAB7F /* hbox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = hbox.h; sourceTree = "<group>"; };
 		92BC3F190BAEE55A000DAB7F /* help.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = help.cpp; sourceTree = "<group>"; };
 		92BC3F1A0BAEE55A000DAB7F /* help.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = help.h; sourceTree = "<group>"; };
 		92BC3F1B0BAEE55A000DAB7F /* inttextbox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = inttextbox.cpp; sourceTree = "<group>"; };
@@ -570,8 +621,6 @@
 		92BC3F2B0BAEE55A000DAB7F /* minimap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = minimap.h; sourceTree = "<group>"; };
 		92BC3F2C0BAEE55A000DAB7F /* ministatus.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ministatus.cpp; sourceTree = "<group>"; };
 		92BC3F2D0BAEE55A000DAB7F /* ministatus.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ministatus.h; sourceTree = "<group>"; };
-		92BC3F2E0BAEE55A000DAB7F /* newskill.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = newskill.cpp; sourceTree = "<group>"; };
-		92BC3F2F0BAEE55A000DAB7F /* newskill.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = newskill.h; sourceTree = "<group>"; };
 		92BC3F300BAEE55A000DAB7F /* npc_text.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = npc_text.cpp; sourceTree = "<group>"; };
 		92BC3F310BAEE55A000DAB7F /* npc_text.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = npc_text.h; sourceTree = "<group>"; };
 		92BC3F320BAEE55A000DAB7F /* npclistdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = npclistdialog.cpp; sourceTree = "<group>"; };
@@ -613,8 +662,6 @@
 		92BC3F570BAEE55A000DAB7F /* slider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = slider.h; sourceTree = "<group>"; };
 		92BC3F580BAEE55A000DAB7F /* status.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = status.cpp; sourceTree = "<group>"; };
 		92BC3F590BAEE55B000DAB7F /* status.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = status.h; sourceTree = "<group>"; };
-		92BC3F5A0BAEE55B000DAB7F /* tabbedcontainer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tabbedcontainer.cpp; sourceTree = "<group>"; };
-		92BC3F5B0BAEE55B000DAB7F /* tabbedcontainer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = tabbedcontainer.h; sourceTree = "<group>"; };
 		92BC3F5C0BAEE55B000DAB7F /* textbox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = textbox.cpp; sourceTree = "<group>"; };
 		92BC3F5D0BAEE55B000DAB7F /* textbox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = textbox.h; sourceTree = "<group>"; };
 		92BC3F5E0BAEE55B000DAB7F /* textfield.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = textfield.cpp; sourceTree = "<group>"; };
@@ -623,8 +670,6 @@
 		92BC3F610BAEE55B000DAB7F /* trade.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = trade.h; sourceTree = "<group>"; };
 		92BC3F620BAEE55B000DAB7F /* updatewindow.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = updatewindow.cpp; sourceTree = "<group>"; };
 		92BC3F630BAEE55B000DAB7F /* updatewindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = updatewindow.h; sourceTree = "<group>"; };
-		92BC3F640BAEE55B000DAB7F /* vbox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = vbox.cpp; sourceTree = "<group>"; };
-		92BC3F650BAEE55B000DAB7F /* vbox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = vbox.h; sourceTree = "<group>"; };
 		92BC3F660BAEE55B000DAB7F /* viewport.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = viewport.cpp; sourceTree = "<group>"; };
 		92BC3F670BAEE55B000DAB7F /* viewport.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = viewport.h; sourceTree = "<group>"; };
 		92BC3F680BAEE55B000DAB7F /* window.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = window.cpp; sourceTree = "<group>"; };
@@ -752,7 +797,6 @@
 		92BC40D80BAEEED3000DAB7F /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
 		92BC40E50BAEF54B000DAB7F /* SDLMain.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = SDLMain.m; path = src/SDLMain.m; sourceTree = "<group>"; };
 		92BC40E80BAEF57D000DAB7F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
-		92BC416E0BAF664C000DAB7F /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ChangeLog; sourceTree = "<group>"; };
 		92FD19AE0DDCE51000D14E5D /* player_relations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = player_relations.cpp; path = src/player_relations.cpp; sourceTree = "<group>"; };
 		92FD19AF0DDCE51000D14E5D /* player_relations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = player_relations.h; path = src/player_relations.h; sourceTree = "<group>"; };
 		92FD19B30DDCE53400D14E5D /* setup_players.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_players.cpp; sourceTree = "<group>"; };
@@ -782,6 +826,7 @@
 				92BC40E90BAEF57D000DAB7F /* Cocoa.framework in Frameworks */,
 				9294DAA10C17E73200FCEDE9 /* libpng.framework in Frameworks */,
 				922CD9ED0E3D02C50074C50E /* guichan.framework in Frameworks */,
+				926A297A0F23C155005D6466 /* SDL_ttf.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -812,6 +857,10 @@
 		20286C2AFDCF999611CA2CEA /* Sources */ = {
 			isa = PBXGroup;
 			children = (
+				9273BE040EF33FB3008E56E1 /* particlecontainer.cpp */,
+				9273BE050EF33FB3008E56E1 /* particlecontainer.h */,
+				9273BE060EF33FB3008E56E1 /* statuseffect.cpp */,
+				9273BE070EF33FB3008E56E1 /* statuseffect.h */,
 				92037A1A0ED2037300D3712D /* particleemitterprop.h */,
 				92037A1B0ED2037300D3712D /* text.cpp */,
 				92037A1C0ED2037300D3712D /* text.h */,
@@ -903,10 +952,11 @@
 		20286C2CFDCF999611CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				92A4CCFE0D1DA8E500CA28FB /* LICENSE.rtf */,
+				9273BDFD0EF33E1A008E56E1 /* AUTHORS */,
+				9273BDFE0EF33E1A008E56E1 /* README */,
+				9273BDFB0EF33DFD008E56E1 /* COPYING */,
 				924A42590C0871EC0066885E /* The Mana World.icns */,
 				924A3E590C085ED70066885E /* data */,
-				92BC416E0BAF664C000DAB7F /* ChangeLog */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
@@ -914,6 +964,7 @@
 		20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = {
 			isa = PBXGroup;
 			children = (
+				926A29790F23C155005D6466 /* SDL_ttf.framework */,
 				922CD9EC0E3D02C50074C50E /* guichan.framework */,
 				9294DAA00C17E73200FCEDE9 /* libpng.framework */,
 				92BC40E80BAEF57D000DAB7F /* Cocoa.framework */,
@@ -940,6 +991,12 @@
 		924A3A0F0C07A60B0066885E /* widgets */ = {
 			isa = PBXGroup;
 			children = (
+				926A29440F23BD88005D6466 /* layout.cpp */,
+				926A29450F23BD88005D6466 /* layout.h */,
+				926A29460F23BD88005D6466 /* tab.cpp */,
+				926A29470F23BD88005D6466 /* tab.h */,
+				926A29480F23BD88005D6466 /* tabbedarea.cpp */,
+				926A29490F23BD88005D6466 /* tabbedarea.h */,
 				924A3A100C07A60B0066885E /* resizegrip.cpp */,
 				924A3A110C07A60B0066885E /* resizegrip.h */,
 			);
@@ -949,6 +1006,7 @@
 		924A3E590C085ED70066885E /* data */ = {
 			isa = PBXGroup;
 			children = (
+				9273BE0A0EF33FFF008E56E1 /* music */,
 				924A3E5C0C085ED70066885E /* graphics */,
 				924A40090C085ED80066885E /* help */,
 				924A40140C085ED80066885E /* icons */,
@@ -969,12 +1027,13 @@
 		924A3E5E0C085ED70066885E /* gui */ = {
 			isa = PBXGroup;
 			children = (
+				926A297E0F23C18E005D6466 /* tab.png */,
+				926A297F0F23C18E005D6466 /* tabselected.png */,
 				92FD19C60DDCEB8500D14E5D /* emotions.png */,
 				92024D5B0CF1BE5C006B55CB /* close_button.png */,
 				92024D5D0CF1BE5C006B55CB /* unknown-item.png */,
 				92024D5C0CF1BE5C006B55CB /* item_shortcut_bgr.png */,
 				924A3E600C085ED70066885E /* bg_quad_dis.png */,
-				924A3E610C085ED70066885E /* browserfont.png */,
 				924A3E620C085ED70066885E /* button.png */,
 				924A3E630C085ED70066885E /* button_disabled.png */,
 				924A3E640C085ED70066885E /* buttonhi.png */,
@@ -1000,7 +1059,6 @@
 				924A3E7A0C085ED70066885E /* radioout.png */,
 				924A3E7B0C085ED70066885E /* resize.png */,
 				924A3E7C0C085ED70066885E /* rpgfont_wider.png */,
-				924A3E7D0C085ED70066885E /* sansserif8.png */,
 				924A3E7E0C085ED70066885E /* selection.png */,
 				924A3E7F0C085ED70066885E /* slider.png */,
 				924A3E800C085ED70066885E /* target-cursor-blue-l.png */,
@@ -1035,6 +1093,7 @@
 		924A40090C085ED80066885E /* help */ = {
 			isa = PBXGroup;
 			children = (
+				926A29840F23C1C8005D6466 /* windows.txt */,
 				924A400A0C085ED80066885E /* about.txt */,
 				924A400B0C085ED80066885E /* changes.txt */,
 				924A400D0C085ED80066885E /* commands.txt */,
@@ -1058,6 +1117,19 @@
 			path = icons;
 			sourceTree = "<group>";
 		};
+		9273BE0A0EF33FFF008E56E1 /* music */ = {
+			isa = PBXGroup;
+			children = (
+				9273BE0B0EF33FFF008E56E1 /* Clouds Calling.ogg */,
+				9273BE0C0EF33FFF008E56E1 /* Faith.ogg */,
+				9273BE0D0EF33FFF008E56E1 /* finalman_and_yakslem-cavesong.ogg */,
+				9273BE0E0EF33FFF008E56E1 /* Magick - Real.ogg */,
+				9273BE0F0EF33FFF008E56E1 /* The Mana World - Snow Village.ogg */,
+				9273BE100EF33FFF008E56E1 /* The Mana World - The Forest.ogg */,
+			);
+			path = music;
+			sourceTree = "<group>";
+		};
 		92A4CCDF0D1DA58D00CA28FB /* archivers */ = {
 			isa = PBXGroup;
 			children = (
@@ -1076,6 +1148,14 @@
 		92BC3EF00BAEE55A000DAB7F /* gui */ = {
 			isa = PBXGroup;
 			children = (
+				926A294E0F23BD9E005D6466 /* npcintegerdialog.cpp */,
+				926A294F0F23BD9E005D6466 /* npcintegerdialog.h */,
+				926A29500F23BD9E005D6466 /* npcstringdialog.cpp */,
+				926A29510F23BD9E005D6466 /* npcstringdialog.h */,
+				926A29520F23BD9E005D6466 /* sdlinput.cpp */,
+				926A29530F23BD9E005D6466 /* sdlinput.h */,
+				926A29540F23BD9E005D6466 /* truetypefont.cpp */,
+				926A29550F23BD9E005D6466 /* truetypefont.h */,
 				92FD19B30DDCE53400D14E5D /* setup_players.cpp */,
 				92FD19B40DDCE53400D14E5D /* setup_players.h */,
 				92FD19B50DDCE53400D14E5D /* table.cpp */,
@@ -1089,8 +1169,6 @@
 				92024D360CF1BDF7006B55CB /* setup_keyboard.cpp */,
 				92024D370CF1BDF7006B55CB /* setup_keyboard.h */,
 				924A3A0F0C07A60B0066885E /* widgets */,
-				92BC3EF10BAEE55A000DAB7F /* box.cpp */,
-				92BC3EF20BAEE55A000DAB7F /* box.h */,
 				92BC3EF30BAEE55A000DAB7F /* browserbox.cpp */,
 				92BC3EF40BAEE55A000DAB7F /* browserbox.h */,
 				92BC3EF50BAEE55A000DAB7F /* buddywindow.cpp */,
@@ -1105,8 +1183,6 @@
 				92BC3EFE0BAEE55A000DAB7F /* char_select.h */,
 				92BC3EFF0BAEE55A000DAB7F /* char_server.cpp */,
 				92BC3F000BAEE55A000DAB7F /* char_server.h */,
-				92BC3F010BAEE55A000DAB7F /* chargedialog.cpp */,
-				92BC3F020BAEE55A000DAB7F /* chargedialog.h */,
 				92BC3F030BAEE55A000DAB7F /* chat.cpp */,
 				92BC3F040BAEE55A000DAB7F /* chat.h */,
 				92BC3F050BAEE55A000DAB7F /* chatinput.cpp */,
@@ -1127,8 +1203,6 @@
 				92BC3F140BAEE55A000DAB7F /* gccontainer.h */,
 				92BC3F150BAEE55A000DAB7F /* gui.cpp */,
 				92BC3F160BAEE55A000DAB7F /* gui.h */,
-				92BC3F170BAEE55A000DAB7F /* hbox.cpp */,
-				92BC3F180BAEE55A000DAB7F /* hbox.h */,
 				92BC3F190BAEE55A000DAB7F /* help.cpp */,
 				92BC3F1A0BAEE55A000DAB7F /* help.h */,
 				92BC3F1B0BAEE55A000DAB7F /* inttextbox.cpp */,
@@ -1150,8 +1224,6 @@
 				92BC3F2B0BAEE55A000DAB7F /* minimap.h */,
 				92BC3F2C0BAEE55A000DAB7F /* ministatus.cpp */,
 				92BC3F2D0BAEE55A000DAB7F /* ministatus.h */,
-				92BC3F2E0BAEE55A000DAB7F /* newskill.cpp */,
-				92BC3F2F0BAEE55A000DAB7F /* newskill.h */,
 				92BC3F300BAEE55A000DAB7F /* npc_text.cpp */,
 				92BC3F310BAEE55A000DAB7F /* npc_text.h */,
 				92BC3F320BAEE55A000DAB7F /* npclistdialog.cpp */,
@@ -1193,8 +1265,6 @@
 				92BC3F570BAEE55A000DAB7F /* slider.h */,
 				92BC3F580BAEE55A000DAB7F /* status.cpp */,
 				92BC3F590BAEE55B000DAB7F /* status.h */,
-				92BC3F5A0BAEE55B000DAB7F /* tabbedcontainer.cpp */,
-				92BC3F5B0BAEE55B000DAB7F /* tabbedcontainer.h */,
 				92BC3F5C0BAEE55B000DAB7F /* textbox.cpp */,
 				92BC3F5D0BAEE55B000DAB7F /* textbox.h */,
 				92BC3F5E0BAEE55B000DAB7F /* textfield.cpp */,
@@ -1203,8 +1273,6 @@
 				92BC3F610BAEE55B000DAB7F /* trade.h */,
 				92BC3F620BAEE55B000DAB7F /* updatewindow.cpp */,
 				92BC3F630BAEE55B000DAB7F /* updatewindow.h */,
-				92BC3F640BAEE55B000DAB7F /* vbox.cpp */,
-				92BC3F650BAEE55B000DAB7F /* vbox.h */,
 				92BC3F660BAEE55B000DAB7F /* viewport.cpp */,
 				92BC3F670BAEE55B000DAB7F /* viewport.h */,
 				92BC3F680BAEE55B000DAB7F /* window.cpp */,
@@ -1337,6 +1405,8 @@
 		92BC3FEE0BAEE55B000DAB7F /* utils */ = {
 			isa = PBXGroup;
 			children = (
+				926A295A0F23BDB1005D6466 /* gettext.h */,
+				926A295B0F23BDB1005D6466 /* mutex.h */,
 				92FD19BF0DDCE6F700D14E5D /* strprintf.cpp */,
 				92FD19C00DDCE6F700D14E5D /* strprintf.h */,
 				92024D400CF1BE22006B55CB /* fastsqrt.h */,
@@ -1367,6 +1437,7 @@
 				924A40880C085FBD0066885E /* Copy Image Files */,
 				924A42000C0861C70066885E /* Copy Help Files */,
 				92EEA0090D2E20D100DDE300 /* Copy Frameworks */,
+				9273BE3C0EF34050008E56E1 /* Copy Music Files */,
 			);
 			buildRules = (
 			);
@@ -1401,7 +1472,12 @@
 			buildActionMask = 2147483647;
 			files = (
 				924A425A0C0871EC0066885E /* The Mana World.icns in Resources */,
-				92A4CCFF0D1DA8E500CA28FB /* LICENSE.rtf in Resources */,
+				9273BDFC0EF33DFD008E56E1 /* COPYING in Resources */,
+				9273BDFF0EF33E1A008E56E1 /* AUTHORS in Resources */,
+				9273BE000EF33E1A008E56E1 /* README in Resources */,
+				926A29800F23C18E005D6466 /* tab.png in Resources */,
+				926A29810F23C18E005D6466 /* tabselected.png in Resources */,
+				926A29850F23C1C8005D6466 /* windows.txt in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1422,7 +1498,6 @@
 				92BC40050BAEE55B000DAB7F /* flooritemmanager.cpp in Sources */,
 				92BC40060BAEE55B000DAB7F /* game.cpp in Sources */,
 				92BC40070BAEE55B000DAB7F /* graphics.cpp in Sources */,
-				92BC40080BAEE55B000DAB7F /* box.cpp in Sources */,
 				92BC40090BAEE55B000DAB7F /* browserbox.cpp in Sources */,
 				92BC400A0BAEE55B000DAB7F /* buddywindow.cpp in Sources */,
 				92BC400B0BAEE55B000DAB7F /* button.cpp in Sources */,
@@ -1430,7 +1505,6 @@
 				92BC400D0BAEE55B000DAB7F /* buysell.cpp in Sources */,
 				92BC400E0BAEE55B000DAB7F /* char_select.cpp in Sources */,
 				92BC400F0BAEE55B000DAB7F /* char_server.cpp in Sources */,
-				92BC40100BAEE55B000DAB7F /* chargedialog.cpp in Sources */,
 				92BC40110BAEE55B000DAB7F /* chat.cpp in Sources */,
 				92BC40120BAEE55B000DAB7F /* chatinput.cpp in Sources */,
 				92BC40130BAEE55B000DAB7F /* checkbox.cpp in Sources */,
@@ -1441,7 +1515,6 @@
 				92BC40180BAEE55B000DAB7F /* focushandler.cpp in Sources */,
 				92BC40190BAEE55B000DAB7F /* gccontainer.cpp in Sources */,
 				92BC401A0BAEE55B000DAB7F /* gui.cpp in Sources */,
-				92BC401B0BAEE55B000DAB7F /* hbox.cpp in Sources */,
 				92BC401C0BAEE55B000DAB7F /* help.cpp in Sources */,
 				92BC401D0BAEE55B000DAB7F /* inttextbox.cpp in Sources */,
 				92BC401E0BAEE55B000DAB7F /* inventorywindow.cpp in Sources */,
@@ -1452,7 +1525,6 @@
 				92BC40230BAEE55B000DAB7F /* menuwindow.cpp in Sources */,
 				92BC40240BAEE55B000DAB7F /* minimap.cpp in Sources */,
 				92BC40250BAEE55B000DAB7F /* ministatus.cpp in Sources */,
-				92BC40260BAEE55B000DAB7F /* newskill.cpp in Sources */,
 				92BC40270BAEE55B000DAB7F /* npc_text.cpp in Sources */,
 				92BC40280BAEE55B000DAB7F /* npclistdialog.cpp in Sources */,
 				92BC40290BAEE55B000DAB7F /* ok_dialog.cpp in Sources */,
@@ -1473,12 +1545,10 @@
 				92BC40380BAEE55B000DAB7F /* skill.cpp in Sources */,
 				92BC40390BAEE55B000DAB7F /* slider.cpp in Sources */,
 				92BC403A0BAEE55B000DAB7F /* status.cpp in Sources */,
-				92BC403B0BAEE55B000DAB7F /* tabbedcontainer.cpp in Sources */,
 				92BC403C0BAEE55B000DAB7F /* textbox.cpp in Sources */,
 				92BC403D0BAEE55B000DAB7F /* textfield.cpp in Sources */,
 				92BC403E0BAEE55B000DAB7F /* trade.cpp in Sources */,
 				92BC403F0BAEE55B000DAB7F /* updatewindow.cpp in Sources */,
-				92BC40400BAEE55B000DAB7F /* vbox.cpp in Sources */,
 				92BC40410BAEE55B000DAB7F /* viewport.cpp in Sources */,
 				92BC40420BAEE55B000DAB7F /* window.cpp in Sources */,
 				92BC40430BAEE55B000DAB7F /* windowcontainer.cpp in Sources */,
@@ -1568,6 +1638,15 @@
 				922CD95F0E3D01080074C50E /* shopitem.cpp in Sources */,
 				92037A1F0ED2037300D3712D /* text.cpp in Sources */,
 				92037A200ED2037300D3712D /* textmanager.cpp in Sources */,
+				9273BE080EF33FB3008E56E1 /* particlecontainer.cpp in Sources */,
+				9273BE090EF33FB3008E56E1 /* statuseffect.cpp in Sources */,
+				926A294A0F23BD88005D6466 /* layout.cpp in Sources */,
+				926A294B0F23BD88005D6466 /* tab.cpp in Sources */,
+				926A294C0F23BD88005D6466 /* tabbedarea.cpp in Sources */,
+				926A29560F23BD9E005D6466 /* npcintegerdialog.cpp in Sources */,
+				926A29570F23BD9E005D6466 /* npcstringdialog.cpp in Sources */,
+				926A29580F23BD9E005D6466 /* sdlinput.cpp in Sources */,
+				926A29590F23BD9E005D6466 /* truetypefont.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1593,6 +1672,7 @@
 					__PHYSFS_CARBONIZED__,
 				);
 				HEADER_SEARCH_PATHS = (
+					/Library/Frameworks/SDL_ttf.framework/Headers,
 					/Library/Frameworks/SDL_net.framework/Headers,
 					/Library/Frameworks/SDL_image.framework/Headers,
 					/Library/Frameworks/SDL_mixer.framework/Headers,
@@ -1640,6 +1720,7 @@
 				GCC_VERSION_ppc = 3.3;
 				GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO;
 				HEADER_SEARCH_PATHS = (
+					/Library/Frameworks/SDL_ttf.framework/Headers,
 					/Library/Frameworks/SDL_net.framework/Headers,
 					/Library/Frameworks/SDL_image.framework/Headers,
 					/Library/Frameworks/SDL_mixer.framework/Headers,
-- 
cgit v1.2.3-70-g09d2


From 845934e41d27e143ac3555da51a3a09664516405 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 18 Jan 2009 17:39:16 +0100
Subject: Used dynamic layout for registration window
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The dialog looks nicer now and the layout problems when the dialog is
translated have been fixed.

Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
---
 src/gui/register.cpp | 98 ++++++++++++++++++++--------------------------------
 src/gui/register.h   | 16 ++-------
 2 files changed, 39 insertions(+), 75 deletions(-)

diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 568ec5ff..a9cf57cf 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -40,9 +40,24 @@
 
 #include "../utils/tostring.h"
 
+#include "widgets/layout.h"
+
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
 
+/**
+ * Listener used while dealing with wrong data. It is used to direct the focus
+ * to the field which contained wrong data when the Ok button was pressed on
+ * the error notice.
+ */
+class WrongDataNoticeListener : public gcn::ActionListener {
+    public:
+        void setTarget(gcn::TextField *textField);
+        void action(const gcn::ActionEvent &event);
+    private:
+        gcn::TextField *mTarget;
+};
+
 void WrongDataNoticeListener::setTarget(gcn::TextField *textField)
 {
     mTarget = textField;
@@ -56,9 +71,10 @@ void WrongDataNoticeListener::action(const gcn::ActionEvent &event)
     }
 }
 
+
 RegisterDialog::RegisterDialog(LoginData *loginData):
     Window(_("Register")),
-    mWrongDataNoticeListener(new WrongDataNoticeListener()),
+    mWrongDataNoticeListener(new WrongDataNoticeListener),
     mLoginData(loginData)
 {
     gcn::Label *userLabel = new gcn::Label(_("Name:"));
@@ -68,7 +84,7 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
     gcn::Label *portLabel = new gcn::Label(_("Port:"));
     mUserField = new TextField(loginData->username);
     mPasswordField = new PasswordField(loginData->password);
-    mConfirmField = new PasswordField();
+    mConfirmField = new PasswordField;
     mServerField = new TextField(loginData->hostname);
     mPortField = new TextField(toString(loginData->port));
     mMaleButton = new RadioButton(_("Male"), "sex", true);
@@ -76,47 +92,24 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
     mRegisterButton = new Button(_("Register"), "register", this);
     mCancelButton = new Button(_("Cancel"), "cancel", this);
 
-    const int WIDTH = 220;
-    const int HEIGHT = 170;
-    const int FIELD_WIDTH = WIDTH - 70;
-
-    setContentSize(WIDTH, HEIGHT);
-
-    const int USER_TOP = 5;
-    userLabel->setPosition(5, USER_TOP);
-    mUserField->setPosition(65, USER_TOP);
-    mUserField->setWidth(FIELD_WIDTH);
-
-    const int PASS_TOP = 9 + USER_TOP + userLabel->getHeight();
-    passwordLabel->setPosition(5, PASS_TOP);
-    mPasswordField->setPosition(65, PASS_TOP);
-    mPasswordField->setWidth(FIELD_WIDTH);
-
-    const int CONFIRM_TOP = 9 + PASS_TOP + passwordLabel->getHeight();
-    confirmLabel->setPosition(5, CONFIRM_TOP);
-    mConfirmField->setPosition(65, CONFIRM_TOP);
-    mConfirmField->setWidth(FIELD_WIDTH);
-
-    const int SEX_TOP = 9 + CONFIRM_TOP + confirmLabel->getHeight();
-    mMaleButton->setPosition(70, SEX_TOP);
-    mFemaleButton->setPosition(80 + mMaleButton->getWidth(), SEX_TOP);
-
-    const int SERVER_TOP = 9 + SEX_TOP + mMaleButton->getHeight() + 5;
-    serverLabel->setPosition(5, SERVER_TOP);
-    mServerField->setPosition(65, SERVER_TOP);
-    mServerField->setWidth(FIELD_WIDTH);
-
-    const int PORT_TOP = 9 + SERVER_TOP + serverLabel->getHeight();
-    portLabel->setPosition(5, PORT_TOP);
-    mPortField->setPosition(65, PORT_TOP);
-    mPortField->setWidth(FIELD_WIDTH);
-
-    mCancelButton->setPosition(
-            WIDTH - mCancelButton->getWidth() - 5,
-            HEIGHT - mCancelButton->getHeight() - 5);
-    mRegisterButton->setPosition(
-            mCancelButton->getX() - mRegisterButton->getWidth() - 5,
-            HEIGHT - mRegisterButton->getHeight() - 5);
+    ContainerPlacer place;
+    place = getPlacer(0, 0);
+    place(0, 0, userLabel);
+    place(0, 1, passwordLabel);
+    place(0, 2, confirmLabel);
+    place(1, 3, mMaleButton);
+    place(2, 3, mFemaleButton);
+    place(0, 4, serverLabel);
+    place(0, 5, portLabel);
+    place(1, 0, mUserField, 3).setPadding(2);
+    place(1, 1, mPasswordField, 3).setPadding(2);
+    place(1, 2, mConfirmField, 3).setPadding(2);
+    place(1, 4, mServerField, 3).setPadding(2);
+    place(1, 5, mPortField, 3).setPadding(2);
+    place = getPlacer(0, 2);
+    place(1, 0, mRegisterButton);
+    place(2, 0, mCancelButton);
+    reflowLayout(250, 0);
 
     mUserField->addKeyListener(this);
     mPasswordField->addKeyListener(this);
@@ -141,23 +134,6 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
     mServerField->addActionListener(this);
     mPortField->addActionListener(this);
 
-    add(userLabel);
-    add(passwordLabel);
-    add(confirmLabel);
-    add(serverLabel);
-    add(portLabel);
-
-    add(mUserField);
-    add(mPasswordField);
-    add(mConfirmField);
-    add(mServerField);
-    add(mPortField);
-
-    add(mMaleButton);
-    add(mFemaleButton);
-    add(mRegisterButton);
-    add(mCancelButton);
-
     setLocationRelativeTo(getParent());
     setVisible(true);
     mUserField->requestFocus();
@@ -265,7 +241,7 @@ void RegisterDialog::keyPressed(gcn::KeyEvent &keyEvent)
     mRegisterButton->setEnabled(canSubmit());
 }
 
-bool RegisterDialog::canSubmit()
+bool RegisterDialog::canSubmit() const
 {
     return !mUserField->getText().empty() &&
            !mPasswordField->getText().empty() &&
diff --git a/src/gui/register.h b/src/gui/register.h
index 4c1d9f88..480a7c03 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -33,19 +33,7 @@
 
 class LoginData;
 class OkDialog;
-
-/**
- * Listener used while dealing with wrong data. It is used to direct the focus
- * to the field which contained wrong data when the Ok button was pressed on
- * the error notice.
- */
-class WrongDataNoticeListener : public gcn::ActionListener {
-    public:
-        void setTarget(gcn::TextField *textField);
-        void action(const gcn::ActionEvent &event);
-    private:
-        gcn::TextField *mTarget;
-};
+class WrongDataNoticeListener;
 
 /**
  * The registration dialog.
@@ -84,7 +72,7 @@ class RegisterDialog : public Window, public gcn::ActionListener,
          * Returns whether submit can be enabled. This is true in the register
          * state, when all necessary fields have some text.
          */
-        bool canSubmit();
+        bool canSubmit() const;
 
 	/**
 	 * Function to decide whether string is an unsigned short or not
-- 
cgit v1.2.3-70-g09d2


From 3b367d91c41323e4ea18cce6b67f3791f7d25b3a Mon Sep 17 00:00:00 2001
From: GonzoDark <Gonzo.Dark@gmail.com>
Date: Sun, 18 Jan 2009 22:32:27 +0100
Subject: This will update the Danish Translation file da.po

I hope you enjoy it, I used a LOT of hours on this baby!
Signed-off-by: GonzoDark <Gonzo.Dark@gmail.com>
---
 po/da.po | 656 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 336 insertions(+), 320 deletions(-)

diff --git a/po/da.po b/po/da.po
index 87afa59d..7686a9ae 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,8 +9,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-16 15:17-0700\n"
 "PO-Revision-Date: 2008-12-28 14:45+0000\n"
-"Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
-"Language-Team: Danish <da@li.org>\n"
+"Last-Translator: GonzoDark AKA IchigoBlack <Gonzo.Dark@gmail.com>\n"
+"Language-Team: Danish <none@none.none>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,7 +46,7 @@ msgstr "Effekt: %s"
 #: ../src/gui/buysell.cpp:30
 #, fuzzy
 msgid "Shop"
-msgstr "Stop"
+msgstr "Butik"
 
 #: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
@@ -63,21 +63,21 @@ msgstr "Fortryd"
 
 #: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
-msgstr "Er du sikker på at du vil slette denne figur?"
+msgstr "Bekræft sletning af karakter"
 
 #: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
-msgstr "Er du sikker på at du vil slette denne figur?"
+msgstr "Er du sikker på at du vil slette denne karakter?"
 
 #: ../src/gui/char_select.cpp:81
 msgid "Select Character"
-msgstr "Vælg Bruger"
+msgstr "Vælg Karakter"
 
 #: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
 #: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
-msgstr "Navn; %s"
+msgstr "Navn: %s"
 
 #. ----------------------
 #. Status Part
@@ -120,17 +120,17 @@ msgstr "Slet"
 
 #: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
 #: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
-msgid "Ok"
-msgstr "O.k."
+msgid "OK"
+msgstr "OK"
 
 #: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
-msgstr ""
+msgstr "Guld: %d"
 
 #: ../src/gui/char_select.cpp:247
 msgid "Create Character"
-msgstr "Lav figur."
+msgstr "Lav Bruger"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:64
@@ -152,31 +152,31 @@ msgstr "Opret"
 #: ../src/gui/char_server.cpp:51
 #, fuzzy
 msgid "Select Server"
-msgstr "Vælg Bruger"
+msgstr "Vælg Server"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
 #: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
-msgstr "Opret"
+msgstr "Chat"
 
 #. Fix the owner of welcome message.
 #: ../src/gui/chat.cpp:136
 msgid "Welcome"
-msgstr ""
+msgstr "Velkommen"
 
 #: ../src/gui/chat.cpp:147
 msgid "Global announcement: "
-msgstr ""
+msgstr "Global meddelelse: "
 
 #: ../src/gui/chat.cpp:152
 msgid "Global announcement from "
-msgstr ""
+msgstr "Global meddelelse fra "
 
 #: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
 msgid "Server:"
@@ -184,349 +184,356 @@ msgstr "Server:"
 
 #: ../src/gui/chat.cpp:291
 msgid "Trying to send a blank party message."
-msgstr ""
+msgstr "Prøver at sende en blank gruppe besked."
 
 #: ../src/gui/chat.cpp:402
 msgid "Whispering to "
-msgstr ""
+msgstr "Hvisker til "
 
 #: ../src/gui/chat.cpp:411
 msgid "Return toggles chat."
-msgstr ""
+msgstr "Retur bringer focus på chatten."
 
 #: ../src/gui/chat.cpp:412
 msgid "Message closes chat."
-msgstr ""
+msgstr "Besked lukker chat."
 
 #: ../src/gui/chat.cpp:417
 msgid "Return now toggles chat."
-msgstr ""
+msgstr "Enter bringer nu focus på chatten."
 
 #: ../src/gui/chat.cpp:422
 msgid "Message now closes chat."
-msgstr ""
+msgstr "Besked lukker nu chat."
 
 #: ../src/gui/chat.cpp:426
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
+"Mulighederne til /toggle er \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #: ../src/gui/chat.cpp:432
-msgid "Unknown party command... Type \"/help\" party for more information."
-msgstr ""
+msgid "Unknown party command... Type \"/help party\" party for more information."
+msgstr "Ukendt gruppe kommando... Skriv \"/help party\" for mere information."
 
 #: ../src/gui/chat.cpp:470
 msgid "No such spell!"
-msgstr ""
+msgstr "Trylleformularen findes ikke!"
 
 #: ../src/gui/chat.cpp:473
 msgid "The current server doesn't support spells"
-msgstr ""
+msgstr "Den nuværende server understøtter ikke trylleformulare"
 
 #: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
 msgid "Present: "
-msgstr ""
+msgstr "Til stede: "
 
 #: ../src/gui/chat.cpp:504
 msgid "Attendance written to record log."
-msgstr ""
+msgstr "Fremmøde skrives til loggen"
 
 #: ../src/gui/chat.cpp:510
 msgid "Unknown command"
-msgstr ""
+msgstr "Ukendt kommando"
 
 #: ../src/gui/chat.cpp:519
 msgid "Trade failed!"
-msgstr ""
+msgstr "Handel fejlede!"
 
 #: ../src/gui/chat.cpp:522
 msgid "Emote failed!"
-msgstr ""
+msgstr "Emote fejlede!"
 
 #: ../src/gui/chat.cpp:525
 msgid "Sit failed!"
-msgstr ""
+msgstr "Sæt dig fejlede!"
 
 #: ../src/gui/chat.cpp:528
 msgid "Chat creating failed!"
-msgstr ""
+msgstr "Chat skabelsen fejlede!"
 
 #: ../src/gui/chat.cpp:531
 msgid "Could not join party!"
-msgstr ""
+msgstr "Kunne ikke tilslutte sig gruppen!"
 
 #: ../src/gui/chat.cpp:534
 msgid "Cannot shout!"
-msgstr ""
+msgstr "Kan ikke råbe!"
 
 #: ../src/gui/chat.cpp:542
 msgid "You have not yet reached a high enough lvl!"
-msgstr ""
+msgstr "Du er ikke nået til det rette Niveau endnu!"
 
 #: ../src/gui/chat.cpp:545
 msgid "Insufficient HP!"
-msgstr ""
+msgstr "Utilstrækkelig HP!"
 
 #: ../src/gui/chat.cpp:548
 msgid "Insufficient SP!"
-msgstr ""
+msgstr "Utilstrækkelig SP!"
 
 #: ../src/gui/chat.cpp:551
 msgid "You have no memos!"
-msgstr ""
+msgstr "Du har ingen memorandaer!"
 
 #: ../src/gui/chat.cpp:554
 msgid "You cannot do that right now!"
-msgstr ""
+msgstr "Det kan du ikke gøre lige nu!"
 
 #: ../src/gui/chat.cpp:557
 msgid "Seems you need more Zeny... ;-)"
-msgstr ""
+msgstr "Det ser ud til at du har behov for flere Zeny... ;-)"
 
 #: ../src/gui/chat.cpp:560
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr ""
+msgstr "Du kan ikke bruge denne færdighed med dette slags våben!"
 
 #: ../src/gui/chat.cpp:563
 msgid "You need another red gem!"
-msgstr ""
+msgstr "Du har behov for en rød krystal mere"
 
 #: ../src/gui/chat.cpp:566
 msgid "You need another blue gem!"
-msgstr ""
+msgstr "Du har behov for en blå krystal mere"
 
 #: ../src/gui/chat.cpp:569
 msgid "You're carrying to much to do this!"
-msgstr ""
+msgstr "Du har for meget på dig, til at kunne gøre dette"
 
 #: ../src/gui/chat.cpp:572
 msgid "Huh? What's that?"
-msgstr ""
+msgstr "Hmm? Hvad er det?"
 
 #: ../src/gui/chat.cpp:578
 msgid "Warp failed..."
-msgstr ""
+msgstr "Warp mislykkede..."
 
 #: ../src/gui/chat.cpp:581
 msgid "Could not steal anything..."
-msgstr ""
+msgstr "Kunne ikke stjæle noget som helst..."
 
 #: ../src/gui/chat.cpp:584
 msgid "Poison had no effect..."
-msgstr ""
+msgstr "Giften havde ingen effekt..."
 
 #: ../src/gui/chat.cpp:652
 msgid "The current party prefix is "
-msgstr ""
+msgstr "Det nuværende gruppe præfiks er "
 
 #: ../src/gui/chat.cpp:657
 msgid "Party prefix must be one character long."
-msgstr ""
+msgstr "Gruppens præfiks skal være et bogstav langt. "
 
 #: ../src/gui/chat.cpp:660
 msgid "Cannot use a '/' as the prefix."
-msgstr ""
+msgstr "Kan ikke bruge '/' som præfikset"
 
 #: ../src/gui/chat.cpp:663
 #, fuzzy
 msgid "Changing prefix to "
-msgstr "Skrifter til OpenGL"
+msgstr "Ændre præfikset til "
 
 #: ../src/gui/chat.cpp:673
 msgid "-- Help --"
-msgstr ""
+msgstr "--Hjælp--"
 
 #: ../src/gui/chat.cpp:675
 msgid "/announce: Global announcement (GM only)"
-msgstr ""
+msgstr "/announce: Global meddelelse (Kun for GM)"
 
 #: ../src/gui/chat.cpp:676
 msgid "/clear: Clears this window"
-msgstr ""
+msgstr "/clear: Rydder dette vindue"
 
 #: ../src/gui/chat.cpp:677
 msgid "/help: Display this help"
-msgstr ""
+msgstr "/help: Viser denne hjælp"
 
 #: ../src/gui/chat.cpp:679
 msgid "/msg <nick> <message>: Alternate form for /whisper"
-msgstr ""
+msgstr "/msg <navn> <besked>: Alternativ form for /whisper"
 
 #: ../src/gui/chat.cpp:680
 msgid "/present: Get list of players present"
-msgstr ""
+msgstr "/present: Får listen af tilstedeværende brugere"
 
 #: ../src/gui/chat.cpp:682
 msgid "/toggle: Determine whether <return> toggles the chat log."
-msgstr ""
+msgstr "/toggle: Bestemmer om <retur> bringer focus på chat loggen."
 
 #: ../src/gui/chat.cpp:684
 msgid "/where: Display map name"
-msgstr ""
+msgstr "/where: Viser bane navnet"
 
 #: ../src/gui/chat.cpp:685
 msgid "/w <nick> <message>: Short form for /whisper"
-msgstr ""
+msgstr "/w <navn> <besked>: Kort form for /whisper"
 
 #: ../src/gui/chat.cpp:686
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
-msgstr ""
+msgstr "/whisper <navn> <besked>: Sender en privat besked til det givne brugernavn"
 
 #: ../src/gui/chat.cpp:688
 msgid "/who: Display number of online users"
-msgstr ""
+msgstr "/who: Viser antalet af online brugere"
 
 #: ../src/gui/chat.cpp:689
 msgid "For more information, type /help <command>"
-msgstr ""
+msgstr "For at få mere information, skriv /help <kommando>"
 
 #: ../src/gui/chat.cpp:694
 msgid "Command: /announce <msg>"
-msgstr ""
+msgstr "Kommando: /announce <besked>"
 
 #: ../src/gui/chat.cpp:695
 msgid "*** only available to a GM ***"
-msgstr ""
+msgstr "*** kun tilgængelig for en GM ***"
 
 #: ../src/gui/chat.cpp:696
 msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
+msgstr "Denne kommando sender beskeden <besked> til alle brugere online."
 
 #: ../src/gui/chat.cpp:702
 msgid "Command: /clear"
-msgstr ""
+msgstr "Kommando: /clear"
 
 #: ../src/gui/chat.cpp:703
 msgid "This command clears the chat log of previous chat."
-msgstr ""
+msgstr "Denne commando rydder chat loggen"
 
 #: ../src/gui/chat.cpp:709
 msgid "Command: /help"
-msgstr ""
+msgstr "Kommando: /help"
 
 #: ../src/gui/chat.cpp:710
 msgid "This command displays a list of all commands available."
-msgstr ""
+msgstr "Denne kommando viser en liste over alle tilgængelige kommandoer"
 
 #: ../src/gui/chat.cpp:712
 msgid "Command: /help <command>"
-msgstr ""
+msgstr "Kommando: /help <kommando>"
 
 #: ../src/gui/chat.cpp:713
 msgid "This command displays help on <command>."
-msgstr ""
+msgstr "Denne kommando viser hjælp for <kommando>"
 
 #: ../src/gui/chat.cpp:723
 msgid "Command: /present"
-msgstr ""
+msgstr "Kommando: /present"
 
 #: ../src/gui/chat.cpp:724
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
+"Denne kommando finder en liste over brugere, der er inden for en lytteradius, og sender listen til enten "
+"record loggen, hvis du optager, ellers er det chat loggen."
 
 #: ../src/gui/chat.cpp:734
 msgid "Command: /toggle <state>"
-msgstr ""
+msgstr "Kommando /toggle <tilstand>"
 
 #: ../src/gui/chat.cpp:735
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
+"Denne kommando bestemmer om retur, skal bruges til at fokusere på chat loggen, eller"
+"om chat om chat loggen, automatisk skal slå fra."
 
 #: ../src/gui/chat.cpp:737
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
+"<tilstand> kan være en ud af \"1\", \"yes\", \"true\" for at slå fokusering af chat vindue til, eller \"0"
+"\", \"no\", \"false\" for at slå fokusering af chat vindue fra."
 
 #: ../src/gui/chat.cpp:738
 msgid "Command: /toggle"
-msgstr ""
+msgstr "Kommando: /toggle"
 
 #: ../src/gui/chat.cpp:739
 msgid "This command displays the return toggle status."
-msgstr ""
+msgstr "Denne kommando viser fokusering af chat vinduets status."
 
 #: ../src/gui/chat.cpp:744
 msgid "Command: /where"
-msgstr ""
+msgstr "kommando: /where"
 
 #: ../src/gui/chat.cpp:745
 msgid "This command displays the name of the current map."
-msgstr ""
+msgstr "Denne kommando viser det nuværende bane navn."
 
 #: ../src/gui/chat.cpp:751
 msgid "Command: /msg <nick> <msg>"
-msgstr ""
+msgstr "Kommando: /msg <navn> <besked>"
 
 #: ../src/gui/chat.cpp:752
 msgid "Command: /whisper <nick> <msg>"
-msgstr ""
+msgstr "Kommando: /whisper <navn> <besked>"
 
 #: ../src/gui/chat.cpp:753
 msgid "Command: /w <nick> <msg>"
-msgstr ""
+msgstr "Kommando: /w <navn> <besked>"
 
 #: ../src/gui/chat.cpp:754
 msgid "This command sends the message <msg> to <nick>."
-msgstr ""
+msgstr "Denne kommando sender beskeden <besked> til <navn>."
 
 #: ../src/gui/chat.cpp:756
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
+msgstr "Hvis navnet har mellemrum i det, skal det omringes med følgende (\")."
 
 #: ../src/gui/chat.cpp:762
 msgid "Command: /who"
-msgstr ""
+msgstr "Kommando: /who"
 
 #: ../src/gui/chat.cpp:763
 msgid "This command displays the number of players currently online."
-msgstr ""
+msgstr "Denne kommando viser det antal af online brugere, der nuværende er online."
 
 #: ../src/gui/chat.cpp:767
 msgid "Unknown command."
-msgstr ""
+msgstr "Ukendt kommando"
 
 #: ../src/gui/chat.cpp:768
 msgid "Type /help for a list of commands."
-msgstr ""
+msgstr "Skriv /help for at få en liste med kommandoer"
 
 #: ../src/gui/colour.cpp:33
 msgid "GM"
-msgstr ""
+msgstr "GM"
 
 #: ../src/gui/colour.cpp:34
 msgid "Player"
-msgstr ""
+msgstr "Bruger"
 
 #: ../src/gui/colour.cpp:35
 msgid "Whisper"
-msgstr ""
+msgstr "Hvisk"
 
 #: ../src/gui/colour.cpp:36
 msgid "Is"
-msgstr ""
+msgstr "Er"
 
 #: ../src/gui/colour.cpp:37
 #, fuzzy
 msgid "Party"
-msgstr "Port:"
+msgstr "Gruppe"
 
 #: ../src/gui/colour.cpp:38
 #, fuzzy
 msgid "Server"
-msgstr "Server:"
+msgstr "Server"
 
 #: ../src/gui/colour.cpp:39
 msgid "Logger"
-msgstr ""
+msgstr "Logger"
 
 #: ../src/gui/colour.cpp:40
 msgid "Hyperlink"
-msgstr ""
+msgstr "Hyperlink"
 
 #: ../src/gui/confirm_dialog.cpp:37
 msgid "Yes"
@@ -542,12 +549,12 @@ msgstr "Opretter forbindelse..."
 
 #: ../src/gui/emotecontainer.cpp:60
 msgid "Unable to load selection.png"
-msgstr ""
+msgstr "Kan ikke loade valgte-billede.png"
 
 #: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
-msgstr ""
+msgstr "Emote"
 
 #: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
@@ -561,11 +568,11 @@ msgstr "Udstyr"
 
 #: ../src/gui/help.cpp:32
 msgid "Help"
-msgstr ""
+msgstr "Hjælp"
 
 #: ../src/gui/help.cpp:40
 msgid "Close"
-msgstr ""
+msgstr "Luk"
 
 #: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
@@ -579,15 +586,15 @@ msgstr "Smid"
 #. Adjust widgets
 #: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
 msgid "Weight: "
-msgstr ""
+msgstr "Vægt: "
 
 #: ../src/gui/inventorywindow.cpp:67
 msgid " g Slots: "
-msgstr ""
+msgstr " g Pladser: "
 
 #: ../src/gui/inventorywindow.cpp:101
 msgid " g  Slots: "
-msgstr ""
+msgstr " g  Pladser: "
 
 #: ../src/gui/inventorywindow.cpp:200
 msgid "Unequip"
@@ -599,11 +606,11 @@ msgstr "Tag på"
 
 #: ../src/gui/item_amount.cpp:75
 msgid "Select amount of items to trade."
-msgstr "Vælge hvor mange du vil bytte."
+msgstr "Vælg hvor mange genstande du vil bytte."
 
 #: ../src/gui/item_amount.cpp:79
 msgid "Select amount of items to drop."
-msgstr "Vælg hvor mange du vil smide,"
+msgstr "Vælg hvor mange genstande du vil smide."
 
 #: ../src/gui/login.cpp:49
 msgid "Login"
@@ -619,7 +626,7 @@ msgstr "Port:"
 
 #: ../src/gui/login.cpp:55
 msgid "Recent:"
-msgstr ""
+msgstr "Nuværende:"
 
 #: ../src/gui/login.cpp:75
 msgid "Keep"
@@ -665,42 +672,42 @@ msgstr "NPC"
 #: ../src/gui/popupmenu.cpp:81
 #, fuzzy
 msgid "@@trade|Trade With "
-msgstr "@@trade|Byt Med %s@@"
+msgstr "@@trade|Byt Med "
 
 #: ../src/gui/popupmenu.cpp:82
 #, fuzzy
 msgid "@@attack|Attack "
-msgstr "@@attack|Angrib %s@@"
+msgstr "@@attack|Angrib "
 
 #: ../src/gui/popupmenu.cpp:88
 msgid "@@friend|Befriend "
-msgstr ""
+msgstr "@@friend|Bliv ven med "
 
 #: ../src/gui/popupmenu.cpp:91
 msgid "@@disregard|Disregard "
-msgstr ""
+msgstr "@@disregard|Se bort fra "
 
 #: ../src/gui/popupmenu.cpp:92
 msgid "@@ignore|Ignore "
-msgstr ""
+msgstr "@@ignore|Bloker "
 
 #: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
 msgid "@@unignore|Un-Ignore "
-msgstr ""
+msgstr "@@unignore|Fjern blokering "
 
 #: ../src/gui/popupmenu.cpp:97
 msgid "@@ignore|Completely ignore "
-msgstr ""
+msgstr "@@ignore|Bloker fuldstændig "
 
 #: ../src/gui/popupmenu.cpp:109
 msgid "@@party-invite|Invite "
-msgstr ""
+msgstr "@@party-invite|Inviter "
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
 #: ../src/gui/popupmenu.cpp:117
 msgid "@@talk|Talk To NPC@@"
-msgstr "@@talk|Snak med NPC@@"
+msgstr "@@talk|Snak Til NPC@@"
 
 #: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
 #: ../src/gui/popupmenu.cpp:302
@@ -715,7 +722,7 @@ msgstr "@@pickup|Saml Op %s@@"
 #: ../src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "@@use|Unequip@@"
-msgstr "@@use|Tag på@@"
+msgstr "@@use|Tag af@@"
 
 #: ../src/gui/popupmenu.cpp:294
 msgid "@@use|Equip@@"
@@ -748,7 +755,7 @@ msgstr "Kvinde"
 #: ../src/gui/register.cpp:183
 #, c-format
 msgid "RegisterDialog::register Username is %s"
-msgstr ""
+msgstr "RegisterDialog::register Brugernavn er %s"
 
 #: ../src/gui/register.cpp:192
 #, c-format
@@ -773,7 +780,7 @@ msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
 #. Password does not match with the confirmation one
 #: ../src/gui/register.cpp:223
 msgid "Passwords do not match."
-msgstr "Adgangskoder stemmer ikke overens."
+msgstr "De indtastede adgangskoder stemmer ikke overens."
 
 #: ../src/gui/register.cpp:243 ../src/main.cpp:1025
 msgid "Error"
@@ -798,7 +805,7 @@ msgstr "Anvend"
 #. Disable this button when the windows aren't created yet
 #: ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:71 ../src/gui/setup.cpp:126
 msgid "Reset Windows"
-msgstr "Nulstil vinduer"
+msgstr "Nulstil Vinduer"
 
 #: ../src/gui/setup.cpp:81
 msgid "Video"
@@ -819,16 +826,16 @@ msgstr "Tastatur"
 #: ../src/gui/setup.cpp:97
 #, fuzzy
 msgid "Colors"
-msgstr "Hårfarve:"
+msgstr "Farver:"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
-msgstr ""
+msgstr "Brugere"
 
 #: ../src/gui/setup_colours.cpp:38
 #, fuzzy
 msgid "Color:"
-msgstr "Hårfarve:"
+msgstr "Farve:"
 
 #: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
 msgid "Press the button to start calibration"
@@ -848,24 +855,24 @@ msgstr "Stop"
 
 #: ../src/gui/setup_joystick.cpp:76
 msgid "Rotate the stick"
-msgstr "Roter joystick"
+msgstr "Rotere joysticket"
 
 #: ../src/gui/setup_keyboard.cpp:88
 msgid "Assign"
-msgstr ""
+msgstr "Tildel"
 
 #: ../src/gui/setup_keyboard.cpp:94
 #, fuzzy
 msgid "Default"
-msgstr "Slet"
+msgstr "Standart"
 
 #: ../src/gui/setup_keyboard.cpp:115
 msgid "Key Conflict(s) Detected."
-msgstr ""
+msgstr "Tast Konfikt(er) Opdaget."
 
 #: ../src/gui/setup_keyboard.cpp:116
 msgid "Resolve them, or gameplay may result in strange behaviour."
-msgstr ""
+msgstr "Løs problemet, ellers kan spillet risikere at opfører sig ustabilt."
 
 #: ../src/gui/setup_players.cpp:52
 #, fuzzy
@@ -874,51 +881,51 @@ msgstr "Navn:"
 
 #: ../src/gui/setup_players.cpp:53
 msgid "Relation"
-msgstr ""
+msgstr "Relation"
 
 #: ../src/gui/setup_players.cpp:57
 msgid "Neutral"
-msgstr ""
+msgstr "Neutral"
 
 #: ../src/gui/setup_players.cpp:58
 msgid "Friend"
-msgstr ""
+msgstr "Ven"
 
 #: ../src/gui/setup_players.cpp:59
 msgid "Disregarded"
-msgstr ""
+msgstr "Se bort fra"
 
 #: ../src/gui/setup_players.cpp:60
 msgid "Ignored"
-msgstr ""
+msgstr "Ignorer"
 
 #: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
 msgid "???"
-msgstr ""
+msgstr "???"
 
 #: ../src/gui/setup_players.cpp:213
 msgid "Save player list"
-msgstr ""
+msgstr "Gem bruger liste"
 
 #: ../src/gui/setup_players.cpp:215
 msgid "Allow trading"
-msgstr ""
+msgstr "Tillad handel"
 
 #: ../src/gui/setup_players.cpp:217
 msgid "Allow whispers"
-msgstr ""
+msgstr "Tillad hviskere"
 
 #: ../src/gui/setup_players.cpp:245
 msgid "When ignoring:"
-msgstr ""
+msgstr "Når ignorer:"
 
 #: ../src/gui/setup_video.cpp:90
 msgid "No modes available"
-msgstr ""
+msgstr "Ingen opsætning tilgængelig"
 
 #: ../src/gui/setup_video.cpp:92
 msgid "All resolutions available"
-msgstr ""
+msgstr "Alle opløsninger er tilgængelige"
 
 #: ../src/gui/setup_video.cpp:115
 msgid "Full screen"
@@ -934,15 +941,15 @@ msgstr "Brugerdefineret Musepil"
 
 #: ../src/gui/setup_video.cpp:118
 msgid "Particle effects"
-msgstr ""
+msgstr "Partikel effekter"
 
 #: ../src/gui/setup_video.cpp:119
 msgid "Speech bubbles"
-msgstr ""
+msgstr "Snakke bobler"
 
 #: ../src/gui/setup_video.cpp:120
 msgid "Show name"
-msgstr ""
+msgstr "Vis navn"
 
 #: ../src/gui/setup_video.cpp:122
 msgid "FPS Limit:"
@@ -980,23 +987,23 @@ msgstr "høj"
 
 #: ../src/gui/setup_video.cpp:245
 msgid "Particle Detail"
-msgstr ""
+msgstr "Partikel Detalje"
 
 #: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
 msgid "medium"
-msgstr ""
+msgstr "mellem"
 
 #: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
 msgid "max"
-msgstr ""
+msgstr "maks"
 
 #: ../src/gui/setup_video.cpp:321
 msgid "Failed to switch to "
-msgstr ""
+msgstr "Fejlede i at skifte til "
 
 #: ../src/gui/setup_video.cpp:322
 msgid "windowed"
-msgstr ""
+msgstr "vinduet"
 
 #: ../src/gui/setup_video.cpp:322
 #, fuzzy
@@ -1005,7 +1012,7 @@ msgstr "Fuld Skærm"
 
 #: ../src/gui/setup_video.cpp:323
 msgid "mode and restoration of old mode also failed!"
-msgstr ""
+msgstr "opsætning og genoprettelse af gammel opsætning fejlede også!"
 
 #: ../src/gui/setup_video.cpp:330
 msgid "Switching to full screen"
@@ -1026,16 +1033,16 @@ msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
 
 #: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
 msgid "Couldn't set "
-msgstr ""
+msgstr "Kunne ikke definere "
 
 #: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
 msgid " video mode: "
-msgstr ""
+msgstr " skærm opsætning: "
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
 #: ../src/gui/setup_video.cpp:433
 msgid "Screen resolution changed"
-msgstr ""
+msgstr "Skærm opløsning ændret"
 
 #: ../src/gui/setup_video.cpp:434
 #, fuzzy
@@ -1044,25 +1051,25 @@ msgstr "Ændringerne kræver at du genstarter klienten."
 
 #: ../src/gui/setup_video.cpp:452
 msgid "Particle effect settings changed"
-msgstr ""
+msgstr "Partikel effekt opsætningen er ændret"
 
 #: ../src/gui/setup_video.cpp:453
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
-msgstr "Ændringerne kræver at du genstarter klienten."
+msgstr "Ændringerne kræver at du genstarter klienten, eller skifter bane."
 
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
-msgstr ""
+msgstr "Færdigheds points: %d"
 
 #: ../src/gui/skill.cpp:131
 msgid "Up"
-msgstr ""
+msgstr "Op"
 
 #: ../src/gui/skill.cpp:131
 msgid "inc"
-msgstr ""
+msgstr "inc"
 
 #: ../src/gui/skill.cpp:132
 #, fuzzy
@@ -1072,22 +1079,22 @@ msgstr "Brug"
 #: ../src/gui/skill.cpp:257
 #, c-format
 msgid "Error loading skills file: %s"
-msgstr ""
+msgstr "Fejl under loading af færdigheds fil: %s"
 
 #: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
 #: ../src/net/playerhandler.cpp:248
 msgid "Message"
-msgstr ""
+msgstr "Besked"
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
 msgid "Job: %d"
-msgstr "Niveau: %d"
+msgstr "Karriere: %d"
 
 #: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
 #, fuzzy, c-format
 msgid "Money: %d GP"
-msgstr "Penge: %d"
+msgstr "Penge: %d GP"
 
 #. ----------------------
 #. Stats Part
@@ -1100,46 +1107,46 @@ msgstr "Status"
 
 #: ../src/gui/status.cpp:126
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #: ../src/gui/status.cpp:127
 msgid "Cost"
-msgstr ""
+msgstr "Pris"
 
 #. Derived Stats
 #: ../src/gui/status.cpp:130
 #, fuzzy
 msgid "Attack:"
-msgstr "Angrib %+d"
+msgstr "Angrib:"
 
 #: ../src/gui/status.cpp:131
 #, fuzzy
 msgid "Defense:"
-msgstr "Forsvar %+d"
+msgstr "Forsvar:"
 
 #: ../src/gui/status.cpp:132
 #, fuzzy
 msgid "M.Attack:"
-msgstr "Angrib %+d"
+msgstr "M.Angrib:"
 
 #: ../src/gui/status.cpp:133
 #, fuzzy
 msgid "M.Defense:"
-msgstr "Forsvar %+d"
+msgstr "M.Forsvar:"
 
 #: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
-msgstr ""
+msgstr "% Nøjagtighed:"
 
 #: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
-msgstr ""
+msgstr "% Undvig:"
 
 #: ../src/gui/status.cpp:136
 msgid "% Reflex:"
-msgstr ""
+msgstr "% Refleks:"
 
 #: ../src/gui/status.cpp:280
 #, fuzzy
@@ -1154,34 +1161,34 @@ msgstr "Adræthed"
 #: ../src/gui/status.cpp:282
 #, fuzzy
 msgid "Vitality"
-msgstr "Helbred:"
+msgstr "Helbred"
 
 #: ../src/gui/status.cpp:283
 #, fuzzy
 msgid "Intelligence"
-msgstr "Intelligens:"
+msgstr "Intelligens"
 
 #: ../src/gui/status.cpp:284
 #, fuzzy
 msgid "Dexterity"
-msgstr "Behændighed:"
+msgstr "Behændighed"
 
 #: ../src/gui/status.cpp:285
 msgid "Luck"
-msgstr ""
+msgstr "Held"
 
 #: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
-msgstr ""
+msgstr "Tilgode Status Points"
 
 #: ../src/gui/trade.cpp:51
 msgid "Trade: You"
-msgstr ""
+msgstr "Handel: Dig"
 
 #: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
-msgstr ""
+msgstr "Handel"
 
 #: ../src/gui/trade.cpp:63
 msgid "Add"
@@ -1198,629 +1205,638 @@ msgstr "Du giver:"
 
 #: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
+msgstr "Fejlede i at tilføje genstand. Du kan ikke overlappe en slags genstand på vinduet."
 
 #: ../src/gui/updatewindow.cpp:78
 #, c-format
 msgid "Couldn't load text file: %s"
-msgstr ""
+msgstr "Kunne ikke loade tekst fil: %s"
 
 #: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
-msgstr ""
+msgstr "Updatere..."
 
 #: ../src/gui/updatewindow.cpp:115
 msgid "Play"
-msgstr ""
+msgstr "Spil"
 
 #: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
-msgstr ""
+msgstr "Kunne ikke loade nyhederne"
 
 #: ../src/gui/updatewindow.cpp:327
 msgid "curl error "
-msgstr ""
+msgstr "curl fejl "
 
 #: ../src/gui/updatewindow.cpp:328
 msgid " host: "
-msgstr ""
+msgstr " host: "
 
 #: ../src/gui/updatewindow.cpp:363
 #, c-format
 msgid "Checksum for file %s failed: (%lx/%lx)"
-msgstr ""
+msgstr "Checksum for fil %s fejlede: (%lx/%lx)"
 
 #: ../src/gui/updatewindow.cpp:413
 msgid "Unable to create mThread"
-msgstr ""
+msgstr "Kunne ikke skabe mThread"
 
 #: ../src/gui/updatewindow.cpp:451
 msgid "##1  The update process is incomplete."
-msgstr ""
+msgstr "##1  Opdateringsprocessen er ikke færdiggjort"
 
 #: ../src/gui/updatewindow.cpp:452
 msgid "##1  It is strongly recommended that"
-msgstr ""
+msgstr "##1  Det er varmt anbefalet at"
 
 #: ../src/gui/updatewindow.cpp:453
 msgid "##1  you try again later"
-msgstr ""
+msgstr "##1  du prøver igen senere"
 
 #: ../src/gui/updatewindow.cpp:507
 #, c-format
 msgid "%s already here"
-msgstr ""
+msgstr "%s allerede her"
 
 #: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
-msgstr ""
+msgstr "Udført"
 
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
 msgstr ""
+"Du bære på mere en halvdelen af din vægt. Du kan derfor ikke genvinde liv."
 
 #: ../src/net/playerhandler.cpp:218
 msgid "You are dead."
-msgstr ""
+msgstr "Du er død."
 
 #: ../src/net/playerhandler.cpp:219
 msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
+msgstr "Vi er ked af at måtte informere dig, om at din karakter var dræbt i kamp."
 
 #: ../src/net/playerhandler.cpp:220
 msgid "You are not that alive anymore."
-msgstr ""
+msgstr "Du er ikke så levende som du engang har været."
 
 #: ../src/net/playerhandler.cpp:221
 msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
+msgstr "De kolder hænder der tilhøre Grim Reaper, griber ud efter din sjæl"
 
 #: ../src/net/playerhandler.cpp:222
 msgid "Game Over!"
-msgstr ""
+msgstr "Game Over!"
 
 #: ../src/net/playerhandler.cpp:223
 msgid "Insert coin to continue"
-msgstr ""
+msgstr "Indsæt en mønt for at fortsætte"
 
 #: ../src/net/playerhandler.cpp:224
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
+"Nej, børn. Din karakter døde ikke rigtigt. Den.. err... tog til et bedre "
+"sted."
 
 #: ../src/net/playerhandler.cpp:225
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
+"Din plan om at smadre fjendens våben, ved at benytte din hals "
+"fejlede."
 
 #: ../src/net/playerhandler.cpp:226
 msgid "I guess this did not run too well."
-msgstr ""
+msgstr "Jeg går ud fra at dette ikke gik alt for godt."
 
 #: ../src/net/playerhandler.cpp:227
 msgid "Do you want your possessions identified?"
-msgstr ""
+msgstr "Du vil gerne have dine ejendele identificeret?"
 
 #. Nethack reference
 #: ../src/net/playerhandler.cpp:228
 msgid "Sadly, no trace of you was ever found..."
-msgstr ""
+msgstr "Desværre, blev der aldrig fundet noget spor efter dig..."
 
 #. Secret of Mana reference
 #: ../src/net/playerhandler.cpp:229
 msgid "Annihilated."
-msgstr ""
+msgstr "Udslettet."
 
 #. Final Fantasy VI reference
 #: ../src/net/playerhandler.cpp:230
 msgid "Looks like you got your head handed to you."
-msgstr ""
+msgstr "Det ser ud til at du fik du hoved udleveret til dig."
 
 #. Earthbound reference
 #: ../src/net/playerhandler.cpp:231
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
+"Du kvajede dig igen, smid din krop ned i kloakken og find dig en ny." 
 
 #. Leisure Suit Larry 1 Reference
 #: ../src/net/playerhandler.cpp:232
 msgid "You're not dead yet. You're just resting."
-msgstr ""
+msgstr "Du er ikke død endnu. Du hviler dig bare."
 
 #. Monty Python reference from a couple of skits
 #: ../src/net/playerhandler.cpp:233
 msgid "You are no more."
-msgstr ""
+msgstr "Du er ikke mere."
 
 #. Monty Python reference from the dead parrot sketch starting now
 #: ../src/net/playerhandler.cpp:234
 msgid "You have ceased to be."
-msgstr ""
+msgstr "Du er holdt op med at være til."
 
 #: ../src/net/playerhandler.cpp:235
 msgid "You've expired and gone to meet your maker."
-msgstr ""
+msgstr "Du er udløbet og er gået hen for at møde din skaber."
 
 #: ../src/net/playerhandler.cpp:236
 msgid "You're a stiff."
-msgstr ""
+msgstr "Du er en hård nød at knække, men desværre død."
 
 #: ../src/net/playerhandler.cpp:237
 msgid "Bereft of life, you rest in peace."
-msgstr ""
+msgstr "Du siver langtsomt ud af din krop, du kan nu endelig slappe af."
 
 #: ../src/net/playerhandler.cpp:238
 msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr ""
+msgstr "Hvis det ikke var fordi du var så animeret, kunne du sikker imponere Chuck Norris."
 
 #: ../src/net/playerhandler.cpp:239
 msgid "Your metabolic processes are now history."
-msgstr ""
+msgstr "Din tid er ovre."
 
 #: ../src/net/playerhandler.cpp:240
 msgid "You're off the twig."
-msgstr ""
+msgstr "Drik noget syre."
 
 #: ../src/net/playerhandler.cpp:241
 msgid "You've kicked the bucket."
-msgstr ""
+msgstr "Du har stillet træskoene."
 
 #: ../src/net/playerhandler.cpp:242
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
+"Du har spist af dødens pølse for den sidste gang."
+
 
 #: ../src/net/playerhandler.cpp:243
 msgid "You are an ex-player."
-msgstr ""
+msgstr "Du er en forhenværende spiller."
 
 #: ../src/net/playerhandler.cpp:244
 msgid "You're pining for the fjords."
-msgstr ""
+msgstr "Du er tabt bag en vogn."
 
 #: ../src/net/playerhandler.cpp:267
 msgid "You picked up "
-msgstr ""
+msgstr "Du samlede op "
 
 #: ../src/net/playerhandler.cpp:390
 msgid "Equip arrows first"
-msgstr ""
+msgstr "Tag først pile på"
 
 #: ../src/net/playerhandler.cpp:394
 #, c-format
 msgid "0x013b: Unhandled message %i"
-msgstr ""
+msgstr "0x013b: Unbehandlet besked %i"
 
 #: ../src/net/tradehandler.cpp:91
 msgid "Request for trade"
-msgstr ""
+msgstr "Ansøg om lov til at handle"
 
 #: ../src/net/tradehandler.cpp:93
 msgid " wants to trade with you, do you accept?"
-msgstr ""
+msgstr " vil gerne handle med dig, vil du acceptere?"
 
 #. Too far away
 #: ../src/net/tradehandler.cpp:107
 msgid "Trading isn't possible. Trade partner is too far away."
-msgstr ""
+msgstr "Du kan ikke handle. Handle partneren er for langt væk."
 
 #. Character doesn't exist
 #: ../src/net/tradehandler.cpp:111
 msgid "Trading isn't possible. Character doesn't exist."
-msgstr ""
+msgstr "Du kan ikke handle. Karakteren findes ikke."
 
 #. Invite request check failed...
 #: ../src/net/tradehandler.cpp:115
 msgid "Trade cancelled due to an unknown reason."
-msgstr ""
+msgstr "Handlen blev annulleret af en ukendt grund."
 
 #: ../src/net/tradehandler.cpp:121
 msgid "Trade: You and "
-msgstr ""
+msgstr "Handel: Dig og "
 
 #: ../src/net/tradehandler.cpp:127
 #, fuzzy
 msgid "Trade with "
-msgstr "@@trade|Byt Med %s@@"
+msgstr "Handel med "
 
 #: ../src/net/tradehandler.cpp:128
 #, fuzzy
 msgid " cancelled"
-msgstr "Fortryd"
+msgstr " afbrudt"
 
 #. Shouldn't happen as well, but to be sure
 #: ../src/net/tradehandler.cpp:135
 msgid "Unhandled trade cancel packet"
-msgstr ""
+msgstr "Ubehandlet handel annullerede pakken"
 
 #. Add item failed - player overweighted
 #: ../src/net/tradehandler.cpp:185
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr ""
+msgstr "Fejlede i at tilføje genstand. Handels partneren bære på for meget."
 
 #. Add item failed - player has no free slot
 #: ../src/net/tradehandler.cpp:190
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr ""
+msgstr "Fejlede i at tilføje genstand. Handels partneren har ikke flere frie pladser."
 
 #: ../src/net/tradehandler.cpp:194
 msgid "Failed adding item for unknown reason."
-msgstr ""
+msgstr "Fejlede i at tilføje genstand af en ukendt grund."
 
 #: ../src/net/tradehandler.cpp:207
 msgid "Trade canceled."
-msgstr ""
+msgstr "Handel annulleret."
 
 #: ../src/net/tradehandler.cpp:214
 msgid "Trade completed."
-msgstr ""
+msgstr "Handel er komplet."
 
 #: ../src/resources/colordb.cpp:56
 #, c-format
 msgid "Trying TMW's color file, %s."
-msgstr ""
+msgstr "Prøver TMW's farve fil, %s."
 
 #: ../src/resources/colordb.cpp:66
 msgid "ColorDB: Failed"
-msgstr ""
+msgstr "ColorDB: Fejlede"
 
 #: ../src/resources/colordb.cpp:83
 #, c-format
-msgid "ColorDB: Redefinition of dye ID %d"
+msgid "ColorDB: Ny definition af dye ID %d"
 msgstr ""
 
 #: ../src/resources/colordb.cpp:98
 msgid "Unloading color database..."
-msgstr ""
+msgstr "Udlæser farve database..."
 
 #: ../src/resources/colordb.cpp:113
 #, c-format
 msgid "ColorDB: Error, unknown dye ID# %d"
-msgstr ""
+msgstr "ColorDB: Fejl, ukendt dye ID# %d"
 
 #: ../src/resources/emotedb.cpp:52
 msgid "Initializing emote database..."
-msgstr ""
+msgstr "startede emote database..."
 
 #: ../src/resources/emotedb.cpp:59
 msgid "Emote Database: Error while loading emotes.xml!"
-msgstr ""
+msgstr "Emote Database: Fejl under læsning af emotes.xml!"
 
 #: ../src/resources/emotedb.cpp:72
 msgid "Emote Database: Emote with missing ID in emotes.xml!"
-msgstr ""
+msgstr "Emote Database: Emote med manglende ID i emotes.xml!"
 
 #: ../src/resources/emotedb.cpp:131
 #, c-format
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
-msgstr ""
+msgstr "EmoteDB: Warning, unknown emote ID %d requested"
 
 #: ../src/resources/itemdb.cpp:52
 msgid "Initializing item database..."
-msgstr ""
+msgstr "Startede genstans database..."
 
 #: ../src/resources/itemdb.cpp:55
 msgid "Unknown item"
-msgstr ""
+msgstr "Ukendt genstand"
 
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
-msgstr ""
+msgstr "ItemDB: Fejl under læsningen af items.xml!"
 
 #: ../src/resources/itemdb.cpp:77
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
-msgstr ""
+msgstr "ItemDB: Ugyldig eller manglende genstand ID i items.xml!"
 
 #: ../src/resources/itemdb.cpp:82
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
-msgstr ""
+msgstr "ItemDB: Ny definition af genstand ID %d"
 
 #: ../src/resources/itemdb.cpp:99
 msgid "Unnamed"
-msgstr ""
+msgstr "Unavngivet"
 
 #: ../src/resources/itemdb.cpp:142
 msgid "Unloading item database..."
-msgstr ""
+msgstr "Udlæser genstands databasen..."
 
 #: ../src/resources/itemdb.cpp:160
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
-msgstr ""
+msgstr "ItemDB: Fejl, ukendt genstand ID# %d"
 
 #: ../src/resources/itemdb.cpp:199
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
-msgstr ""
+msgstr "ItemDB: Ignorerer ukendt lyd begivenhed '%s'"
 
 #: ../src/resources/monsterdb.cpp:44
 msgid "unnamed"
-msgstr ""
+msgstr "unavngivet"
 
 #: ../src/resources/monsterdb.cpp:46
 msgid "Initializing monster database..."
-msgstr ""
+msgstr "Starter monster database..."
 
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
-msgstr ""
+msgstr "Monster Database: Fejl under indlæsningen ad monster.xml!"
 
 #: ../src/resources/monsterdb.cpp:84
 #, c-format
 msgid ""
 "MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
 msgstr ""
+"MonsterDB: Ukendt mål mus skriver \"%s\" for %s - at bruge en mellem størelse"
 
 #: ../src/resources/monsterdb.cpp:121
 #, c-format
 msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
-msgstr ""
+msgstr "MonsterDB: Advarsel, lyd effekt %s for ukendt begivenhed %s af monster %s"
 
 #: ../src/resources/monsterdb.cpp:159
 #, c-format
 msgid "MonsterDB: Warning, unknown monster ID %d requested"
-msgstr ""
+msgstr "MonsterDB: Advarsel, ukendt monster ID %d efterspurgt"
 
 #: ../src/resources/npcdb.cpp:48
 msgid "Initializing NPC database..."
-msgstr ""
+msgstr "Starter NPC database..."
 
 #: ../src/resources/npcdb.cpp:55
 msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
+msgstr "NPC Database: Fejl under indlæsning af npcs.xml!"
 
 #: ../src/resources/npcdb.cpp:67
 msgid "NPC Database: NPC with missing ID in npcs.xml!"
-msgstr ""
+msgstr "NPC Database: NPC med manglende ID i npcs.xml!"
 
 #: ../src/resources/npcdb.cpp:125
 #, c-format
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
-msgstr ""
+msgstr "NPCDB: Advarsel, ukendt NPC ID %d efterspurgt"
 
 #: ../src/game.cpp:386
 msgid "Screenshot saved to ~/"
-msgstr ""
+msgstr "Skærmbillede gemt under ~/"
 
 #: ../src/game.cpp:391
 msgid "Saving screenshot failed!"
-msgstr ""
+msgstr "Gemningen af skærmbilledet fejlede!"
 
 #: ../src/game.cpp:392
 msgid "Error: could not save screenshot."
-msgstr ""
+msgstr "Fejl: kunne ikke gemme skærmbilledet."
 
 #: ../src/game.cpp:467
 msgid "Network Error"
-msgstr ""
+msgstr "Netværk Fejl"
 
 #: ../src/game.cpp:468
 msgid "The connection to the server was lost, the program will now quit"
-msgstr ""
+msgstr "Forbindelsen til serveren er tabt, programmet vil nu lukke"
 
 #: ../src/game.cpp:531
 msgid "Ignoring incoming trade requests"
-msgstr ""
+msgstr "Ignorer indkomne handels anmodninger"
 
 #: ../src/game.cpp:536
 msgid "Accepting incoming trade requests"
-msgstr ""
+msgstr "Accepter indkomne handels anmodninger"
 
 #: ../src/game.cpp:638
 #, fuzzy
 msgid "Are you sure you want to quit?"
-msgstr "Er du sikker på at du vil slette denne figur?"
+msgstr "Er du sikker på at du gerne vil stoppe?"
 
 #: ../src/game.cpp:644
 msgid "no"
-msgstr ""
+msgstr "nej"
 
 #: ../src/game.cpp:785
 #, c-format
 msgid "Warning: guichan input exception: %s"
-msgstr ""
+msgstr "Advarsel: guichan indput untagelse: %s"
 
 #: ../src/main.cpp:207
 #, c-format
 msgid "Error: Invalid update host: %s"
-msgstr ""
+msgstr "Fejl: Ugyldigt opdaterings host: %s"
 
 #: ../src/main.cpp:208
 msgid "Invalid update host: "
-msgstr ""
+msgstr "Ugyldigt opdaterings host: "
 
 #: ../src/main.cpp:212
 msgid "Warning: no protocol was specified for the update host"
-msgstr ""
+msgstr "Advarsel: ingen protocol var aktiv som opdate host"
 
 #: ../src/main.cpp:222
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
-msgstr ""
+msgstr "Fejl: %s/%s kan ikke laves, men findes ikke!"
 
 #: ../src/main.cpp:224
 msgid "Error creating updates directory!"
-msgstr ""
+msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
 #: ../src/main.cpp:252
 msgid " can't be created, but it doesn't exist! Exiting."
-msgstr ""
+msgstr " kan ikke laves, men det findes ikke! Lukker."
 
 #: ../src/main.cpp:261
 #, c-format
 msgid "Starting Aethyra Version %s"
-msgstr ""
+msgstr "Starter Aethyra Version %s"
 
 #: ../src/main.cpp:263
 msgid "Starting Aethyra - Version not defined"
-msgstr ""
+msgstr "Starter Aethyra - Version er ikke defineret"
 
 #. Initialize SDL
 #: ../src/main.cpp:267
 msgid "Initializing SDL..."
-msgstr ""
+msgstr "Starter SDL..."
 
 #: ../src/main.cpp:269
 msgid "Could not initialize SDL: "
-msgstr ""
+msgstr "Kunne ikke starte SDL: "
 
 #: ../src/main.cpp:282
 msgid " couldn't be set as home directory! Exiting."
-msgstr ""
+msgstr " kunne ikke blive sat til hjemmemappen! Lukker."
 
 #: ../src/main.cpp:302
 #, c-format
 msgid "Can't find Resources directory\n"
-msgstr ""
+msgstr "Kan ikke finde ressourcernes mappe\n"
 
 #. Fill configuration with defaults
 #: ../src/main.cpp:312
 msgid "Initializing configuration..."
-msgstr ""
+msgstr "Starter configurationen..."
 
 #: ../src/main.cpp:426
 #, c-format
 msgid "Warning: %s"
-msgstr ""
+msgstr "Advarsel: %s"
 
 #: ../src/main.cpp:468
 msgid "aethyra"
-msgstr ""
+msgstr "aethyra"
 
 #: ../src/main.cpp:469
 msgid "Options: "
-msgstr ""
+msgstr "Opsætning: "
 
 #: ../src/main.cpp:470
 msgid "  -C --configfile : Configuration file to use"
-msgstr ""
+msgstr "  -C --configfile : Configurations fil til brug"
 
 #: ../src/main.cpp:471
 msgid "  -d --data       : Directory to load game data from"
-msgstr ""
+msgstr "  -d --data       : Mappen at indlæse spillets data fra"
 
 #: ../src/main.cpp:472
 msgid "  -D --default    : Bypass the login process with default settings"
-msgstr ""
+msgstr "  -D --default    : Overskriv login processen med normale indstillinger"
 
 #: ../src/main.cpp:473
 msgid "  -h --help       : Display this help"
-msgstr ""
+msgstr "  -h --help       : Viser denne hjælp"
 
 #: ../src/main.cpp:474
 msgid "  -H --updatehost : Use this update host"
-msgstr ""
+msgstr "  -H --updatehost : Brug denne opdaterings host"
 
 #: ../src/main.cpp:475
 msgid "  -p --playername : Login with this player"
-msgstr ""
+msgstr "  -p --playername : Logind med denne bruger"
 
 #: ../src/main.cpp:476
 msgid "  -P --password   : Login with this password"
-msgstr ""
+msgstr "  -P --password   : Logind med denne adgangskode"
 
 #: ../src/main.cpp:477
 msgid "  -u --skipupdate : Skip the update downloads"
-msgstr ""
+msgstr "  -u --skipupdate : Spring opdateringerne over"
 
 #: ../src/main.cpp:478
 msgid "  -U --username   : Login with this username"
-msgstr ""
+msgstr "  -U --username   : Logind med dette brugernavn"
 
 #: ../src/main.cpp:479
 msgid "  -v --version    : Display the version"
-msgstr ""
+msgstr "  -v --version    : Viser den nuværende version"
 
 #: ../src/main.cpp:485 ../src/main.cpp:488
 msgid "Aethyra version "
-msgstr ""
+msgstr "Aethyra version "
 
 #: ../src/main.cpp:489
 msgid "(local build?, PACKAGE_VERSION is not defined)"
-msgstr ""
+msgstr "(lokalt build?, PACKAGE_VERSION er ikke defineret)"
 
 #: ../src/main.cpp:585
 #, fuzzy
 msgid "Trying to connect to account server..."
-msgstr "Opretter forbindelse..."
+msgstr "Prøver at opretter forbindelse til bruger serveren..."
 
 #: ../src/main.cpp:586
 #, c-format
 msgid "Username is %s"
-msgstr ""
+msgstr "Brugernavn er %s"
 
 #: ../src/main.cpp:640
 #, fuzzy
 msgid "Trying to connect to char server..."
-msgstr "Opretter forbindelse..."
+msgstr "Prøver at oprette forbindelse til karakter serveren..."
 
 #: ../src/main.cpp:662
 #, c-format
 msgid "Memorizing selected character %s"
-msgstr ""
+msgstr "Husk den valgte karakter %s"
 
 #: ../src/main.cpp:668
 #, fuzzy
 msgid "Trying to connect to map server..."
-msgstr "Opretter forbindelse..."
+msgstr "Prøver at oprette forbindelse til bane serveren..."
 
 #: ../src/main.cpp:669
 #, fuzzy, c-format
 msgid "Map: %s"
-msgstr "Navn; %s"
+msgstr "Bane; %s"
 
 #: ../src/main.cpp:799
 #, c-format
 msgid "Couldn't load %s as wallpaper"
-msgstr ""
+msgstr "Kunne ikke indlæse %s som background"
 
 #: ../src/main.cpp:832
 msgid "Got disconnected from server!"
-msgstr ""
+msgstr "Blev smidt af serveren!"
 
 #: ../src/main.cpp:1037
 #, fuzzy
 msgid "Connecting to map server..."
-msgstr "Opretter forbindelse..."
+msgstr "Opretter forbindelse til bane serveren..."
 
 #: ../src/main.cpp:1045
 msgid "Connecting to character server..."
-msgstr ""
+msgstr "Opretter forbindelse til karakter serveren..."
 
 #: ../src/main.cpp:1053
 msgid "Connecting to account server..."
-msgstr ""
+msgstr "Opretter forbindelse til bruger serveren..."
 
 #, fuzzy
 #~ msgid "Description:"
-#~ msgstr "Beskrivelse: %s"
+#~ msgstr "Beskrivelse:"
 
 #, fuzzy
 #~ msgid "Effect:"
-#~ msgstr "Effekt: %s"
+#~ msgstr "Effekt:"
 
 #, fuzzy
 #~ msgid "Name: "
-#~ msgstr "Navn:"
+#~ msgstr "Navn: "
 
 #, fuzzy
 #~ msgid "Effect: "
-#~ msgstr "Effekt: %s"
+#~ msgstr "Effekt: "
 
 #, fuzzy
 #~ msgid "Description: "
-#~ msgstr "Beskrivelse: %s"
+#~ msgstr "Beskrivelse: "
 
 #~ msgid "Remember Username"
-#~ msgstr "Husk dette brugernavn."
+#~ msgstr "Husk Brugernavn"
 
 #~ msgid "Account and Character Management"
-#~ msgstr "Ret konto og figurer"
+#~ msgstr "Ret konto og karakter"
 
 #~ msgid "Unregister"
 #~ msgstr "Frameld"
@@ -1853,10 +1869,10 @@ msgstr ""
 #~ msgstr "Opdel"
 
 #~ msgid "Select amount of items to split."
-#~ msgstr "Vælg hvor mange du vil opdele."
+#~ msgstr "Vælg hvor mange genstande du vil opdele."
 
 #~ msgid "Guilds"
-#~ msgstr "Gilder"
+#~ msgstr "Klaner"
 
 #~ msgid "@@guild|Invite %s@@"
 #~ msgstr "@@guild|Inviter %s@@"
@@ -1871,19 +1887,19 @@ msgstr ""
 #~ msgstr "Skift server"
 
 #~ msgid "Switch character"
-#~ msgstr "Skift figur"
+#~ msgstr "Skift karakter"
 
 #~ msgid "Email:"
 #~ msgstr "E-mail:"
 
 #~ msgid "Choose your Mana World Server"
-#~ msgstr "Vælg din Mana World Server"
+#~ msgstr "Vælg din Aethyra Server"
 
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Skriv både adressen og porten på serveren."
 
 #~ msgid "Visible names"
-#~ msgstr "Vis navne"
+#~ msgstr "Synlige navne"
 
 #~ msgid "Propose trade"
 #~ msgstr "Foreslå handel"
-- 
cgit v1.2.3-70-g09d2


From 7b38f31192be70463cfa1fa6f0ffe13181fc26a9 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <crush@themanaworld.org>
Date: Sun, 18 Jan 2009 21:40:52 +0100
Subject: Fixed mapreader crash caused by unknown tile properties (That's why I
 said that I would like some praxis-oriented testing of the animation system
 before the release).

---
 src/resources/mapreader.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 04019d32..802199f1 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -532,8 +532,12 @@ Tileset *MapReader::readTileset(xmlNodePtr node,
                         break;
                     }
                 }
-                map->addAnimation(tileGID, new TileAnimation(ani));
-                logger->log("Animation length: %d", ani->getLength());
+
+                if (ani->getLength() > 0)
+                {
+                    map->addAnimation(tileGID, new TileAnimation(ani));
+                    logger->log("Animation length: %d", ani->getLength());
+                }
             }
         }
     }
-- 
cgit v1.2.3-70-g09d2


From 640b37b66712d22afd5c453f6aebc4abf7dcd442 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 18 Jan 2009 23:29:48 +0100
Subject: Fixed layout of video setup page when translated

Introduced a LayoutHelper class which can be used for any non-Window
container where you want to use a layout to place child widgets.
---
 po/POTFILES.in                   |   2 +
 src/CMakeLists.txt               |   2 +
 src/Makefile.am                  |   4 +-
 src/gui/setup_video.cpp          | 104 ++++++++++++++++-----------------------
 src/gui/setup_video.h            |  10 ++--
 src/gui/setuptab.h               |   4 +-
 src/gui/widgets/layout.h         |   2 +-
 src/gui/widgets/layouthelper.cpp |  63 ++++++++++++++++++++++++
 src/gui/widgets/layouthelper.h   |  84 +++++++++++++++++++++++++++++++
 src/gui/window.cpp               |   9 ++--
 10 files changed, 209 insertions(+), 75 deletions(-)
 create mode 100644 src/gui/widgets/layouthelper.cpp
 create mode 100644 src/gui/widgets/layouthelper.h

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 534bdd70..7010ea24 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -18,7 +18,9 @@ src/gui/item_amount.cpp
 src/gui/login.cpp
 src/gui/menuwindow.cpp
 src/gui/minimap.cpp
+src/gui/npcintegerdialog.cpp
 src/gui/npclistdialog.cpp
+src/gui/npcstringdialog.cpp
 src/gui/npc_text.cpp
 src/gui/ok_dialog.cpp
 src/gui/popupmenu.cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6bb1a2f3..adc36eaa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -55,6 +55,8 @@ SET(SRCS
     gui/widgets/resizegrip.h
     gui/widgets/layout.cpp
     gui/widgets/layout.h
+    gui/widgets/layouthelper.cpp
+    gui/widgets/layouthelper.h
     gui/widgets/tab.cpp
     gui/widgets/tab.h
     gui/widgets/tabbedarea.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 2bb11268..33d01598 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,9 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
               gui/widgets/dropdown.h \
 	      gui/widgets/layout.cpp \
 	      gui/widgets/layout.h \
-              gui/widgets/resizegrip.cpp \
+	      gui/widgets/layouthelper.cpp \
+	      gui/widgets/layouthelper.h \
+	      gui/widgets/resizegrip.cpp \
 	      gui/widgets/resizegrip.h \
 	      gui/widgets/tab.cpp \
 	      gui/widgets/tab.h \
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 78e26e5e..30441bb8 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -36,6 +36,8 @@
 #include "slider.h"
 #include "textfield.h"
 
+#include "widgets/layouthelper.h"
+
 #include "../configuration.h"
 #include "../graphics.h"
 #include "../localplayer.h"
@@ -136,37 +138,28 @@ Setup_Video::Setup_Video():
     mParticleDetailField(new gcn::Label(""))
 {
     setOpaque(false);
-    setDimension(gcn::Rectangle(0, 0, 290, 255));
 
     ScrollArea *scrollArea = new ScrollArea(mModeList);
+    scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+
     gcn::Label *alphaLabel = new gcn::Label(_("Gui opacity"));
+    gcn::Label *scrollRadiusLabel = new gcn::Label(_("Scroll radius"));
+    gcn::Label *scrollLazinessLabel = new gcn::Label(_("Scroll laziness"));
+    gcn::Label *overlayDetailLabel = new gcn::Label(_("Ambient FX"));
+    gcn::Label *particleDetailLabel = new gcn::Label(_("Particle Detail"));
 
     mModeList->setEnabled(true);
 #ifndef USE_OPENGL
     mOpenGLCheckBox->setEnabled(false);
 #endif
 
-    mModeList->setDimension(gcn::Rectangle(0, 0, 60, 70));
-    scrollArea->setDimension(gcn::Rectangle(10, 10, 90, 70));
-    mFsCheckBox->setPosition(110, 10);
-    mNameCheckBox->setPosition(195, 10);
-    mOpenGLCheckBox->setPosition(110, 30);
-    mParticleEffectsCheckBox->setPosition(180, 30);
-    mCustomCursorCheckBox->setPosition(110, 50);
-    mSpeechBubbleCheckBox->setPosition(110, 70);
-    mAlphaSlider->setDimension(gcn::Rectangle(10, 100, 75, 10));
-    alphaLabel->setPosition(20 + mAlphaSlider->getWidth(),
-                            mAlphaSlider->getY());
-    mFpsCheckBox->setPosition(90, 120);
-    mFpsSlider->setDimension(gcn::Rectangle(10, 120, 75, 10));
-    mFpsField->setPosition(100 + mFpsCheckBox->getWidth(), 100);
-    mFpsField->setWidth(30);
-
     mModeList->setSelected(-1);
     mAlphaSlider->setValue(mOpacity);
+    mAlphaSlider->setWidth(90);
 
     mFpsField->setText(toString(mFps));
     mFpsField->setEnabled(mFps > 0);
+    mFpsField->setWidth(30);
     mFpsSlider->setValue(mFps);
     mFpsSlider->setEnabled(mFps > 0);
     mFpsCheckBox->setSelected(mFps > 0);
@@ -206,27 +199,12 @@ Setup_Video::Setup_Video():
     mParticleDetailSlider->addActionListener(this);
     mParticleDetailField->addKeyListener(this);
 
-    mScrollRadiusSlider->setDimension(gcn::Rectangle(10, 140, 75, 10));
-    gcn::Label *scrollRadiusLabel = new gcn::Label(_("Scroll radius"));
-    scrollRadiusLabel->setPosition(90, 140);
-    mScrollRadiusField->setPosition(mFpsField->getX(), 140);
-    mScrollRadiusField->setWidth(30);
     mScrollRadiusField->setText(toString(mOriginalScrollRadius));
     mScrollRadiusSlider->setValue(mOriginalScrollRadius);
 
-    mScrollLazinessSlider->setDimension(gcn::Rectangle(10, 160, 75, 10));
-    gcn::Label *scrollLazinessLabel = new gcn::Label(_("Scroll laziness"));
-    scrollLazinessLabel->setPosition(90, 160);
-    mScrollLazinessField->setPosition(mFpsField->getX(), 160);
-    mScrollLazinessField->setWidth(30);
     mScrollLazinessField->setText(toString(mOriginalScrollLaziness));
     mScrollLazinessSlider->setValue(mOriginalScrollLaziness);
 
-    mOverlayDetailSlider->setDimension(gcn::Rectangle(10, 180, 75, 10));
-    gcn::Label *overlayDetailLabel = new gcn::Label(_("Ambient FX"));
-    overlayDetailLabel->setPosition(90, 180);
-    mOverlayDetailField->setPosition(180, 180);
-    mOverlayDetailField->setWidth(30);
     switch (mOverlayDetail)
     {
         case 0:
@@ -241,11 +219,6 @@ Setup_Video::Setup_Video():
     }
     mOverlayDetailSlider->setValue(mOverlayDetail);
 
-    mParticleDetailSlider->setDimension(gcn::Rectangle(10, 200, 75, 10));
-    gcn::Label *particleDetailLabel = new gcn::Label(_("Particle Detail"));
-    particleDetailLabel->setPosition(90, 200);
-    mParticleDetailField->setPosition(180, 200);
-    mParticleDetailField->setWidth(60);
     switch (mParticleDetail)
     {
         case 0:
@@ -263,30 +236,39 @@ Setup_Video::Setup_Video():
     }
     mParticleDetailSlider->setValue(mParticleDetail);
 
-    add(scrollArea);
-    add(mFsCheckBox);
-    add(mOpenGLCheckBox);
-    add(mCustomCursorCheckBox);
-    add(mParticleEffectsCheckBox);
-    add(mSpeechBubbleCheckBox);
-    add(mNameCheckBox);
-    add(mAlphaSlider);
-    add(alphaLabel);
-    add(mFpsCheckBox);
-    add(mFpsSlider);
-    add(mFpsField);
-    add(mScrollRadiusSlider);
-    add(scrollRadiusLabel);
-    add(mScrollRadiusField);
-    add(mScrollLazinessSlider);
-    add(scrollLazinessLabel);
-    add(mScrollLazinessField);
-    add(mOverlayDetailSlider);
-    add(overlayDetailLabel);
-    add(mOverlayDetailField);
-    add(mParticleDetailSlider);
-    add(particleDetailLabel);
-    add(mParticleDetailField);
+    // Do the layout
+    LayoutHelper h(this);
+    ContainerPlacer place = h.getPlacer(0, 0);
+
+    place(0, 0, scrollArea, 1, 5).setPadding(2);
+    place(1, 0, mFsCheckBox, 3);
+    place(2, 0, mNameCheckBox, 3);
+    place(1, 1, mOpenGLCheckBox, 3);
+    place(2, 1, mParticleEffectsCheckBox, 3);
+    place(1, 2, mCustomCursorCheckBox, 3);
+    place(1, 3, mSpeechBubbleCheckBox, 3);
+
+    place(0, 5, mAlphaSlider);
+    place(0, 6, mFpsSlider);
+    place(0, 7, mScrollRadiusSlider);
+    place(0, 8, mScrollLazinessSlider);
+    place(0, 9, mOverlayDetailSlider);
+    place(0, 10, mParticleDetailSlider);
+
+    place(1, 5, alphaLabel, 2);
+    place(1, 6, mFpsCheckBox).setPadding(3);
+    place(1, 7, scrollRadiusLabel);
+    place(1, 8, scrollLazinessLabel);
+    place(1, 9, overlayDetailLabel);
+    place(1, 10, particleDetailLabel);
+
+    place(2, 6, mFpsField).setPadding(1);
+    place(2, 7, mScrollRadiusField).setPadding(1);
+    place(2, 8, mScrollLazinessField).setPadding(1);
+    place(2, 9, mOverlayDetailField, 2).setPadding(2);
+    place(2, 10, mParticleDetailField, 2).setPadding(2);
+
+    setDimension(gcn::Rectangle(0, 0, 295, 255));
 }
 
 Setup_Video::~Setup_Video()
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index 370a2d2e..360daff0 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -45,6 +45,11 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
         void keyPressed(gcn::KeyEvent &event);
 
     private:
+        void updateSliders(bool originalValues);
+
+        int updateSlider(gcn::Slider *slider, gcn::TextField *field,
+                         const std::string &configName);
+
         bool mFullScreenEnabled;
         bool mOpenGLEnabled;
         bool mCustomCursorEnabled;
@@ -84,11 +89,6 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
         int mParticleDetail;
         gcn::Slider *mParticleDetailSlider;
         gcn::Label *mParticleDetailField;
-
-        void updateSliders(bool originalValues);
-
-        int updateSlider(gcn::Slider *slider, gcn::TextField *field,
-                         const std::string &configName);
 };
 
 #endif
diff --git a/src/gui/setuptab.h b/src/gui/setuptab.h
index 6c276c35..9e668a20 100644
--- a/src/gui/setuptab.h
+++ b/src/gui/setuptab.h
@@ -27,8 +27,8 @@
 class SetupTab : public GCContainer
 {
     public:
-        virtual void apply() =0;
-        virtual void cancel() =0;
+        virtual void apply() = 0;
+        virtual void cancel() = 0;
 };
 
 #endif
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index d631c154..9ba97fa1 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -317,4 +317,4 @@ class Layout: public LayoutCell
         bool mComputed;
 };
 
-#endif
+#endif // _TMW_WIDGET_LAYOUT_H__
diff --git a/src/gui/widgets/layouthelper.cpp b/src/gui/widgets/layouthelper.cpp
new file mode 100644
index 00000000..4dddaab3
--- /dev/null
+++ b/src/gui/widgets/layouthelper.cpp
@@ -0,0 +1,63 @@
+/*
+ *  The Mana World
+ *  Copyright 2009 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "layouthelper.h"
+
+LayoutHelper::LayoutHelper(gcn::Container *container):
+    mContainer(container)
+{
+    mContainer->addWidgetListener(this);
+}
+
+LayoutHelper::~LayoutHelper()
+{
+    mContainer->removeWidgetListener(this);
+}
+
+Layout &LayoutHelper::getLayout()
+{
+    return mLayout;
+}
+
+LayoutCell &LayoutHelper::place(int x, int y, gcn::Widget *wg, int w, int h)
+{
+    mContainer->add(wg);
+    return mLayout.place(wg, x, y, w, h);
+}
+
+ContainerPlacer LayoutHelper::getPlacer(int x, int y)
+{
+    return ContainerPlacer(mContainer, &mLayout.at(x, y));
+}
+
+void LayoutHelper::reflowLayout(int w, int h)
+{
+    mLayout.reflow(w, h);
+    mContainer->setSize(w, h);
+}
+
+void LayoutHelper::widgetResized(const gcn::Event &event)
+{
+    const gcn::Rectangle area = mContainer->getChildrenArea();
+    int w = area.width;
+    int h = area.height;
+    mLayout.reflow(w, h);
+}
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
new file mode 100644
index 00000000..b1039fb0
--- /dev/null
+++ b/src/gui/widgets/layouthelper.h
@@ -0,0 +1,84 @@
+/*
+ *  The Mana World
+ *  Copyright 2009 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef LAYOUTHELPER_H
+#define LAYOUTHELPER_H
+
+#include "layout.h"
+
+#include <guichan/widgetlistener.hpp>
+
+/**
+ * A helper class for adding a layout to a Guichan container widget. The layout
+ * will register itself as a widget listener and relayout the widgets in the
+ * container dynamically on resize.
+ */
+class LayoutHelper : public gcn::WidgetListener
+{
+    public:
+        /**
+         * Constructor.
+         */
+        LayoutHelper(gcn::Container *container);
+
+        /**
+         * Destructor.
+         */
+        ~LayoutHelper();
+
+        /**
+         * Gets the layout handler.
+         */
+        Layout &getLayout();
+
+        /**
+         * Computes the position of the widgets according to the current
+         * layout. Resizes the managed container so that the layout fits.
+         *
+         * @note This function is meant to be called with fixed-size
+         * containers.
+         *
+         * @param w if non-zero, force the container to this width.
+         * @param h if non-zero, force the container to this height.
+         */
+        void reflowLayout(int w = 0, int h = 0);
+
+        /**
+         * Adds a widget to the container and sets it at given cell.
+         */
+        LayoutCell &place(int x, int y, gcn::Widget *, int w = 1, int h = 1);
+
+        /**
+         * Returns a proxy for adding widgets in an inner table of the layout.
+         */
+        ContainerPlacer getPlacer(int x, int y);
+
+        /**
+         * Called whenever the managed container changes size.
+         */
+        void widgetResized(const gcn::Event &event);
+
+    private:
+        Layout mLayout;              /**< Layout handler */
+        gcn::Container *mContainer;  /**< Managed container */
+};
+
+#endif // LAYOUTHELPER_H
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index f6f5f4b8..d1ada53d 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -257,17 +257,16 @@ void Window::setResizable(bool r)
 
 void Window::widgetResized(const gcn::Event &event)
 {
+    const gcn::Rectangle area = getChildrenArea();
+
     if (mGrip)
-    {
-        const gcn::Rectangle area = getChildrenArea();
         mGrip->setPosition(getWidth() - mGrip->getWidth() - area.x,
                            getHeight() - mGrip->getHeight() - area.y);
-    }
 
     if (mLayout)
     {
-        int w = getWidth() - 2 * getPadding();
-        int h = getHeight() - getPadding() - getTitleBarHeight();
+        int w = area.width;
+        int h = area.height;
         mLayout->reflow(w, h);
     }
 }
-- 
cgit v1.2.3-70-g09d2


From 8d6f86a5b4b647ead0ec806ed1f73249594f7a70 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 18 Jan 2009 16:22:18 -0700
Subject: While the last commit might look good in English, it wasn't very
 translation friendly.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/setup_video.cpp | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 30441bb8..f4bcbe31 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -240,33 +240,33 @@ Setup_Video::Setup_Video():
     LayoutHelper h(this);
     ContainerPlacer place = h.getPlacer(0, 0);
 
-    place(0, 0, scrollArea, 1, 5).setPadding(2);
+    place(0, 0, scrollArea, 1, 6).setPadding(2);
     place(1, 0, mFsCheckBox, 3);
-    place(2, 0, mNameCheckBox, 3);
     place(1, 1, mOpenGLCheckBox, 3);
-    place(2, 1, mParticleEffectsCheckBox, 3);
     place(1, 2, mCustomCursorCheckBox, 3);
     place(1, 3, mSpeechBubbleCheckBox, 3);
-
-    place(0, 5, mAlphaSlider);
-    place(0, 6, mFpsSlider);
-    place(0, 7, mScrollRadiusSlider);
-    place(0, 8, mScrollLazinessSlider);
-    place(0, 9, mOverlayDetailSlider);
-    place(0, 10, mParticleDetailSlider);
-
-    place(1, 5, alphaLabel, 2);
-    place(1, 6, mFpsCheckBox).setPadding(3);
-    place(1, 7, scrollRadiusLabel);
-    place(1, 8, scrollLazinessLabel);
-    place(1, 9, overlayDetailLabel);
-    place(1, 10, particleDetailLabel);
-
-    place(2, 6, mFpsField).setPadding(1);
-    place(2, 7, mScrollRadiusField).setPadding(1);
-    place(2, 8, mScrollLazinessField).setPadding(1);
-    place(2, 9, mOverlayDetailField, 2).setPadding(2);
-    place(2, 10, mParticleDetailField, 2).setPadding(2);
+    place(1, 4, mNameCheckBox, 3);
+    place(1, 5, mParticleEffectsCheckBox, 3);
+
+    place(0, 7, mAlphaSlider);
+    place(0, 8, mFpsSlider);
+    place(0, 9, mScrollRadiusSlider);
+    place(0, 10, mScrollLazinessSlider);
+    place(0, 11, mOverlayDetailSlider);
+    place(0, 12, mParticleDetailSlider);
+
+    place(1, 7, alphaLabel, 2);
+    place(1, 8, mFpsCheckBox).setPadding(3);
+    place(1, 9, scrollRadiusLabel);
+    place(1, 10, scrollLazinessLabel);
+    place(1, 11, overlayDetailLabel);
+    place(1, 12, particleDetailLabel);
+
+    place(2, 8, mFpsField).setPadding(1);
+    place(2, 9, mScrollRadiusField).setPadding(1);
+    place(2, 10, mScrollLazinessField).setPadding(1);
+    place(2, 11, mOverlayDetailField, 2).setPadding(2);
+    place(2, 12, mParticleDetailField, 2).setPadding(2);
 
     setDimension(gcn::Rectangle(0, 0, 295, 255));
 }
-- 
cgit v1.2.3-70-g09d2


From d975741a095ae0dee82ff1dfdaa8e03439d7cf2b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 18 Jan 2009 17:25:09 -0700
Subject: Reflowed Color setup dialog to use layout code.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/setup_colours.cpp | 182 +++++++++++++++++++++++++---------------------
 src/gui/setup_colours.h   |  27 +++----
 2 files changed, 110 insertions(+), 99 deletions(-)

diff --git a/src/gui/setup_colours.cpp b/src/gui/setup_colours.cpp
index 33c7d86b..c08c94ef 100644
--- a/src/gui/setup_colours.cpp
+++ b/src/gui/setup_colours.cpp
@@ -29,57 +29,102 @@
 #include "scrollarea.h"
 #include "setup_colours.h"
 #include "slider.h"
+#include "textfield.h"
+
+#include "widgets/layouthelper.h"
 
 #include "../configuration.h"
 
 #include "../utils/gettext.h"
 
 Setup_Colours::Setup_Colours() :
-    mColourLabel(_("Color:")),
     mSelected(-1)
 {
     setOpaque(false);
-    setDimension(gcn::Rectangle(0, 0, 290, 255));
 
     mColourBox = new gcn::ListBox(textColour);
-    mScroll = new ScrollArea(mColourBox);
-
-    mColourLabel.setX(5);
-    mColourLabel.setY(5);
-
-    mColourBox->setDimension(gcn::Rectangle(0, 10 + mColourLabel.getHeight(),
-                                            80,
-                                            115 - mColourLabel.getHeight()));
-    mScroll->setDimension(gcn::Rectangle(5, 10 + mColourLabel.getHeight(),
-                                         100, 115 - mColourLabel.getHeight()));
-    mColourBox->setSelected(-1);
     mColourBox->setActionEventId("colour_box");
     mColourBox->addActionListener(this);
 
-    setOpaque(false);
-
-    add(&mColourLabel);
-    add(mScroll);
+    mScroll = new ScrollArea(mColourBox);
+    mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mScroll->setWidth(90);
+
+    mRedLabel = new gcn::Label(_("Red: "));
+
+    mRedText = new TextField();
+    mRedText->setWidth(40);
+    mRedText->setRange(0, 255);
+    mRedText->setNumeric(true);
+    mRedText->addListener(this);
+
+    mRedSlider = new Slider(0, 255);
+    mRedSlider->setWidth(90);
+    mRedSlider->setValue(mRedText->getValue());
+    mRedSlider->setActionEventId("slider_red");
+    mRedSlider->addActionListener(this);
+
+    mGreenLabel = new gcn::Label(_("Green: "));
+
+    mGreenText = new TextField();
+    mGreenText->setWidth(40);
+    mGreenText->setRange(0, 255);
+    mGreenText->setNumeric(true);
+    mGreenText->addListener(this);
+
+    mGreenSlider = new Slider(0, 255);
+    mGreenSlider->setWidth(90);
+    mGreenSlider->setValue(mGreenText->getValue());
+    mGreenSlider->setActionEventId("slider_green");
+    mGreenSlider->addActionListener(this);
+
+    mBlueLabel = new gcn::Label(_("Blue: "));
+
+    mBlueText = new TextField();
+    mBlueText->setWidth(40);
+    mBlueText->setRange(0, 255);
+    mBlueText->setNumeric(true);
+    mBlueText->addListener(this);
+
+    mBlueSlider = new Slider(0, 255);
+    mBlueSlider->setWidth(90);
+    mBlueSlider->setValue(mBlueText->getValue());
+    mBlueSlider->setActionEventId("slider_blue");
+    mBlueSlider->addActionListener(this);
 
-    setupPlacer(140, mLabel1, mSlider1, mText1, "R", "1");
-    setupPlacer(165, mLabel2, mSlider2, mText2, "G", "2");
-    setupPlacer(190, mLabel3, mSlider3, mText3, "B", "3");
+    setOpaque(false);
 
+    // Do the layout
+    LayoutHelper h(this);
+    ContainerPlacer place = h.getPlacer(0, 0);
+
+    place(0, 0, mScroll, 1, 3).setPadding(2);
+    place(1, 0, mRedLabel, 2);
+    place(3, 0, mRedSlider);
+    place(4, 0, mRedText).setPadding(1);
+    place(1, 1, mGreenLabel, 2);
+    place(3, 1, mGreenSlider);
+    place(4, 1, mGreenText).setPadding(1);
+    place(1, 2, mBlueLabel, 2);
+    place(3, 2, mBlueSlider);
+    place(4, 2, mBlueText).setPadding(1);
+
+    setDimension(gcn::Rectangle(0, 0, 290, 150));
 }
 
 Setup_Colours::~Setup_Colours()
 {
-    delete mLabel1;
-    delete mSlider1;
-    delete mText1;
+    delete mRedLabel;
+    delete mRedSlider;
+    delete mRedText;
 
-    delete mLabel2;
-    delete mSlider2;
-    delete mText2;
+    delete mGreenLabel;
+    delete mGreenSlider;
+    delete mGreenText;
 
-    delete mLabel3;
-    delete mSlider3;
-    delete mText3;
+    delete mBlueLabel;
+    delete mBlueSlider;
+    delete mBlueText;
 
     delete mScroll;
 }
@@ -90,35 +135,35 @@ void Setup_Colours::action(const gcn::ActionEvent &event)
     {
         mSelected = mColourBox->getSelected();
         int col = textColour->getColourAt(mSelected);
-        setEntry(mSlider1, mText1, col >> 16);
-        setEntry(mSlider2, mText2, (col >> 8) & 0xff);
-        setEntry(mSlider3, mText3, col & 0xff);
+        setEntry(mRedSlider, mRedText, col >> 16);
+        setEntry(mGreenSlider, mGreenText, (col >> 8) & 0xff);
+        setEntry(mBlueSlider, mBlueText, col & 0xff);
         return;
     }
 
-    if (event.getId() == "slider1")
+    if (event.getId() == "slider_red")
     {
         char buffer[30];
-        std::sprintf(buffer, "%d", static_cast<int>(mSlider1->getValue()));
-        mText1->setText(buffer);
+        std::sprintf(buffer, "%d", static_cast<int>(mRedSlider->getValue()));
+        mRedText->setText(buffer);
         updateColour();
         return;
     }
 
-    if (event.getId() == "slider2")
+    if (event.getId() == "slider_green")
     {
         char buffer[30];
-        std::sprintf(buffer, "%d", static_cast<int>(mSlider2->getValue()));
-        mText2->setText(buffer);
+        std::sprintf(buffer, "%d", static_cast<int>(mGreenSlider->getValue()));
+        mGreenText->setText(buffer);
         updateColour();
         return;
     }
 
-    if (event.getId() == "slider3")
+    if (event.getId() == "slider_blue")
     {
         char buffer[30];
-        std::sprintf(buffer, "%d", static_cast<int>(mSlider3->getValue()));
-        mText3->setText(buffer);
+        std::sprintf(buffer, "%d", static_cast<int>(mBlueSlider->getValue()));
+        mBlueText->setText(buffer);
         updateColour();
         return;
     }
@@ -141,59 +186,28 @@ void Setup_Colours::cancel()
 {
     textColour->rollback();
     int col = textColour->getColourAt(mSelected);
-    setEntry(mSlider1, mText1, col >> 16);
-    setEntry(mSlider2, mText2, (col >> 8) & 0xff);
-    setEntry(mSlider3, mText3, col & 0xff);
-}
-
-void Setup_Colours::setupPlacer(int v, gcn::Label *&l, Slider *&s,
-                                TextField *&t, std::string lbl,
-                                std::string sfx)
-{
-    l = new gcn::Label(lbl + ":");
-    l->setX(5);
-    l->setY(v - l->getHeight() / 2);
-
-    s = new Slider(0, 255);
-    s->setHeight(10);
-    s->setX(25);
-    s->setY(v - s->getHeight() / 2);
-    s->setWidth(128);
-    s->setScale(0, 255);
-
-    t = new TextField();
-    t->setX(165);
-    t->setY(v - t->getHeight() / 2);
-    t->setWidth(40);
-    t->setNumeric(true);
-    t->setRange(0, 255);
-    t->addListener(this);
-
-    s->setActionEventId("slider" + sfx);
-    s->addActionListener(this);
-
-    add(l);
-    add(s);
-    add(t);
+    setEntry(mRedSlider, mRedText, col >> 16);
+    setEntry(mGreenSlider, mGreenText, (col >> 8) & 0xff);
+    setEntry(mBlueSlider, mBlueText, col & 0xff);
 }
 
 void Setup_Colours::listen(const TextField *tf)
 {
-    if (tf == mText1)
+    if (tf == mRedText)
     {
-        mSlider1->setValue(tf->getValue());
+        mRedSlider->setValue(tf->getValue());
         updateColour();
         return;
     }
-    if (tf == mText2)
+    if (tf == mGreenText)
     {
-        mSlider2->setValue(tf->getValue());
+        mGreenSlider->setValue(tf->getValue());
         updateColour();
         return;
     }
-    if (tf == mText3)
+    if (tf == mBlueText)
     {
-        mSlider3->setValue(tf->getValue());
+        mBlueSlider->setValue(tf->getValue());
         updateColour();
         return;
     }
@@ -205,8 +219,8 @@ void Setup_Colours::updateColour()
     {
         return;
     }
-    int rgb = static_cast<int>(mSlider1->getValue()) << 16 |
-              static_cast<int>(mSlider2->getValue()) << 8 |
-              static_cast<int>(mSlider3->getValue());
+    int rgb = static_cast<int>(mRedSlider->getValue()) << 16 |
+              static_cast<int>(mGreenSlider->getValue()) << 8 |
+              static_cast<int>(mBlueSlider->getValue());
     textColour->setColourAt(mSelected, rgb);
 }
diff --git a/src/gui/setup_colours.h b/src/gui/setup_colours.h
index 3bd87848..628efb43 100644
--- a/src/gui/setup_colours.h
+++ b/src/gui/setup_colours.h
@@ -49,27 +49,24 @@ class Setup_Colours : public SetupTab, public gcn::ActionListener,
         void listen(const TextField *tf);
     private:
         gcn::ListBox *mColourBox;
-        gcn::Label mColourLabel;
         ScrollArea *mScroll;
         int mSelected;
 
-        gcn::Label *mLabel1;
-        Slider *mSlider1;
-        TextField *mText1;
-        int mValue1;
+        gcn::Label *mRedLabel;
+        Slider *mRedSlider;
+        TextField *mRedText;
+        int mRedValue;
 
-        gcn::Label *mLabel2;
-        Slider *mSlider2;
-        TextField *mText2;
-        int mValue2;
+        gcn::Label *mGreenLabel;
+        Slider *mGreenSlider;
+        TextField *mGreenText;
+        int mGreenValue;
 
-        gcn::Label *mLabel3;
-        Slider *mSlider3;
-        TextField *mText3;
-        int mValue3;
+        gcn::Label *mBlueLabel;
+        Slider *mBlueSlider;
+        TextField *mBlueText;
+        int mBlueValue;
 
-        void setupPlacer(int v, gcn::Label *&l, Slider *&s, TextField *&t,
-                         std::string lbl, std::string sfx);
         void setEntry(Slider *s, TextField *t, int value);
         void updateColour();
 };
-- 
cgit v1.2.3-70-g09d2


From d2b804c1a817ccdd85b4b1220bf929e9d370d774 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 18 Jan 2009 19:04:02 -0700
Subject: Fixed the NPC Integer input field, as well as cut some bull from the
 NPC String class. The Integer input field was rather horribly broken to the
 point where it could send invalid data, the increment and decrement buttons
 didn't work, and overall it was tripping over itself. As for the NPC String,
 "The Mana World" as a string is not needed to set the field to that length,
 but instead fills the text field with that text for starting. This is
 completely inappropriate for a text entry field, and a more sensible default
 would be to leave it empty, so that people can type in what they want without
 having to delete it.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 AethyraLin2WinXcompile.cbp   |  4 +--
 src/CMakeLists.txt           |  4 +--
 src/Makefile.am              |  4 +--
 src/game.cpp                 | 10 ++++++
 src/gui/inttextbox.cpp       | 71 -------------------------------------
 src/gui/inttextbox.h         | 66 ----------------------------------
 src/gui/inttextfield.cpp     | 84 ++++++++++++++++++++++++++++++++++++++++++++
 src/gui/inttextfield.h       | 72 +++++++++++++++++++++++++++++++++++++
 src/gui/item_amount.cpp      | 24 ++++++-------
 src/gui/item_amount.h        |  4 +--
 src/gui/npcintegerdialog.cpp | 62 +++++++++++++-------------------
 src/gui/npcintegerdialog.h   | 12 +++----
 src/gui/npcstringdialog.cpp  |  2 +-
 src/gui/textfield.cpp        |  2 --
 src/gui/textfield.h          |  1 -
 src/net/npchandler.cpp       |  2 +-
 16 files changed, 217 insertions(+), 207 deletions(-)
 delete mode 100644 src/gui/inttextbox.cpp
 delete mode 100644 src/gui/inttextbox.h
 create mode 100644 src/gui/inttextfield.cpp
 create mode 100644 src/gui/inttextfield.h

diff --git a/AethyraLin2WinXcompile.cbp b/AethyraLin2WinXcompile.cbp
index ff6699d8..3397ac02 100644
--- a/AethyraLin2WinXcompile.cbp
+++ b/AethyraLin2WinXcompile.cbp
@@ -147,8 +147,8 @@
 		<Unit filename="src\gui\hbox.h" />
 		<Unit filename="src\gui\help.cpp" />
 		<Unit filename="src\gui\help.h" />
-		<Unit filename="src\gui\inttextbox.cpp" />
-		<Unit filename="src\gui\inttextbox.h" />
+		<Unit filename="src\gui\inttextfield.cpp" />
+		<Unit filename="src\gui\inttextfield.h" />
 		<Unit filename="src\gui\inventorywindow.cpp" />
 		<Unit filename="src\gui\inventorywindow.h" />
 		<Unit filename="src\gui\item_amount.cpp" />
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index adc36eaa..1aa38230 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -97,8 +97,8 @@ SET(SRCS
     gui/gui.h
     gui/help.cpp
     gui/help.h
-    gui/inttextbox.cpp
-    gui/inttextbox.h
+    gui/inttextfield.cpp
+    gui/inttextfield.h
     gui/inventorywindow.cpp
     gui/inventorywindow.h
     gui/itemcontainer.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 33d01598..37b40936 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,8 +55,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/gui.h \
 	      gui/help.cpp \
 	      gui/help.h \
-	      gui/inttextbox.h \
-	      gui/inttextbox.cpp \
+	      gui/inttextfield.h \
+	      gui/inttextfield.cpp \
 	      gui/inventorywindow.cpp \
 	      gui/inventorywindow.h \
 	      gui/itemcontainer.cpp \
diff --git a/src/game.cpp b/src/game.cpp
index ec5bc267..752406b9 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -622,6 +622,11 @@ void Game::handleInput()
 		    {
 			setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
 		    }
+		    // Submits the text and proceeds to the next dialog
+		    else if (npcStringDialog->isVisible())
+		    {
+			npcStringDialog->action(gcn::ActionEvent(NULL, "ok"));
+		    }
 		    // Proceed to the next dialog option, or close the window
 		    else if (npcTextDialog->isVisible())
 		    {
@@ -632,6 +637,11 @@ void Game::handleInput()
 		    {
 			npcListDialog->action(gcn::ActionEvent(NULL, "ok"));
 		    }
+		    // Submits the text and proceeds to the next dialog
+		    else if (npcIntegerDialog->isVisible())
+		    {
+			npcIntegerDialog->action(gcn::ActionEvent(NULL, "ok"));
+		    }
 		    // Else, open the chat edit box
 		    else
 		    {
diff --git a/src/gui/inttextbox.cpp b/src/gui/inttextbox.cpp
deleted file mode 100644
index 4cb885c3..00000000
--- a/src/gui/inttextbox.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "inttextbox.h"
-#include "sdlinput.h"
-
-#include "../utils/tostring.h"
-
-IntTextBox::IntTextBox(int i):
-    mValue(i)
-{
-}
-
-void IntTextBox::keyPressed(gcn::KeyEvent &event)
-{
-    const gcn::Key &key = event.getKey();
-
-    if (key.getValue() == Key::BACKSPACE ||
-        key.getValue() == Key::DELETE)
-    {
-        setText(std::string());
-        event.consume();
-    }
-
-    if (!key.isNumber()) return;
-    TextField::keyPressed(event);
-
-    std::istringstream s(getText());
-    int i;
-    s >> i;
-    setInt(i);
-}
-
-void IntTextBox::setRange(int min, int max)
-{
-    mMin = min;
-    mMax = max;
-}
-
-int IntTextBox::getInt()
-{
-    return getText().empty() ? mMin : mValue;
-}
-
-void IntTextBox::setInt(int i)
-{
-    if (i >= mMin && i <= mMax)
-        mValue = i;
-
-    const std::string valStr = toString(mValue);
-    setText(valStr);
-    setCaretPosition(valStr.length() + 1);
-}
diff --git a/src/gui/inttextbox.h b/src/gui/inttextbox.h
deleted file mode 100644
index d134fcd7..00000000
--- a/src/gui/inttextbox.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef INTTEXTBOX_H
-#define INTTEXTBOX_H
-
-#include "textfield.h"
-
-#include "../guichanfwd.h"
-
-/**
- * TextBox which only accepts numbers as input.
- */
-class IntTextBox : public TextField
-{
-    public:
-        /**
-         * Constructor, sets initial value.
-         */
-        IntTextBox(int value=0);
-
-        /**
-         * Sets the minimum and maximum values of the text box.
-         */
-        void setRange(int minimum, int maximum);
-
-        /**
-         * Returns the value in the text box.
-         */
-        int getInt();
-
-        /**
-         * Set the value of the text box to the specified value.
-         */
-        void setInt(int value);
-
-        /**
-         * Responds to key presses.
-         */
-        void keyPressed(gcn::KeyEvent &event);
-
-    private:
-        int mMin;            /**< Minimum value */
-        int mMax;            /**< Maximum value */
-        int mValue;          /**< Current value */
-};
-
-#endif
diff --git a/src/gui/inttextfield.cpp b/src/gui/inttextfield.cpp
new file mode 100644
index 00000000..e8e6e69b
--- /dev/null
+++ b/src/gui/inttextfield.cpp
@@ -0,0 +1,84 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "inttextfield.h"
+#include "sdlinput.h"
+
+#include "../utils/tostring.h"
+
+IntTextField::IntTextField(int def):
+    TextField(toString(def)),
+    mDefault(def),
+    mValue(def)
+{
+}
+
+void IntTextField::keyPressed(gcn::KeyEvent &event)
+{
+    const gcn::Key &key = event.getKey();
+
+    if (key.getValue() == Key::BACKSPACE ||
+        key.getValue() == Key::DELETE)
+    {
+        setText(std::string());
+        event.consume();
+    }
+
+    if (!key.isNumber())
+        return;
+
+    TextField::keyPressed(event);
+
+    std::istringstream s(getText());
+    int i;
+    s >> i;
+    setValue(i);
+}
+
+void IntTextField::setRange(int min, int max)
+{
+    mMin = min;
+    mMax = max;
+}
+
+int IntTextField::getValue()
+{
+    return getText().empty() ? mMin : mValue;
+}
+
+void IntTextField::setValue(int i)
+{
+    if (i >= mMin && i <= mMax)
+        mValue = i;
+    else if (i < mMin)
+        mValue = mMin;
+    else if (i > mMax)
+        mValue = mMax;
+
+    const std::string valStr = toString(mValue);
+    setText(valStr);
+    setCaretPosition(valStr.length() + 1);
+}
+
+void IntTextField::reset()
+{
+    setValue(mDefault);
+}
diff --git a/src/gui/inttextfield.h b/src/gui/inttextfield.h
new file mode 100644
index 00000000..3f9cd7ad
--- /dev/null
+++ b/src/gui/inttextfield.h
@@ -0,0 +1,72 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef INTTEXTFIELD_H
+#define INTTEXTFIELD_H
+
+#include "textfield.h"
+
+#include "../guichanfwd.h"
+
+/**
+ * TextBox which only accepts numbers as input.
+ */
+class IntTextField : public TextField
+{
+    public:
+        /**
+         * Constructor, sets default value.
+         */
+        IntTextField(int def = 0);
+
+        /**
+         * Sets the minimum and maximum values of the text box.
+         */
+        void setRange(int minimum, int maximum);
+
+        /**
+         * Returns the value in the text box.
+         */
+        int getValue();
+
+        /**
+         * Reset the field to the default value.
+         */
+        void reset();
+
+        /**
+         * Set the value of the text box to the specified value.
+         */
+        void setValue(int value);
+
+        /**
+         * Responds to key presses.
+         */
+        void keyPressed(gcn::KeyEvent &event);
+
+    private:
+        int mMin;            /**< Minimum value */
+        int mMax;            /**< Maximum value */
+        int mDefault;        /**< Default value */
+        int mValue;          /**< Current value */
+};
+
+#endif
diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp
index 48b0e601..03b22fa9 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "button.h"
-#include "inttextbox.h"
+#include "inttextfield.h"
 #include "item_amount.h"
 #include "slider.h"
 #include "trade.h"
@@ -39,11 +39,11 @@ ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
     const int maxRange = mItem->getQuantity();
 
     // Integer field
-    mItemAmountTextBox = new IntTextBox(1);
-    mItemAmountTextBox->setRange(1, maxRange);
-    mItemAmountTextBox->setWidth(30);
-    mItemAmountTextBox->setActionEventId("Dummy");
-    mItemAmountTextBox->addActionListener(this);
+    mItemAmountTextField = new IntTextField(1);
+    mItemAmountTextField->setRange(1, maxRange);
+    mItemAmountTextField->setWidth(30);
+    mItemAmountTextField->setActionEventId("Dummy");
+    mItemAmountTextField->addActionListener(this);
 
     // Slider
     mItemAmountSlide = new Slider(1.0, maxRange);
@@ -61,7 +61,7 @@ ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
 
     // Set positions
     place(0, 0, minusButton);
-    place(1, 0, mItemAmountTextBox).setPadding(2);
+    place(1, 0, mItemAmountTextField).setPadding(2);
     place(2, 0, plusButton);
     place(0, 1, mItemAmountSlide, 6);
     place(4, 2, okButton);
@@ -89,12 +89,12 @@ ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
 
 void ItemAmountWindow::resetAmount()
 {
-    mItemAmountTextBox->setInt(1);
+    mItemAmountTextField->setValue(1);
 }
 
 void ItemAmountWindow::action(const gcn::ActionEvent &event)
 {
-    int amount = mItemAmountTextBox->getInt();
+    int amount = mItemAmountTextField->getValue();
 
     if (event.getId() == "Cancel")
     {
@@ -114,14 +114,14 @@ void ItemAmountWindow::action(const gcn::ActionEvent &event)
     }
     else if (event.getId() == "Drop")
     {
-        player_node->dropItem(mItem, mItemAmountTextBox->getInt());
+        player_node->dropItem(mItem, mItemAmountTextField->getValue());
         scheduleDelete();
     }
     else if (event.getId() == "AddTrade")
     {
-        tradeWindow->tradeItem(mItem, mItemAmountTextBox->getInt());
+        tradeWindow->tradeItem(mItem, mItemAmountTextField->getValue());
         scheduleDelete();
     }
-    mItemAmountTextBox->setInt(amount);
+    mItemAmountTextField->setValue(amount);
     mItemAmountSlide->setValue(amount);
 }
diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h
index 2005094d..08852c8f 100644
--- a/src/gui/item_amount.h
+++ b/src/gui/item_amount.h
@@ -30,7 +30,7 @@
 
 #include "../guichanfwd.h"
 
-class IntTextBox;
+class IntTextField;
 class Item;
 
 #define AMOUNT_TRADE_ADD 1
@@ -60,7 +60,7 @@ class ItemAmountWindow : public Window, public gcn::ActionListener
         void resetAmount();
 
     private:
-        IntTextBox *mItemAmountTextBox;   /**< Item amount caption. */
+        IntTextField *mItemAmountTextField;   /**< Item amount caption. */
         Item *mItem;
 
         /**
diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp
index f5b6ac5b..75dd52c8 100644
--- a/src/gui/npcintegerdialog.cpp
+++ b/src/gui/npcintegerdialog.cpp
@@ -25,7 +25,7 @@
 #include <sstream>
 
 #include "button.h"
-#include "textfield.h"
+#include "inttextfield.h"
 
 #include "../npc.h"
 
@@ -39,18 +39,25 @@ NpcIntegerDialog::NpcIntegerDialog():
 {
     mDecButton = new Button("-", "decvalue", this);
     mIncButton = new Button("+", "incvalue", this);
-    mValueField = new TextField();
+    mValueField = new IntTextField();
     okButton = new Button(_("OK"), "ok", this);
     cancelButton = new Button(_("Cancel"), "cancel", this);
+    resetButton = new Button(_("Reset"), "reset", this);
 
     mDecButton->setSize(20, 20);
     mIncButton->setSize(20, 20);
 
+    ContainerPlacer place;
+    place = getPlacer(0, 0);
+
     place(0, 0, mDecButton);
     place(1, 0, mValueField, 3);
     place(4, 0, mIncButton);
-    place(2, 1, okButton);
-    place(3, 1, cancelButton, 2);
+    place.getCell().matchColWidth(1, 0);
+    place = getPlacer(0, 1);
+    place(0, 0, resetButton);
+    place(2, 0, cancelButton);
+    place(3, 0, okButton);
     reflowLayout(175, 0);
 
     setLocationRelativeTo(getParent());
@@ -59,19 +66,14 @@ NpcIntegerDialog::NpcIntegerDialog():
     mValueField->addKeyListener(this);
 }
 
-void NpcIntegerDialog::prepDialog(const int min, const int def, const int max)
+void NpcIntegerDialog::setRange(const int min, const int max)
 {
-    mMin = min;
-    mMax = max;
-    mDefault = def;
-    mValue = def;
-
-    mValueField->setText(toString(mValue));
+    mValueField->setRange(min, max);
 }
 
 int NpcIntegerDialog::getValue()
 {
-    return mValue;
+    return mValueField->getValue();
 }
 
 void NpcIntegerDialog::action(const gcn::ActionEvent &event)
@@ -85,41 +87,25 @@ void NpcIntegerDialog::action(const gcn::ActionEvent &event)
     else if (event.getId() == "cancel")
     {
         finish = 1;
-        mValue = mDefault;
+        mValueField->reset();
     }
-    else if (event.getId() == "decvalue" && mValue < mMin)
+    else if (event.getId() == "decvalue")
     {
-        mValue--;
+        mValueField->setValue(mValueField->getValue() - 1);
     }
-    else if (event.getId() == "incvalue" && mValue > mMax)
+    else if (event.getId() == "incvalue")
     {
-        mValue++;
+        mValueField->setValue(mValueField->getValue() + 1);
+    }
+    else if (event.getId() == "reset")
+    {
+        mValueField->reset();
     }
-
-    mValueField->setText(toString(mValue));
 
     if (finish)
     {
         setVisible(false);
-        current_npc->integerInput(mValue);
+        current_npc->integerInput(mValueField->getValue());
         current_npc = 0;
     }
 }
-
-void NpcIntegerDialog::keyPressed(gcn::KeyEvent &event)
-{
-    std::stringstream tempValue(mValueField->getText());
-    int value;
-    tempValue >> value;
-    if (value < mMin)
-    {
-        value = mMin;
-    }
-    if (value > mMax)
-    {
-        value = mMax;
-    }
-
-    mValue = value;
-    mValueField->setText(toString(value));
-}
diff --git a/src/gui/npcintegerdialog.h b/src/gui/npcintegerdialog.h
index a45d57c4..c1bdffe1 100644
--- a/src/gui/npcintegerdialog.h
+++ b/src/gui/npcintegerdialog.h
@@ -32,6 +32,8 @@
 
 #include "../guichanfwd.h"
 
+class IntTextField;
+
 /**
  * The npc integer input dialog.
  *
@@ -53,9 +55,6 @@ class NpcIntegerDialog : public Window, public gcn::ActionListener,
          */
         void action(const gcn::ActionEvent &event);
 
-        /** Called when key is pressed */
-        void keyPressed(gcn::KeyEvent &event);
-
         /**
          * Returns the current value.
          */
@@ -65,18 +64,17 @@ class NpcIntegerDialog : public Window, public gcn::ActionListener,
          * Prepares the NPC dialog.
          *
          * @param min The minimum value to allow
-         * @param def The default value
          * @param max The maximum value to allow
          */
-        void prepDialog(const int min, const int def, const int max);
+        void setRange(const int min, const int max);
 
     private:
-        int mMin, mMax, mDefault, mValue;
         gcn::Button *mDecButton;
         gcn::Button *mIncButton;
-        gcn::TextField *mValueField;
+        IntTextField *mValueField;
         gcn::Button *okButton;
         gcn::Button *cancelButton;
+        gcn::Button *resetButton;
 };
 
 #endif // _TMW_GUI_NPCINTEGERDIALOG_H
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index 6bca961c..53f200b0 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -37,7 +37,7 @@
 NpcStringDialog::NpcStringDialog():
     Window(_("NPC Text Request"))
 {
-    mValueField = new TextField("The Mana World"); // Just a sizing value :)
+    mValueField = new TextField("");
     okButton = new Button(_("OK"), "ok", this);
     cancelButton = new Button(_("Cancel"), "cancel", this);
 
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index 0146fd4a..80e3bbcf 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -19,8 +19,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "textfield.h"
-
 #include <algorithm>
 
 #include <guichan/font.hpp>
diff --git a/src/gui/textfield.h b/src/gui/textfield.h
index 38150b83..3235e3f6 100644
--- a/src/gui/textfield.h
+++ b/src/gui/textfield.h
@@ -27,7 +27,6 @@
 #include "../guichanfwd.h"
 
 class ImageRect;
-
 class TextField;
 
 class TextFieldListener
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index c597e31c..3cea2d64 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -90,7 +90,7 @@ void NPCHandler::handleMessage(MessageIn *msg)
             // Request for an integer
             id = msg->readInt32();
             current_npc = dynamic_cast<NPC*>(beingManager->findBeing(id));
-            npcIntegerDialog->prepDialog(0, 0, 2147483647);
+            npcIntegerDialog->setRange(0, 2147483647);
             npcIntegerDialog->setVisible(true);
             break;
 
-- 
cgit v1.2.3-70-g09d2


From d6184d3ce17ef2f63ada515ff83271a55a21987b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 18 Jan 2009 21:03:57 -0700
Subject: Fixed String dialog sending so that it doesn't crash the client after
 completing, as well as making it so that the server can actually use the
 string to match to the same value (which it wasn't doing before. Did anyone
 think to test that?) Would eventually like to whittle down the wasted bytes
 sent, but this so far is the least number that can be done, make it so that
 strings can be matched, and on top of that, NOT crash the map server.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/npc.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/npc.cpp b/src/npc.cpp
index ae5ca476..2dbf7f43 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -146,10 +146,10 @@ void NPC::stringInput(const std::string &value)
 {
     MessageOut outMsg(mNetwork);
     outMsg.writeInt16(CMSG_NPC_STR_RESPONSE);
-    outMsg.writeInt16(value.length() + 8);
+    outMsg.writeInt16(value.length() + 15);
     outMsg.writeInt32(mId);
-    outMsg.writeString(value, value.length());
-    outMsg.writeInt8(0); // Just to be safe
+    outMsg.writeString(value, value.length() + 6);
+    outMsg.writeInt8(0);
 }
 
 /*
-- 
cgit v1.2.3-70-g09d2


From 928e1671e44a08a1d778b4fff4f0555ce3e9e51f Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 18 Jan 2009 21:29:58 -0700
Subject: Fixed ok/cancel position in the string dialog to conform to a more
 uniform GUI style.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/npcstringdialog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index 53f200b0..da7048a6 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -42,8 +42,8 @@ NpcStringDialog::NpcStringDialog():
     cancelButton = new Button(_("Cancel"), "cancel", this);
 
     place(0, 0, mValueField, 3);
-    place(1, 1, okButton);
-    place(2, 1, cancelButton);
+    place(1, 1, cancelButton);
+    place(2, 1, okButton);
     reflowLayout(175, 0);
 
     setLocationRelativeTo(getParent());
-- 
cgit v1.2.3-70-g09d2


From 7c13d69ed3739668bff47728a8976131cd00d5a4 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 18 Jan 2009 21:52:29 -0700
Subject: Reset the input fields so that they're reset when they're brought up
 again.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/npcintegerdialog.cpp | 1 +
 src/gui/npcstringdialog.cpp  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp
index 75dd52c8..473c10f6 100644
--- a/src/gui/npcintegerdialog.cpp
+++ b/src/gui/npcintegerdialog.cpp
@@ -107,5 +107,6 @@ void NpcIntegerDialog::action(const gcn::ActionEvent &event)
         setVisible(false);
         current_npc->integerInput(mValueField->getValue());
         current_npc = 0;
+        mValueField->reset();
     }
 }
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index da7048a6..500875be 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -69,6 +69,7 @@ void NpcStringDialog::action(const gcn::ActionEvent &event)
     setVisible(false);
     current_npc->stringInput(mValueField->getText());
     current_npc = 0;
+    mValueField->setText("");
 }
 
 bool NpcStringDialog::isInputFocused()
-- 
cgit v1.2.3-70-g09d2


From 8f28b18a31fc8415fbf6aedc5106b8b8525f4caf Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 18 Jan 2009 22:47:39 -0700
Subject: Reflowed the setup keyboard tab with the layout code.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/setup_keyboard.cpp | 19 ++++++++++++-------
 src/gui/setup_video.cpp    |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 24d12049..83c556a2 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -30,6 +30,8 @@
 #include "scrollarea.h"
 #include "setup_keyboard.h"
 
+#include "widgets/layouthelper.h"
+
 #include "../configuration.h"
 #include "../keyboardconfig.h"
 
@@ -73,7 +75,6 @@ Setup_Keyboard::Setup_Keyboard():
 {
     keyboard.setSetupKeyboard(this);
     setOpaque(false);
-    setDimension(gcn::Rectangle(0, 0, 290, 255));
 
     refreshKeys();
 
@@ -82,19 +83,23 @@ Setup_Keyboard::Setup_Keyboard():
     mKeyList->setSelected(-1);
 
     ScrollArea *scrollArea = new ScrollArea(mKeyList);
-    scrollArea->setDimension(gcn::Rectangle(10, 10, 200, 140));
-    add(scrollArea);
 
     mAssignKeyButton = new Button(_("Assign"), "assign", this);
-    mAssignKeyButton->setPosition(165, 155);
     mAssignKeyButton->addActionListener(this);
     mAssignKeyButton->setEnabled(false);
-    add(mAssignKeyButton);
 
     mMakeDefaultButton = new Button(_("Default"), "makeDefault", this);
-    mMakeDefaultButton->setPosition(10, 155);
     mMakeDefaultButton->addActionListener(this);
-    add(mMakeDefaultButton);
+
+    // Do the layout
+    LayoutHelper h(this);
+    ContainerPlacer place = h.getPlacer(0, 0);
+
+    place(0, 0, scrollArea, 4, 6).setPadding(2);
+    place(0, 6, mMakeDefaultButton);
+    place(3, 6, mAssignKeyButton);
+
+    setDimension(gcn::Rectangle(0, 0, 295, 250));
 }
 
 Setup_Keyboard::~Setup_Keyboard()
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index f4bcbe31..16a7172f 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -268,7 +268,7 @@ Setup_Video::Setup_Video():
     place(2, 11, mOverlayDetailField, 2).setPadding(2);
     place(2, 12, mParticleDetailField, 2).setPadding(2);
 
-    setDimension(gcn::Rectangle(0, 0, 295, 255));
+    setDimension(gcn::Rectangle(0, 0, 295, 250));
 }
 
 Setup_Video::~Setup_Video()
-- 
cgit v1.2.3-70-g09d2


From 18c00fedebda79d4ebfbe15401c3e5bc8869fda2 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 18 Jan 2009 23:15:08 -0700
Subject: Reflowed Player tab in setup to use layout code. TODO: Fix up table
 model, cause it's a mess.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/setup_players.cpp | 48 ++++++++++++++++++++++++++---------------------
 src/gui/table_model.cpp   |  6 +++---
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index e7770959..4bfca983 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -29,6 +29,8 @@
 #include "ok_dialog.h"
 #include "setup_players.h"
 
+#include "widgets/layouthelper.h"
+
 #include "../configuration.h"
 #include "../log.h"
 #include "../player_relations.h"
@@ -43,7 +45,7 @@
 #define ROW_HEIGHT 12
 // The following column widths really shouldn't be hardcoded but should scale with the size of the widget... except
 // that, right now, the widget doesn't exactly scale either.
-#define NAME_COLUMN_WIDTH 120
+#define NAME_COLUMN_WIDTH 195
 #define RELATION_CHOICE_COLUMN_WIDTH 80
 
 #define WIDGET_AT(row, column) (((row) * COLUMNS_NR) + column)
@@ -128,7 +130,8 @@ public:
         mPlayers = player_names;
 
         // set up widgets
-        for (unsigned int r = 0; r < player_names->size(); ++r) {
+        for (unsigned int r = 0; r < player_names->size(); ++r)
+        {
             std::string name = (*player_names)[r];
             gcn::Widget *widget = new gcn::Label(name);
             mWidgets.push_back(widget);
@@ -220,7 +223,6 @@ Setup_Players::Setup_Players():
     mIgnoreActionChoicesBox(new gcn::DropDown(new IgnoreChoicesListModel()))
 {
     setOpaque(false);
-    setDimension(gcn::Rectangle(0, 0, 290, 255));
 
     int table_width = NAME_COLUMN_WIDTH + RELATION_CHOICE_COLUMN_WIDTH;
     mPlayerTableTitleModel->fixColumnWidth(NAME_COLUMN, NAME_COLUMN_WIDTH);
@@ -228,28 +230,30 @@ Setup_Players::Setup_Players():
                                            RELATION_CHOICE_COLUMN_WIDTH);
     mPlayerTitleTable->setDimension(gcn::Rectangle(10, 10, table_width, 10));
     mPlayerTitleTable->setBackgroundColor(gcn::Color(0xbf, 0xbf, 0xbf));
-    for (int i = 0; i < COLUMNS_NR; i++) {
+
+    for (int i = 0; i < COLUMNS_NR; i++) 
+    {
         mPlayerTableTitleModel->set(0, i,
                 new gcn::Label(gettext(table_titles[i])));
     }
+
     mPlayerTitleTable->setLinewiseSelection(true);
 
-    mPlayerScrollArea->setDimension(gcn::Rectangle(10, 25, table_width + COLUMNS_NR, 90));
     mPlayerScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     mPlayerTable->setActionEventId(ACTION_TABLE);
     mPlayerTable->setLinewiseSelection(true);
     mPlayerTable->addActionListener(this);
 
-    mDeleteButton->setPosition(10, 118);
-
     gcn::Label *ignore_action_label = new gcn::Label(_("When ignoring:"));
 
-    ignore_action_label->setPosition(80, 118);
     mIgnoreActionChoicesBox->setDimension(gcn::Rectangle(80, 132, 120, 12));
     mIgnoreActionChoicesBox->setActionEventId(ACTION_STRATEGY);
     mIgnoreActionChoicesBox->addActionListener(this);
+
     int ignore_strategy_index = 0; // safe default
-    if (player_relations.getPlayerIgnoreStrategy()) {
+
+    if (player_relations.getPlayerIgnoreStrategy())
+    {
         ignore_strategy_index = player_relations.getPlayerIgnoreStrategyIndex(
             player_relations.getPlayerIgnoreStrategy()->mShortName);
         if (ignore_strategy_index < 0)
@@ -258,22 +262,24 @@ Setup_Players::Setup_Players():
     mIgnoreActionChoicesBox->setSelected(ignore_strategy_index);
     mIgnoreActionChoicesBox->adjustHeight();
 
-    mPersistIgnores->setPosition(80, 148);
-    mDefaultTrading->setPosition(80, 160);
-    mDefaultWhisper->setPosition(80, 172);
-
     reset();
 
-    add(ignore_action_label);
-    add(mDefaultTrading);
-    add(mDefaultWhisper);
-    add(mIgnoreActionChoicesBox);
-    add(mDeleteButton);
-    add(mPlayerScrollArea);
-    add(mPlayerTitleTable);
-    add(mPersistIgnores);
+    // Do the layout
+    LayoutHelper h(this);
+    ContainerPlacer place = h.getPlacer(0, 0);
+
+    place(0, 0, mPlayerTitleTable, 4);
+    place(0, 1, mPlayerScrollArea, 4, 4).setPadding(2);
+    place(0, 5, mDeleteButton);
+    place(2, 5, ignore_action_label);
+    place(2, 6, mIgnoreActionChoicesBox, 2).setPadding(2);
+    place(2, 7, mPersistIgnores);
+    place(2, 8, mDefaultTrading);
+    place(2, 9, mDefaultWhisper);
 
     player_relations.addListener(this);
+
+    setDimension(gcn::Rectangle(0, 0, 290, 250));
 }
 
 Setup_Players::~Setup_Players(void)
diff --git a/src/gui/table_model.cpp b/src/gui/table_model.cpp
index 9911eec3..d626423a 100644
--- a/src/gui/table_model.cpp
+++ b/src/gui/table_model.cpp
@@ -25,6 +25,8 @@
 
 #include "table_model.h"
 
+#include "../utils/dtor.h"
+
 void TableModel::installListener(TableModelListener *listener)
 {
     listeners.insert(listener);
@@ -63,9 +65,7 @@ StaticTableModel::StaticTableModel(int row, int column) :
 
 StaticTableModel::~StaticTableModel(void)
 {
-    for (std::vector<gcn::Widget *>::const_iterator it = mTableModel.begin(); it != mTableModel.end(); it++)
-        if (*it)
-            delete *it;
+    delete_all(mTableModel);
 }
 
 void StaticTableModel::resize(void)
-- 
cgit v1.2.3-70-g09d2


From e3f05299f81cd2e567531df6729de0f34970a9e9 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 18 Jan 2009 23:40:12 -0700
Subject: Reflowed Joystick tab using layout engine.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/setup_joystick.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 1457bc2f..2411eebc 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -25,6 +25,8 @@
 #include "checkbox.h"
 #include "setup_joystick.h"
 
+#include "widgets/layouthelper.h"
+
 #include "../configuration.h"
 #include "../joystick.h"
 
@@ -38,20 +40,23 @@ Setup_Joystick::Setup_Joystick():
     mJoystickEnabled(new CheckBox(_("Enable joystick")))
 {
     setOpaque(false);
-    setDimension(gcn::Rectangle(0, 0, 290, 255));
-
-    mJoystickEnabled->setPosition(10, 10);
-    mCalibrateLabel->setPosition(10, 25);
-    mCalibrateButton->setPosition(10, 30 + mCalibrateLabel->getHeight());
 
     mOriginalJoystickEnabled = (int)config.getValue("joystickEnabled", 0) != 0;
     mJoystickEnabled->setSelected(mOriginalJoystickEnabled);
 
     mJoystickEnabled->addActionListener(this);
 
-    add(mCalibrateLabel);
-    add(mCalibrateButton);
-    add(mJoystickEnabled);
+    // Do the layout
+    LayoutHelper h(this);
+    ContainerPlacer place = h.getPlacer(0, 0);
+
+    place(0, 0, mJoystickEnabled);
+    place(0, 1, mCalibrateLabel);
+    place.getCell().matchColWidth(0, 0);
+    place = h.getPlacer(0, 1);
+    place(0, 0, mCalibrateButton);
+
+    setDimension(gcn::Rectangle(0, 0, 290, 75));
 }
 
 void Setup_Joystick::action(const gcn::ActionEvent &event)
-- 
cgit v1.2.3-70-g09d2


From 0bf74eedeb0e00b0d25ad46743e9e10aea3f2cf2 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 18 Jan 2009 23:41:09 -0700
Subject: Some style fixes that were forgotten in the previous commit.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/setup_joystick.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 2411eebc..187b3e2b 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -61,7 +61,8 @@ Setup_Joystick::Setup_Joystick():
 
 void Setup_Joystick::action(const gcn::ActionEvent &event)
 {
-    if (!joystick) {
+    if (!joystick)
+    {
         return;
     }
 
@@ -71,12 +72,15 @@ void Setup_Joystick::action(const gcn::ActionEvent &event)
     }
     else
     {
-        if (joystick->isCalibrating()) {
+        if (joystick->isCalibrating())
+        {
             mCalibrateButton->setCaption(_("Calibrate"));
             mCalibrateLabel->setCaption
                 (_("Press the button to start calibration"));
             joystick->finishCalibration();
-        } else {
+        }
+        else
+        {
             mCalibrateButton->setCaption(_("Stop"));
             mCalibrateLabel->setCaption(_("Rotate the stick"));
             joystick->startCalibration();
-- 
cgit v1.2.3-70-g09d2


From adfa6fa21b1ef5c8169538ca5c4896bf86e59d6a Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 18 Jan 2009 23:47:04 -0700
Subject: Reflowed Audio setup tab using layout code.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/setup_audio.cpp | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index eaa3ddba..7486e414 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -26,6 +26,8 @@
 #include "setup_audio.h"
 #include "slider.h"
 
+#include "widgets/layouthelper.h"
+
 #include "../configuration.h"
 #include "../log.h"
 #include "../sound.h"
@@ -41,7 +43,6 @@ Setup_Audio::Setup_Audio():
     mMusicSlider(new Slider(0, 128))
 {
     setOpaque(false);
-    setDimension(gcn::Rectangle(0, 0, 290, 255));
 
     gcn::Label *sfxLabel = new gcn::Label(_("Sfx volume"));
     gcn::Label *musicLabel = new gcn::Label(_("Music volume"));
@@ -53,19 +54,24 @@ Setup_Audio::Setup_Audio():
     mMusicSlider->addActionListener(this);
 
     mSoundCheckBox->setPosition(10, 10);
-    mSfxSlider->setDimension(gcn::Rectangle(10, 30, 100, 10));
-    mMusicSlider->setDimension(gcn::Rectangle(10, 50, 100, 10));
-    sfxLabel->setPosition(20 + mSfxSlider->getWidth(), 27);
-    musicLabel->setPosition(20 + mMusicSlider->getWidth(), 47);
 
     mSfxSlider->setValue(mSfxVolume);
     mMusicSlider->setValue(mMusicVolume);
 
-    add(mSoundCheckBox);
-    add(mSfxSlider);
-    add(mMusicSlider);
-    add(sfxLabel);
-    add(musicLabel);
+    mSfxSlider->setWidth(90);
+    mMusicSlider->setWidth(90);
+
+    // Do the layout
+    LayoutHelper h(this);
+    ContainerPlacer place = h.getPlacer(0, 0);
+
+    place(0, 0, mSoundCheckBox);
+    place(0, 1, sfxLabel);
+    place(1, 1, mSfxSlider);
+    place(0, 2, musicLabel);
+    place(1, 2, mMusicSlider);
+
+    setDimension(gcn::Rectangle(0, 0, 290, 250));
 }
 
 void Setup_Audio::apply()
-- 
cgit v1.2.3-70-g09d2


From ed3a7626a24750803ebe16f528b292ff1b24affa Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <crush@themanaworld.org>
Date: Sun, 18 Jan 2009 14:34:53 +0100
Subject: Added current map filename to debug window.

---
 src/gui/debugwindow.cpp     | 35 ++++++++++++++++++++++-------------
 src/gui/debugwindow.h       |  2 +-
 src/resources/mapreader.cpp |  2 ++
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 63f4762a..b97474af 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -42,27 +42,31 @@ DebugWindow::DebugWindow():
 
     setResizable(true);
     setCloseButton(true);
-    setDefaultSize(0, 0, 400, 100);
+    setDefaultSize(0, 0, 400, 60);
     loadWindowState();
 
     mFPSLabel = new gcn::Label("[0 FPS]");
     mFPSLabel->setPosition(0,0);
 
-    mMusicFileLabel = new gcn::Label("Music File: ");
-    mMusicFileLabel->setPosition(0, 20);
+    mMusicFileLabel = new gcn::Label("Music: ");
+    mMusicFileLabel->setPosition(0, 15);
 
-    mMapFileLabel = new gcn::Label("Mini-Map File: ");
-    mMapFileLabel->setPosition(0, 40);
+    mMapLabel = new gcn::Label("Map: ");
+    mMapLabel->setPosition(0, 30);
+
+    mMiniMapLabel = new gcn::Label("Mini-Map: ");
+    mMiniMapLabel->setPosition(0, 45);
 
     mTileMouseLabel = new gcn::Label("[Mouse: 0, 0]");
-    mTileMouseLabel->setPosition(100, 0);
+    mTileMouseLabel->setPosition(200, 0);
 
     mParticleCountLabel = new gcn::Label("[Particle count: 0]");
-    mParticleCountLabel->setPosition(100, 60);
+    mParticleCountLabel->setPosition(200, 15);
 
     add(mFPSLabel);
     add(mMusicFileLabel);
-    add(mMapFileLabel);
+    add(mMiniMapLabel);
+    add(mMapLabel);
     add(mTileMouseLabel);
     add(mParticleCountLabel);
 }
@@ -75,7 +79,7 @@ void DebugWindow::logic()
     int mouseTileX = mouseX / 32 + viewport->getCameraX();
     int mouseTileY = mouseY / 32 + viewport->getCameraY();
 
-    mFPSLabel->setCaption("[" + toString(fps) + " FPS");
+    mFPSLabel->setCaption("[" + toString(fps) + " FPS]");
     mFPSLabel->adjustSize();
 
     mTileMouseLabel->setCaption("[Mouse: " +
@@ -86,14 +90,19 @@ void DebugWindow::logic()
     if (currentMap != NULL)
     {
         const std::string music =
-            " [Music File: " + currentMap->getProperty("music") + "]";
+            " [Music: " + currentMap->getProperty("music") + "]";
         mMusicFileLabel->setCaption(music);
         mMusicFileLabel->adjustSize();
 
         const std::string minimap =
-            " [MiniMap File: " + currentMap->getProperty("minimap") + "]";
-        mMapFileLabel->setCaption(minimap);
-        mMapFileLabel->adjustSize();
+            " [MiniMap: " + currentMap->getProperty("minimap") + "]";
+        mMiniMapLabel->setCaption(minimap);
+        mMiniMapLabel->adjustSize();
+
+        const std::string map =
+            " [Map: " + currentMap->getProperty("_filename") + "]";
+        mMapLabel->setCaption(map);
+        mMapLabel->adjustSize();
     }
 
     mParticleCountLabel->setCaption("[Particle count: " +
diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h
index ae1d8b14..8d8b7822 100644
--- a/src/gui/debugwindow.h
+++ b/src/gui/debugwindow.h
@@ -49,7 +49,7 @@ class DebugWindow : public Window
         void logic();
 
     private:
-        gcn::Label *mMusicFileLabel, *mMapFileLabel;
+        gcn::Label *mMusicFileLabel, *mMapLabel, *mMiniMapLabel;
         gcn::Label *mTileMouseLabel, *mFPSLabel;
         gcn::Label *mParticleCountLabel;
 };
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 802199f1..0082a024 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -194,6 +194,8 @@ Map *MapReader::readMap(const std::string &filename)
         logger->log("Error while parsing map file (%s)!", filename.c_str());
     }
 
+    if (map) map->setProperty("_filename", filename);
+
     return map;
 }
 
-- 
cgit v1.2.3-70-g09d2


From fa007dafa2c499425e7112095cbda9c2ff5ea20c Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 19 Jan 2009 00:08:15 -0700
Subject: Fixed overlaps in the last commit by converting the debug window code
 to use the layout engine.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/debugwindow.cpp | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index b97474af..557c0f5f 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -28,6 +28,8 @@
 #include "gui.h"
 #include "viewport.h"
 
+#include "widgets/layout.h"
+
 #include "../engine.h"
 #include "../game.h"
 #include "../particle.h"
@@ -46,29 +48,25 @@ DebugWindow::DebugWindow():
     loadWindowState();
 
     mFPSLabel = new gcn::Label("[0 FPS]");
-    mFPSLabel->setPosition(0,0);
 
     mMusicFileLabel = new gcn::Label("Music: ");
-    mMusicFileLabel->setPosition(0, 15);
 
     mMapLabel = new gcn::Label("Map: ");
-    mMapLabel->setPosition(0, 30);
 
     mMiniMapLabel = new gcn::Label("Mini-Map: ");
-    mMiniMapLabel->setPosition(0, 45);
 
     mTileMouseLabel = new gcn::Label("[Mouse: 0, 0]");
-    mTileMouseLabel->setPosition(200, 0);
 
     mParticleCountLabel = new gcn::Label("[Particle count: 0]");
-    mParticleCountLabel->setPosition(200, 15);
-
-    add(mFPSLabel);
-    add(mMusicFileLabel);
-    add(mMiniMapLabel);
-    add(mMapLabel);
-    add(mTileMouseLabel);
-    add(mParticleCountLabel);
+
+    place(0, 0, mFPSLabel);
+    place(3, 0, mTileMouseLabel);
+    place(0, 1, mMusicFileLabel, 2);
+    place(3, 1, mParticleCountLabel);
+    place(0, 2, mMapLabel, 2);
+    place(0, 3, mMiniMapLabel, 2);
+
+    reflowLayout(375, 0);
 }
 
 void DebugWindow::logic()
-- 
cgit v1.2.3-70-g09d2


From 2b5947171bfa4cdad73bb87d7195408fca4e685a Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 19 Jan 2009 12:04:12 -0700
Subject: Fixed a directory creation error reported by our Windows users (why
 doesn't PhysFS handle this properly?!?) when there's already an update
 directory. Also fixed the recorder class so that it's fixed on Windows as
 well.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 aethyra.cbp                       | 10 ++++++--
 src/main.cpp                      | 48 +++++++++++++++++++++++++++++++--------
 src/recorder.h                    | 20 ++++++++--------
 src/resources/resourcemanager.cpp |  4 ++--
 4 files changed, 59 insertions(+), 23 deletions(-)

diff --git a/aethyra.cbp b/aethyra.cbp
index 68d4a609..633cea8d 100644
--- a/aethyra.cbp
+++ b/aethyra.cbp
@@ -159,8 +159,8 @@
 		<Unit filename="src\gui\gui.h" />
 		<Unit filename="src\gui\help.cpp" />
 		<Unit filename="src\gui\help.h" />
-		<Unit filename="src\gui\inttextbox.cpp" />
-		<Unit filename="src\gui\inttextbox.h" />
+		<Unit filename="src\gui\inttextfield.cpp" />
+		<Unit filename="src\gui\inttextfield.h" />
 		<Unit filename="src\gui\inventorywindow.cpp" />
 		<Unit filename="src\gui\inventorywindow.h" />
 		<Unit filename="src\gui\item_amount.cpp" />
@@ -184,8 +184,12 @@
 		<Unit filename="src\gui\ministatus.h" />
 		<Unit filename="src\gui\npc_text.cpp" />
 		<Unit filename="src\gui\npc_text.h" />
+		<Unit filename="src\gui\npcintegerdialog.cpp" />
+		<Unit filename="src\gui\npcintegerdialog.h" />
 		<Unit filename="src\gui\npclistdialog.cpp" />
 		<Unit filename="src\gui\npclistdialog.h" />
+		<Unit filename="src\gui\npcstringdialog.cpp" />
+		<Unit filename="src\gui\npcstringdialog.h" />
 		<Unit filename="src\gui\ok_dialog.cpp" />
 		<Unit filename="src\gui\ok_dialog.h" />
 		<Unit filename="src\gui\passwordfield.cpp" />
@@ -257,6 +261,8 @@
 		<Unit filename="src\gui\widgets\dropdown.h" />
 		<Unit filename="src\gui\widgets\layout.cpp" />
 		<Unit filename="src\gui\widgets\layout.h" />
+		<Unit filename="src\gui\widgets\layouthelper.cpp" />
+		<Unit filename="src\gui\widgets\layouthelper.h" />
 		<Unit filename="src\gui\widgets\resizegrip.cpp" />
 		<Unit filename="src\gui\widgets\resizegrip.h" />
 		<Unit filename="src\gui\widgets\tab.cpp" />
diff --git a/src/main.cpp b/src/main.cpp
index ea120fc4..a0066c66 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -101,7 +101,8 @@
 #include <sys/stat.h>
 #endif
 
-namespace {
+namespace
+{
     Window *setupWindow = 0;
 
     struct SetupListener : public gcn::ActionListener
@@ -186,7 +187,8 @@ void setUpdatesDir()
     std::stringstream updates;
 
     // If updatesHost is currently empty, fill it from config file
-    if (updateHost.empty()) {
+    if (updateHost.empty())
+    {
         updateHost =
             config.getValue("updatehost", "http://www.aethyra.org/updates");
     }
@@ -198,31 +200,59 @@ void setUpdatesDir()
     // Parse out any "http://" or "ftp://", and set the updates directory
     size_t pos;
     pos = updateHost.find("://");
-    if (pos != updateHost.npos) {
-        if (pos + 3 < updateHost.length()) {
+    if (pos != updateHost.npos)
+    {
+        if (pos + 3 < updateHost.length())
+        {
             updates << "updates/" << updateHost.substr(pos + 3) 
                     << "/" << loginData.port;
             updatesDir = updates.str();
-        } else {
+        }
+        else
+        {
             logger->log(_("Error: Invalid update host: %s"), updateHost.c_str());
             errorMessage = _("Invalid update host: ") + updateHost;
             state = ERROR_STATE;
         }
-    } else {
+    }
+    else
+    {
         logger->log(_("Warning: no protocol was specified for the update host"));
-        updates << "updates/" << updateHost  << "/" << loginData.port;
+        updates << "updates/" << updateHost << "/" << loginData.port;
         updatesDir = updates.str();
     }
 
     ResourceManager *resman = ResourceManager::getInstance();
 
     // Verify that the updates directory exists. Create if necessary.
-    if (!resman->isDirectory("/" + updatesDir)) {
-        if (!resman->mkdir("/" + updatesDir)) {
+    if (!resman->isDirectory("/" + updatesDir))
+    {
+        if (!resman->mkdir("/" + updatesDir))
+        {
+#if defined WIN32
+            std::string newDir = homeDir + "\\" + updatesDir;
+            std::string::size_type loc = newDir.find("/", 0);
+
+            while (loc != std::string::npos)
+            {
+                newDir.replace(loc, 1, "\\");
+                loc = newDir.find("/", loc);
+            }
+
+            if (!CreateDirectory(newDir.c_str(), 0) &&
+                GetLastError() != ERROR_ALREADY_EXISTS)
+            {
+                logger->log(_("Error: %s can't be made, but doesn't exist!"),
+                              newDir.c_str());
+                errorMessage = _("Error creating updates directory!");
+                state = ERROR_STATE;
+            }
+#else
             logger->log(_("Error: %s/%s can't be made, but doesn't exist!"),
                          homeDir.c_str(), updatesDir.c_str());
             errorMessage = _("Error creating updates directory!");
             state = ERROR_STATE;
+#endif
         }
     }
 }
diff --git a/src/recorder.h b/src/recorder.h
index fe49810f..eeaf4821 100644
--- a/src/recorder.h
+++ b/src/recorder.h
@@ -31,18 +31,18 @@ class ChatWindow;
 
 class Recorder : public ButtonBoxListener
 {
+    private:
+        ChatWindow *mChat;
+        std::ofstream mStream;
+        ButtonBox *mButtonBox;
     public:
         Recorder(ChatWindow *chat);
-	void record(const std::string &msg);
-	void respond(const std::string &msg);
-	void help() const;
-	void help(const std::string &args) const;
-	void buttonBoxRespond();
-	bool isRecording() const {return mStream.is_open();}
+        void record(const std::string &msg);
+        void respond(const std::string &msg);
+        void help() const;
+        void help(const std::string &args) const;
+        void buttonBoxRespond();
+        bool isRecording() {return (bool) mStream.is_open();}
         virtual ~Recorder();
-    private:
-	ChatWindow *mChat;
-	std::ofstream mStream;
-	ButtonBox *mButtonBox;
 };
 #endif
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 99b84506..7f2cba1d 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -153,8 +153,8 @@ bool ResourceManager::addToSearchPath(const std::string &path, bool append)
 }
 
 void ResourceManager::searchAndAddArchives(const std::string &path,
-                                      const std::string &ext,
-                                      bool append)
+                                           const std::string &ext,
+                                           bool append)
 {
     const char *dirSep = PHYSFS_getDirSeparator();
     char **list = PHYSFS_enumerateFiles(path.c_str());
-- 
cgit v1.2.3-70-g09d2


From 16ac3080c22a70c4004f904569dc8a72ecfd76a4 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 19 Jan 2009 13:09:59 -0700
Subject: Made the party class use gettext.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 po/POTFILES.in     |   1 +
 po/ar.po           | 641 ++++++++++++++++++++++++++++++----------------
 po/ca.po           | 632 +++++++++++++++++++++++++++++----------------
 po/cs.po           | 643 ++++++++++++++++++++++++++++++----------------
 po/da.po           | 733 ++++++++++++++++++++++++++++++++++-------------------
 po/de.po           | 643 ++++++++++++++++++++++++++++++----------------
 po/en_GB.po        | 641 ++++++++++++++++++++++++++++++----------------
 po/eo.po           | 632 +++++++++++++++++++++++++++++----------------
 po/es.po           | 643 ++++++++++++++++++++++++++++++----------------
 po/fi.po           | 643 ++++++++++++++++++++++++++++++----------------
 po/fr.po           | 643 ++++++++++++++++++++++++++++++----------------
 po/he.po           | 643 ++++++++++++++++++++++++++++++----------------
 po/hr.po           | 643 ++++++++++++++++++++++++++++++----------------
 po/id.po           | 643 ++++++++++++++++++++++++++++++----------------
 po/it.po           | 643 ++++++++++++++++++++++++++++++----------------
 po/ja.po           | 640 ++++++++++++++++++++++++++++++----------------
 po/nl.po           | 643 ++++++++++++++++++++++++++++++----------------
 po/pl.po           | 643 ++++++++++++++++++++++++++++++----------------
 po/pt.po           | 643 ++++++++++++++++++++++++++++++----------------
 po/pt_BR.po        | 643 ++++++++++++++++++++++++++++++----------------
 po/ru.po           | 643 ++++++++++++++++++++++++++++++----------------
 po/sk.po           | 640 ++++++++++++++++++++++++++++++----------------
 po/sv.po           | 643 ++++++++++++++++++++++++++++++----------------
 po/th.po           | 641 ++++++++++++++++++++++++++++++----------------
 po/zh_CN.po        | 643 ++++++++++++++++++++++++++++++----------------
 src/gui/status.cpp |   6 +-
 src/party.cpp      |  89 ++++---
 27 files changed, 10136 insertions(+), 5448 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7010ea24..f338e665 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -48,3 +48,4 @@ src/resources/npcdb.cpp
 src/being.cpp
 src/game.cpp
 src/main.cpp
+src/party.cpp
diff --git a/po/ar.po b/po/ar.po
index fa5aef7b..f7a89bab 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-07-16 18:28+0000\n"
 "Last-Translator: صقر بن عبدالله <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -27,7 +27,7 @@ msgstr "شراء"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "السعر: %d GP / الإجمالي: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "مغادرة"
 
@@ -55,8 +55,9 @@ msgstr "بيع"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "إلغاء"
@@ -114,7 +115,7 @@ msgstr "التّالي"
 msgid "New"
 msgstr "جديد"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "حذف"
 
@@ -133,7 +134,7 @@ msgid "Create Character"
 msgstr "إنشاء شخصيّة"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "الاسم:"
 
@@ -155,7 +156,8 @@ msgid "Select Server"
 msgstr "إنتقاء الشخصيّة"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -166,330 +168,332 @@ msgid "Chat"
 msgstr "إنشاء"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "الخادوم:"
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -608,11 +612,11 @@ msgstr "انتقاء كمّيّة من المواد لإسقاطها."
 msgid "Login"
 msgstr "ولوج"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "كلمة السرّ:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr "المنفذ:"
 
@@ -624,8 +628,8 @@ msgstr ""
 msgid "Keep"
 msgstr "ترك"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "تسجيل"
 
@@ -644,7 +648,7 @@ msgid "Shortcut"
 msgstr "اختصار"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "تثبيت"
 
@@ -657,10 +661,23 @@ msgstr "خارطة صغيرة"
 msgid "MiniMap"
 msgstr "خارطة صغيرة"
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "تسجيل"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 #, fuzzy
 msgid "@@trade|Trade With "
@@ -732,61 +749,61 @@ msgstr "@@إسقاط|إسقاط@@"
 msgid "@@description|Description@@"
 msgstr "@@الوصف|الوصف@@"
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr "تأكيد:"
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "يجب أن يكون طول اسم المستخدم على الأقل %d محارف."
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "يجب أن يكون طول اسم المستخدم أقل من %d محارف."
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "يجب أن تكون طول كلمة السرّ على الأقل %d محارف."
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محارف."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr "كلمات السرّ غير متطابقة."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "خطأ"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr "صوت"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr "حجم صوت المؤثرّات"
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr "حجم صوت الموسيقا"
 
@@ -824,231 +841,244 @@ msgstr "لون الشعر:"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-msgid "Color:"
-msgstr "لون الشعر:"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "إضغط على الزرّ لبدأ المعايرة"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "معايرة"
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr "تفعيل عصا الألعاب"
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "إيقاف"
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "تدوير العصا"
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "حذف"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "الاسم:"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr "ملء الشاشة"
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr "مؤشّر مخصّص"
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr "حدّ FPS:"
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr "عتمة واجهة المستخدم"
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr "نصف قطر اللفّ"
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr "كسل اللفّ"
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr "مؤثّرات محيطة"
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr "واقف"
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr "منخفض"
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr "مرتفع"
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 #, fuzzy
 msgid "fullscreen"
 msgstr "ملء الشاشة"
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr "جارِ ملء الشاشة"
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr "تغيير OpenGL"
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
 
+#: ../src/gui/skill.cpp:39
+#, fuzzy
+msgid "skills.xml"
+msgstr "مهارات"
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1127,16 +1157,16 @@ msgstr "دفاع %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1505,6 +1535,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1544,6 +1578,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1581,219 +1619,376 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "جارِ الاتّصال..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "جارِ الاتّصال..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "جارِ الاتّصال..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "الاسم: %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "جارِ الاتّصال..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+#, fuzzy
+msgid "Invite to party"
+msgstr "الجردة"
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "إنشاء"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#~ msgid "Color:"
+#~ msgstr "لون الشعر:"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "الوصف: %s"
diff --git a/po/ca.po b/po/ca.po
index 0415ed64..0cb17dc2 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-07-03 17:21+0000\n"
 "Last-Translator: Habari <thomas.becerril@gmail.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Price: %d GP / Total: %d GP"
 msgstr "preu %d GP / total %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "sortir"
 
@@ -54,8 +54,9 @@ msgstr ""
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr ""
@@ -113,7 +114,7 @@ msgstr ""
 msgid "New"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr ""
 
@@ -132,7 +133,7 @@ msgid "Create Character"
 msgstr ""
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "nom"
 
@@ -153,7 +154,8 @@ msgid "Select Server"
 msgstr ""
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -164,330 +166,332 @@ msgid "Chat"
 msgstr "canvi"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr ""
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -604,11 +608,11 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr ""
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr ""
 
@@ -620,8 +624,8 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr ""
 
@@ -640,7 +644,7 @@ msgid "Shortcut"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr ""
 
@@ -652,10 +656,22 @@ msgstr ""
 msgid "MiniMap"
 msgstr ""
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+msgid "Reset"
+msgstr ""
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr ""
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 msgid "@@trade|Trade With "
 msgstr ""
@@ -724,61 +740,61 @@ msgstr ""
 msgid "@@description|Description@@"
 msgstr ""
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr ""
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr ""
 
@@ -815,227 +831,239 @@ msgstr ""
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-msgid "Color:"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 msgid "Default"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "nom"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "fullscreen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
+#: ../src/gui/skill.cpp:39
+msgid "skills.xml"
+msgstr ""
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1108,16 +1136,16 @@ msgstr ""
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1479,6 +1507,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1518,6 +1550,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1555,214 +1591,366 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 msgid "Trying to connect to account server..."
 msgstr ""
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 msgid "Trying to connect to char server..."
 msgstr ""
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 msgid "Trying to connect to map server..."
 msgstr ""
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, c-format
 msgid "Map: %s"
 msgstr ""
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 msgid "Connecting to map server..."
 msgstr ""
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+msgid "Invite to party"
+msgstr ""
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+msgid "   /create"
+msgstr ""
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
 #, fuzzy
 #~ msgid "Name: "
 #~ msgstr "nom"
diff --git a/po/cs.po b/po/cs.po
index edceaf79..350551d6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-12-17 16:31+0000\n"
 "Last-Translator: Lubos <alvinx12@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -27,7 +27,7 @@ msgstr "Nákup"
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr ""
 
@@ -54,8 +54,9 @@ msgstr "Prodej"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Zrušit"
@@ -114,7 +115,7 @@ msgstr "Další"
 msgid "New"
 msgstr "Nová"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "Odstranit"
 
@@ -133,7 +134,7 @@ msgid "Create Character"
 msgstr "Vytvořit postavu"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "Jméno:"
 
@@ -155,7 +156,8 @@ msgid "Select Server"
 msgstr "Server:"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -166,330 +168,332 @@ msgid "Chat"
 msgstr "Vytvořit"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -608,11 +612,11 @@ msgstr "Vyberte množství zboží, které chcete upustit."
 msgid "Login"
 msgstr ""
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr "Port:"
 
@@ -624,8 +628,8 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Registrace"
 
@@ -644,7 +648,7 @@ msgid "Shortcut"
 msgstr "Zkratka"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "Nastavení"
 
@@ -657,10 +661,23 @@ msgstr "MiniMapa"
 msgid "MiniMap"
 msgstr "MiniMapa"
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Registrace"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr ""
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 msgid "@@trade|Trade With "
 msgstr ""
@@ -729,61 +746,61 @@ msgstr ""
 msgid "@@description|Description@@"
 msgstr ""
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr ""
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr "Muž"
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr "Žena"
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Uživatelské jméno musí být nejméně %d znaků dlouhé."
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Uživatelské jméno musí být kratší než %d znaků."
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Heslo musí být kratší než %d znaků."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "Chyba"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr ""
 
@@ -821,229 +838,241 @@ msgstr "Barva vlasů:"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
-msgid "Color:"
-msgstr "Barva vlasů:"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "Kalibrovat"
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "Odstranit"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "Jméno:"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "fullscreen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
+#: ../src/gui/skill.cpp:39
+#, fuzzy
+msgid "skills.xml"
+msgstr "Dovednosti"
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1121,16 +1150,16 @@ msgstr "Obrana %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1497,6 +1526,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1536,6 +1569,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1573,219 +1610,377 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Připojuji se..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Připojuji se..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Připojuji se..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Jméno: %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Připojuji se..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+#, fuzzy
+msgid "Invite to party"
+msgstr "Inventář"
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "Vytvořit"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "Barva vlasů:"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "Popis: %s"
diff --git a/po/da.po b/po/da.po
index 7686a9ae..fecbf3f6 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-12-28 14:45+0000\n"
 "Last-Translator: GonzoDark AKA IchigoBlack <Gonzo.Dark@gmail.com>\n"
 "Language-Team: Danish <none@none.none>\n"
@@ -27,7 +27,7 @@ msgstr "Køb"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Pris: %d GP / Total: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "Afslut"
 
@@ -55,8 +55,9 @@ msgstr "Sælg"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Fortryd"
@@ -114,14 +115,14 @@ msgstr "Næste"
 msgid "New"
 msgstr "Opret"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "Slet"
 
 #: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
 #: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
-msgid "OK"
-msgstr "OK"
+msgid "Ok"
+msgstr ""
 
 #: ../src/gui/char_select.cpp:176
 #, c-format
@@ -133,7 +134,7 @@ msgid "Create Character"
 msgstr "Lav Bruger"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "Navn:"
 
@@ -155,7 +156,8 @@ msgid "Select Server"
 msgstr "Vælg Server"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr "OK"
 
@@ -166,338 +168,347 @@ msgid "Chat"
 msgstr "Chat"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr "Velkommen"
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr "Global meddelelse: "
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, fuzzy, c-format
+msgid "Global announcement from %s: "
 msgstr "Global meddelelse fra "
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:291
+#: ../src/gui/chat.cpp:321
+#, fuzzy, c-format
+msgid "Whispering to %s: %s"
+msgstr "Hvisker til "
+
+#: ../src/gui/chat.cpp:340
 msgid "Trying to send a blank party message."
 msgstr "Prøver at sende en blank gruppe besked."
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
-msgstr "Hvisker til "
-
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr "Retur bringer focus på chatten."
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr "Besked lukker chat."
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr "Enter bringer nu focus på chatten."
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr "Besked lukker nu chat."
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
-"Mulighederne til /toggle er \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+"Mulighederne til /toggle er \"yes\", \"no\", \"true\", \"false\", \"1\", \"0"
+"\"."
 
-#: ../src/gui/chat.cpp:432
-msgid "Unknown party command... Type \"/help party\" party for more information."
+#: ../src/gui/chat.cpp:474
+#, fuzzy
+msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr "Ukendt gruppe kommando... Skriv \"/help party\" for mere information."
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr "Trylleformularen findes ikke!"
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr "Den nuværende server understøtter ikke trylleformulare"
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr "Til stede: "
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr "Fremmøde skrives til loggen"
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr "Ukendt kommando"
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr "Handel fejlede!"
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr "Emote fejlede!"
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr "Sæt dig fejlede!"
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr "Chat skabelsen fejlede!"
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr "Kunne ikke tilslutte sig gruppen!"
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr "Kan ikke råbe!"
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du er ikke nået til det rette Niveau endnu!"
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr "Utilstrækkelig HP!"
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr "Utilstrækkelig SP!"
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr "Du har ingen memorandaer!"
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr "Det kan du ikke gøre lige nu!"
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr "Det ser ud til at du har behov for flere Zeny... ;-)"
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kan ikke bruge denne færdighed med dette slags våben!"
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr "Du har behov for en rød krystal mere"
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr "Du har behov for en blå krystal mere"
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr "Du har for meget på dig, til at kunne gøre dette"
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr "Hmm? Hvad er det?"
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr "Warp mislykkede..."
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr "Kunne ikke stjæle noget som helst..."
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr "Giften havde ingen effekt..."
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr "Det nuværende gruppe præfiks er "
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr "Gruppens præfiks skal være et bogstav langt. "
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr "Kan ikke bruge '/' som præfikset"
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Ændre præfikset til "
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr "--Hjælp--"
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr "/announce: Global meddelelse (Kun for GM)"
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr "/clear: Rydder dette vindue"
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr "/help: Viser denne hjælp"
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr "/msg <navn> <besked>: Alternativ form for /whisper"
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr "/present: Får listen af tilstedeværende brugere"
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr "/toggle: Bestemmer om <retur> bringer focus på chat loggen."
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr "/where: Viser bane navnet"
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr "/w <navn> <besked>: Kort form for /whisper"
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
-msgstr "/whisper <navn> <besked>: Sender en privat besked til det givne brugernavn"
+msgstr ""
+"/whisper <navn> <besked>: Sender en privat besked til det givne brugernavn"
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr "/who: Viser antalet af online brugere"
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr "For at få mere information, skriv /help <kommando>"
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr "Kommando: /announce <besked>"
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr "*** kun tilgængelig for en GM ***"
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Denne kommando sender beskeden <besked> til alle brugere online."
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr "Kommando: /clear"
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr "Denne commando rydder chat loggen"
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr "Kommando: /help"
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr "Denne kommando viser en liste over alle tilgængelige kommandoer"
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr "Kommando: /help <kommando>"
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr "Denne kommando viser hjælp for <kommando>"
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr "Kommando: /present"
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
-"Denne kommando finder en liste over brugere, der er inden for en lytteradius, og sender listen til enten "
-"record loggen, hvis du optager, ellers er det chat loggen."
+"Denne kommando finder en liste over brugere, der er inden for en "
+"lytteradius, og sender listen til enten record loggen, hvis du optager, "
+"ellers er det chat loggen."
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr "Kommando /toggle <tilstand>"
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
+#, fuzzy
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
-"Denne kommando bestemmer om retur, skal bruges til at fokusere på chat loggen, eller"
-"om chat om chat loggen, automatisk skal slå fra."
+"Denne kommando bestemmer om retur, skal bruges til at fokusere på chat "
+"loggen, ellerom chat om chat loggen, automatisk skal slå fra."
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
-"<tilstand> kan være en ud af \"1\", \"yes\", \"true\" for at slå fokusering af chat vindue til, eller \"0"
-"\", \"no\", \"false\" for at slå fokusering af chat vindue fra."
+"<tilstand> kan være en ud af \"1\", \"yes\", \"true\" for at slå fokusering "
+"af chat vindue til, eller \"0\", \"no\", \"false\" for at slå fokusering af "
+"chat vindue fra."
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr "Kommando: /toggle"
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr "Denne kommando viser fokusering af chat vinduets status."
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr "kommando: /where"
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr "Denne kommando viser det nuværende bane navn."
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr "Kommando: /msg <navn> <besked>"
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr "Kommando: /whisper <navn> <besked>"
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr "Kommando: /w <navn> <besked>"
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr "Denne kommando sender beskeden <besked> til <navn>."
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Hvis navnet har mellemrum i det, skal det omringes med følgende (\")."
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr "Kommando: /who"
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
-msgstr "Denne kommando viser det antal af online brugere, der nuværende er online."
+msgstr ""
+"Denne kommando viser det antal af online brugere, der nuværende er online."
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr "Ukendt kommando"
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr "Skriv /help for at få en liste med kommandoer"
 
@@ -616,11 +627,11 @@ msgstr "Vælg hvor mange genstande du vil smide."
 msgid "Login"
 msgstr "Log Ind"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr "Port:"
 
@@ -632,8 +643,8 @@ msgstr "Nuværende:"
 msgid "Keep"
 msgstr "Behold"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Registrer"
 
@@ -652,7 +663,7 @@ msgid "Shortcut"
 msgstr "Genvej"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "Opsætning"
 
@@ -665,10 +676,23 @@ msgstr "MiniKort"
 msgid "MiniMap"
 msgstr "MiniKort"
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Nuværende:"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 #, fuzzy
 msgid "@@trade|Trade With "
@@ -740,61 +764,61 @@ msgstr "@@drop|Smid@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Beskrivelse@@"
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr "Bekræft:"
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr "Mand"
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr "Kvinde"
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr "RegisterDialog::register Brugernavn er %s"
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Brugernavnet skal mindst være %d bogstaver langt."
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Brugernavnet skal være mindre end %d bogstaver langt."
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Adgangskoden skal mindst være %d bogstaver langt."
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr "De indtastede adgangskoder stemmer ikke overens."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "Fejl"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr "Lyd"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr "Lydstyrke på effekter"
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr "Lydstyrke på musik"
 
@@ -832,232 +856,245 @@ msgstr "Farver:"
 msgid "Players"
 msgstr "Brugere"
 
-#: ../src/gui/setup_colours.cpp:38
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:67
 #, fuzzy
-msgid "Color:"
-msgstr "Farve:"
+msgid "Green: "
+msgstr "Til stede: "
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Tryk på knappen for at starte justeringen."
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "Justering"
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr "Aktiver joystick"
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "Stop"
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "Rotere joysticket"
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr "Tildel"
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "Standart"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr "Tast Konfikt(er) Opdaget."
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr "Løs problemet, ellers kan spillet risikere at opfører sig ustabilt."
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "Navn:"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr "Relation"
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr "Neutral"
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr "Ven"
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr "Se bort fra"
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr "Ignorer"
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr "???"
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr "Gem bruger liste"
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr "Tillad handel"
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr "Tillad hviskere"
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr "Når ignorer:"
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr "Ingen opsætning tilgængelig"
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr "Alle opløsninger er tilgængelige"
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr "Fuld Skærm"
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr "Brugerdefineret Musepil"
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr "Partikel effekter"
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr "Snakke bobler"
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr "Vis navn"
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr "FPS grænse:"
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr "Gennemsigtighed"
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr "Følsomhed på mus"
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr "Acceleration på mus"
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr "Omgivende FX"
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr "Partikel Detalje"
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr "fra"
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr "lav"
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr "høj"
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr "Partikel Detalje"
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr "mellem"
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr "maks"
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr "Fejlede i at skifte til "
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr "vinduet"
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 #, fuzzy
 msgid "fullscreen"
 msgstr "Fuld Skærm"
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr "opsætning og genoprettelse af gammel opsætning fejlede også!"
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr "Skifter til fuld skærm"
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr "Skrifter til OpenGL"
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr "Kunne ikke definere "
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr " skærm opsætning: "
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr "Skærm opløsning ændret"
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr "Partikel effekt opsætningen er ændret"
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten, eller skifter bane."
 
+#: ../src/gui/skill.cpp:39
+#, fuzzy
+msgid "skills.xml"
+msgstr "Færdigheder"
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1135,17 +1172,18 @@ msgid "M.Defense:"
 msgstr "M.Forsvar:"
 
 #: ../src/gui/status.cpp:134
-#, c-format
-msgid "% Accuracy:"
+#, fuzzy, c-format
+msgid "\\% Accuracy:"
 msgstr "% Nøjagtighed:"
 
 #: ../src/gui/status.cpp:135
-#, c-format
-msgid "% Evade:"
+#, fuzzy, c-format
+msgid "\\% Evade:"
 msgstr "% Undvig:"
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+#, fuzzy
+msgid "\\% Reflex:"
 msgstr "% Refleks:"
 
 #: ../src/gui/status.cpp:280
@@ -1180,7 +1218,7 @@ msgstr "Held"
 #: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
-msgstr "Tilgode Status Points"
+msgstr "Tilgode Status Points: %d"
 
 #: ../src/gui/trade.cpp:51
 msgid "Trade: You"
@@ -1205,7 +1243,9 @@ msgstr "Du giver:"
 
 #: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Fejlede i at tilføje genstand. Du kan ikke overlappe en slags genstand på vinduet."
+msgstr ""
+"Fejlede i at tilføje genstand. Du kan ikke overlappe en slags genstand på "
+"vinduet."
 
 #: ../src/gui/updatewindow.cpp:78
 #, c-format
@@ -1274,7 +1314,8 @@ msgstr "Du er død."
 
 #: ../src/net/playerhandler.cpp:219
 msgid "We regret to inform you that your character was killed in battle."
-msgstr "Vi er ked af at måtte informere dig, om at din karakter var dræbt i kamp."
+msgstr ""
+"Vi er ked af at måtte informere dig, om at din karakter var dræbt i kamp."
 
 #: ../src/net/playerhandler.cpp:220
 msgid "You are not that alive anymore."
@@ -1304,9 +1345,7 @@ msgstr ""
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
-msgstr ""
-"Din plan om at smadre fjendens våben, ved at benytte din hals "
-"fejlede."
+msgstr "Din plan om at smadre fjendens våben, ved at benytte din hals fejlede."
 
 #: ../src/net/playerhandler.cpp:226
 msgid "I guess this did not run too well."
@@ -1335,8 +1374,7 @@ msgstr "Det ser ud til at du fik du hoved udleveret til dig."
 #: ../src/net/playerhandler.cpp:231
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"Du kvajede dig igen, smid din krop ned i kloakken og find dig en ny." 
+msgstr "Du kvajede dig igen, smid din krop ned i kloakken og find dig en ny."
 
 #. Leisure Suit Larry 1 Reference
 #: ../src/net/playerhandler.cpp:232
@@ -1367,7 +1405,9 @@ msgstr "Du siver langtsomt ud af din krop, du kan nu endelig slappe af."
 
 #: ../src/net/playerhandler.cpp:238
 msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr "Hvis det ikke var fordi du var så animeret, kunne du sikker imponere Chuck Norris."
+msgstr ""
+"Hvis det ikke var fordi du var så animeret, kunne du sikker imponere Chuck "
+"Norris."
 
 #: ../src/net/playerhandler.cpp:239
 msgid "Your metabolic processes are now history."
@@ -1385,9 +1425,7 @@ msgstr "Du har stillet træskoene."
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
-msgstr ""
-"Du har spist af dødens pølse for den sidste gang."
-
+msgstr "Du har spist af dødens pølse for den sidste gang."
 
 #: ../src/net/playerhandler.cpp:243
 msgid "You are an ex-player."
@@ -1460,7 +1498,8 @@ msgstr "Fejlede i at tilføje genstand. Handels partneren bære på for meget."
 #. Add item failed - player has no free slot
 #: ../src/net/tradehandler.cpp:190
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Fejlede i at tilføje genstand. Handels partneren har ikke flere frie pladser."
+msgstr ""
+"Fejlede i at tilføje genstand. Handels partneren har ikke flere frie pladser."
 
 #: ../src/net/tradehandler.cpp:194
 msgid "Failed adding item for unknown reason."
@@ -1484,9 +1523,9 @@ msgid "ColorDB: Failed"
 msgstr "ColorDB: Fejlede"
 
 #: ../src/resources/colordb.cpp:83
-#, c-format
-msgid "ColorDB: Ny definition af dye ID %d"
-msgstr ""
+#, fuzzy, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr "ItemDB: Ny definition af genstand ID %d"
 
 #: ../src/resources/colordb.cpp:98
 msgid "Unloading color database..."
@@ -1522,6 +1561,10 @@ msgstr "Startede genstans database..."
 msgid "Unknown item"
 msgstr "Ukendt genstand"
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr "ItemDB: Fejl under læsningen af items.xml!"
@@ -1561,6 +1604,10 @@ msgstr "unavngivet"
 msgid "Initializing monster database..."
 msgstr "Starter monster database..."
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr "Monster Database: Fejl under indlæsningen ad monster.xml!"
@@ -1575,7 +1622,8 @@ msgstr ""
 #: ../src/resources/monsterdb.cpp:121
 #, c-format
 msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
-msgstr "MonsterDB: Advarsel, lyd effekt %s for ukendt begivenhed %s af monster %s"
+msgstr ""
+"MonsterDB: Advarsel, lyd effekt %s for ukendt begivenhed %s af monster %s"
 
 #: ../src/resources/monsterdb.cpp:159
 #, c-format
@@ -1599,219 +1647,390 @@ msgstr "NPC Database: NPC med manglende ID i npcs.xml!"
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr "NPCDB: Advarsel, ukendt NPC ID %d efterspurgt"
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr "Skærmbillede gemt under ~/"
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr "Gemningen af skærmbilledet fejlede!"
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr "Fejl: kunne ikke gemme skærmbilledet."
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr "Netværk Fejl"
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr "Forbindelsen til serveren er tabt, programmet vil nu lukke"
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer indkomne handels anmodninger"
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr "Accepter indkomne handels anmodninger"
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Er du sikker på at du gerne vil stoppe?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr "nej"
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr "Advarsel: guichan indput untagelse: %s"
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr "Fejl: Ugyldigt opdaterings host: %s"
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr "Ugyldigt opdaterings host: "
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr "Advarsel: ingen protocol var aktiv som opdate host"
 
-#: ../src/main.cpp:222
-#, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+#: ../src/main.cpp:245
+#, fuzzy, c-format
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr "Fejl: %s/%s kan ikke laves, men findes ikke!"
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr "Fejl: %s/%s kan ikke laves, men findes ikke!"
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr " kan ikke laves, men det findes ikke! Lukker."
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr "Starter Aethyra Version %s"
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr "Starter Aethyra - Version er ikke defineret"
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr "Starter SDL..."
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr "Kunne ikke starte SDL: "
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr " kunne ikke blive sat til hjemmemappen! Lukker."
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr "Kan ikke finde ressourcernes mappe\n"
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr "Starter configurationen..."
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr "Advarsel: %s"
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr "aethyra"
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr "Opsætning: "
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr "  -C --configfile : Configurations fil til brug"
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr "  -d --data       : Mappen at indlæse spillets data fra"
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
-msgstr "  -D --default    : Overskriv login processen med normale indstillinger"
+msgstr ""
+"  -D --default    : Overskriv login processen med normale indstillinger"
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr "  -h --help       : Viser denne hjælp"
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr "  -H --updatehost : Brug denne opdaterings host"
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr "  -p --playername : Logind med denne bruger"
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr "  -P --password   : Logind med denne adgangskode"
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr "  -u --skipupdate : Spring opdateringerne over"
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr "  -U --username   : Logind med dette brugernavn"
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr "  -v --version    : Viser den nuværende version"
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr "Aethyra version "
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr "(lokalt build?, PACKAGE_VERSION er ikke defineret)"
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Prøver at opretter forbindelse til bruger serveren..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr "Brugernavn er %s"
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Prøver at oprette forbindelse til karakter serveren..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr "Husk den valgte karakter %s"
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Prøver at oprette forbindelse til bane serveren..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Bane; %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr "Kunne ikke indlæse %s som background"
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr "Blev smidt af serveren!"
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Opretter forbindelse til bane serveren..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr "Opretter forbindelse til karakter serveren..."
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr "Opretter forbindelse til bruger serveren..."
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+#, fuzzy
+msgid "Could not create party."
+msgstr "Kunne ikke tilslutte sig gruppen!"
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+#, fuzzy
+msgid "Invite to party"
+msgstr "Inventarliste"
+
+#: ../src/party.cpp:130
+#, fuzzy, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr " vil gerne handle med dig, vil du acceptere?"
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+#, fuzzy
+msgid "Command: /party <command> <args>"
+msgstr "Kommando: /help <kommando>"
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "Opret"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+#, fuzzy
+msgid "This command implements the partying function."
+msgstr "Denne kommando viser hjælp for <kommando>"
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+#, fuzzy
+msgid "Command: /party new <party-name>"
+msgstr "Kommando /toggle <tilstand>"
+
+#: ../src/party.cpp:191
+#, fuzzy
+msgid "Command: /party create <party-name>"
+msgstr "Kommando /toggle <tilstand>"
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+#, fuzzy
+msgid "This command sets the party prefix character."
+msgstr "Denne commando rydder chat loggen"
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+#, fuzzy
+msgid "Command: /party prefix"
+msgstr "Kommando: /present"
+
+#: ../src/party.cpp:204
+#, fuzzy
+msgid "This command reports the current party prefix character."
+msgstr "Denne commando rydder chat loggen"
+
+#: ../src/party.cpp:212
+#, fuzzy
+msgid "Command: /party leave"
+msgstr "Kommando: /present"
+
+#: ../src/party.cpp:213
+#, fuzzy
+msgid "This command causes the player to leave the party."
+msgstr "Denne kommando viser fokusering af chat vinduets status."
+
+#: ../src/party.cpp:217
+#, fuzzy
+msgid "Unknown /party command."
+msgstr "Ukendt kommando"
+
+#: ../src/party.cpp:218
+#, fuzzy
+msgid "Type /help party for a list of options."
+msgstr "Skriv /help for at få en liste med kommandoer"
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "Farve:"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "Beskrivelse:"
diff --git a/po/de.po b/po/de.po
index ed92c46d..898a2e8c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-10-13 00:25+0000\n"
 "Last-Translator: Aeneas Jaißle <Unknown>\n"
 "Language-Team: German\n"
@@ -27,7 +27,7 @@ msgstr "Kaufen"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preis: %d GP / Summe: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "Beenden"
 
@@ -55,8 +55,9 @@ msgstr "Verkaufen"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -114,7 +115,7 @@ msgstr "Weiter"
 msgid "New"
 msgstr "Neu"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "Löschen"
 
@@ -133,7 +134,7 @@ msgid "Create Character"
 msgstr "Charakter erstellen"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "Name :"
 
@@ -155,7 +156,8 @@ msgid "Select Server"
 msgstr "Spielfigur auswählen"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -166,331 +168,333 @@ msgid "Chat"
 msgstr "Erstellen"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Ändere OpenGL"
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -609,11 +613,11 @@ msgstr "Wähle aus, wieviele Gegenstände Du wegwerfen möchtest."
 msgid "Login"
 msgstr "Anmelden"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr "Port:"
 
@@ -625,8 +629,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Erinnern"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Registrieren"
 
@@ -645,7 +649,7 @@ msgid "Shortcut"
 msgstr "Tastenkürzel"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "Einstellungen"
 
@@ -658,10 +662,23 @@ msgstr "Übersichtskarte"
 msgid "MiniMap"
 msgstr "Übersichtskarte"
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Registrieren"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 #, fuzzy
 msgid "@@trade|Trade With "
@@ -733,61 +750,61 @@ msgstr "@@drop|Fallen lassen@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Beschreibung@@"
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr "Männlich"
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr "Weiblich"
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Der Nutzername muss aus mindestens %d Zeichen bestehen."
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Der Nutzername muss kürzer als %d Zeichen sein."
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Das Passwort muss aus mindestens %d bestehen."
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Das Passwort muss kürzer als %d Zeichen sein."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "Fehler"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr "Ton"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr "Lautstärke der Klangeffekte"
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr "Latustärke der Musik"
 
@@ -825,234 +842,246 @@ msgstr "Haarfarbe"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
-msgid "Color:"
-msgstr "Haarfarbe"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Knopf drücken um die Kalibrierung zu starten"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "Kalibrieren"
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr "Joystick aktivieren"
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "Kreise den Steuerknüppel"
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "Löschen"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "Name :"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr "Vollbild"
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr "Benutzerdefinierten Zeiger"
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr "FPS-Limit:"
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr "GUI Transparenz"
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr "Scroll-Radius"
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr "Scroll-Trägheit"
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr "Hintergrundeffekte"
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr "Aus"
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr "Niedrig"
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr "Hoch"
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 #, fuzzy
 msgid "fullscreen"
 msgstr "Vollbild"
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr "Wechsle zum Vollbildmodus"
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr "Ändere OpenGL"
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
 
+#: ../src/gui/skill.cpp:39
+#, fuzzy
+msgid "skills.xml"
+msgstr "Fertigkeiten"
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1131,16 +1160,16 @@ msgstr "Verteidigung %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1509,6 +1538,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1548,6 +1581,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1585,219 +1622,377 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Verbinde..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Verbinde..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Verbinde..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Name : %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Verbinde..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+#, fuzzy
+msgid "Invite to party"
+msgstr "Inventar"
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "Erstellen"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "Haarfarbe"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "Beschreibung: %s"
diff --git a/po/en_GB.po b/po/en_GB.po
index b6713923..503f24c9 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-05-10 16:51+0000\n"
 "Last-Translator: Me <Glich.Glich@googlemail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -27,7 +27,7 @@ msgstr "Buy"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Price: %d GP / Total: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "Exit"
 
@@ -55,8 +55,9 @@ msgstr "Sell"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancel"
@@ -114,7 +115,7 @@ msgstr "Next"
 msgid "New"
 msgstr "New"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "Delete"
 
@@ -133,7 +134,7 @@ msgid "Create Character"
 msgstr "Create Character"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "Name:"
 
@@ -155,7 +156,8 @@ msgid "Select Server"
 msgstr "Select Character"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -166,331 +168,333 @@ msgid "Chat"
 msgstr "Create"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Changing OpenGL"
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -609,11 +613,11 @@ msgstr "Select amount of items to drop."
 msgid "Login"
 msgstr "Login"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr "Port:"
 
@@ -625,8 +629,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Keep"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Register"
 
@@ -645,7 +649,7 @@ msgid "Shortcut"
 msgstr "Shortcut"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "Setup"
 
@@ -658,10 +662,23 @@ msgstr "MiniMap"
 msgid "MiniMap"
 msgstr "MiniMap"
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Register"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 #, fuzzy
 msgid "@@trade|Trade With "
@@ -733,61 +750,61 @@ msgstr "@@drop|Drop@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Description@@"
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr "Confirm:"
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "The username needs to be at least %d characters long."
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "The username needs to be less than %d characters long."
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "The password needs to be at least %d characters long."
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "The password needs to be less than %d characters long."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "Error"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr "Sound"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr "Sfx volume"
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr "Music volume"
 
@@ -824,231 +841,244 @@ msgstr "Colours"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-msgid "Color:"
-msgstr "Colour:"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Press the button to start calibration"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "Calibrate"
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr "Enable joystick"
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "Stop"
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "Rotate the stick"
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "Delete"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "Name:"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr "Full screen"
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr "Custom cursor"
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr "FPS Limit:"
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr "Gui opacity"
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr "Scroll radius"
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr "Scroll laziness"
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr "Ambient FX"
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr "off"
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr "low"
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr "high"
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 #, fuzzy
 msgid "fullscreen"
 msgstr "Full screen"
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr "Switching to full screen"
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr "Restart needed for changes to take effect."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr "Changing OpenGL"
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applying change to OpenGL requires restart."
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Restart needed for changes to take effect."
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Restart needed for changes to take effect."
 
+#: ../src/gui/skill.cpp:39
+#, fuzzy
+msgid "skills.xml"
+msgstr "Skills"
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1127,16 +1157,16 @@ msgstr "Defense %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1505,6 +1535,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1544,6 +1578,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1581,219 +1619,376 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Are you sure you want to delete this character?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Connecting..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Connecting..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Connecting..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Name: %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Connecting..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+#, fuzzy
+msgid "Invite to party"
+msgstr "Inventory"
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "Create"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#~ msgid "Color:"
+#~ msgstr "Colour:"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "Description: %s"
diff --git a/po/eo.po b/po/eo.po
index eb490c33..bf33fedd 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-11-10 22:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr ""
 
@@ -54,8 +54,9 @@ msgstr ""
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr ""
@@ -113,7 +114,7 @@ msgstr ""
 msgid "New"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr ""
 
@@ -132,7 +133,7 @@ msgid "Create Character"
 msgstr ""
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr ""
 
@@ -153,7 +154,8 @@ msgid "Select Server"
 msgstr ""
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -163,330 +165,332 @@ msgid "Chat"
 msgstr ""
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr ""
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -603,11 +607,11 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr ""
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr ""
 
@@ -619,8 +623,8 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr ""
 
@@ -639,7 +643,7 @@ msgid "Shortcut"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr ""
 
@@ -651,10 +655,22 @@ msgstr ""
 msgid "MiniMap"
 msgstr ""
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+msgid "Reset"
+msgstr ""
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr ""
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 msgid "@@trade|Trade With "
 msgstr ""
@@ -723,61 +739,61 @@ msgstr ""
 msgid "@@description|Description@@"
 msgstr ""
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr ""
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr ""
 
@@ -814,226 +830,238 @@ msgstr ""
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-msgid "Color:"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 msgid "Default"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 msgid "Name"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "fullscreen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
+#: ../src/gui/skill.cpp:39
+msgid "skills.xml"
+msgstr ""
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1106,16 +1134,16 @@ msgstr ""
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1477,6 +1505,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1516,6 +1548,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1553,210 +1589,362 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 msgid "Trying to connect to account server..."
 msgstr ""
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 msgid "Trying to connect to char server..."
 msgstr ""
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 msgid "Trying to connect to map server..."
 msgstr ""
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, c-format
 msgid "Map: %s"
 msgstr ""
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 msgid "Connecting to map server..."
 msgstr ""
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
+
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+msgid "Invite to party"
+msgstr ""
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+msgid "   /create"
+msgstr ""
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
diff --git a/po/es.po b/po/es.po
index 217e924a..6f250db8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-10-15 01:37+0000\n"
 "Last-Translator: catalania <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -27,7 +27,7 @@ msgstr "Comprar"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Precio: %d GP / Total: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "Salir"
 
@@ -55,8 +55,9 @@ msgstr "Vender"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancelar"
@@ -114,7 +115,7 @@ msgstr "Siguiente"
 msgid "New"
 msgstr "Nuevo"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -133,7 +134,7 @@ msgid "Create Character"
 msgstr "Crear Personaje"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -155,7 +156,8 @@ msgid "Select Server"
 msgstr "Seleccionar personaje"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -166,331 +168,333 @@ msgid "Chat"
 msgstr "Crear"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Cambiar a OpenGL"
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -609,11 +613,11 @@ msgstr "Seleccione objetos para soltar."
 msgid "Login"
 msgstr "conectarse"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr "Puerto:"
 
@@ -625,8 +629,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Mantener"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Registrar"
 
@@ -645,7 +649,7 @@ msgid "Shortcut"
 msgstr "Atajos"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "Configuración"
 
@@ -658,10 +662,23 @@ msgstr "Minimapa"
 msgid "MiniMap"
 msgstr "Minimapa"
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Registrar"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 #, fuzzy
 msgid "@@trade|Trade With "
@@ -733,61 +750,61 @@ msgstr "@@drop|Tirar@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Descripción@@"
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "El nombre de usuario debe tener al menos %d caracteres."
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "El nombre de usuario puede tener como máximo %d caracteres."
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "La contraseña debe tener al menos %d caracteres."
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "La contraseña puede tener como máximo %d caracteres."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "Error"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr "Sonido"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr "Volumen efectos"
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr "Volumen musica"
 
@@ -825,232 +842,244 @@ msgstr "Color de pelo:"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
-msgid "Color:"
-msgstr "Color de pelo:"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Presione el botón para comenzar la calibración"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "Calibrar"
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr "Activar joystick"
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "Detener"
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "Gire el stick"
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "Eliminar"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "Nombre:"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr "Cursor propio"
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr "Límite de FPS:"
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr "Transparencia menus"
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr "Ratio de scroll"
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr "Velocidad de scroll"
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr "Efectos ambientales"
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr "desactivado"
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr "bajo"
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr "alto"
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 #, fuzzy
 msgid "fullscreen"
 msgstr "Pantalla completa"
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr "Cambiar a pantalla completa"
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr "Se necesita reiniciar para aplicar los cambios."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr "Cambiar a OpenGL"
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr "Se necesita reiniciar para aplicar los cambios hechos a OpenGL."
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Se necesita reiniciar para aplicar los cambios."
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Se necesita reiniciar para aplicar los cambios."
 
+#: ../src/gui/skill.cpp:39
+#, fuzzy
+msgid "skills.xml"
+msgstr "Habilidades"
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1129,16 +1158,16 @@ msgstr "Defensa %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1507,6 +1536,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1546,6 +1579,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1583,219 +1620,377 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "¿Seguro que quieres borrar este personaje?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Conectando…"
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Conectando…"
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Conectando…"
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nombre: %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Conectando…"
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+#, fuzzy
+msgid "Invite to party"
+msgstr "Inventario"
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "Crear"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "Color de pelo:"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "Descripción: %s"
diff --git a/po/fi.po b/po/fi.po
index 1bd73914..7e76ee69 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-12-30 10:23+0000\n"
 "Last-Translator: ville-v <villev90@gmail.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -27,7 +27,7 @@ msgstr "Osta"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Kappalehinta: %d GP / Yhteensä: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "Sulje"
 
@@ -55,8 +55,9 @@ msgstr "Myy"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Peru"
@@ -115,7 +116,7 @@ msgstr "Seuraava"
 msgid "New"
 msgstr "Uusi"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "Poista"
 
@@ -134,7 +135,7 @@ msgid "Create Character"
 msgstr "Luo hahmo"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -156,7 +157,8 @@ msgid "Select Server"
 msgstr "Vaihda palvelinta"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -167,331 +169,333 @@ msgid "Chat"
 msgstr "Luo"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Vaihdetaan OpenGL -toimintatilaan"
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -610,11 +614,11 @@ msgstr "Anna pudotettavien tavaroiden määrä."
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr "Portti:"
 
@@ -626,8 +630,8 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Rekisteröidy"
 
@@ -646,7 +650,7 @@ msgid "Shortcut"
 msgstr "Pikavalinnat"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "Asetukset"
 
@@ -659,10 +663,23 @@ msgstr "Apukartta"
 msgid "MiniMap"
 msgstr "Apukartta"
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Rekisteröidy"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "Epäpelattava hahmo"
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 #, fuzzy
 msgid "@@trade|Trade With "
@@ -734,61 +751,61 @@ msgstr "@@drop|Pudota maahan@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Kuvaus@@"
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr "Vahvista:"
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr "Miespuolinen"
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr "Naispuolinen"
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Käyttäjänimen tulee olla vähintään %d merkkiä pitkä"
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Käyttäjänimen tulee olla alle %d merkkiä pitkä."
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Salasanan tulee olla vähintään %d merkkiä pitkä"
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "Virhe"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr "Ääni"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr "Äänitehosteiden voimakkuus"
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr "Musiikin voimakkuus"
 
@@ -826,232 +843,244 @@ msgstr "Hiusten väri:"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
-msgid "Color:"
-msgstr "Hiusten väri:"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "Kalibroi"
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr "Peliohjaintuki päälle"
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "Lopeta"
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "Käytä ohjain ääriasennoissaan pyörittämällä"
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "Poista"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "Nimi:"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr "Kokoruututila"
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr "Tyylitelty hiiren osoitin"
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr "Piirtonopeusrajoitin (kuvaa / sekunti)"
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr "Käyttöliittymän läpinäkyvyys"
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr "Kameran perässälaahaus"
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr "Kameran perässälaahauksen tiukkuus"
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr "Taustaäänet"
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr "pois päältä"
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr "matala"
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr "korkea"
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 #, fuzzy
 msgid "fullscreen"
 msgstr "Kokoruututila"
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr "Kokoruututilaan siirtyminen"
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr "Vaihdetaan OpenGL -toimintatilaan"
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetusten muutokset vaativat ohjelman uudelleenkäynnistyksen"
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
+#: ../src/gui/skill.cpp:39
+#, fuzzy
+msgid "skills.xml"
+msgstr "Taidot"
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1130,16 +1159,16 @@ msgstr "Puolustus %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1508,6 +1537,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1547,6 +1580,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1584,219 +1621,377 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Yhdistetään..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Yhdistetään..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Yhdistetään..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nimi: %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Yhdistetään..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+#, fuzzy
+msgid "Invite to party"
+msgstr "Tavaraluettelo"
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "Luo"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "Hiusten väri:"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "Kuvaus: %s"
diff --git a/po/fr.po b/po/fr.po
index 9201ff5c..8a51b872 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-12-26 10:43+0000\n"
 "Last-Translator: Johan Serre <Unknown>\n"
 "Language-Team: French\n"
@@ -28,7 +28,7 @@ msgstr "Acheter"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Prix : %d PO / Total : %d PO"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "Quitter"
 
@@ -56,8 +56,9 @@ msgstr "Vendre"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Annuler"
@@ -115,7 +116,7 @@ msgstr "Suivant"
 msgid "New"
 msgstr "Nouveau"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -134,7 +135,7 @@ msgid "Create Character"
 msgstr "Création du personnage"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "Nom :"
 
@@ -156,7 +157,8 @@ msgid "Select Server"
 msgstr "Choix du personnage"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -167,331 +169,333 @@ msgid "Chat"
 msgstr "Créer"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Serveur :"
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Changement OpenGL"
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -610,11 +614,11 @@ msgstr "Choisissez le nombre d'objets à lâcher."
 msgid "Login"
 msgstr "Connexion"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr "Port :"
 
@@ -626,8 +630,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Conserver"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "S'inscrire"
 
@@ -646,7 +650,7 @@ msgid "Shortcut"
 msgstr "Raccourci"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "Configuration"
 
@@ -659,10 +663,23 @@ msgstr "Plan"
 msgid "MiniMap"
 msgstr "Plan"
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "S'inscrire"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "PNJ"
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 #, fuzzy
 msgid "@@trade|Trade With "
@@ -734,61 +751,61 @@ msgstr "@@drop|Lâcher@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Description@@"
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr "Vérification :"
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr "Masculin"
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr "Féminin"
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Le nom d'utilisateur doit faire au moins %d caractères."
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Le nom d'utilisateur doit faire moins de %d caractères."
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Le mot de passe doit faire au moins %d caractères."
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Le mot de passe doit faire moins de %d caractères."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe ne correspondent pas."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "Erreur"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr "Son"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr "Volume des effets sonores"
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr "Volume de la musique"
 
@@ -826,236 +843,248 @@ msgstr "Couleur des cheveux"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
-msgid "Color:"
-msgstr "Couleur des cheveux"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Presser le bouton pour démarrer la calibration"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "Calibrer"
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr "Activer le joystick"
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "Stop"
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "Tourner le joystick"
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "Supprimer"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "Nom :"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr "Plein écran"
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr "Curseur personnalisé"
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr "Limite FPS :"
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr "Opacité de l'interface"
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr "Rayon du scrolling"
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr "Paresse du scrolling"
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr "Effets ambiants"
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr "aucun"
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr "léger"
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr "complet"
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 #, fuzzy
 msgid "fullscreen"
 msgstr "Plein écran"
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr "Passage en plein écran"
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr "Changement OpenGL"
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
+#: ../src/gui/skill.cpp:39
+#, fuzzy
+msgid "skills.xml"
+msgstr "Compétences"
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1134,16 +1163,16 @@ msgstr "Défense %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1512,6 +1541,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1551,6 +1584,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1588,219 +1625,377 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Connexion..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Connexion..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Connexion..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nom : %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Connexion..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+#, fuzzy
+msgid "Invite to party"
+msgstr "Inventaire"
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "Créer"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "Couleur des cheveux"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "Description : %s"
diff --git a/po/he.po b/po/he.po
index 2d77d9f1..6d9c6bbd 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-10-20 00:23+0000\n"
 "Last-Translator: Ddorda <d.dorda@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -27,7 +27,7 @@ msgstr "קנה"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "מחיר: %d זהב / סה\"כ %d זהב"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "יציאה"
 
@@ -55,8 +55,9 @@ msgstr "מכר"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "ביטול"
@@ -115,7 +116,7 @@ msgstr "הבא"
 msgid "New"
 msgstr "חדש"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "מחק"
 
@@ -134,7 +135,7 @@ msgid "Create Character"
 msgstr "צור שחקן"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "שם:"
 
@@ -156,7 +157,8 @@ msgid "Select Server"
 msgstr "החלף שרת"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -167,331 +169,333 @@ msgid "Chat"
 msgstr "צור"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "שרת:"
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "משנה OpenGL"
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -610,11 +614,11 @@ msgstr "בחר כמות חפצים להשליך."
 msgid "Login"
 msgstr "התחברות"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr "פורט:"
 
@@ -626,8 +630,8 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "הרשם"
 
@@ -646,7 +650,7 @@ msgid "Shortcut"
 msgstr "קיצור-דרך"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "הגדרות"
 
@@ -659,10 +663,23 @@ msgstr "מיני-מפה"
 msgid "MiniMap"
 msgstr "מיני-מפה"
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "הרשם"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 #, fuzzy
 msgid "@@trade|Trade With "
@@ -734,61 +751,61 @@ msgstr "@@drop|השלך@@"
 msgid "@@description|Description@@"
 msgstr "@@description|תיאור@@"
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr "אשר:"
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr "זכר"
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr "נקבה"
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "שם המשתמש חייב להכיל לפחות %d תוים."
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "שם המשתמש חייב להכיל פחות מ-%d תוים."
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "הסיסמה חייבת להכיל לפחות %d תוים."
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "הסיסמה חייבת להכיל פחות מ-%d תוים."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr "הסיסמאות אינן תואמות."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "שגיאה"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr "צליל"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr "עוצמת SFX"
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr "עוצמת מוזיקה"
 
@@ -826,232 +843,244 @@ msgstr "צבע שיער:"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
-msgid "Color:"
-msgstr "צבע שיער:"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "לחץ על הכפתור בכדי להתחיל בכיול"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "כייל"
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr "אפשר ג'ויסטיק"
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "עצור"
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "סובב את המקל"
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "מחק"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "שם:"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr "מסך מלא"
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr "‏OpenGL"
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr "סמן-עכבר מותאם"
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr "הגבלת FPS:"
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr "אטימות Gui"
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr "תווך גלילה"
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr "עצלנות גלילה"
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr "אופף FX"
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr "כבוי"
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr "נמוך"
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr "גבוה"
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 #, fuzzy
 msgid "fullscreen"
 msgstr "מסך מלא"
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr "מחליף למסך מלא"
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr "משנה OpenGL"
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr "אישור שינויים עבור OpenGL דורש איתחול."
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
 
+#: ../src/gui/skill.cpp:39
+#, fuzzy
+msgid "skills.xml"
+msgstr "כישורים"
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1130,16 +1159,16 @@ msgstr "הגנה %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1508,6 +1537,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1547,6 +1580,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1584,219 +1621,377 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "מתחבר..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "מתחבר..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "מתחבר..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "שם: %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "מתחבר..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+#, fuzzy
+msgid "Invite to party"
+msgstr "ציוד"
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "צור"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "צבע שיער:"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "תיאור: %s"
diff --git a/po/hr.po b/po/hr.po
index 3eba733c..d11e1daf 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-12-28 23:36+0000\n"
 "Last-Translator: Dino Paskvan <dpaskvan@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -27,7 +27,7 @@ msgstr "Kupi"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cijena: %d zlatnika / Ukupno: %d zlatnika"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "Izlaz"
 
@@ -54,8 +54,9 @@ msgstr ""
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Poništi"
@@ -114,7 +115,7 @@ msgstr "Slijedeći"
 msgid "New"
 msgstr "Novi"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "Obriši"
 
@@ -133,7 +134,7 @@ msgid "Create Character"
 msgstr "Stvori Lika"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "Ime:"
 
@@ -154,7 +155,8 @@ msgid "Select Server"
 msgstr ""
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -165,330 +167,332 @@ msgid "Chat"
 msgstr "Stvori"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr ""
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -605,11 +609,11 @@ msgstr "Odaberi količinu predmeta za ispuštanje."
 msgid "Login"
 msgstr "Korisničko ime"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "Lozinka"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr ""
 
@@ -621,8 +625,8 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Registriraj se"
 
@@ -641,7 +645,7 @@ msgid "Shortcut"
 msgstr "Kratica"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "Podešavanje"
 
@@ -654,10 +658,23 @@ msgstr "Karta"
 msgid "MiniMap"
 msgstr "Karta"
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Registriraj se"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr ""
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 msgid "@@trade|Trade With "
 msgstr ""
@@ -727,61 +744,61 @@ msgstr ""
 msgid "@@description|Description@@"
 msgstr ""
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr ""
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr "Muško"
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr "Žensko"
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "Greška"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr ""
 
@@ -819,229 +836,241 @@ msgstr "Boja kose:"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
-msgid "Color:"
-msgstr "Boja kose:"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "Obriši"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "Ime:"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "fullscreen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
+#: ../src/gui/skill.cpp:39
+#, fuzzy
+msgid "skills.xml"
+msgstr "Vještine"
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1116,16 +1145,16 @@ msgstr ""
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1493,6 +1522,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1532,6 +1565,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1569,219 +1606,377 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Da li ste sigurni da želite obrisati ovog lika?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Spajanje..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Spajanje..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Spajanje..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Ime: %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Spajanje..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+#, fuzzy
+msgid "Invite to party"
+msgstr "Zalihe"
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "Stvori"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "Boja kose:"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "Opis: %s"
diff --git a/po/id.po b/po/id.po
index 0ee3c5b4..9083ca14 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-03-26 09:11+0000\n"
 "Last-Translator: ActiveFile <activefile@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -27,7 +27,7 @@ msgstr "Beli"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Harga: %d GP / Jumlah: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "Keluar"
 
@@ -55,8 +55,9 @@ msgstr "Jual"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Batal"
@@ -114,7 +115,7 @@ msgstr "Berikutnya"
 msgid "New"
 msgstr "Buat baru"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "Hapus"
 
@@ -133,7 +134,7 @@ msgid "Create Character"
 msgstr "Buat Karakter"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "Nama:"
 
@@ -155,7 +156,8 @@ msgid "Select Server"
 msgstr "Pilih Karakter"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -166,331 +168,333 @@ msgid "Chat"
 msgstr "Buat"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Mengubah OpenGL"
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -609,11 +613,11 @@ msgstr "Pilih jumlah item yang mau di buang"
 msgid "Login"
 msgstr "Login"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "Kata Sandi:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr "Port:"
 
@@ -625,8 +629,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Pertahankan"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Mendaftar"
 
@@ -645,7 +649,7 @@ msgid "Shortcut"
 msgstr "Tombol Singkat"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "Atur"
 
@@ -658,10 +662,23 @@ msgstr "MiniMap"
 msgid "MiniMap"
 msgstr "MiniMap"
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Mendaftar"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 #, fuzzy
 msgid "@@trade|Trade With "
@@ -733,61 +750,61 @@ msgstr "@@drop|Buang@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Deskripsi@@"
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr "Konfirmasi:"
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Panjang username setidak-tidaknya %d karakter"
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Panjang kata-sandi setidak-tidaknya %d karakter"
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr "Kata sandi tidak sama."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "Kesalahan"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr "Suara"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr "Volume sfx"
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr "Volume Musik"
 
@@ -825,232 +842,244 @@ msgstr "Warna Rambut:"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
-msgid "Color:"
-msgstr "Warna Rambut:"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Tekan tombol untuk memulai kalibrasi"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "Kalibrasi"
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr "Membolehkan joistik"
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "Berhenti"
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "Memutar tongkat"
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "Hapus"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "Nama:"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr "Layar penuh"
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr "Batas FPS"
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr "Radius gulungan"
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr "mati"
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr "rendah"
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr "tinggi"
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 #, fuzzy
 msgid "fullscreen"
 msgstr "Layar penuh"
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr "Mengganti ke layar penuh"
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr "Mengubah OpenGL"
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
+#: ../src/gui/skill.cpp:39
+#, fuzzy
+msgid "skills.xml"
+msgstr "Keahlian"
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1129,16 +1158,16 @@ msgstr "Pertahanan %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1507,6 +1536,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1546,6 +1579,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1583,219 +1620,377 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Menyambung..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Menyambung..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Menyambung..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nama: %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Menyambung..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+#, fuzzy
+msgid "Invite to party"
+msgstr "Inventaris"
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "Buat"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "Warna Rambut:"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "Deskripsi: %s"
diff --git a/po/it.po b/po/it.po
index 1df6f016..55ccd26b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2007-12-03 01:45+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Italian\n"
@@ -29,7 +29,7 @@ msgstr "Compra"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Prezzo: %d GP / Totale: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "Esci"
 
@@ -57,8 +57,9 @@ msgstr "Vendi"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancella"
@@ -116,7 +117,7 @@ msgstr "Prossimo"
 msgid "New"
 msgstr "Nuovo"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "Elimina"
 
@@ -135,7 +136,7 @@ msgid "Create Character"
 msgstr "Crea Personaggio"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "Nome :"
 
@@ -157,7 +158,8 @@ msgid "Select Server"
 msgstr "Scelta Personaggio"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -168,331 +170,333 @@ msgid "Chat"
 msgstr "Create"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Modifica OpenGL"
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -611,11 +615,11 @@ msgstr "Seleziona la quantità di oggetti da lasciare."
 msgid "Login"
 msgstr "Autenticazione"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr "Porta:"
 
@@ -627,8 +631,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Mantieni"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Registra"
 
@@ -647,7 +651,7 @@ msgid "Shortcut"
 msgstr "Scorciatoia"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "Impostazioni"
 
@@ -660,10 +664,23 @@ msgstr "Mini mappa"
 msgid "MiniMap"
 msgstr "Mini mappa"
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Registra"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 #, fuzzy
 msgid "@@trade|Trade With "
@@ -735,61 +752,61 @@ msgstr "@@drop|Lascia@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Descrizione@@"
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr "Conferma:"
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Il nome utente deve contenere almeno %d caratteri."
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Il nome utente deve avere meno di %d caratteri."
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "La password deve essere lunga almeno %d caratteri."
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "La password deve contenere meno di %d caratteri."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "Errore"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr "Suono"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr "Volume effetti sonori"
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr "Volume musica"
 
@@ -827,232 +844,244 @@ msgstr "Colore Capelli"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
-msgid "Color:"
-msgstr "Colore Capelli"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Premi il pulsante per cominciare la calibrazione"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "Calibra"
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr "Abilita joystick"
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "Ferma"
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "Ruota la manopola"
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "Elimina"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "Nome :"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr "Schermo intero"
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr "Cursore personalizzato"
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr "Limita FPS:"
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr "Opacità IU"
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr "Raggio dello scroll"
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr "Lentezza dello scroll"
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr "Suoni ambientali"
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr "Spento"
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr "Basso"
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr "Alto"
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 #, fuzzy
 msgid "fullscreen"
 msgstr "Schermo intero"
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr "Modalità a schermo intero"
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr "Modifica OpenGL"
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
+#: ../src/gui/skill.cpp:39
+#, fuzzy
+msgid "skills.xml"
+msgstr "Abilità"
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1131,16 +1160,16 @@ msgstr "Difesa %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1509,6 +1538,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1548,6 +1581,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1585,219 +1622,377 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Sei sicuro di voler cancellare questo personaggio?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Connessione..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Connessione..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Connessione..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nome : %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Connessione..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+#, fuzzy
+msgid "Invite to party"
+msgstr "Inventario"
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "Create"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "Colore Capelli"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "Descrizione : %s"
diff --git a/po/ja.po b/po/ja.po
index 4e4ba8b8..789a1f34 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-06-28 16:27+0000\n"
 "Last-Translator: fate <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -27,7 +27,7 @@ msgstr "買う"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "価格: %d GP / 合計: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "終了"
 
@@ -54,8 +54,9 @@ msgstr ""
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "取消"
@@ -113,7 +114,7 @@ msgstr "次へ"
 msgid "New"
 msgstr "新規"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "削除"
 
@@ -132,7 +133,7 @@ msgid "Create Character"
 msgstr "キャラを作成"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "名前:"
 
@@ -154,7 +155,8 @@ msgid "Select Server"
 msgstr "キャラを選択"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -165,330 +167,332 @@ msgid "Chat"
 msgstr "作成"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "サーバ:"
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -607,11 +611,11 @@ msgstr ""
 msgid "Login"
 msgstr "ログイン"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr "ポート:"
 
@@ -623,8 +627,8 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr ""
 
@@ -643,7 +647,7 @@ msgid "Shortcut"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "セットアップ"
 
@@ -655,10 +659,22 @@ msgstr ""
 msgid "MiniMap"
 msgstr ""
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+msgid "Reset"
+msgstr ""
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr ""
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 msgid "@@trade|Trade With "
 msgstr ""
@@ -729,61 +745,61 @@ msgstr ""
 msgid "@@description|Description@@"
 msgstr ""
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr ""
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr "パスワードが一致していません。"
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "エラー"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr ""
 
@@ -821,229 +837,240 @@ msgstr "髪の色："
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
-msgid "Color:"
-msgstr "髪の色："
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "削除"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "名前:"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "fullscreen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
+#: ../src/gui/skill.cpp:39
+msgid "skills.xml"
+msgstr ""
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1118,16 +1145,16 @@ msgstr ""
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1495,6 +1522,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1534,6 +1565,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1571,219 +1606,376 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "このキャラは消してもいいですか?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "接続しています..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "接続しています..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "接続しています..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "名前: %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "接続しています..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+msgid "Invite to party"
+msgstr ""
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "作成"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "髪の色："
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "名状: %s"
diff --git a/po/nl.po b/po/nl.po
index 96247edc..421c0b96 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-10-10 00:04+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Dutch\n"
@@ -27,7 +27,7 @@ msgstr "Kopen"
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -55,8 +55,9 @@ msgstr ""
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Annuleren"
@@ -114,7 +115,7 @@ msgstr "Volgende"
 msgid "New"
 msgstr "Nieuw"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -133,7 +134,7 @@ msgid "Create Character"
 msgstr "Personage Aanmaken"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "Naam:"
 
@@ -155,7 +156,8 @@ msgid "Select Server"
 msgstr "Kies Personage"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -166,331 +168,333 @@ msgid "Chat"
 msgstr "Aanmaken"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Veranderen van OpenGL"
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -609,11 +613,11 @@ msgstr "Selecteer het aantal exemplaren om neer te leggen"
 msgid "Login"
 msgstr "Inloggen"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "Wachtword:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr "Poort:"
 
@@ -625,8 +629,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Behouden"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Aanmelden"
 
@@ -645,7 +649,7 @@ msgid "Shortcut"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "Configureren"
 
@@ -658,10 +662,23 @@ msgstr "Kaartje"
 msgid "MiniMap"
 msgstr "Kaartje"
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Aanmelden"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 #, fuzzy
 msgid "@@trade|Trade With "
@@ -733,61 +750,61 @@ msgstr "@@drop|Neerleggen@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Beschrijving@@"
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr "Bevestigen:"
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "De gebruikersnaam moet uit ten minste %d tekens bestaan."
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "De gebruikersnaam moet uit minder dan %d tekens bestaan."
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Het wachtwoord moet uit ten minste %d tekens bestaan."
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "Fout"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr "Geluid"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr "Volume van geluiden"
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr "Muziek volume"
 
@@ -825,232 +842,244 @@ msgstr "Haarkleur:"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
-msgid "Color:"
-msgstr "Haarkleur:"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Druk op de knop om het kalibreren te starten"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "Kalibreren"
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr "Joystick activeren"
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "Stoppen"
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "Maak rondjes met de stick"
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "Verwijderen"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "Naam:"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr "Volledig scherm"
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr "FPS limiet:"
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr "Dekking van de GUI"
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr "Scroll radius"
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr "Scroll vertraging"
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr "Omgevingseffecten"
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr "uit"
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr "laag"
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr "hoog"
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 #, fuzzy
 msgid "fullscreen"
 msgstr "Volledig scherm"
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr "Overgaan naar volledig scherm"
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr "Veranderen van OpenGL"
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
+#: ../src/gui/skill.cpp:39
+#, fuzzy
+msgid "skills.xml"
+msgstr "Vaardigheden"
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1125,16 +1154,16 @@ msgstr ""
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1503,6 +1532,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1542,6 +1575,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1579,219 +1616,377 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Verbinden..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Verbinden..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Verbinden..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Naam: %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Verbinden..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+#, fuzzy
+msgid "Invite to party"
+msgstr "Inventaris"
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "Aanmaken"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "Haarkleur:"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "Beschrijving: %s"
diff --git a/po/pl.po b/po/pl.po
index 9c409ecb..7b18329f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-10-10 05:26+0000\n"
 "Last-Translator: Michał Trzebiatowski <Unknown>\n"
 "Language-Team: <pl@li.org>\n"
@@ -29,7 +29,7 @@ msgstr "Kup"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cena: %d GP / Razem: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "Wyjdź"
 
@@ -57,8 +57,9 @@ msgstr "Sprzedaj"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Anuluj"
@@ -116,7 +117,7 @@ msgstr "Następny"
 msgid "New"
 msgstr "Nowa"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "Usuń"
 
@@ -135,7 +136,7 @@ msgid "Create Character"
 msgstr "Stwórz postać"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "Imię:"
 
@@ -157,7 +158,8 @@ msgid "Select Server"
 msgstr "Wybierz postać"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -168,331 +170,333 @@ msgid "Chat"
 msgstr "Stwórz"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Serwer:"
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Zmień ustawienia OpenGL"
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -611,11 +615,11 @@ msgstr "Wybierz ilość przedmiotów do upuszczenia."
 msgid "Login"
 msgstr "Użytkownik"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr "Port:"
 
@@ -627,8 +631,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Zachowaj"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Rejestruj"
 
@@ -647,7 +651,7 @@ msgid "Shortcut"
 msgstr "Skrót"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "Konfiguracja"
 
@@ -660,10 +664,23 @@ msgstr "MiniMapa"
 msgid "MiniMap"
 msgstr "MiniMapa"
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Rejestruj"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 #, fuzzy
 msgid "@@trade|Trade With "
@@ -735,61 +752,61 @@ msgstr "@@drop|Upuść@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Opis@@"
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr "Potwierdź:"
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr "Mężczyzna"
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr "Kobieta"
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Nazwa użytkownika musi być długa na conajmniej %d znaków."
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Nazwa użytkownika musi mieć mniej niż %d znaków."
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Hasło musi mieć conajmniej %d znaków."
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Hasło nie może mieć więcej jak %d znaków."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "Błąd"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr "Dźwięk"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr "Głośność efektów dźwiękowych"
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr "Głośność muzyki"
 
@@ -827,233 +844,245 @@ msgstr "Kolor włosów:"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
-msgid "Color:"
-msgstr "Kolor włosów:"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Wciśnij przycisk aby rozpocząć kalibrację"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "Kalibruj"
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr "Włącz joystick"
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "Obróć drążek"
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "Usuń"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "Imię:"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr "Pełen ekran"
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr "Własny kursor"
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr "Limit FPS:"
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr "Przezroczystość GUI"
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr "Skok przy przewijaniu ekranu"
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr "Opóźnienie przy przewijaniu ekranu"
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr "Dźwięki otoczenia"
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr "wyłączone"
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr "niskie"
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr "wysokie"
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 #, fuzzy
 msgid "fullscreen"
 msgstr "Pełen ekran"
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr "Przełączanie na pełen ekran"
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr "Zmień ustawienia OpenGL"
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Zastosowywanie zmian w konfiguracji OpenGL wymaga ponownego uruchomienia."
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
 
+#: ../src/gui/skill.cpp:39
+#, fuzzy
+msgid "skills.xml"
+msgstr "Zdolności"
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1132,16 +1161,16 @@ msgstr "Obrona %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1510,6 +1539,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1549,6 +1582,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1586,219 +1623,377 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Łączenie..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Łączenie..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Łączenie..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Imię: %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Łączenie..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+#, fuzzy
+msgid "Invite to party"
+msgstr "Inwentarz"
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "Stwórz"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "Kolor włosów:"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "Opis: %s"
diff --git a/po/pt.po b/po/pt.po
index fffa1efc..c8609174 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-02-03 10:14+0000\n"
 "Last-Translator: Tiago Silva <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -27,7 +27,7 @@ msgstr "Comprar"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preço: %d GP / Total: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "Sair"
 
@@ -55,8 +55,9 @@ msgstr "Vender"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancelar"
@@ -114,7 +115,7 @@ msgstr "Seguinte"
 msgid "New"
 msgstr "Novo"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -133,7 +134,7 @@ msgid "Create Character"
 msgstr "Criar Personagem"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "Nome:"
 
@@ -155,7 +156,8 @@ msgid "Select Server"
 msgstr "Seleccione um Personagem"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -166,331 +168,333 @@ msgid "Chat"
 msgstr "Criar"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Mudando OpenGL"
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -609,11 +613,11 @@ msgstr "Seleccionar a quantidade de itens a largar."
 msgid "Login"
 msgstr "Autenticar"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr "Porta:"
 
@@ -625,8 +629,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Manter"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Registo"
 
@@ -645,7 +649,7 @@ msgid "Shortcut"
 msgstr "Atalho"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "Configuração"
 
@@ -658,10 +662,23 @@ msgstr "MiniMapa"
 msgid "MiniMap"
 msgstr "MiniMapa"
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Registo"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 #, fuzzy
 msgid "@@trade|Trade With "
@@ -733,61 +750,61 @@ msgstr "@@drop|Largar@@"
 msgid "@@description|Description@@"
 msgstr "@@descrição|Descrição@@"
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "O nome de utilizador necessita de pelo menos %d caracteres."
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "O nome de utilizador só pode ter %d caracteres."
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "A password necessita de pelo menos %d caracteres."
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "A password só pode ter até %d caracteres."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr "As senhas não coincidem."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr "Som"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr "Volume dos Efeitos"
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr "Volume da Música"
 
@@ -825,232 +842,244 @@ msgstr "Cor de Cabelo:"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
-msgid "Color:"
-msgstr "Cor de Cabelo:"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Pressione o botão para começar a calibragem"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "Calibrar"
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr "Habilitar Joystick"
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "Parar"
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "Rode o manipulo"
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "Eliminar"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "Nome:"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr "Ecrã completo"
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr "Cursor personalizado"
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr "Limite de FPS:"
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr "Opacidade do Interface"
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr "Efeitos Ambientais"
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr "desligado"
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr "baixo"
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr "elevado"
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 #, fuzzy
 msgid "fullscreen"
 msgstr "Ecrã completo"
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr "Mudar para ecrã completo"
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr "É necessário reiniciar para as alterações terem efeito."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr "Mudando OpenGL"
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr "É necessário reiniciar para as alterações ao OpenGl terem efeito."
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "É necessário reiniciar para as alterações terem efeito."
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "É necessário reiniciar para as alterações terem efeito."
 
+#: ../src/gui/skill.cpp:39
+#, fuzzy
+msgid "skills.xml"
+msgstr "Competências"
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1137,16 +1166,16 @@ msgstr ""
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1515,6 +1544,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1554,6 +1587,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1591,219 +1628,377 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Tem a certeza que quer apagar este personagem"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nome: %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+#, fuzzy
+msgid "Invite to party"
+msgstr "Inventário"
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "Criar"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "Cor de Cabelo:"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "Descrição: %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c8550606..0326b3f6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-12-14 21:37+0000\n"
 "Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -27,7 +27,7 @@ msgstr "Comprar"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preço: %d GP / Total: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "Sair"
 
@@ -55,8 +55,9 @@ msgstr "Vender"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancelar"
@@ -114,7 +115,7 @@ msgstr "Próximo"
 msgid "New"
 msgstr "Novo"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "Excluir"
 
@@ -133,7 +134,7 @@ msgid "Create Character"
 msgstr "Criar Personagem"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "Nome:"
 
@@ -155,7 +156,8 @@ msgid "Select Server"
 msgstr "Selecionar personagem"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -166,331 +168,333 @@ msgid "Chat"
 msgstr "Criar"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Trocando OpenGL"
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -609,11 +613,11 @@ msgstr "Selecionar montante de itens para descartar."
 msgid "Login"
 msgstr "Login"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr "Porta:"
 
@@ -625,8 +629,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Manter"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Registrar"
 
@@ -645,7 +649,7 @@ msgid "Shortcut"
 msgstr "Atalho"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "Configurar"
 
@@ -658,10 +662,23 @@ msgstr "MiniMapa"
 msgid "MiniMap"
 msgstr "MiniMapa"
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Registrar"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 #, fuzzy
 msgid "@@trade|Trade With "
@@ -733,61 +750,61 @@ msgstr "@@descartar|Descartar@@"
 msgid "@@description|Description@@"
 msgstr "@@descrição|Descrição@@"
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr "Homem"
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr "Mulher"
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "O nome do usuário precisa ter pelo menos %d caracteres."
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "O nome do usuário tem que ser inferior a %d caracteres."
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "A senha deve ter pelo menos %d caracteres."
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "A senha deve ser menor que %d caracteres."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr "Som"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr "Volume Sfx"
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr "Volume da Música"
 
@@ -825,232 +842,244 @@ msgstr "Cor do Cabelo:"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
-msgid "Color:"
-msgstr "Cor do Cabelo:"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Aperto o botão para começar a calibração"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "Calibrar"
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr "Habilitar joystick"
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "Parar"
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "Excluir"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "Nome:"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr "Limite FPS:"
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr "Opacidade da GUI"
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr "desligado"
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr "baixo"
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr "alto"
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 #, fuzzy
 msgid "fullscreen"
 msgstr "Tela cheia"
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr "Mudando para Tela cheia"
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr "Trocando OpenGL"
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicando mudança a OpenGL requer reiniciar o jogo."
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
+#: ../src/gui/skill.cpp:39
+#, fuzzy
+msgid "skills.xml"
+msgstr "Habilidades"
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1129,16 +1158,16 @@ msgstr "Defesa %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1507,6 +1536,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1546,6 +1579,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1583,219 +1620,377 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Tem certeza de que deseja excluir este personagem?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nome: %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+#, fuzzy
+msgid "Invite to party"
+msgstr "Inventório"
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "Criar"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "Cor do Cabelo:"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "Descrição: %s"
diff --git a/po/ru.po b/po/ru.po
index f1dc2710..f33bb093 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-01-08 11:50+0000\n"
 "Last-Translator: idle sign <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -27,7 +27,7 @@ msgstr "Купить"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Стоимость: %d GP / Всегоl: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "Выход"
 
@@ -55,8 +55,9 @@ msgstr "Продать"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Отмена"
@@ -114,7 +115,7 @@ msgstr "Следующий"
 msgid "New"
 msgstr "Новый"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "Удалить"
 
@@ -133,7 +134,7 @@ msgid "Create Character"
 msgstr "Создать персонажа"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "Имя:"
 
@@ -155,7 +156,8 @@ msgid "Select Server"
 msgstr "Выбор персонажа"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -166,331 +168,333 @@ msgid "Chat"
 msgstr "Создать"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Сервер:"
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Переключение на OpenGL"
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -609,11 +613,11 @@ msgstr "Сколько предметов сбросить."
 msgid "Login"
 msgstr "Вход"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr "Порт:"
 
@@ -625,8 +629,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Оставить"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Зарегистрироваться"
 
@@ -645,7 +649,7 @@ msgid "Shortcut"
 msgstr "Клавиша"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "Настройка"
 
@@ -658,10 +662,23 @@ msgstr "МиниКарта"
 msgid "MiniMap"
 msgstr "МиниКарта"
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Зарегистрироваться"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 #, fuzzy
 msgid "@@trade|Trade With "
@@ -733,61 +750,61 @@ msgstr "@@drop|Сбросить@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Описание@@"
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr "Подтвердите:"
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Имя пользователя должно содержать не менее %d символов."
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Имя пользователя не должно содержать более %d символов."
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Пароль должен содержать не менее %d символов."
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Пароль не должен содержать более %d символов."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr "Звук"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr "Громкость эффектов"
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr "Громкость музыки"
 
@@ -825,232 +842,244 @@ msgstr "Цвет волос:"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
-msgid "Color:"
-msgstr "Цвет волос:"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Нажмите кнопку, чтобы начать калибровку"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "Калибровать"
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr "Использовать джойстик"
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "Стоп"
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "Вращайте рукоять"
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "Удалить"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "Имя:"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr "На полный экран"
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr "Выборочный курсор"
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr "Ограничение кадр/с:"
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr "Прозрачность интерфейса"
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr "Радиус прокрутки"
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr "Заторможенность прокрутки"
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr "Эффекты окружающей среды"
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr "выкл"
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr "низ."
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr "выс."
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 #, fuzzy
 msgid "fullscreen"
 msgstr "На полный экран"
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr "Переключение в полноэкранный режим"
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr "Переключение на OpenGL"
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr "Переход к OpenGL требует перезагрузки игры."
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
+#: ../src/gui/skill.cpp:39
+#, fuzzy
+msgid "skills.xml"
+msgstr "Умения"
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1129,16 +1158,16 @@ msgstr "Защита %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1507,6 +1536,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1546,6 +1579,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1583,219 +1620,377 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Вы уверены, что хотите удалить этого персонажа?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Соединение..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Соединение..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Соединение..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Имя: %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Соединение..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+#, fuzzy
+msgid "Invite to party"
+msgstr "Инвентарь"
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "Создать"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "Цвет волос:"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "Описание: %s"
diff --git a/po/sk.po b/po/sk.po
index 3c98e8d8..2cd774d2 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-12-30 14:07+0000\n"
 "Last-Translator: TomasKovacik <nail@nodomain.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -27,7 +27,7 @@ msgstr "Kúpiť"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cena: %d GP / Spolu: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "Ukončiť"
 
@@ -54,8 +54,9 @@ msgstr ""
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Zrušiť"
@@ -114,7 +115,7 @@ msgstr "Nasledujúci"
 msgid "New"
 msgstr "Nový"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "Vymazať"
 
@@ -133,7 +134,7 @@ msgid "Create Character"
 msgstr "Vytvoriť postavu"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "Meno"
 
@@ -154,7 +155,8 @@ msgid "Select Server"
 msgstr ""
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -165,330 +167,332 @@ msgid "Chat"
 msgstr "Vytvoriť"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr ""
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -605,11 +609,11 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr ""
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr ""
 
@@ -621,8 +625,8 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr ""
 
@@ -641,7 +645,7 @@ msgid "Shortcut"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr ""
 
@@ -653,10 +657,22 @@ msgstr ""
 msgid "MiniMap"
 msgstr ""
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+msgid "Reset"
+msgstr ""
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr ""
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 msgid "@@trade|Trade With "
 msgstr ""
@@ -725,61 +741,61 @@ msgstr ""
 msgid "@@description|Description@@"
 msgstr ""
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr ""
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr "Muž"
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr "Žena"
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr ""
 
@@ -817,229 +833,240 @@ msgstr "Farba vlasov:"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
-msgid "Color:"
-msgstr "Farba vlasov:"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "Vymazať"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "Meno"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "fullscreen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
+#: ../src/gui/skill.cpp:39
+msgid "skills.xml"
+msgstr ""
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1112,16 +1139,16 @@ msgstr ""
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1486,6 +1513,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1525,6 +1556,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1562,215 +1597,372 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 msgid "Trying to connect to account server..."
 msgstr ""
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 msgid "Trying to connect to char server..."
 msgstr ""
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 msgid "Trying to connect to map server..."
 msgstr ""
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, c-format
 msgid "Map: %s"
 msgstr ""
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 msgid "Connecting to map server..."
 msgstr ""
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+msgid "Invite to party"
+msgstr ""
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "Vytvoriť"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "Farba vlasov:"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "Popis: %s"
diff --git a/po/sv.po b/po/sv.po
index 85e7588d..1213a38c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-05-07 19:04+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -27,7 +27,7 @@ msgstr "Köp"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Pris: %d GP / Totalt: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -55,8 +55,9 @@ msgstr "Sälj"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Avbryt"
@@ -114,7 +115,7 @@ msgstr "Nästa"
 msgid "New"
 msgstr "Ny"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -133,7 +134,7 @@ msgid "Create Character"
 msgstr "Skapa karaktär"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "Namn:"
 
@@ -155,7 +156,8 @@ msgid "Select Server"
 msgstr "Välj karaktär"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -166,331 +168,333 @@ msgid "Chat"
 msgstr "Skapa"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Ändrar OpenGL"
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -609,11 +613,11 @@ msgstr "Välj antal föremål att släppa."
 msgid "Login"
 msgstr "Användarnamn"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr "Port:"
 
@@ -625,8 +629,8 @@ msgstr ""
 msgid "Keep"
 msgstr "Behåll"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Registrera"
 
@@ -645,7 +649,7 @@ msgid "Shortcut"
 msgstr "Genväg"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "Inställningar"
 
@@ -658,10 +662,23 @@ msgstr "Minikarta"
 msgid "MiniMap"
 msgstr "Minikarta"
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Registrera"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 #, fuzzy
 msgid "@@trade|Trade With "
@@ -733,61 +750,61 @@ msgstr "@@drop|Släpp@@"
 msgid "@@description|Description@@"
 msgstr "@@description|Beskrivning@@"
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr "Bekräfta:"
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Användarnamnet måste vara minst %d tecken långt."
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Användarnamnet måste vara kortare än %d tecken."
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Lösenordet måste vara minst %d tecken långt."
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Lösenordet måste vara kortare än %d tecken."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr "Lösenorden stämmer inte överens."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "Fel"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr "Ljud"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr "Volym för ljudeffekter"
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr "Musikvolym"
 
@@ -825,232 +842,244 @@ msgstr "Hårfärg:"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
-msgid "Color:"
-msgstr "Hårfärg:"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Klicka på knappen för att starta kalibreringen"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "Kalibrera"
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr "Aktivera joystick"
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "Rotera spaken"
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "Ta bort"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "Namn:"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr "Helskärm"
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr "Särskild muspekare"
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr "FPS-gräns:"
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr "Genomskinlighet"
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr "Rullningsradie"
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr "Tröghet för rullning"
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr "Omgivande FX"
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr "av"
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr "låg"
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr "hög"
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 #, fuzzy
 msgid "fullscreen"
 msgstr "Helskärm"
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr "Byte till helskärm"
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr "Ändrar OpenGL"
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ändringar i OpenGL kräver omstart."
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
 
+#: ../src/gui/skill.cpp:39
+#, fuzzy
+msgid "skills.xml"
+msgstr "Färdigheter"
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1129,16 +1158,16 @@ msgstr "Försvar %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1507,6 +1536,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1546,6 +1579,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1583,219 +1620,377 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Är du säker på att du vill ta bort den här karaktären?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Ansluter..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Ansluter..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Ansluter..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Namn: %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Ansluter..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+#, fuzzy
+msgid "Invite to party"
+msgstr "Inventarium"
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "Skapa"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "Hårfärg:"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "Beskrivning: %s"
diff --git a/po/th.po b/po/th.po
index cc7f58df..2df6c357 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-11-25 06:16+0000\n"
 "Last-Translator: Tharawut Paripaiboon <Unknown>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -27,7 +27,7 @@ msgstr "ซื้อ"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "ราคา: %d GP / ทั้งหมด: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "ออก"
 
@@ -54,8 +54,9 @@ msgstr ""
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "ยกเลิก"
@@ -114,7 +115,7 @@ msgstr "ถัดไป"
 msgid "New"
 msgstr "สร้างใหม่"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "ลบทิ้ง"
 
@@ -133,7 +134,7 @@ msgid "Create Character"
 msgstr "สร้างตัวละคร"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "ชื่อ:"
 
@@ -154,7 +155,8 @@ msgid "Select Server"
 msgstr ""
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -165,330 +167,332 @@ msgid "Chat"
 msgstr "สร้าง"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr ""
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -605,11 +609,11 @@ msgstr ""
 msgid "Login"
 msgstr "เข้าระบบ"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr ""
 
@@ -621,8 +625,8 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "สมัครสมาชิก"
 
@@ -641,7 +645,7 @@ msgid "Shortcut"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "ตั้งค่า"
 
@@ -653,10 +657,23 @@ msgstr ""
 msgid "MiniMap"
 msgstr ""
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "สมัครสมาชิก"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 msgid "@@trade|Trade With "
 msgstr ""
@@ -725,61 +742,61 @@ msgstr ""
 msgid "@@description|Description@@"
 msgstr ""
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr "ยืนยัน:"
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr "ชาย"
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr "หญิง"
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "ผิดพลาด"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr ""
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr ""
 
@@ -817,229 +834,240 @@ msgstr "สีผม:"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
-msgid "Color:"
-msgstr "สีผม:"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "ลบทิ้ง"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "ชื่อ:"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "fullscreen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
+#: ../src/gui/skill.cpp:39
+msgid "skills.xml"
+msgstr ""
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1114,16 +1142,16 @@ msgstr ""
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1491,6 +1519,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1530,6 +1562,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1567,219 +1603,376 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "ชื่อ: %s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+msgid "Invite to party"
+msgstr ""
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "สร้าง"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "สีผม:"
+
 #, fuzzy
 #~ msgid "Name: "
 #~ msgstr "ชื่อ:"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2cc1d038..feed8d0e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 15:17-0700\n"
+"POT-Creation-Date: 2009-01-19 13:00-0700\n"
 "PO-Revision-Date: 2008-09-17 14:41+0000\n"
 "Last-Translator: luojie-dune <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -27,7 +27,7 @@ msgstr "买"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "价格：%d GP/总数：%d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:638
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
 msgid "Quit"
 msgstr "退出"
 
@@ -55,8 +55,9 @@ msgstr "出售"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
+#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "取消"
@@ -114,7 +115,7 @@ msgstr "下一页"
 msgid "New"
 msgstr "新建"
 
-#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:219
+#: ../src/gui/char_select.cpp:96 ../src/gui/setup_players.cpp:222
 msgid "Delete"
 msgstr "删除"
 
@@ -133,7 +134,7 @@ msgid "Create Character"
 msgstr "创建角色"
 
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:64
+#: ../src/gui/register.cpp:80
 msgid "Name:"
 msgstr "名称"
 
@@ -155,7 +156,8 @@ msgid "Select Server"
 msgstr "选择较色"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npclistdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
 msgid "OK"
 msgstr ""
 
@@ -166,331 +168,333 @@ msgid "Chat"
 msgstr "建立"
 
 #. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:136
+#: ../src/gui/chat.cpp:138
 msgid "Welcome"
 msgstr ""
 
-#: ../src/gui/chat.cpp:147
+#: ../src/gui/chat.cpp:150
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
-msgid "Global announcement from "
+#: ../src/gui/chat.cpp:155
+#, c-format
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
+#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "服务器："
 
-#: ../src/gui/chat.cpp:291
-msgid "Trying to send a blank party message."
+#: ../src/gui/chat.cpp:321
+#, c-format
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:402
-msgid "Whispering to "
+#: ../src/gui/chat.cpp:340
+msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:411
+#: ../src/gui/chat.cpp:443
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:412
+#: ../src/gui/chat.cpp:444
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:417
+#: ../src/gui/chat.cpp:454
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:422
+#: ../src/gui/chat.cpp:462
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:426
+#: ../src/gui/chat.cpp:467
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:432
+#: ../src/gui/chat.cpp:474
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:470
+#: ../src/gui/chat.cpp:520
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:473
+#: ../src/gui/chat.cpp:523
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:503 ../src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:559
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:568
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:519
+#: ../src/gui/chat.cpp:580
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:522
+#: ../src/gui/chat.cpp:583
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:525
+#: ../src/gui/chat.cpp:586
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:589
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:592
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:534
+#: ../src/gui/chat.cpp:595
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:542
+#: ../src/gui/chat.cpp:604
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:607
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:548
+#: ../src/gui/chat.cpp:610
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:551
+#: ../src/gui/chat.cpp:613
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:616
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:557
+#: ../src/gui/chat.cpp:619
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:560
+#: ../src/gui/chat.cpp:622
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:625
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
+#: ../src/gui/chat.cpp:628
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:569
+#: ../src/gui/chat.cpp:631
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:572
+#: ../src/gui/chat.cpp:634
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:578
+#: ../src/gui/chat.cpp:643
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:581
+#: ../src/gui/chat.cpp:646
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:584
+#: ../src/gui/chat.cpp:649
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:724
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:657
+#: ../src/gui/chat.cpp:729
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:660
+#: ../src/gui/chat.cpp:735
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:663
+#: ../src/gui/chat.cpp:740
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "改变成OpenGL"
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:750
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:675
+#: ../src/gui/chat.cpp:753
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:754
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:755
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:679
+#: ../src/gui/chat.cpp:757
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:680
+#: ../src/gui/chat.cpp:758
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:682
+#: ../src/gui/chat.cpp:760
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:684
+#: ../src/gui/chat.cpp:762
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:763
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:764
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:766
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:767
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:694
+#: ../src/gui/chat.cpp:771
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:695
+#: ../src/gui/chat.cpp:772
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:696
+#: ../src/gui/chat.cpp:773
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:702
+#: ../src/gui/chat.cpp:778
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:703
+#: ../src/gui/chat.cpp:779
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:709
+#: ../src/gui/chat.cpp:784
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:710
+#: ../src/gui/chat.cpp:785
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:712
+#: ../src/gui/chat.cpp:787
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:713
+#: ../src/gui/chat.cpp:788
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:723
+#: ../src/gui/chat.cpp:796
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:797
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:734
+#: ../src/gui/chat.cpp:807
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:808
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
+"This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:737
+#: ../src/gui/chat.cpp:811
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:738
+#: ../src/gui/chat.cpp:814
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:739
+#: ../src/gui/chat.cpp:815
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:744
+#: ../src/gui/chat.cpp:819
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:745
+#: ../src/gui/chat.cpp:820
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:751
+#: ../src/gui/chat.cpp:825
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:752
+#: ../src/gui/chat.cpp:826
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:827
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:828
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:756
+#: ../src/gui/chat.cpp:830
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:835
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:836
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:841
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:768
+#: ../src/gui/chat.cpp:842
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -609,11 +613,11 @@ msgstr "请选择丢弃的物品数量"
 msgid "Login"
 msgstr "登陆"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
 msgstr "密码："
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
 msgstr "端口："
 
@@ -625,8 +629,8 @@ msgstr ""
 msgid "Keep"
 msgstr "保持"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
-#: ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "注册"
 
@@ -645,7 +649,7 @@ msgid "Shortcut"
 msgstr "快捷键"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:757
+#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
 msgstr "安装"
 
@@ -658,10 +662,23 @@ msgstr "小地图"
 msgid "MiniMap"
 msgstr "小地图"
 
+#: ../src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "注册"
+
 #: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
 msgid "NPC"
 msgstr "NPC"
 
+#: ../src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: ../src/gui/popupmenu.cpp:81
 #, fuzzy
 msgid "@@trade|Trade With "
@@ -733,61 +750,61 @@ msgstr "@@丢弃|丢弃@@"
 msgid "@@description|Description@@"
 msgstr "@@描述|描述@@"
 
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:82
 msgid "Confirm:"
 msgstr "确定"
 
-#: ../src/gui/register.cpp:74
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:75
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:183
+#: ../src/gui/register.cpp:159
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "用户名至少需要%d个字符"
 
-#: ../src/gui/register.cpp:200
+#: ../src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "用户名不能少于%d个字符"
 
-#: ../src/gui/register.cpp:208
+#: ../src/gui/register.cpp:184
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "密码需要至少%d个字符"
 
-#: ../src/gui/register.cpp:216
+#: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "密码不能少于%d个字符"
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:223
+#: ../src/gui/register.cpp:199
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#: ../src/gui/register.cpp:243 ../src/main.cpp:1025
+#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
 msgid "Error"
 msgstr "错误"
 
-#: ../src/gui/setup_audio.cpp:39
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr "声音"
 
-#: ../src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr "音效声量"
 
-#: ../src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr "音乐声量"
 
@@ -825,232 +842,244 @@ msgstr "头发颜色"
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
-msgid "Color:"
-msgstr "头发颜色"
+#: ../src/gui/setup_colours.cpp:53
+msgid "Red: "
+msgstr ""
 
-#: ../src/gui/setup_joystick.cpp:36 ../src/gui/setup_joystick.cpp:72
+#: ../src/gui/setup_colours.cpp:67
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:81
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "按下开始校准按钮"
 
-#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "校准"
 
-#: ../src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr "启用游戏杆"
 
-#: ../src/gui/setup_joystick.cpp:75
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "停止"
 
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr "旋转手柄"
 
-#: ../src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 #, fuzzy
 msgid "Default"
 msgstr "删除"
 
-#: ../src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: ../src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:52
+#: ../src/gui/setup_players.cpp:54
 #, fuzzy
 msgid "Name"
 msgstr "名称"
 
-#: ../src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:55
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:57
+#: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:60
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:197 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:213
+#: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:215
+#: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:217
+#: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:90
+#: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:92
+#: ../src/gui/setup_video.cpp:94
 msgid "All resolutions available"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:115
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr "全屏"
 
-#: ../src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: ../src/gui/setup_video.cpp:117
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr "通常的光标"
 
-#: ../src/gui/setup_video.cpp:118
+#: ../src/gui/setup_video.cpp:120
 msgid "Particle effects"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:119
+#: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:120
+#: ../src/gui/setup_video.cpp:122
 msgid "Show name"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:122
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr "FPS限制"
 
-#: ../src/gui/setup_video.cpp:142
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: ../src/gui/setup_video.cpp:210
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr "滚动半径"
 
-#: ../src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr "拉动极限"
 
-#: ../src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr "环境音效"
 
-#: ../src/gui/setup_video.cpp:233 ../src/gui/setup_video.cpp:492
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
 msgstr "离线"
 
-#: ../src/gui/setup_video.cpp:236 ../src/gui/setup_video.cpp:252
-#: ../src/gui/setup_video.cpp:495 ../src/gui/setup_video.cpp:509
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
 msgid "low"
 msgstr "低"
 
-#: ../src/gui/setup_video.cpp:239 ../src/gui/setup_video.cpp:258
-#: ../src/gui/setup_video.cpp:498 ../src/gui/setup_video.cpp:515
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
 msgid "high"
 msgstr "高"
 
-#: ../src/gui/setup_video.cpp:245
-msgid "Particle Detail"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255 ../src/gui/setup_video.cpp:512
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:261 ../src/gui/setup_video.cpp:518
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:321
+#: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 msgid "windowed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:322
+#: ../src/gui/setup_video.cpp:304
 #, fuzzy
 msgid "fullscreen"
 msgstr "全屏"
 
-#: ../src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:305
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:330
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr "切换到全屏"
 
-#: ../src/gui/setup_video.cpp:331
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr "只有改变生效后才能重启"
 
 #. OpenGL can currently only be changed by restarting, notify user.
-#: ../src/gui/setup_video.cpp:343
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr "改变成OpenGL"
 
-#: ../src/gui/setup_video.cpp:344
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
-#: ../src/gui/setup_video.cpp:421 ../src/main.cpp:395
+#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
 msgid "Couldn't set "
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:422 ../src/main.cpp:396
+#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
 msgid " video mode: "
 msgstr ""
 
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:433
+#: ../src/gui/setup_video.cpp:415
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:416
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "只有改变生效后才能重启"
 
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:435
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "只有改变生效后才能重启"
 
+#: ../src/gui/skill.cpp:39
+#, fuzzy
+msgid "skills.xml"
+msgstr "技能"
+
 #: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
@@ -1129,16 +1158,16 @@ msgstr "防护 %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "% Accuracy:"
+msgid "\\% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "% Evade:"
+msgid "\\% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "% Reflex:"
+msgid "\\% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1507,6 +1536,10 @@ msgstr ""
 msgid "Unknown item"
 msgstr ""
 
+#: ../src/resources/itemdb.cpp:60
+msgid "items.xml"
+msgstr ""
+
 #: ../src/resources/itemdb.cpp:65
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
@@ -1546,6 +1579,10 @@ msgstr ""
 msgid "Initializing monster database..."
 msgstr ""
 
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
 #: ../src/resources/monsterdb.cpp:53
 msgid "Monster Database: Error while loading monster.xml!"
 msgstr ""
@@ -1583,219 +1620,377 @@ msgstr ""
 msgid "NPCDB: Warning, unknown NPC ID %d requested"
 msgstr ""
 
-#: ../src/game.cpp:386
+#: ../src/game.cpp:394
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: ../src/game.cpp:391
+#: ../src/game.cpp:399
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: ../src/game.cpp:392
+#: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
 msgstr ""
 
-#: ../src/game.cpp:467
+#: ../src/game.cpp:475
 msgid "Network Error"
 msgstr ""
 
-#: ../src/game.cpp:468
+#: ../src/game.cpp:476
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:531
+#: ../src/game.cpp:539
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:536
+#: ../src/game.cpp:544
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:638
+#: ../src/game.cpp:656
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "你确定想删除这个较色"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:662
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:785
+#: ../src/game.cpp:804
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/main.cpp:207
+#: ../src/main.cpp:213
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:208
+#: ../src/main.cpp:214
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:212
+#: ../src/main.cpp:220
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:222
+#: ../src/main.cpp:245
 #, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:224
+#: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:252
+#: ../src/main.cpp:251
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:282
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:261
+#: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:263
+#: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:267
+#: ../src/main.cpp:297
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:269
+#: ../src/main.cpp:299
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:312
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:302
+#: ../src/main.cpp:332
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:312
+#: ../src/main.cpp:342
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:426
+#: ../src/main.cpp:456
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:468
+#: ../src/main.cpp:498
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:469
+#: ../src/main.cpp:499
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:470
+#: ../src/main.cpp:500
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:471
+#: ../src/main.cpp:501
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:472
+#: ../src/main.cpp:502
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:473
+#: ../src/main.cpp:503
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:474
+#: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:475
+#: ../src/main.cpp:505
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:476
+#: ../src/main.cpp:506
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:477
+#: ../src/main.cpp:507
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:478
+#: ../src/main.cpp:508
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:479
+#: ../src/main.cpp:509
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:485 ../src/main.cpp:488
+#: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:489
+#: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:585
+#: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "连接中..."
 
-#: ../src/main.cpp:586
+#: ../src/main.cpp:616
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:640
+#: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "连接中..."
 
-#: ../src/main.cpp:662
+#: ../src/main.cpp:692
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:668
+#: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "连接中..."
 
-#: ../src/main.cpp:669
+#: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "名字：%s"
 
-#: ../src/main.cpp:799
+#: ../src/main.cpp:829
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:832
+#: ../src/main.cpp:862
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1037
+#: ../src/main.cpp:1067
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "连接中..."
 
-#: ../src/main.cpp:1045
+#: ../src/main.cpp:1075
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1053
+#: ../src/main.cpp:1083
 msgid "Connecting to account server..."
 msgstr ""
 
+#: ../src/party.cpp:54
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:63
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:70
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:83
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:91
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:96
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:105
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:109
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:113
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:125
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:129
+#, fuzzy
+msgid "Invite to party"
+msgstr "清单"
+
+#: ../src/party.cpp:130
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:148
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:159
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:179
+#, fuzzy
+msgid "   /create"
+msgstr "建立"
+
+#: ../src/party.cpp:180
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:182
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:184
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:190
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:191
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:192
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:199
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:203
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:204
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:212
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:213
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:217
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:218
+msgid "Type /help party for a list of options."
+msgstr ""
+
+#: ../src/party.cpp:169
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Color:"
+#~ msgstr "头发颜色"
+
 #, fuzzy
 #~ msgid "Description:"
 #~ msgstr "描述：%s"
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 19cd921a..e140c42b 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -131,9 +131,9 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     mStatsDefenseLabel= new gcn::Label(_("Defense:"));
     mStatsMagicAttackLabel = new gcn::Label(_("M.Attack:"));
     mStatsMagicDefenseLabel = new gcn::Label(_("M.Defense:"));
-    mStatsAccuracyLabel = new gcn::Label(_("% Accuracy:"));
-    mStatsEvadeLabel = new gcn::Label(_("% Evade:"));
-    mStatsReflexLabel = new gcn::Label(_("% Reflex:"));
+    mStatsAccuracyLabel = new gcn::Label(_("\% Accuracy:"));
+    mStatsEvadeLabel = new gcn::Label(_("\% Evade:"));
+    mStatsReflexLabel = new gcn::Label(_("\% Reflex:"));
 
     mStatsAttackPoints = new gcn::Label;
     mStatsDefensePoints = new gcn::Label;
diff --git a/src/party.cpp b/src/party.cpp
index 3df2eedc..ecb0ab2d 100644
--- a/src/party.cpp
+++ b/src/party.cpp
@@ -30,6 +30,9 @@
 #include "net/messageout.h"
 #include "net/protocol.h"
 
+#include "utils/gettext.h"
+#include "utils/strprintf.h"
+
 Party::Party(ChatWindow *chat, Network *network) :
              mChat(chat), mNetwork(network), mInviteListener(network, &mInParty)
 {
@@ -49,7 +52,7 @@ void Party::respond(const std::string &command, const std::string &args)
     }
     if (command == "settings")
     {
-	mChat->chatLog("Not yet implemented!", BY_SERVER);
+	mChat->chatLog(_("Not yet implemented!"), BY_SERVER);
 	return;
 	/*
 	  MessageOut outMsg(mNetwork);
@@ -58,14 +61,14 @@ void Party::respond(const std::string &command, const std::string &args)
 	  outMsg.writeInt16(0); // Item
 	 */
     }
-    mChat->chatLog("Party command not known.", BY_SERVER);
+    mChat->chatLog(_("Party command not known."), BY_SERVER);
 }
 
 void Party::create(const std::string &party)
 {
     if (party == "")
     {
-	mChat->chatLog("Party name is missing.", BY_SERVER);
+	mChat->chatLog(_("Party name is missing."), BY_SERVER);
 	return;
     }
     MessageOut outMsg(mNetwork);
@@ -78,7 +81,7 @@ void Party::leave(const std::string &args)
 {
     MessageOut outMsg(mNetwork);
     outMsg.writeInt16(CMSG_PARTY_LEAVE);
-    mChat->chatLog("Left party.", BY_SERVER);
+    mChat->chatLog(_("Left party."), BY_SERVER);
     mInParty = false;
 }
 
@@ -86,12 +89,12 @@ void Party::createResponse(bool ok)
 {
     if (ok)
     {
-	mChat->chatLog("Party successfully created.", BY_SERVER);
+	mChat->chatLog(_("Party successfully created."), BY_SERVER);
 	mInParty = true;
     }
     else
     {
-	mChat->chatLog("Could not create party.", BY_SERVER);
+	mChat->chatLog(_("Could not create party."), BY_SERVER);
     }
 }
 
@@ -100,15 +103,16 @@ void Party::inviteResponse(const std::string &nick, int status)
     switch (status)
     {
         case 0:
-  	    mChat->chatLog(nick + " is already a member of a party.",
-			   BY_SERVER);
+  	    mChat->chatLog(strprintf(_("%s is already a member of a party."),
+                           nick.c_str()), BY_SERVER);
 	    break;
         case 1:
-  	    mChat->chatLog(nick + " refused your invitation.", BY_SERVER);
+  	    mChat->chatLog(strprintf(_("%s refused your invitation."),
+                           nick.c_str()), BY_SERVER);
 	    break;
         case 2:
- 	    mChat->chatLog(nick + " is now a member of your party.",
-			   BY_SERVER);
+ 	    mChat->chatLog(strprintf(_("%s is now a member of your party."),
+                           nick.c_str()), BY_SERVER);
 	    break;
     }
 }
@@ -119,15 +123,14 @@ void Party::invitedAsk(const std::string &nick, int gender,
     mPartyName = partyName; /* Quick and nasty - needs redoing */
     if (nick == "")
     {
-        mChat->chatLog("Something\'s wrong!", BY_SERVER);
+        mChat->chatLog(_("You can\'t have a blank party name!"), BY_SERVER);
 	return;
     }
     mCreating = false;
-    ConfirmDialog *dlg = new ConfirmDialog("Invite to party",
-					   nick + " invites you to join " +
-					   (gender == 0 ? "his" : "her") +
-					   " party, " + partyName +
-					   ", do you accept?");
+    ConfirmDialog *dlg = new ConfirmDialog(_("Invite to party"),
+					     strprintf(_("%s invites you to join"
+                                             " the %s party, do you accept?"), 
+                                             nick.c_str(), partyName.c_str()));
     dlg->addActionListener(&mInviteListener);
 }
 
@@ -143,7 +146,8 @@ void Party::InviteListener::action(const gcn::ActionEvent &event)
 
 void Party::leftResponse(const std::string &nick)
 {
-    mChat->chatLog(nick + " has left your party.", BY_SERVER);
+    mChat->chatLog(strprintf(_("%s has left your party."), nick.c_str()), 
+                               BY_SERVER);
 }
 
 void Party::receiveChat(Being *being, const std::string &msg)
@@ -154,7 +158,8 @@ void Party::receiveChat(Being *being, const std::string &msg)
     }
     if (being->getType() != Being::PLAYER)
     {
-	mChat->chatLog("Something\'s wrong!", BY_SERVER);
+	mChat->chatLog(_("Party chat received, but being is not a player"), 
+                       BY_SERVER);
 	return;
     }
     being->setSpeech(msg, SPEECH_TIME);
@@ -163,54 +168,54 @@ void Party::receiveChat(Being *being, const std::string &msg)
 
 void Party::help()
 {
-    mChat->chatLog("/party <command> <params>: Party commands.", BY_SERVER);
+    mChat->chatLog(_("/party <command> <params>: Party commands."), BY_SERVER);
 }
 
 void Party::help(const std::string &msg)
 {
     if (msg == "")
     {
-	mChat->chatLog("Command: /party <command> <args>", BY_SERVER);
-	mChat->chatLog("where <command> can be one of:", BY_SERVER);
-	mChat->chatLog("   /new", BY_SERVER);
-	mChat->chatLog("   /create", BY_SERVER);
-	mChat->chatLog("   /prefix", BY_SERVER);
-	mChat->chatLog("   /leave", BY_SERVER);
-	mChat->chatLog("This command implements the partying function.",
+	mChat->chatLog(_("Command: /party <command> <args>"), BY_SERVER);
+	mChat->chatLog(_("where <command> can be one of:"), BY_SERVER);
+	mChat->chatLog(_("   /new"), BY_SERVER);
+	mChat->chatLog(_("   /create"), BY_SERVER);
+	mChat->chatLog(_("   /prefix"), BY_SERVER);
+	mChat->chatLog(_("   /leave"), BY_SERVER);
+	mChat->chatLog(_("This command implements the partying function."),
 		       BY_SERVER);
-	mChat->chatLog("Type /help party <command> for further help.",
+	mChat->chatLog(_("Type /help party <command> for further help."),
 		       BY_SERVER);
 	return;
     }
     if (msg == "new" || msg == "create")
     {
-	mChat->chatLog("Command: /party new <party-name>", BY_SERVER);
-	mChat->chatLog("Command: /party create <party-name>", BY_SERVER);
-	mChat->chatLog("These commands create a new party <party-name.",
+	mChat->chatLog(_("Command: /party new <party-name>"), BY_SERVER);
+	mChat->chatLog(_("Command: /party create <party-name>"), BY_SERVER);
+	mChat->chatLog(_("These commands create a new party <party-name."),
 		       BY_SERVER);
 	return;
     }
     if (msg == "prefix")
     {
-	mChat->chatLog("Command: /party prefix <prefix-char>", BY_SERVER);
-	mChat->chatLog("This command sets the party prefix character.",
+	mChat->chatLog(_("Command: /party prefix <prefix-char>"), BY_SERVER);
+	mChat->chatLog(_("This command sets the party prefix character."),
 		       BY_SERVER);
-	mChat->chatLog("Any message preceded by <prefix-char> is sent to "
-		       "the party instead of everyone.", BY_SERVER);
-	mChat->chatLog("Command: /party prefix", BY_SERVER);
-	mChat->chatLog("This command reports the current party prefix "
-		       "character.", BY_SERVER);
+	mChat->chatLog(_("Any message preceded by <prefix-char> is sent to "
+		       "the party instead of everyone."), BY_SERVER);
+	mChat->chatLog(_("Command: /party prefix"), BY_SERVER);
+	mChat->chatLog(_("This command reports the current party prefix "
+		       "character."), BY_SERVER);
 	return;
     }
     //if (msg == "settings")
     //if (msg == "info")
     if (msg == "leave")
     {
-	mChat->chatLog("Command: /party leave", BY_SERVER);
-	mChat->chatLog("This command causes the player to leave the party.",
+	mChat->chatLog(_("Command: /party leave"), BY_SERVER);
+	mChat->chatLog(_("This command causes the player to leave the party."),
 		       BY_SERVER);
 	return;
     }
-    mChat->chatLog("Unknown /party command.", BY_SERVER);
-    mChat->chatLog("Type /help party for a list of options.", BY_SERVER);
+    mChat->chatLog(_("Unknown /party command."), BY_SERVER);
+    mChat->chatLog(_("Type /help party for a list of options."), BY_SERVER);
 }
-- 
cgit v1.2.3-70-g09d2


From e4ea98d7256526ec57eba1fdeebfd5828550301f Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 19 Jan 2009 13:35:14 -0700
Subject: Removed tabs from game.cpp.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/game.cpp | 890 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 445 insertions(+), 445 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 752406b9..51a5d7d9 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -484,469 +484,469 @@ void Game::logic()
 void Game::handleInput()
 {
     if (joystick)
-	joystick->update();
+        joystick->update();
 
     // Events
     SDL_Event event;
     while (SDL_PollEvent(&event))
     {
-	bool used = false;
-
-	// Keyboard events (for discontinuous keys)
-	if (event.type == SDL_KEYDOWN)
-	{
-	    gcn::Window *requestedWindow = NULL;
-
-	    if (setupWindow->isVisible() && 
-		    keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE)
-	    {
-		keyboard.setNewKey((int) event.key.keysym.sym);
-		keyboard.callbackNewKey();
-		keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
-		return;
-	    }
-	    // Keys pressed together with Alt/Meta
-	    // Emotions and some internal gui windows
+        bool used = false;
+
+        // Keyboard events (for discontinuous keys)
+        if (event.type == SDL_KEYDOWN)
+        {
+            gcn::Window *requestedWindow = NULL;
+
+            if (setupWindow->isVisible() && 
+                    keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE)
+            {
+                keyboard.setNewKey((int) event.key.keysym.sym);
+                keyboard.callbackNewKey();
+                keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
+                return;
+            }
+            // Keys pressed together with Alt/Meta
+            // Emotions and some internal gui windows
 #ifndef __APPLE__
-	    if (event.key.keysym.mod & KMOD_LALT)
+            if (event.key.keysym.mod & KMOD_LALT)
 #else
-		if (event.key.keysym.mod & KMOD_LMETA)
+                if (event.key.keysym.mod & KMOD_LMETA)
 #endif
-		{
-		    switch (event.key.keysym.sym)
-		    {
-			case SDLK_p:
-			    // Screenshot (picture, hence the p)
-			    saveScreenshot();
-			    used = true;
-			    break;
-
-			default:
-			    break;
-
-			case SDLK_f:
-			    // Find path to mouse (debug purpose)
-			    viewport->toggleDebugPath();
-			    used = true;
-			    break;
-
-			case SDLK_t:
-			    // Toggle accepting of incoming trade requests
-			    {
-				unsigned int deflt = player_relations.getDefault();
-				if (deflt & PlayerRelation::TRADE) {
-				    chatWindow->chatLog(
-					    _("Ignoring incoming trade requests"),
-					    BY_SERVER);
-				    deflt &= ~PlayerRelation::TRADE;
-				} else {
-				    chatWindow->chatLog(
-					    _("Accepting incoming trade requests"),
-					    BY_SERVER);
-				    deflt |= PlayerRelation::TRADE;
-				}
-
-				player_relations.setDefault(deflt);
-			    }
-			    used = true;
-			    break;
-		    }
-		}
-
-	    // Mode switch to emotes
-	    if (keyboard.isKeyActive(keyboard.KEY_EMOTE))
-	    {
-		// Emotions
-		int emotion = keyboard.getKeyEmoteOffset(event.key.keysym.sym);
-		if (emotion)
-		{
-		    emoteShortcut->useEmote(emotion);
-		    used = true;
+                {
+                    switch (event.key.keysym.sym)
+                    {
+                        case SDLK_p:
+                            // Screenshot (picture, hence the p)
+                            saveScreenshot();
+                            used = true;
+                            break;
+
+                        default:
+                            break;
+
+                        case SDLK_f:
+                            // Find path to mouse (debug purpose)
+                            viewport->toggleDebugPath();
+                            used = true;
+                            break;
+
+                        case SDLK_t:
+                            // Toggle accepting of incoming trade requests
+                            {
+                                unsigned int deflt = player_relations.getDefault();
+                                if (deflt & PlayerRelation::TRADE) {
+                                    chatWindow->chatLog(
+                                            _("Ignoring incoming trade requests"),
+                                            BY_SERVER);
+                                    deflt &= ~PlayerRelation::TRADE;
+                                } else {
+                                    chatWindow->chatLog(
+                                            _("Accepting incoming trade requests"),
+                                            BY_SERVER);
+                                    deflt |= PlayerRelation::TRADE;
+                                }
+
+                                player_relations.setDefault(deflt);
+                            }
+                            used = true;
+                            break;
+                    }
+                }
+
+            // Mode switch to emotes
+            if (keyboard.isKeyActive(keyboard.KEY_EMOTE))
+            {
+                // Emotions
+                int emotion = keyboard.getKeyEmoteOffset(event.key.keysym.sym);
+                if (emotion)
+                {
+                    emoteShortcut->useEmote(emotion);
+                    used = true;
                     return;
-		}
-	    }
-	    switch (event.key.keysym.sym)
-	    {
-		case SDLK_PAGEUP:
-		    if (chatWindow->isVisible())
-		    {
-			chatWindow->scroll(-DEFAULT_CHAT_WINDOW_SCROLL);
-			used = true;
-		    }
-		    break;
-
-		case SDLK_PAGEDOWN:
-		    if (chatWindow->isVisible())
-		    {
-			chatWindow->scroll(DEFAULT_CHAT_WINDOW_SCROLL);
-			used = true;
-			return;
-		    }
-		    break;
-
-		case SDLK_F1:
-		    // In-game Help
-		    if (helpWindow->isVisible())
-		    {
-			helpWindow->setVisible(false);
-		    }
-		    else
-		    {
-			helpWindow->loadHelp("index");
-			helpWindow->requestMoveToTop();
-		    }
-		    used = true;
-		    break;
-
-		case SDLK_RETURN:
-		    // Input chat window
-		    if (chatWindow->isInputFocused() ||
-			    deathNotice != NULL ||
-			    weightNotice != NULL)
-		    {
-			break;
-		    }
-
-		    // Quit by pressing Enter if the exit confirm is there
-		    if (exitConfirm)
-		    {
-			done = true;
-		    }
-		    // Close the Browser if opened
-		    else if (helpWindow->isVisible())
-		    {
-			helpWindow->setVisible(false);
-		    }
-		    // Close the config window, cancelling changes if opened
-		    else if (setupWindow->isVisible())
-		    {
-			setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
-		    }
-		    // Submits the text and proceeds to the next dialog
-		    else if (npcStringDialog->isVisible())
-		    {
-			npcStringDialog->action(gcn::ActionEvent(NULL, "ok"));
-		    }
-		    // Proceed to the next dialog option, or close the window
-		    else if (npcTextDialog->isVisible())
-		    {
-			npcTextDialog->action(gcn::ActionEvent(NULL, "ok"));
-		    }
-		    // Choose the currently highlighted dialogue option
-		    else if (npcListDialog->isVisible())
-		    {
-			npcListDialog->action(gcn::ActionEvent(NULL, "ok"));
-		    }
-		    // Submits the text and proceeds to the next dialog
-		    else if (npcIntegerDialog->isVisible())
-		    {
-			npcIntegerDialog->action(gcn::ActionEvent(NULL, "ok"));
-		    }
-		    // Else, open the chat edit box
-		    else
-		    {
-			chatWindow->requestChatFocus();
-			used = true;
-		    }
-		    break;
-		    // Quitting confirmation dialog
-		case SDLK_ESCAPE:
-		    if (!exitConfirm) {
-			exitConfirm = new ConfirmDialog(
-				_("Quit"), _("Are you sure you want to quit?"));
-			exitConfirm->addActionListener(&exitListener);
-			exitConfirm->requestMoveToTop();
-		    }
-		    else
-		    {
-			exitConfirm->action(gcn::ActionEvent(NULL, _("no")));
-		    }
-		    break;
-
-		default:
-		    break;
-	    }
+                }
+            }
+            switch (event.key.keysym.sym)
+            {
+                case SDLK_PAGEUP:
+                    if (chatWindow->isVisible())
+                    {
+                        chatWindow->scroll(-DEFAULT_CHAT_WINDOW_SCROLL);
+                        used = true;
+                    }
+                    break;
+
+                case SDLK_PAGEDOWN:
+                    if (chatWindow->isVisible())
+                    {
+                        chatWindow->scroll(DEFAULT_CHAT_WINDOW_SCROLL);
+                        used = true;
+                        return;
+                    }
+                    break;
+
+                case SDLK_F1:
+                    // In-game Help
+                    if (helpWindow->isVisible())
+                    {
+                        helpWindow->setVisible(false);
+                    }
+                    else
+                    {
+                        helpWindow->loadHelp("index");
+                        helpWindow->requestMoveToTop();
+                    }
+                    used = true;
+                    break;
+
+                case SDLK_RETURN:
+                    // Input chat window
+                    if (chatWindow->isInputFocused() ||
+                            deathNotice != NULL ||
+                            weightNotice != NULL)
+                    {
+                        break;
+                    }
+
+                    // Quit by pressing Enter if the exit confirm is there
+                    if (exitConfirm)
+                    {
+                        done = true;
+                    }
+                    // Close the Browser if opened
+                    else if (helpWindow->isVisible())
+                    {
+                        helpWindow->setVisible(false);
+                    }
+                    // Close the config window, cancelling changes if opened
+                    else if (setupWindow->isVisible())
+                    {
+                        setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
+                    }
+                    // Submits the text and proceeds to the next dialog
+                    else if (npcStringDialog->isVisible())
+                    {
+                        npcStringDialog->action(gcn::ActionEvent(NULL, "ok"));
+                    }
+                    // Proceed to the next dialog option, or close the window
+                    else if (npcTextDialog->isVisible())
+                    {
+                        npcTextDialog->action(gcn::ActionEvent(NULL, "ok"));
+                    }
+                    // Choose the currently highlighted dialogue option
+                    else if (npcListDialog->isVisible())
+                    {
+                        npcListDialog->action(gcn::ActionEvent(NULL, "ok"));
+                    }
+                    // Submits the text and proceeds to the next dialog
+                    else if (npcIntegerDialog->isVisible())
+                    {
+                        npcIntegerDialog->action(gcn::ActionEvent(NULL, "ok"));
+                    }
+                    // Else, open the chat edit box
+                    else
+                    {
+                        chatWindow->requestChatFocus();
+                        used = true;
+                    }
+                    break;
+                    // Quitting confirmation dialog
+                case SDLK_ESCAPE:
+                    if (!exitConfirm) {
+                        exitConfirm = new ConfirmDialog(
+                                _("Quit"), _("Are you sure you want to quit?"));
+                        exitConfirm->addActionListener(&exitListener);
+                        exitConfirm->requestMoveToTop();
+                    }
+                    else
+                    {
+                        exitConfirm->action(gcn::ActionEvent(NULL, _("no")));
+                    }
+                    break;
+
+                default:
+                    break;
+            }
             if (keyboard.isEnabled() && !chatWindow->isInputFocused()
                 && !npcStringDialog->isInputFocused())
-	    {
-		const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
-		// Do not activate shortcuts if tradewindow is visible
-		if (!tradeWindow->isVisible())
-		{
-		    // Checks if any item shortcut is pressed.
-		    for (int i = KeyboardConfig::KEY_SHORTCUT_1;
-			    i <= KeyboardConfig::KEY_SHORTCUT_12;
-			    i++)
-		    {
-			if (tKey == i && !used) {
-			    itemShortcut->useItem(
-				    i - KeyboardConfig::KEY_SHORTCUT_1);
-			    break;
-			}
-		    }
-		}
-		switch (tKey) {
-		    case KeyboardConfig::KEY_PICKUP:
-			{
-			    FloorItem *item =
-				floorItemManager->findByCoordinates(
-					player_node->mX, player_node->mY);
-
-			    // If none below the player, try the tile in front
-			    // of the player
-			    if (!item) {
-				Uint16 x = player_node->mX;
-				Uint16 y = player_node->mY;
-				if (player_node->getDirection() & Being::UP)
-				    y--;
-				if (player_node->getDirection() & Being::DOWN)
-				    y++;
-				if (player_node->getDirection() & Being::LEFT)
-				    x--;
-				if (player_node->getDirection() & Being::RIGHT)
-				    x++;
-
-				item = floorItemManager->findByCoordinates(
-					x, y);
-			    }
-
-			    if (item)
-				player_node->pickUp(item);
-
-			    used = true;
-			}
-			break;
-		    case KeyboardConfig::KEY_SIT:
-			// Player sit action
-			player_node->toggleSit();
-			used = true;
-			break;
-		    case KeyboardConfig::KEY_HIDE_WINDOWS:
-			// Hide certain windows
-			if (!chatWindow->isInputFocused())
-			{
-			    statusWindow->setVisible(false);
-			    inventoryWindow->setVisible(false);
-			    emoteWindow->setVisible(false);
-			    skillDialog->setVisible(false);
-			    setupWindow->setVisible(false);
-			    equipmentWindow->setVisible(false);
-			    helpWindow->setVisible(false);
-			    debugWindow->setVisible(false);
-			}
-			break;
-
-		    case KeyboardConfig::KEY_WINDOW_STATUS:
-			requestedWindow = statusWindow;
-			break;
-		    case KeyboardConfig::KEY_WINDOW_INVENTORY:
-			requestedWindow = inventoryWindow;
-			break;
-		    case KeyboardConfig::KEY_WINDOW_EQUIPMENT:
-			requestedWindow = equipmentWindow;
-			break;
-		    case KeyboardConfig::KEY_WINDOW_SKILL:
-			requestedWindow = skillDialog;
-			break;
-		    case KeyboardConfig::KEY_WINDOW_MINIMAP:
-			minimap->toggle();
-			requestedWindow = minimap;
-			break;
-		    case KeyboardConfig::KEY_WINDOW_CHAT:
-			requestedWindow = chatWindow;
-			break;
-		    case KeyboardConfig::KEY_WINDOW_SHORTCUT:
-			requestedWindow = itemShortcutWindow;
-			break;
-		    case KeyboardConfig::KEY_WINDOW_SETUP:
-			requestedWindow = setupWindow;
-			break;
-		    case KeyboardConfig::KEY_WINDOW_DEBUG:
-			requestedWindow = debugWindow;
-			break;
-		    case KeyboardConfig::KEY_WINDOW_EMOTE:
-			requestedWindow = emoteWindow;
-			break;
-		    case KeyboardConfig::KEY_WINDOW_EMOTE_SHORTCUT:
-			requestedWindow = emoteShortcutWindow;
-			break;
-		}
-	    }
-
-	    if (requestedWindow)
-	    {
-		requestedWindow->setVisible(!requestedWindow->isVisible());
-		if (requestedWindow->isVisible())
-		{
-		    requestedWindow->requestMoveToTop();
-		}
-		used = true;
-	    }
-
-	}
-
-	// Quit event
-	else if (event.type == SDL_QUIT)
-	{
-	    done = true;
-	}
-
-	// Push input to GUI when not used
-	if (!used)
-	{
-	    try
-	    {
-		guiInput->pushInput(event);
-	    }
-	    catch (gcn::Exception e)
-	    {
-		const char* err = e.getMessage().c_str();
-		logger->log(_("Warning: guichan input exception: %s"), err);
-	    }
-	}
+            {
+                const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
+                // Do not activate shortcuts if tradewindow is visible
+                if (!tradeWindow->isVisible())
+                {
+                    // Checks if any item shortcut is pressed.
+                    for (int i = KeyboardConfig::KEY_SHORTCUT_1;
+                            i <= KeyboardConfig::KEY_SHORTCUT_12;
+                            i++)
+                    {
+                        if (tKey == i && !used) {
+                            itemShortcut->useItem(
+                                    i - KeyboardConfig::KEY_SHORTCUT_1);
+                            break;
+                        }
+                    }
+                }
+                switch (tKey) {
+                    case KeyboardConfig::KEY_PICKUP:
+                        {
+                            FloorItem *item =
+                                floorItemManager->findByCoordinates(
+                                        player_node->mX, player_node->mY);
+
+                            // If none below the player, try the tile in front
+                            // of the player
+                            if (!item) {
+                                Uint16 x = player_node->mX;
+                                Uint16 y = player_node->mY;
+                                if (player_node->getDirection() & Being::UP)
+                                    y--;
+                                if (player_node->getDirection() & Being::DOWN)
+                                    y++;
+                                if (player_node->getDirection() & Being::LEFT)
+                                    x--;
+                                if (player_node->getDirection() & Being::RIGHT)
+                                    x++;
+
+                                item = floorItemManager->findByCoordinates(
+                                        x, y);
+                            }
+
+                            if (item)
+                                player_node->pickUp(item);
+
+                            used = true;
+                        }
+                        break;
+                    case KeyboardConfig::KEY_SIT:
+                        // Player sit action
+                        player_node->toggleSit();
+                        used = true;
+                        break;
+                    case KeyboardConfig::KEY_HIDE_WINDOWS:
+                        // Hide certain windows
+                        if (!chatWindow->isInputFocused())
+                        {
+                            statusWindow->setVisible(false);
+                            inventoryWindow->setVisible(false);
+                            emoteWindow->setVisible(false);
+                            skillDialog->setVisible(false);
+                            setupWindow->setVisible(false);
+                            equipmentWindow->setVisible(false);
+                            helpWindow->setVisible(false);
+                            debugWindow->setVisible(false);
+                        }
+                        break;
+
+                    case KeyboardConfig::KEY_WINDOW_STATUS:
+                        requestedWindow = statusWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_INVENTORY:
+                        requestedWindow = inventoryWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_EQUIPMENT:
+                        requestedWindow = equipmentWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_SKILL:
+                        requestedWindow = skillDialog;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_MINIMAP:
+                        minimap->toggle();
+                        requestedWindow = minimap;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_CHAT:
+                        requestedWindow = chatWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_SHORTCUT:
+                        requestedWindow = itemShortcutWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_SETUP:
+                        requestedWindow = setupWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_DEBUG:
+                        requestedWindow = debugWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_EMOTE:
+                        requestedWindow = emoteWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_EMOTE_SHORTCUT:
+                        requestedWindow = emoteShortcutWindow;
+                        break;
+                }
+            }
+
+            if (requestedWindow)
+            {
+                requestedWindow->setVisible(!requestedWindow->isVisible());
+                if (requestedWindow->isVisible())
+                {
+                    requestedWindow->requestMoveToTop();
+                }
+                used = true;
+            }
+
+        }
+
+        // Quit event
+        else if (event.type == SDL_QUIT)
+        {
+            done = true;
+        }
+
+        // Push input to GUI when not used
+        if (!used)
+        {
+            try
+            {
+                guiInput->pushInput(event);
+            }
+            catch (gcn::Exception e)
+            {
+                const char* err = e.getMessage().c_str();
+                logger->log(_("Warning: guichan input exception: %s"), err);
+            }
+        }
     } // End while
 
     // If the user is configuring the keys then don't respond.
     if (!keyboard.isEnabled())
-	return;
+        return;
 
     // Moving player around
     if (player_node->mAction != Being::DEAD &&
-	    current_npc == 0 &&
-	    !chatWindow->isInputFocused())
+            current_npc == 0 &&
+            !chatWindow->isInputFocused())
     {
-	// Get the state of the keyboard keys
-	keyboard.refreshActiveKeys();
-
-	const Uint16 x = player_node->mX;
-	const Uint16 y = player_node->mY;
-	unsigned char direction = 0;
-
-	// Translate pressed keys to movement and direction
-	if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP) ||
-		(joystick && joystick->isUp()))
-	{
-	    direction |= Being::UP;
-	}
-	else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) ||
-		(joystick && joystick->isDown()))
-	{
-	    direction |= Being::DOWN;
-	}
-
-	if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) ||
-		(joystick && joystick->isLeft()))
-	{
-	    direction |= Being::LEFT;
-	}
-	else if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) ||
-		(joystick && joystick->isRight()))
-	{
-	    direction |= Being::RIGHT;
-	}
-
-	player_node->setWalkingDir(direction);
-
-	// Attacking monsters
-	if (keyboard.isKeyActive(keyboard.KEY_ATTACK) ||
-		(joystick && joystick->buttonPressed(0)))
-	{
-	    Being *target = beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER);
-
-	    bool newTarget = !keyboard.isKeyActive(keyboard.KEY_TARGET);
-	    // A set target has highest priority
-	    if (newTarget || !player_node->getTarget())
-	    {
-		Uint16 targetX = x, targetY = y;
-
-		switch (player_node->getSpriteDirection())
-		{
-		    case DIRECTION_UP   : --targetY; break;
-		    case DIRECTION_DOWN : ++targetY; break;
-		    case DIRECTION_LEFT : --targetX; break;
-		    case DIRECTION_RIGHT: ++targetX; break;
-		    default: break;
-		}
-
-		// Attack priorioty is: Monster, Player, auto target
-		target = beingManager->findBeing(targetX, targetY, Being::MONSTER);
-		if (!target)
-		    target = beingManager->findBeing(targetX, targetY, Being::PLAYER);
-	    }
-
-	    player_node->attack(target, newTarget);
-	}
-
-	// Target the nearest player if 'q' is pressed
-	if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) && 
-		!keyboard.isKeyActive(keyboard.KEY_TARGET) )
-	{
-	    Being *target = beingManager->findNearestLivingBeing(player_node, 20, Being::PLAYER);
-
-	    player_node->setTarget(target);
-	}
-
-	// Target the nearest monster if 'a' pressed
-	if ((keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) || 
-		    (joystick && joystick->buttonPressed(3))) && 
-		!keyboard.isKeyActive(keyboard.KEY_TARGET))
-	{
-	    Being *target = beingManager->findNearestLivingBeing(
-		    x, y, 20, Being::MONSTER);
-
-	    player_node->setTarget(target);
-	}
-
-	// Target the nearest npc if 'n' pressed
-	if ( keyboard.isKeyActive(keyboard.KEY_TARGET_NPC) && 
-		!keyboard.isKeyActive(keyboard.KEY_TARGET) )
-	{
-	    Being *target = beingManager->findNearestLivingBeing(
-		    x, y, 20, Being::NPC);
-
-	    player_node->setTarget(target);
-	}
-
-	// Talk to the nearest NPC if 't' pressed
-	if ( keyboard.isKeyActive(keyboard.KEY_TALK) )
-	{
-	    if (!npcTextDialog->isVisible() && !npcListDialog->isVisible())
-	    {
-		Being *target = player_node->getTarget();
-
-		if (!target)
-		{
-		    target = beingManager->findNearestLivingBeing(
-			    x, y, 20, Being::NPC);
-		}
-
-		if (target)
-		{
-		    if (target->getType() == Being::NPC)
-			dynamic_cast<NPC*>(target)->talk();
-		}
-	    }
-	}
-
-	// Stop attacking if shift is pressed
-	if (keyboard.isKeyActive(keyboard.KEY_TARGET))
-	{
-	    player_node->stopAttack();
-	}
-
-	if (joystick)
-	{
-	    if (joystick->buttonPressed(1))
-	    {
-		FloorItem *item = floorItemManager->findByCoordinates(x, y);
-
-		if (item)
-		    player_node->pickUp(item);
-	    }
-	    else if (joystick->buttonPressed(2))
-	    {
-		player_node->toggleSit();
-	    }
-	}
+        // Get the state of the keyboard keys
+        keyboard.refreshActiveKeys();
+
+        const Uint16 x = player_node->mX;
+        const Uint16 y = player_node->mY;
+        unsigned char direction = 0;
+
+        // Translate pressed keys to movement and direction
+        if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP) ||
+                (joystick && joystick->isUp()))
+        {
+            direction |= Being::UP;
+        }
+        else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) ||
+                (joystick && joystick->isDown()))
+        {
+            direction |= Being::DOWN;
+        }
+
+        if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) ||
+                (joystick && joystick->isLeft()))
+        {
+            direction |= Being::LEFT;
+        }
+        else if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) ||
+                (joystick && joystick->isRight()))
+        {
+            direction |= Being::RIGHT;
+        }
+
+        player_node->setWalkingDir(direction);
+
+        // Attacking monsters
+        if (keyboard.isKeyActive(keyboard.KEY_ATTACK) ||
+                (joystick && joystick->buttonPressed(0)))
+        {
+            Being *target = beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER);
+
+            bool newTarget = !keyboard.isKeyActive(keyboard.KEY_TARGET);
+            // A set target has highest priority
+            if (newTarget || !player_node->getTarget())
+            {
+                Uint16 targetX = x, targetY = y;
+
+                switch (player_node->getSpriteDirection())
+                {
+                    case DIRECTION_UP   : --targetY; break;
+                    case DIRECTION_DOWN : ++targetY; break;
+                    case DIRECTION_LEFT : --targetX; break;
+                    case DIRECTION_RIGHT: ++targetX; break;
+                    default: break;
+                }
+
+                // Attack priorioty is: Monster, Player, auto target
+                target = beingManager->findBeing(targetX, targetY, Being::MONSTER);
+                if (!target)
+                    target = beingManager->findBeing(targetX, targetY, Being::PLAYER);
+            }
+
+            player_node->attack(target, newTarget);
+        }
+
+        // Target the nearest player if 'q' is pressed
+        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) && 
+                !keyboard.isKeyActive(keyboard.KEY_TARGET) )
+        {
+            Being *target = beingManager->findNearestLivingBeing(player_node, 20, Being::PLAYER);
+
+            player_node->setTarget(target);
+        }
+
+        // Target the nearest monster if 'a' pressed
+        if ((keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) || 
+                    (joystick && joystick->buttonPressed(3))) && 
+                !keyboard.isKeyActive(keyboard.KEY_TARGET))
+        {
+            Being *target = beingManager->findNearestLivingBeing(
+                    x, y, 20, Being::MONSTER);
+
+            player_node->setTarget(target);
+        }
+
+        // Target the nearest npc if 'n' pressed
+        if ( keyboard.isKeyActive(keyboard.KEY_TARGET_NPC) && 
+                !keyboard.isKeyActive(keyboard.KEY_TARGET) )
+        {
+            Being *target = beingManager->findNearestLivingBeing(
+                    x, y, 20, Being::NPC);
+
+            player_node->setTarget(target);
+        }
+
+        // Talk to the nearest NPC if 't' pressed
+        if ( keyboard.isKeyActive(keyboard.KEY_TALK) )
+        {
+            if (!npcTextDialog->isVisible() && !npcListDialog->isVisible())
+            {
+                Being *target = player_node->getTarget();
+
+                if (!target)
+                {
+                    target = beingManager->findNearestLivingBeing(
+                            x, y, 20, Being::NPC);
+                }
+
+                if (target)
+                {
+                    if (target->getType() == Being::NPC)
+                        dynamic_cast<NPC*>(target)->talk();
+                }
+            }
+        }
+
+        // Stop attacking if shift is pressed
+        if (keyboard.isKeyActive(keyboard.KEY_TARGET))
+        {
+            player_node->stopAttack();
+        }
+
+        if (joystick)
+        {
+            if (joystick->buttonPressed(1))
+            {
+                FloorItem *item = floorItemManager->findByCoordinates(x, y);
+
+                if (item)
+                    player_node->pickUp(item);
+            }
+            else if (joystick->buttonPressed(2))
+            {
+                player_node->toggleSit();
+            }
+        }
     }
 }
-- 
cgit v1.2.3-70-g09d2


From 73edfce4ce8c12a8ec09a7b5f831698bd64b688b Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 19 Jan 2009 14:06:02 -0700
Subject: Fixed up indentation in game so that the indentation isn't
 misleading.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/game.cpp | 502 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 251 insertions(+), 251 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 51a5d7d9..4c912827 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -553,141 +553,144 @@ void Game::handleInput()
                     }
                 }
 
-            // Mode switch to emotes
-            if (keyboard.isKeyActive(keyboard.KEY_EMOTE))
-            {
-                // Emotions
-                int emotion = keyboard.getKeyEmoteOffset(event.key.keysym.sym);
-                if (emotion)
+                // Mode switch to emotes
+                if (keyboard.isKeyActive(keyboard.KEY_EMOTE))
                 {
-                    emoteShortcut->useEmote(emotion);
-                    used = true;
-                    return;
-                }
-            }
-            switch (event.key.keysym.sym)
-            {
-                case SDLK_PAGEUP:
-                    if (chatWindow->isVisible())
+                    // Emotions
+                    int emotion = keyboard.getKeyEmoteOffset(event.key.keysym.sym);
+                    if (emotion)
                     {
-                        chatWindow->scroll(-DEFAULT_CHAT_WINDOW_SCROLL);
-                        used = true;
-                    }
-                    break;
-
-                case SDLK_PAGEDOWN:
-                    if (chatWindow->isVisible())
-                    {
-                        chatWindow->scroll(DEFAULT_CHAT_WINDOW_SCROLL);
+                        emoteShortcut->useEmote(emotion);
                         used = true;
                         return;
                     }
-                    break;
-
-                case SDLK_F1:
-                    // In-game Help
-                    if (helpWindow->isVisible())
-                    {
-                        helpWindow->setVisible(false);
-                    }
-                    else
-                    {
-                        helpWindow->loadHelp("index");
-                        helpWindow->requestMoveToTop();
-                    }
-                    used = true;
-                    break;
+                }
+                switch (event.key.keysym.sym)
+                {
+                    case SDLK_PAGEUP:
+                        if (chatWindow->isVisible())
+                        {
+                            chatWindow->scroll(-DEFAULT_CHAT_WINDOW_SCROLL);
+                            used = true;
+                        }
+                        break;
 
-                case SDLK_RETURN:
-                    // Input chat window
-                    if (chatWindow->isInputFocused() ||
-                            deathNotice != NULL ||
-                            weightNotice != NULL)
-                    {
+                    case SDLK_PAGEDOWN:
+                        if (chatWindow->isVisible())
+                        {
+                            chatWindow->scroll(DEFAULT_CHAT_WINDOW_SCROLL);
+                            used = true;
+                            return;
+                        }
                         break;
-                    }
 
-                    // Quit by pressing Enter if the exit confirm is there
-                    if (exitConfirm)
-                    {
-                        done = true;
-                    }
-                    // Close the Browser if opened
-                    else if (helpWindow->isVisible())
-                    {
-                        helpWindow->setVisible(false);
-                    }
-                    // Close the config window, cancelling changes if opened
-                    else if (setupWindow->isVisible())
-                    {
-                        setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
-                    }
-                    // Submits the text and proceeds to the next dialog
-                    else if (npcStringDialog->isVisible())
-                    {
-                        npcStringDialog->action(gcn::ActionEvent(NULL, "ok"));
-                    }
-                    // Proceed to the next dialog option, or close the window
-                    else if (npcTextDialog->isVisible())
-                    {
-                        npcTextDialog->action(gcn::ActionEvent(NULL, "ok"));
-                    }
-                    // Choose the currently highlighted dialogue option
-                    else if (npcListDialog->isVisible())
-                    {
-                        npcListDialog->action(gcn::ActionEvent(NULL, "ok"));
-                    }
-                    // Submits the text and proceeds to the next dialog
-                    else if (npcIntegerDialog->isVisible())
-                    {
-                        npcIntegerDialog->action(gcn::ActionEvent(NULL, "ok"));
-                    }
-                    // Else, open the chat edit box
-                    else
-                    {
-                        chatWindow->requestChatFocus();
+                    case SDLK_F1:
+                        // In-game Help
+                        if (helpWindow->isVisible())
+                        {
+                            helpWindow->setVisible(false);
+                        }
+                        else
+                        {
+                            helpWindow->loadHelp("index");
+                            helpWindow->requestMoveToTop();
+                        }
                         used = true;
-                    }
-                    break;
-                    // Quitting confirmation dialog
-                case SDLK_ESCAPE:
-                    if (!exitConfirm) {
-                        exitConfirm = new ConfirmDialog(
-                                _("Quit"), _("Are you sure you want to quit?"));
-                        exitConfirm->addActionListener(&exitListener);
-                        exitConfirm->requestMoveToTop();
-                    }
-                    else
-                    {
-                        exitConfirm->action(gcn::ActionEvent(NULL, _("no")));
-                    }
-                    break;
+                        break;
 
-                default:
-                    break;
-            }
-            if (keyboard.isEnabled() && !chatWindow->isInputFocused()
-                && !npcStringDialog->isInputFocused())
-            {
-                const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
-                // Do not activate shortcuts if tradewindow is visible
-                if (!tradeWindow->isVisible())
+                    case SDLK_RETURN:
+                        // Input chat window
+                        if (chatWindow->isInputFocused() ||
+                                        deathNotice != NULL ||
+                                        weightNotice != NULL)
+                        {
+                            break;
+                        }
+
+                        // Quit by pressing Enter if the exit confirm is there
+                        if (exitConfirm)
+                        {
+                           done = true;
+                        }
+                        // Close the Browser if opened
+                        else if (helpWindow->isVisible())
+                        {
+                            helpWindow->setVisible(false);
+                        }
+                        // Close the config window, cancelling changes if opened
+                        else if (setupWindow->isVisible())
+                        {
+                            setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
+                        }
+                        // Submits the text and proceeds to the next dialog
+                        else if (npcStringDialog->isVisible())
+                        {
+                            npcStringDialog->action(gcn::ActionEvent(NULL, "ok"));
+                        }
+                        // Proceed to the next dialog option, or close the window
+                        else if (npcTextDialog->isVisible())
+                        {
+                            npcTextDialog->action(gcn::ActionEvent(NULL, "ok"));
+                        }
+                        // Choose the currently highlighted dialogue option
+                        else if (npcListDialog->isVisible())
+                        {
+                            npcListDialog->action(gcn::ActionEvent(NULL, "ok"));
+                        }
+                        // Submits the text and proceeds to the next dialog
+                        else if (npcIntegerDialog->isVisible())
+                        {
+                            npcIntegerDialog->action(gcn::ActionEvent(NULL, "ok"));
+                        }
+                        // Else, open the chat edit box
+                        else
+                        {
+                            chatWindow->requestChatFocus();
+                            used = true;
+                        }
+                        break;
+                        // Quitting confirmation dialog
+                    case SDLK_ESCAPE:
+                        if (!exitConfirm) 
+                        {
+                            exitConfirm = new ConfirmDialog( _("Quit"), 
+                                                             _("Are you sure you "
+                                                               "want to quit?"));
+                            exitConfirm->addActionListener(&exitListener);
+                            exitConfirm->requestMoveToTop();
+                        }
+                        else
+                        {
+                            exitConfirm->action(gcn::ActionEvent(NULL, _("no")));
+                        }
+                        break;
+
+                    default:
+                        break;
+                 }
+                if (keyboard.isEnabled() && !chatWindow->isInputFocused()
+                                         && !npcStringDialog->isInputFocused())
                 {
-                    // Checks if any item shortcut is pressed.
-                    for (int i = KeyboardConfig::KEY_SHORTCUT_1;
-                            i <= KeyboardConfig::KEY_SHORTCUT_12;
-                            i++)
+                    const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
+                    // Do not activate shortcuts if tradewindow is visible
+                    if (!tradeWindow->isVisible())
                     {
-                        if (tKey == i && !used) {
-                            itemShortcut->useItem(
-                                    i - KeyboardConfig::KEY_SHORTCUT_1);
-                            break;
+                        // Checks if any item shortcut is pressed.
+                        for (int i = KeyboardConfig::KEY_SHORTCUT_1;
+                                 i <= KeyboardConfig::KEY_SHORTCUT_12;
+                                 i++)
+                        {
+                            if (tKey == i && !used) 
+                            {
+                                itemShortcut->useItem(
+                                              i - KeyboardConfig::KEY_SHORTCUT_1);
+                                break;
+                            }
                         }
                     }
-                }
-                switch (tKey) {
-                    case KeyboardConfig::KEY_PICKUP:
-                        {
+                    switch (tKey)
+                    {
+                        case KeyboardConfig::KEY_PICKUP:
                             FloorItem *item =
                                 floorItemManager->findByCoordinates(
                                         player_node->mX, player_node->mY);
@@ -714,158 +717,155 @@ void Game::handleInput()
                                 player_node->pickUp(item);
 
                             used = true;
-                        }
-                        break;
-                    case KeyboardConfig::KEY_SIT:
-                        // Player sit action
-                        player_node->toggleSit();
-                        used = true;
-                        break;
-                    case KeyboardConfig::KEY_HIDE_WINDOWS:
-                        // Hide certain windows
-                        if (!chatWindow->isInputFocused())
-                        {
-                            statusWindow->setVisible(false);
-                            inventoryWindow->setVisible(false);
-                            emoteWindow->setVisible(false);
-                            skillDialog->setVisible(false);
-                            setupWindow->setVisible(false);
-                            equipmentWindow->setVisible(false);
-                            helpWindow->setVisible(false);
-                            debugWindow->setVisible(false);
-                        }
-                        break;
+                            break;
+                        case KeyboardConfig::KEY_SIT:
+                             // Player sit action
+                            player_node->toggleSit();
+                            used = true;
+                            break;
+                        case KeyboardConfig::KEY_HIDE_WINDOWS:
+                            // Hide certain windows
+                            if (!chatWindow->isInputFocused())
+                            {
+                                statusWindow->setVisible(false);
+                                inventoryWindow->setVisible(false);
+                                emoteWindow->setVisible(false);
+                                skillDialog->setVisible(false);
+                                setupWindow->setVisible(false);
+                                equipmentWindow->setVisible(false);
+                                helpWindow->setVisible(false);
+                                debugWindow->setVisible(false);
+                            }
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_STATUS:
+                            requestedWindow = statusWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_INVENTORY:
+                            requestedWindow = inventoryWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_EQUIPMENT:
+                            requestedWindow = equipmentWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_SKILL:
+                            requestedWindow = skillDialog;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_MINIMAP:
+                            minimap->toggle();
+                            requestedWindow = minimap;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_CHAT:
+                            requestedWindow = chatWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_SHORTCUT:
+                            requestedWindow = itemShortcutWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_SETUP:
+                            requestedWindow = setupWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_DEBUG:
+                            requestedWindow = debugWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_EMOTE:
+                            requestedWindow = emoteWindow;
+                            break;
+                        case KeyboardConfig::KEY_WINDOW_EMOTE_SHORTCUT:
+                            requestedWindow = emoteShortcutWindow;
+                            break;
+                   }
+                }
 
-                    case KeyboardConfig::KEY_WINDOW_STATUS:
-                        requestedWindow = statusWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_INVENTORY:
-                        requestedWindow = inventoryWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_EQUIPMENT:
-                        requestedWindow = equipmentWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_SKILL:
-                        requestedWindow = skillDialog;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_MINIMAP:
-                        minimap->toggle();
-                        requestedWindow = minimap;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_CHAT:
-                        requestedWindow = chatWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_SHORTCUT:
-                        requestedWindow = itemShortcutWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_SETUP:
-                        requestedWindow = setupWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_DEBUG:
-                        requestedWindow = debugWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_EMOTE:
-                        requestedWindow = emoteWindow;
-                        break;
-                    case KeyboardConfig::KEY_WINDOW_EMOTE_SHORTCUT:
-                        requestedWindow = emoteShortcutWindow;
-                        break;
+                if (requestedWindow)
+                {
+                    requestedWindow->setVisible(!requestedWindow->isVisible());
+                    if (requestedWindow->isVisible())
+                    {
+                        requestedWindow->requestMoveToTop();
+                    }
+                    used = true;
                 }
+
+            }
+            // Quit event
+            else if (event.type == SDL_QUIT)
+            {
+                done = true;
             }
 
-            if (requestedWindow)
+            // Push input to GUI when not used
+            if (!used)
             {
-                requestedWindow->setVisible(!requestedWindow->isVisible());
-                if (requestedWindow->isVisible())
+                try
                 {
-                    requestedWindow->requestMoveToTop();
+                    guiInput->pushInput(event);
+                }
+                catch (gcn::Exception e)
+                {
+                    const char* err = e.getMessage().c_str();
+                    logger->log(_("Warning: guichan input exception: %s"), err);
                 }
-                used = true;
             }
+        } // End while
 
-        }
+        // If the user is configuring the keys then don't respond.
+        if (!keyboard.isEnabled())
+            return;
 
-        // Quit event
-        else if (event.type == SDL_QUIT)
+        // Moving player around
+        if (player_node->mAction != Being::DEAD &&
+            current_npc == 0 && !chatWindow->isInputFocused())
         {
-            done = true;
-        }
+            // Get the state of the keyboard keys
+            keyboard.refreshActiveKeys();
 
-        // Push input to GUI when not used
-        if (!used)
-        {
-            try
+            const Uint16 x = player_node->mX;
+            const Uint16 y = player_node->mY;
+            unsigned char direction = 0;
+
+            // Translate pressed keys to movement and direction
+            if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP) ||
+               (joystick && joystick->isUp()))
             {
-                guiInput->pushInput(event);
+                direction |= Being::UP;
             }
-            catch (gcn::Exception e)
+            else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) ||
+                    (joystick && joystick->isDown()))
             {
-                const char* err = e.getMessage().c_str();
-                logger->log(_("Warning: guichan input exception: %s"), err);
+                direction |= Being::DOWN;
             }
-        }
-    } // End while
-
-    // If the user is configuring the keys then don't respond.
-    if (!keyboard.isEnabled())
-        return;
 
-    // Moving player around
-    if (player_node->mAction != Being::DEAD &&
-            current_npc == 0 &&
-            !chatWindow->isInputFocused())
-    {
-        // Get the state of the keyboard keys
-        keyboard.refreshActiveKeys();
-
-        const Uint16 x = player_node->mX;
-        const Uint16 y = player_node->mY;
-        unsigned char direction = 0;
-
-        // Translate pressed keys to movement and direction
-        if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP) ||
-                (joystick && joystick->isUp()))
-        {
-            direction |= Being::UP;
-        }
-        else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) ||
-                (joystick && joystick->isDown()))
-        {
-            direction |= Being::DOWN;
-        }
-
-        if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) ||
-                (joystick && joystick->isLeft()))
-        {
-            direction |= Being::LEFT;
-        }
-        else if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) ||
-                (joystick && joystick->isRight()))
-        {
-            direction |= Being::RIGHT;
-        }
-
-        player_node->setWalkingDir(direction);
+            if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) ||
+               (joystick && joystick->isLeft()))
+            {
+                direction |= Being::LEFT;
+            }
+            else if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) ||
+                    (joystick && joystick->isRight()))
+            {
+                direction |= Being::RIGHT;
+            }
 
-        // Attacking monsters
-        if (keyboard.isKeyActive(keyboard.KEY_ATTACK) ||
-                (joystick && joystick->buttonPressed(0)))
-        {
-            Being *target = beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER);
+            player_node->setWalkingDir(direction);
 
-            bool newTarget = !keyboard.isKeyActive(keyboard.KEY_TARGET);
-            // A set target has highest priority
-            if (newTarget || !player_node->getTarget())
+            // Attacking monsters
+            if (keyboard.isKeyActive(keyboard.KEY_ATTACK) ||
+               (joystick && joystick->buttonPressed(0)))
             {
-                Uint16 targetX = x, targetY = y;
+                Being *target = beingManager->findNearestLivingBeing(x, y, 20, 
+                                                                     Being::MONSTER);
 
-                switch (player_node->getSpriteDirection())
+                bool newTarget = !keyboard.isKeyActive(keyboard.KEY_TARGET);
+                // A set target has highest priority
+                if (newTarget || !player_node->getTarget())
                 {
-                    case DIRECTION_UP   : --targetY; break;
-                    case DIRECTION_DOWN : ++targetY; break;
-                    case DIRECTION_LEFT : --targetX; break;
-                    case DIRECTION_RIGHT: ++targetX; break;
-                    default: break;
+                     Uint16 targetX = x, targetY = y;
+
+                    switch (player_node->getSpriteDirection())
+                    {
+                        case DIRECTION_UP   : --targetY; break;
+                        case DIRECTION_DOWN : ++targetY; break;
+                        case DIRECTION_LEFT : --targetX; break;
+                        case DIRECTION_RIGHT: ++targetX; break;
+                        default: break;
                 }
 
                 // Attack priorioty is: Monster, Player, auto target
-- 
cgit v1.2.3-70-g09d2


From 3b615fd98c6ebedbcedb474087f4cb1e59382002 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 19 Jan 2009 20:43:15 +0100
Subject: Reverse the order of slider and label again

In order to stay consistent with the video setup page.
---
 src/gui/setup_audio.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 7486e414..7ffff913 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -66,10 +66,10 @@ Setup_Audio::Setup_Audio():
     ContainerPlacer place = h.getPlacer(0, 0);
 
     place(0, 0, mSoundCheckBox);
-    place(0, 1, sfxLabel);
-    place(1, 1, mSfxSlider);
-    place(0, 2, musicLabel);
-    place(1, 2, mMusicSlider);
+    place(0, 1, mSfxSlider);
+    place(1, 1, sfxLabel);
+    place(0, 2, mMusicSlider);
+    place(1, 2, musicLabel);
 
     setDimension(gcn::Rectangle(0, 0, 290, 250));
 }
-- 
cgit v1.2.3-70-g09d2


From 36e7572e2c395161594287768ed86a92f0291fda Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 19 Jan 2009 14:38:06 -0700
Subject: Fixed the uninstallation portion of the nsi script while it's still
 on my mind.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 packaging/windows/setup.nsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index c380e7b7..a151e3cd 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -226,6 +226,7 @@ Section Uninstall
   RMDir "$SMPROGRAMS\Aethyra"
   RMDir /r "$INSTDIR\data"
   RMDir /r "$INSTDIR\docs"
+  RMDir /r "$INSTDIR\po"
   RMDir /r "$INSTDIR\updates"
   RMDir "$INSTDIR"
 
-- 
cgit v1.2.3-70-g09d2


From d1b38ab0264bf922fc5e12e9328eea49cee132c3 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 19 Jan 2009 15:03:13 -0700
Subject: Didn't know that one set of brackets I used was needed for compiling
 for GNU. Fixed that, as well as found why we were indented as many lines as
 we were in the first place.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/game.cpp | 578 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 281 insertions(+), 297 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 4c912827..1d09ebe2 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -510,194 +510,182 @@ void Game::handleInput()
 #ifndef __APPLE__
             if (event.key.keysym.mod & KMOD_LALT)
 #else
-                if (event.key.keysym.mod & KMOD_LMETA)
+            if (event.key.keysym.mod & KMOD_LMETA)
 #endif
-                {
-                    switch (event.key.keysym.sym)
-                    {
-                        case SDLK_p:
-                            // Screenshot (picture, hence the p)
-                            saveScreenshot();
-                            used = true;
-                            break;
-
-                        default:
-                            break;
-
-                        case SDLK_f:
-                            // Find path to mouse (debug purpose)
-                            viewport->toggleDebugPath();
-                            used = true;
-                            break;
-
-                        case SDLK_t:
-                            // Toggle accepting of incoming trade requests
-                            {
-                                unsigned int deflt = player_relations.getDefault();
-                                if (deflt & PlayerRelation::TRADE) {
-                                    chatWindow->chatLog(
-                                            _("Ignoring incoming trade requests"),
-                                            BY_SERVER);
-                                    deflt &= ~PlayerRelation::TRADE;
-                                } else {
-                                    chatWindow->chatLog(
-                                            _("Accepting incoming trade requests"),
-                                            BY_SERVER);
-                                    deflt |= PlayerRelation::TRADE;
-                                }
-
-                                player_relations.setDefault(deflt);
-                            }
-                            used = true;
-                            break;
-                    }
-                }
-
-                // Mode switch to emotes
-                if (keyboard.isKeyActive(keyboard.KEY_EMOTE))
-                {
-                    // Emotions
-                    int emotion = keyboard.getKeyEmoteOffset(event.key.keysym.sym);
-                    if (emotion)
-                    {
-                        emoteShortcut->useEmote(emotion);
-                        used = true;
-                        return;
-                    }
-                }
+            {
                 switch (event.key.keysym.sym)
                 {
-                    case SDLK_PAGEUP:
-                        if (chatWindow->isVisible())
-                        {
-                            chatWindow->scroll(-DEFAULT_CHAT_WINDOW_SCROLL);
-                            used = true;
-                        }
+                    case SDLK_p:
+                        // Screenshot (picture, hence the p)
+                        saveScreenshot();
+                        used = true;
                         break;
 
-                    case SDLK_PAGEDOWN:
-                        if (chatWindow->isVisible())
-                        {
-                            chatWindow->scroll(DEFAULT_CHAT_WINDOW_SCROLL);
-                            used = true;
-                            return;
-                        }
+                    default:
                         break;
 
-                    case SDLK_F1:
-                        // In-game Help
-                        if (helpWindow->isVisible())
-                        {
-                            helpWindow->setVisible(false);
-                        }
-                        else
-                        {
-                            helpWindow->loadHelp("index");
-                            helpWindow->requestMoveToTop();
-                        }
+                    case SDLK_f:
+                        // Find path to mouse (debug purpose)
+                        viewport->toggleDebugPath();
                         used = true;
                         break;
 
-                    case SDLK_RETURN:
-                        // Input chat window
-                        if (chatWindow->isInputFocused() ||
-                                        deathNotice != NULL ||
-                                        weightNotice != NULL)
-                        {
-                            break;
-                        }
-
-                        // Quit by pressing Enter if the exit confirm is there
-                        if (exitConfirm)
-                        {
-                           done = true;
-                        }
-                        // Close the Browser if opened
-                        else if (helpWindow->isVisible())
-                        {
-                            helpWindow->setVisible(false);
-                        }
-                        // Close the config window, cancelling changes if opened
-                        else if (setupWindow->isVisible())
+                    case SDLK_t:
+                        // Toggle accepting of incoming trade requests
+                        unsigned int deflt = player_relations.getDefault();
+                        if (deflt & PlayerRelation::TRADE)
                         {
-                            setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
-                        }
-                        // Submits the text and proceeds to the next dialog
-                        else if (npcStringDialog->isVisible())
-                        {
-                            npcStringDialog->action(gcn::ActionEvent(NULL, "ok"));
-                        }
-                        // Proceed to the next dialog option, or close the window
-                        else if (npcTextDialog->isVisible())
-                        {
-                            npcTextDialog->action(gcn::ActionEvent(NULL, "ok"));
-                        }
-                        // Choose the currently highlighted dialogue option
-                        else if (npcListDialog->isVisible())
-                        {
-                            npcListDialog->action(gcn::ActionEvent(NULL, "ok"));
-                        }
-                        // Submits the text and proceeds to the next dialog
-                        else if (npcIntegerDialog->isVisible())
-                        {
-                            npcIntegerDialog->action(gcn::ActionEvent(NULL, "ok"));
-                        }
-                        // Else, open the chat edit box
-                        else
-                        {
-                            chatWindow->requestChatFocus();
-                            used = true;
-                        }
-                        break;
-                        // Quitting confirmation dialog
-                    case SDLK_ESCAPE:
-                        if (!exitConfirm) 
-                        {
-                            exitConfirm = new ConfirmDialog( _("Quit"), 
-                                                             _("Are you sure you "
-                                                               "want to quit?"));
-                            exitConfirm->addActionListener(&exitListener);
-                            exitConfirm->requestMoveToTop();
+                            chatWindow->chatLog(
+                                              _("Ignoring incoming trade requests"),
+                                                BY_SERVER);
+                            deflt &= ~PlayerRelation::TRADE;
                         }
                         else
                         {
-                            exitConfirm->action(gcn::ActionEvent(NULL, _("no")));
+                            chatWindow->chatLog(
+                                              _("Accepting incoming trade requests"),
+                                                BY_SERVER);
+                            deflt |= PlayerRelation::TRADE;
                         }
+
+                        player_relations.setDefault(deflt);
+
+                        used = true;
                         break;
+                }
+            }
 
-                    default:
+            // Mode switch to emotes
+            if (keyboard.isKeyActive(keyboard.KEY_EMOTE))
+            {
+                // Emotions
+                int emotion = keyboard.getKeyEmoteOffset(event.key.keysym.sym);
+                if (emotion)
+                {
+                    emoteShortcut->useEmote(emotion);
+                    used = true;
+                    return;
+                }
+            }
+            switch (event.key.keysym.sym)
+            {
+                case SDLK_PAGEUP:
+                    if (chatWindow->isVisible())
+                    {
+                        chatWindow->scroll(-DEFAULT_CHAT_WINDOW_SCROLL);
+                        used = true;
+                    }
+                    break;
+                case SDLK_PAGEDOWN:
+                    if (chatWindow->isVisible())
+                    {
+                        chatWindow->scroll(DEFAULT_CHAT_WINDOW_SCROLL);
+                        used = true;
+                        return;
+                    }
+                    break;
+                case SDLK_F1:
+                    // In-game Help
+                    if (helpWindow->isVisible())
+                        helpWindow->setVisible(false);
+                    else
+                    {
+                        helpWindow->loadHelp("index");
+                        helpWindow->requestMoveToTop();
+                    }
+                    used = true;
+                    break;
+
+                case SDLK_RETURN:
+                    // Input chat window
+                    if (chatWindow->isInputFocused() ||
+                                    deathNotice != NULL ||
+                                    weightNotice != NULL)
+                    {
                         break;
-                 }
-                if (keyboard.isEnabled() && !chatWindow->isInputFocused()
-                                         && !npcStringDialog->isInputFocused())
+                    }
+
+                    // Quit by pressing Enter if the exit confirm is there
+                    if (exitConfirm)
+                       done = true;
+                    // Close the Browser if opened
+                    else if (helpWindow->isVisible())
+                        helpWindow->setVisible(false);
+                    // Close the config window, cancelling changes if opened
+                    else if (setupWindow->isVisible())
+                        setupWindow->action(gcn::ActionEvent(NULL, "cancel"));
+                    // Submits the text and proceeds to the next dialog
+                    else if (npcStringDialog->isVisible())
+                        npcStringDialog->action(gcn::ActionEvent(NULL, "ok"));
+                    // Proceed to the next dialog option, or close the window
+                    else if (npcTextDialog->isVisible())
+                        npcTextDialog->action(gcn::ActionEvent(NULL, "ok"));
+                    // Choose the currently highlighted dialogue option
+                    else if (npcListDialog->isVisible())
+                        npcListDialog->action(gcn::ActionEvent(NULL, "ok"));
+                    // Submits the text and proceeds to the next dialog
+                    else if (npcIntegerDialog->isVisible())
+                        npcIntegerDialog->action(gcn::ActionEvent(NULL, "ok"));
+                    // Else, open the chat edit box
+                    else
+                    {
+                        chatWindow->requestChatFocus();
+                        used = true;
+                    }
+                    break;
+               // Quitting confirmation dialog
+               case SDLK_ESCAPE:
+                    if (!exitConfirm) 
+                    {
+                        exitConfirm = new ConfirmDialog( _("Quit"), 
+                                                         _("Are you sure you "
+                                                           "want to quit?"));
+                        exitConfirm->addActionListener(&exitListener);
+                        exitConfirm->requestMoveToTop();
+                    }
+                    else
+                    {
+                        exitConfirm->action(gcn::ActionEvent(NULL, _("no")));
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+            if (keyboard.isEnabled() && !chatWindow->isInputFocused()
+                                     && !npcStringDialog->isInputFocused())
+            {
+                const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
+
+                // Do not activate shortcuts if tradewindow is visible
+                if (!tradeWindow->isVisible())
                 {
-                    const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
-                    // Do not activate shortcuts if tradewindow is visible
-                    if (!tradeWindow->isVisible())
+                    // Checks if any item shortcut is pressed.
+                    for (int i = KeyboardConfig::KEY_SHORTCUT_1;
+                             i <= KeyboardConfig::KEY_SHORTCUT_12;
+                             i++)
                     {
-                        // Checks if any item shortcut is pressed.
-                        for (int i = KeyboardConfig::KEY_SHORTCUT_1;
-                                 i <= KeyboardConfig::KEY_SHORTCUT_12;
-                                 i++)
+                        if (tKey == i && !used) 
                         {
-                            if (tKey == i && !used) 
-                            {
-                                itemShortcut->useItem(
-                                              i - KeyboardConfig::KEY_SHORTCUT_1);
-                                break;
-                            }
+                            itemShortcut->useItem(
+                                          i - KeyboardConfig::KEY_SHORTCUT_1);
+                            break;
                         }
                     }
-                    switch (tKey)
-                    {
-                        case KeyboardConfig::KEY_PICKUP:
-                            FloorItem *item =
-                                floorItemManager->findByCoordinates(
-                                        player_node->mX, player_node->mY);
+                }
+
+                switch (tKey)
+                {
+                    case KeyboardConfig::KEY_PICKUP:
+                        {
+                            FloorItem *item = floorItemManager->findByCoordinates(
+                                                                player_node->mX,
+                                                                player_node->mY);
 
                             // If none below the player, try the tile in front
                             // of the player
-                            if (!item) {
+                            if (!item)
+                            {
                                 Uint16 x = player_node->mX;
                                 Uint16 y = player_node->mY;
                                 if (player_node->getDirection() & Being::UP)
@@ -708,164 +696,160 @@ void Game::handleInput()
                                     x--;
                                 if (player_node->getDirection() & Being::RIGHT)
                                     x++;
-
-                                item = floorItemManager->findByCoordinates(
-                                        x, y);
+                                item = floorItemManager->findByCoordinates(x, y);
                             }
 
                             if (item)
                                 player_node->pickUp(item);
 
                             used = true;
-                            break;
-                        case KeyboardConfig::KEY_SIT:
-                             // Player sit action
-                            player_node->toggleSit();
-                            used = true;
-                            break;
-                        case KeyboardConfig::KEY_HIDE_WINDOWS:
-                            // Hide certain windows
-                            if (!chatWindow->isInputFocused())
-                            {
-                                statusWindow->setVisible(false);
-                                inventoryWindow->setVisible(false);
-                                emoteWindow->setVisible(false);
-                                skillDialog->setVisible(false);
-                                setupWindow->setVisible(false);
-                                equipmentWindow->setVisible(false);
-                                helpWindow->setVisible(false);
-                                debugWindow->setVisible(false);
-                            }
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_STATUS:
-                            requestedWindow = statusWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_INVENTORY:
-                            requestedWindow = inventoryWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_EQUIPMENT:
-                            requestedWindow = equipmentWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_SKILL:
-                            requestedWindow = skillDialog;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_MINIMAP:
-                            minimap->toggle();
-                            requestedWindow = minimap;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_CHAT:
-                            requestedWindow = chatWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_SHORTCUT:
-                            requestedWindow = itemShortcutWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_SETUP:
-                            requestedWindow = setupWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_DEBUG:
-                            requestedWindow = debugWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_EMOTE:
-                            requestedWindow = emoteWindow;
-                            break;
-                        case KeyboardConfig::KEY_WINDOW_EMOTE_SHORTCUT:
-                            requestedWindow = emoteShortcutWindow;
-                            break;
-                   }
-                }
-
-                if (requestedWindow)
-                {
-                    requestedWindow->setVisible(!requestedWindow->isVisible());
-                    if (requestedWindow->isVisible())
-                    {
-                        requestedWindow->requestMoveToTop();
-                    }
-                    used = true;
+                        }
+                        break;
+                    case KeyboardConfig::KEY_SIT:
+                        // Player sit action
+                        player_node->toggleSit();
+                        used = true;
+                        break;
+                    case KeyboardConfig::KEY_HIDE_WINDOWS:
+                        // Hide certain windows
+                        if (!chatWindow->isInputFocused())
+                        {
+                            statusWindow->setVisible(false);
+                            inventoryWindow->setVisible(false);
+                            emoteWindow->setVisible(false);
+                            skillDialog->setVisible(false);
+                            setupWindow->setVisible(false);
+                            equipmentWindow->setVisible(false);
+                            helpWindow->setVisible(false);
+                            debugWindow->setVisible(false);
+                        }
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_STATUS:
+                        requestedWindow = statusWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_INVENTORY:
+                        requestedWindow = inventoryWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_EQUIPMENT:
+                        requestedWindow = equipmentWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_SKILL:
+                        requestedWindow = skillDialog;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_MINIMAP:
+                        minimap->toggle();
+                        requestedWindow = minimap;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_CHAT:
+                        requestedWindow = chatWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_SHORTCUT:
+                        requestedWindow = itemShortcutWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_SETUP:
+                        requestedWindow = setupWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_DEBUG:
+                        requestedWindow = debugWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_EMOTE:
+                        requestedWindow = emoteWindow;
+                        break;
+                    case KeyboardConfig::KEY_WINDOW_EMOTE_SHORTCUT:
+                        requestedWindow = emoteShortcutWindow;
+                        break;
                 }
-
-            }
-            // Quit event
-            else if (event.type == SDL_QUIT)
-            {
-                done = true;
             }
 
-            // Push input to GUI when not used
-            if (!used)
+            if (requestedWindow)
             {
-                try
-                {
-                    guiInput->pushInput(event);
-                }
-                catch (gcn::Exception e)
-                {
-                    const char* err = e.getMessage().c_str();
-                    logger->log(_("Warning: guichan input exception: %s"), err);
-                }
+                requestedWindow->setVisible(!requestedWindow->isVisible());
+                if (requestedWindow->isVisible())
+                    requestedWindow->requestMoveToTop();
+                used = true;
             }
-        } // End while
-
-        // If the user is configuring the keys then don't respond.
-        if (!keyboard.isEnabled())
-            return;
-
-        // Moving player around
-        if (player_node->mAction != Being::DEAD &&
-            current_npc == 0 && !chatWindow->isInputFocused())
+        }
+        // Quit event
+        else if (event.type == SDL_QUIT)
         {
-            // Get the state of the keyboard keys
-            keyboard.refreshActiveKeys();
-
-            const Uint16 x = player_node->mX;
-            const Uint16 y = player_node->mY;
-            unsigned char direction = 0;
+            done = true;
+        }
 
-            // Translate pressed keys to movement and direction
-            if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP) ||
-               (joystick && joystick->isUp()))
+        // Push input to GUI when not used
+        if (!used)
+        {
+            try
             {
-                direction |= Being::UP;
+                guiInput->pushInput(event);
             }
-            else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) ||
-                    (joystick && joystick->isDown()))
+            catch (gcn::Exception e)
             {
-                direction |= Being::DOWN;
+                const char* err = e.getMessage().c_str();
+                logger->log(_("Warning: guichan input exception: %s"), err);
             }
+        }
+    } // End while
 
-            if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) ||
-               (joystick && joystick->isLeft()))
-            {
-                direction |= Being::LEFT;
-            }
-            else if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) ||
-                    (joystick && joystick->isRight()))
-            {
-                direction |= Being::RIGHT;
-            }
+    // If the user is configuring the keys then don't respond.
+    if (!keyboard.isEnabled())
+        return;
 
-            player_node->setWalkingDir(direction);
+    // Moving player around
+    if (player_node->mAction != Being::DEAD &&
+        current_npc == 0 && !chatWindow->isInputFocused())
+    {
+        // Get the state of the keyboard keys
+        keyboard.refreshActiveKeys();
+
+        const Uint16 x = player_node->mX;
+        const Uint16 y = player_node->mY;
+        unsigned char direction = 0;
 
-            // Attacking monsters
-            if (keyboard.isKeyActive(keyboard.KEY_ATTACK) ||
-               (joystick && joystick->buttonPressed(0)))
+        // Translate pressed keys to movement and direction
+        if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP) ||
+           (joystick && joystick->isUp()))
+        {
+            direction |= Being::UP;
+        }
+        else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) ||
+                (joystick && joystick->isDown()))
+        {
+            direction |= Being::DOWN;
+        }
+
+        if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) ||
+           (joystick && joystick->isLeft()))
+        {
+            direction |= Being::LEFT;
+        }
+        else if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) ||
+                (joystick && joystick->isRight()))
+        {
+            direction |= Being::RIGHT;
+        }
+
+        player_node->setWalkingDir(direction);
+
+        // Attacking monsters
+        if (keyboard.isKeyActive(keyboard.KEY_ATTACK) ||
+           (joystick && joystick->buttonPressed(0)))
+        {
+            Being *target = beingManager->findNearestLivingBeing(x, y, 20, 
+                                                                 Being::MONSTER);
+
+            bool newTarget = !keyboard.isKeyActive(keyboard.KEY_TARGET);
+            // A set target has highest priority
+            if (newTarget || !player_node->getTarget())
             {
-                Being *target = beingManager->findNearestLivingBeing(x, y, 20, 
-                                                                     Being::MONSTER);
+                Uint16 targetX = x, targetY = y;
 
-                bool newTarget = !keyboard.isKeyActive(keyboard.KEY_TARGET);
-                // A set target has highest priority
-                if (newTarget || !player_node->getTarget())
+                switch (player_node->getSpriteDirection())
                 {
-                     Uint16 targetX = x, targetY = y;
-
-                    switch (player_node->getSpriteDirection())
-                    {
-                        case DIRECTION_UP   : --targetY; break;
-                        case DIRECTION_DOWN : ++targetY; break;
-                        case DIRECTION_LEFT : --targetX; break;
-                        case DIRECTION_RIGHT: ++targetX; break;
-                        default: break;
+                    case DIRECTION_UP   : --targetY; break;
+                    case DIRECTION_DOWN : ++targetY; break;
+                    case DIRECTION_LEFT : --targetX; break;
+                    case DIRECTION_RIGHT: ++targetX; break;
+                    default: break;
                 }
 
                 // Attack priorioty is: Monster, Player, auto target
-- 
cgit v1.2.3-70-g09d2


From 114559b98b7e8c94b1d84d4d450309fd16ed2a38 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 20 Jan 2009 09:37:46 -0700
Subject: Modified the item shortcut bar to show item popups based on a
 suggestion made by Jarvellis.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/itemshortcutcontainer.cpp | 82 ++++++++++++++++++++++++++++++++-------
 src/gui/itemshortcutcontainer.h   |  7 ++++
 2 files changed, 74 insertions(+), 15 deletions(-)

diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index e66dc04f..950c042a 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -43,6 +43,8 @@ ItemShortcutContainer::ItemShortcutContainer():
     addMouseListener(this);
     addWidgetListener(this);
 
+    mItemPopup = new ItemPopup();
+
     ResourceManager *resman = ResourceManager::getInstance();
 
     mBackgroundImg = resman->getImage("graphics/gui/item_shortcut_bgr.png");
@@ -134,16 +136,21 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
 
 void ItemShortcutContainer::mouseDragged(gcn::MouseEvent &event)
 {
-    if (event.getButton() == gcn::MouseEvent::LEFT) {
-        if (!mItemMoved && mItemClicked) {
+    if (event.getButton() == gcn::MouseEvent::LEFT)
+    {
+        if (!mItemMoved && mItemClicked)
+        {
             const int index = getIndexFromGrid(event.getX(), event.getY());
-            if (index == -1) {
-                return;
-            }
             const int itemId = itemShortcut->getItem(index);
+
+            if (index == -1)
+                return;
+
             if (itemId < 0)
                 return;
+
             Item *item = player_node->getInventory()->findItem(itemId);
+
             if (item)
             {
                 mItemMoved = item;
@@ -160,18 +167,17 @@ void ItemShortcutContainer::mouseDragged(gcn::MouseEvent &event)
 void ItemShortcutContainer::mousePressed(gcn::MouseEvent &event)
 {
     const int index = getIndexFromGrid(event.getX(), event.getY());
-    if (index == -1) {
+    if (index == -1)
         return;
-    }
 
     // Stores the selected item if theirs one.
-    if (itemShortcut->isItemSelected()) {
+    if (itemShortcut->isItemSelected())
+    {
         itemShortcut->setItem(index);
         itemShortcut->setItemSelected(-1);
     }
-    else if (itemShortcut->getItem(index)) {
+    else if (itemShortcut->getItem(index))
         mItemClicked = true;
-    }
 }
 
 void ItemShortcutContainer::mouseReleased(gcn::MouseEvent &event)
@@ -179,15 +185,16 @@ void ItemShortcutContainer::mouseReleased(gcn::MouseEvent &event)
     if (event.getButton() == gcn::MouseEvent::LEFT)
     {
         if (itemShortcut->isItemSelected())
-        {
             itemShortcut->setItemSelected(-1);
-        }
+
         const int index = getIndexFromGrid(event.getX(), event.getY());
-        if (index == -1) {
+        if (index == -1)
+        {
             mItemMoved = NULL;
             return;
         }
-        if (mItemMoved) {
+        if (mItemMoved)
+        {
             itemShortcut->setItems(index, mItemMoved->getId());
             mItemMoved = NULL;
         }
@@ -195,9 +202,54 @@ void ItemShortcutContainer::mouseReleased(gcn::MouseEvent &event)
         {
             itemShortcut->useItem(index);
         }
-        if (mItemClicked) {
+        if (mItemClicked)
             mItemClicked = false;
+    }
+}
+
+// Show ItemTooltip
+void ItemShortcutContainer::mouseMoved(gcn::MouseEvent &event)
+{
+    const int index = getIndexFromGrid(event.getX(), event.getY());
+    const int itemId = itemShortcut->getItem(index);
+
+    if (index == -1)
+         return;
+
+    if (itemId < 0)
+        return;
+
+    Item *item = player_node->getInventory()->findItem(itemId);
+
+    if (item)
+    {
+        if (getParent()->getParent()->getWidth() < 
+            getParent()->getParent()->getHeight())
+        {
+            mItemPopup->setPosition(getParent()->getParent()->getX() - 
+                                    mItemPopup->getWidth(), 
+                                    getParent()->getParent()->getY());
         }
+        else
+        {
+            mItemPopup->setPosition(getParent()->getParent()->getX(), 
+                                    getParent()->getParent()->getY() + 
+                                    getParent()->getParent()->getHeight());
+        }
+
+        mItemPopup->setItem(item->getInfo());
+        mItemPopup->setOpaque(false);
+        mItemPopup->setVisible(true);
     }
+    else
+    {
+        mItemPopup->setVisible(false);
+    }
+}
+
+// Hide ItemTooltip
+void ItemShortcutContainer::mouseExited(gcn::MouseEvent &event)
+{
+    mItemPopup->setVisible(false);
 }
 
diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h
index 37c61e07..07e2c38d 100644
--- a/src/gui/itemshortcutcontainer.h
+++ b/src/gui/itemshortcutcontainer.h
@@ -29,6 +29,8 @@
 #include "../guichanfwd.h"
 #include "shortcutcontainer.h"
 
+#include "itempopup.h"
+
 class Image;
 class Item;
 
@@ -76,8 +78,13 @@ class ItemShortcutContainer : public ShortcutContainer
         void mouseReleased(gcn::MouseEvent &event);
 
     private:
+        void mouseExited(gcn::MouseEvent &event);
+        void mouseMoved(gcn::MouseEvent &event);
+
         bool mItemClicked;
         Item *mItemMoved;
+
+        ItemPopup *mItemPopup;
 };
 
 #endif
-- 
cgit v1.2.3-70-g09d2


From 088ccc74d9b8695c906eaabae8e4019ebf55c83c Mon Sep 17 00:00:00 2001
From: David Athay <ko2fan@gmail.com>
Date: Tue, 13 Jan 2009 12:48:36 +0000
Subject: Added WoW style item adding to chat window. Right click, then left
 clicking on add to chat to put the item in the chat input. Left click the
 item link to show a popup description, and click the link again to remove the
 popup.

---
 aethyra.cbp                 |  2 ++
 src/CMakeLists.txt          |  2 ++
 src/Makefile.am             |  2 ++
 src/gui/chat.cpp            | 22 +++++++++++++----
 src/gui/chat.h              |  7 +++++-
 src/gui/inventorywindow.cpp |  6 ++---
 src/gui/inventorywindow.h   |  2 ++
 src/gui/itemcontainer.cpp   | 10 ++++----
 src/gui/itemcontainer.h     |  2 +-
 src/gui/itemlinkhandler.cpp | 60 +++++++++++++++++++++++++++++++++++++++++++++
 src/gui/itemlinkhandler.h   | 40 ++++++++++++++++++++++++++++++
 src/gui/itempopup.cpp       |  6 ++---
 src/gui/popupmenu.cpp       |  7 ++++++
 13 files changed, 150 insertions(+), 18 deletions(-)
 create mode 100644 src/gui/itemlinkhandler.cpp
 create mode 100644 src/gui/itemlinkhandler.h

diff --git a/aethyra.cbp b/aethyra.cbp
index 633cea8d..ebda9029 100644
--- a/aethyra.cbp
+++ b/aethyra.cbp
@@ -167,6 +167,8 @@
 		<Unit filename="src\gui\item_amount.h" />
 		<Unit filename="src\gui\itemcontainer.cpp" />
 		<Unit filename="src\gui\itemcontainer.h" />
+		<Unit filename="src\gui\itemlinkhandler.cpp" />
+		<Unit filename="src\gui\itemlinkhandler.h" />
 		<Unit filename="src\gui\itempopup.cpp" />
 		<Unit filename="src\gui\itempopup.h" />
 		<Unit filename="src\gui\itemshortcutcontainer.cpp" />
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1aa38230..94cf0174 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -103,6 +103,8 @@ SET(SRCS
     gui/inventorywindow.h
     gui/itemcontainer.cpp
     gui/itemcontainer.h
+    gui/itemlinkhandler.cpp
+    gui/itemlinkhandler.h
     gui/itempopup.cpp
     gui/itempopup.h
     gui/itemshortcutcontainer.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 37b40936..8f76b06a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -61,6 +61,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/inventorywindow.h \
 	      gui/itemcontainer.cpp \
 	      gui/itemcontainer.h \
+	      gui/itemlinkhandler.cpp \
+	      gui/itemlinkhandler.h \
 	      gui/itempopup.cpp \
 	      gui/itempopup.h \
 	      gui/itemshortcutcontainer.cpp \
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index fa969d17..3e9b292e 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -27,6 +27,7 @@
 #include "browserbox.h"
 #include "chat.h"
 #include "chatinput.h"
+#include "itemlinkhandler.h"
 #include "scrollarea.h"
 #include "sdlinput.h"
 #include "windowcontainer.h"
@@ -54,19 +55,23 @@ Window(""), mNetwork(network), mTmpVisible(false)
     setResizable(true);
     setDefaultSize(0, windowContainer->getHeight() - 123, 600, 123);
 
+    mItemLinkHandler = new ItemLinkHandler();
+
     mChatInput = new ChatInput;
     mChatInput->setActionEventId("chatinput");
     mChatInput->addActionListener(this);
 
     mTextOutput = new BrowserBox(BrowserBox::AUTO_WRAP);
     mTextOutput->setOpaque(false);
-    mTextOutput->disableLinksAndUserColors();
     mTextOutput->setMaxRow((int) config.getValue("ChatLogLength", 0));
+    mTextOutput->setLinkHandler(mItemLinkHandler);
+
     mScrollArea = new ScrollArea(mTextOutput);
-    mScrollArea->setPosition(mScrollArea->getFrameSize(),
+    mScrollArea->setPosition(mScrollArea->getFrameSize(), 
                              mScrollArea->getFrameSize());
     mScrollArea->setScrollPolicy(gcn::ScrollArea::SHOW_NEVER,
                                  gcn::ScrollArea::SHOW_ALWAYS);
+    mScrollArea->setScrollAmount(0, 1);
     mScrollArea->setOpaque(false);
 
     add(mScrollArea);
@@ -257,9 +262,8 @@ void ChatWindow::action(const gcn::ActionEvent & event)
 
             // If the chatWindow is shown up because you want to send a message
             // It should hide now
-            if (mTmpVisible) {
+            if (mTmpVisible)
                 setVisible(false);
-            }
         }
     }
 }
@@ -697,7 +701,15 @@ void ChatWindow::keyPressed(gcn::KeyEvent & event)
 
 void ChatWindow::setInputText(std::string input_str)
 {
-    mChatInput->setText(input_str + " ");
+     mChatInput->setText(mChatInput->getText() + input_str + " ");
+     requestChatFocus();
+}
+
+void ChatWindow::addItemText(int itemId, const std::string &item)
+{
+    std::ostringstream text;
+    text << "[@@" << itemId << "|" << item << "@@] ";
+    mChatInput->setText(mChatInput->getText() + text.str());
     requestChatFocus();
 }
 
diff --git a/src/gui/chat.h b/src/gui/chat.h
index f7d05df1..03b2062a 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -38,6 +38,7 @@ class Network;
 class Recorder;
 class Party;
 class ScrollArea;
+class ItemLinkHandler;
 
 #define BY_GM         0   // those should be self-explanatory =)
 #define BY_PLAYER     1
@@ -185,6 +186,9 @@ class ChatWindow : public Window, public gcn::ActionListener,
         /** Called to set current text */
         void setInputText(std::string input_str);
 
+        /** Called to add item to chat */
+        void addItemText(int itemid, const std::string &item);
+
         /** Override to reset mTmpVisible */
         void setVisible(bool visible);
 
@@ -234,7 +238,8 @@ class ChatWindow : public Window, public gcn::ActionListener,
         gcn::TextField *mChatInput; /**< Input box for typing chat messages */
         BrowserBox *mTextOutput;    /**< Text box for displaying chat history */
         ScrollArea *mScrollArea;    /**< Scroll area around text output */
-
+        ItemLinkHandler *mItemLinkHandler; /** Used for showing item popup on
+                                               clicking links **/
         typedef std::list<std::string> History;
         typedef History::iterator HistoryIterator;
         History mHistory;           /**< Command history */
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 5ac966e3..efe1cd51 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -42,7 +42,8 @@
 #include "../utils/tostring.h"
 
 InventoryWindow::InventoryWindow():
-    Window(_("Inventory"))
+    Window(_("Inventory")),
+    mItemDesc(false)
 {
     setWindowName(_("Inventory"));
     setResizable(true);
@@ -201,8 +202,7 @@ void InventoryWindow::updateButtons()
         }
         else {
             mUseButton->setCaption(_("Equip"));
-        }
-    }
+        }    }
     else {
         mUseButton->setCaption(_("Use"));
     }
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 989a5c1d..922dd28f 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -90,6 +90,8 @@ class InventoryWindow : public Window, gcn::ActionListener,
         gcn::Button *mUseButton, *mDropButton;
         gcn::ScrollArea *mInvenScroll;
         TextBox *mWeightLabel;
+
+        bool mItemDesc;
 };
 
 extern InventoryWindow *inventoryWindow;
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 7d9b3f70..78745158 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -164,7 +164,8 @@ void ItemContainer::selectNone()
 
 void ItemContainer::refindSelectedItem()
 {
-    if (mSelectedItemIndex != NO_ITEM) {
+    if (mSelectedItemIndex != NO_ITEM)
+    {
 
         if (mInventory->getItem(mSelectedItemIndex) &&
             mInventory->getItem(mSelectedItemIndex)->getId() == mLastSelectedItemId)
@@ -175,7 +176,8 @@ void ItemContainer::refindSelectedItem()
 
         for (int i = 0; i <= mMaxItems + 1; i++)
             if (mInventory->getItem(i) &&
-                mInventory->getItem(i)->getId() == mLastSelectedItemId) {
+                mInventory->getItem(i)->getId() == mLastSelectedItemId)
+            {
                 mSelectedItemIndex = i;
                 return;
             }
@@ -248,12 +250,11 @@ void ItemContainer::mouseMoved(gcn::MouseEvent &event)
 {
     Item *item = mInventory->getItem( getSlotIndex(event.getX(), event.getY() ) );
 
-    if( item )
+    if (item)
     {
         mItemPopup->setPosition(getParent()->getParent()->getX() + 
                                 getParent()->getParent()->getWidth(), 
                                 getParent()->getParent()->getY());
-
         mItemPopup->setItem(item->getInfo());
         mItemPopup->setOpaque(false);
         mItemPopup->setVisible(true);
@@ -278,4 +279,3 @@ int ItemContainer::getSlotIndex(const int posX, const int posY) const
     return (index);
 }
 
-
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index 223a3677..558470bd 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -144,9 +144,9 @@ class ItemContainer : public gcn::Widget,
 
         Inventory *mInventory;
         Image *mSelImg;
+
         int mSelectedItemIndex;
         int mLastSelectedItemId;  // last selected item ID. If we lose the item, find again by ID.
-
         int mMaxItems;
         int mOffset;
 
diff --git a/src/gui/itemlinkhandler.cpp b/src/gui/itemlinkhandler.cpp
new file mode 100644
index 00000000..bdfa2ca6
--- /dev/null
+++ b/src/gui/itemlinkhandler.cpp
@@ -0,0 +1,60 @@
+/*
+ *  The Mana World
+ *  Copyright 2009 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "itemlinkhandler.h"
+#include "itempopup.h"
+
+#include "../resources/iteminfo.h"
+#include "../resources/itemdb.h"
+
+#include <sstream>
+#include <string>
+
+ItemLinkHandler::ItemLinkHandler()
+{
+    mItemPopup = new ItemPopup;
+}
+
+ItemLinkHandler::~ItemLinkHandler()
+{
+    delete mItemPopup;
+}
+
+void ItemLinkHandler::handleLink(const std::string &link)
+{
+    int id = 0;
+    std::stringstream stream;
+    stream << link;
+    stream >> id;
+    if (id > 0)
+    {
+        const ItemInfo &iteminfo = ItemDB::get(id);
+        mItemPopup->setItem(iteminfo);
+        if (mItemPopup->isVisible())
+        {
+            mItemPopup->setVisible(false);
+        }
+        else
+        {
+            mItemPopup->setVisible(true);
+        }
+    }
+}
diff --git a/src/gui/itemlinkhandler.h b/src/gui/itemlinkhandler.h
new file mode 100644
index 00000000..973aab75
--- /dev/null
+++ b/src/gui/itemlinkhandler.h
@@ -0,0 +1,40 @@
+/*
+ *  The Mana World
+ *  Copyright 2009 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _TMW_ITEM_LINK_HANDLER_H_
+#define _TMW_ITEM_LINK_HANDLER_H_
+
+#include "linkhandler.h"
+
+class ItemPopup;
+
+class ItemLinkHandler : public LinkHandler
+{
+    public:
+        ItemLinkHandler();
+        ~ItemLinkHandler();
+        void handleLink(const std::string &link);
+
+    private:
+        ItemPopup *mItemPopup;
+};
+
+#endif
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index 5f7dc736..c0a75193 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -50,6 +50,7 @@ ItemPopup::ItemPopup():
     // Item Description
     mItemDesc = new TextBox();
     mItemDesc->setEditable(false);
+    mItemDesc->setMinWidth(186);
     mItemDescScroll = new ScrollArea(mItemDesc);
 
     mItemDescScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
@@ -61,6 +62,7 @@ ItemPopup::ItemPopup():
     // Item Effect
     mItemEffect = new TextBox();
     mItemEffect->setEditable(false);
+    mItemEffect->setMinWidth(186);
     mItemEffectScroll = new ScrollArea(mItemEffect);
 
     mItemEffectScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
@@ -98,11 +100,9 @@ void ItemPopup::setItem(const ItemInfo &item)
     int numRowsEffect = mItemEffect->getNumberOfRows();
 
     if(item.getEffect() == "")
-    {
         setContentSize(200, (numRowsDesc * 14) + 30);
-    } else {
+    else
         setContentSize(200, (numRowsDesc * 14) + (numRowsEffect * 14) + 30);
-    }
 
     mItemDescScroll->setDimension(gcn::Rectangle(2, 0, 196, numRowsDesc * 14));
 
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index a02a9eae..fde81cd8 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -25,6 +25,7 @@
 #include <guichan/focushandler.hpp>
 
 #include "browserbox.h"
+#include "chat.h"
 #include "inventorywindow.h"
 #include "item_amount.h"
 #include "popupmenu.h"
@@ -248,6 +249,11 @@ void PopupMenu::handleLink(const std::string& link)
 	}
     }
 
+    else if (link == "chat")
+    {
+	chatWindow->addItemText(mItem->getId(), mItem->getInfo().getName());
+    }
+
     else if (link == "drop")
     {
 	new ItemAmountWindow(AMOUNT_ITEM_DROP, inventoryWindow, mItem);
@@ -297,6 +303,7 @@ void PopupMenu::showPopup(int x, int y, Item *item)
         mBrowserBox->addRow(_("@@use|Use@@"));
 
     mBrowserBox->addRow(_("@@drop|Drop@@"));
+    mBrowserBox->addRow(_("@@chat|Add to Chat@@"));
     mBrowserBox->addRow(_("@@description|Description@@"));
     mBrowserBox->addRow("##3---");
     mBrowserBox->addRow(_("@@cancel|Cancel@@"));
-- 
cgit v1.2.3-70-g09d2


From de068425200d5254181c6806ebeb4a72d68895ec Mon Sep 17 00:00:00 2001
From: David Athay <ko2fan@gmail.com>
Date: Wed, 14 Jan 2009 14:11:35 +0000
Subject: Added linking to item's just using [Item Name] in chat

---
 src/gui/chat.cpp         | 21 +++++++++++++++++++++
 src/resources/itemdb.cpp | 32 ++++++++++++++++++++++++++++++++
 src/resources/itemdb.h   |  3 +++
 src/resources/iteminfo.h |  7 +++++++
 4 files changed, 63 insertions(+)

diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 3e9b292e..84666df4 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -43,8 +43,12 @@
 #include "../net/messageout.h"
 #include "../net/protocol.h"
 
+#include "../resources/iteminfo.h"
+#include "../resources/itemdb.h"
+
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
+#include "../utils/tostring.h"
 #include "../utils/trim.h"
 
 ChatWindow::ChatWindow(Network * network):
@@ -352,6 +356,23 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
         return;
     }
 
+    // check for item link
+    std::string::size_type start = msg.find('[');
+    if (start != std::string::npos)
+    {
+        std::string::size_type end = msg.find(']', start);
+        if (end != std::string::npos)
+        {
+            std::string temp = msg.substr(start+1, end-1);
+            ItemInfo itemInfo = ItemDB::get(temp);
+            msg.insert(end, "@@");
+            msg.insert(start+1, "|");
+            msg.insert(start+1, toString(itemInfo.getId()));
+            msg.insert(start+1, "@@");
+
+        }
+    }
+
     // Prepare ordinary message
     if (msg.substr(0, 1) != "/") 
     {
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 7091abed..53e7530b 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -36,6 +36,7 @@
 namespace
 {
     ItemDB::ItemInfos mItemInfos;
+    ItemDB::NamedItemInfos mNamedItemInfos;
     ItemInfo *mUnknown;
     bool mLoaded = false;
 }
@@ -95,6 +96,7 @@ void ItemDB::load()
         if (id)
         {
             ItemInfo *itemInfo = new ItemInfo;
+            itemInfo->setId(id);
             itemInfo->setImageName(image);
             itemInfo->setName(name.empty() ? _("Unnamed") : name);
             itemInfo->setDescription(description);
@@ -117,6 +119,19 @@ void ItemDB::load()
             }
 
             mItemInfos[id] = itemInfo;
+            if (!name.empty())
+            {
+                NamedItemInfoIterator itr = mNamedItemInfos.find(name);
+                if (itr == mNamedItemInfos.end())
+                {
+                    mNamedItemInfos[name] = itemInfo;
+                }
+                else
+                {
+                    logger->log(_("ItemDB: Duplicate name of item found item %d"),
+                                   id);
+                }
+            }
         }
 
 #define CHECK_PARAM(param, error_value) \
@@ -166,6 +181,23 @@ const ItemInfo& ItemDB::get(int id)
     }
 }
 
+const ItemInfo& ItemDB::get(const std::string &name)
+{
+    assert(mLoaded && !name.empty());
+
+    NamedItemInfoIterator i = mNamedItemInfos.find(name);
+
+    if (i == mNamedItemInfos.end())
+    {
+        logger->log("ItemDB: Error, unknown item name %s", name.c_str());
+        return *mUnknown;
+    }
+    else
+    {
+        return *(i->second);
+    }
+}
+
 void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node)
 {
     std::string gender = XML::getProperty(node, "gender", "unisex");
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 9b661a60..2cc23ec9 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -42,10 +42,13 @@ namespace ItemDB
     void unload();
 
     const ItemInfo& get(int id);
+    const ItemInfo& get(const std::string &name);
 
     // Items database
     typedef std::map<int, ItemInfo*> ItemInfos;
+    typedef std::map<std::string, ItemInfo*> NamedItemInfos;
     typedef ItemInfos::iterator ItemInfoIterator;
+    typedef NamedItemInfos::iterator NamedItemInfoIterator;
 }
 
 #endif
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index b7729d2c..773fd17c 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -54,6 +54,12 @@ class ItemInfo
         {
         }
 
+        void setId(int id)
+        { mId = id; }
+
+        int getId() const
+        { return mId; }
+
         void setName(const std::string &name)
         { mName = name; }
 
@@ -115,6 +121,7 @@ class ItemInfo
         char mType;                    /**< Item type. */
         short mWeight;                 /**< Weight in grams. */
         int mView;                     /**< Item ID of how this item looks. */
+        int mId;                       /**< Item ID */
 
         // Equipment related members
         SpriteAction mAttackType;      /**< Attack type, in case of weapon. */
-- 
cgit v1.2.3-70-g09d2


From 1cd00ac68dca25c942c8db0cbaa8110d4a6a2f7a Mon Sep 17 00:00:00 2001
From: David Athay <ko2fan@gmail.com>
Date: Thu, 15 Jan 2009 11:13:33 +0000
Subject: Fix bug with item links.

---
 src/gui/chat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 84666df4..b4b533db 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -358,7 +358,7 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
 
     // check for item link
     std::string::size_type start = msg.find('[');
-    if (start != std::string::npos)
+    if (start != std::string::npos && msg[start+1] != '@')
     {
         std::string::size_type end = msg.find(']', start);
         if (end != std::string::npos)
-- 
cgit v1.2.3-70-g09d2


From f404997629d9a34f5a15261073536903a59a604c Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 20 Jan 2009 11:57:14 -0700
Subject: Trim displayed speech to not show links.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/being.cpp            | 34 +++++++++++++++++++++++++++++++++-
 src/gui/speechbubble.cpp |  5 -----
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index 98aaeec2..3e621295 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -171,7 +171,39 @@ void Being::setSpeech(const std::string &text, Uint32 time)
 {
     mSpeech = text;
 
-    mSpeechTime = 500;
+    // Trim whitespace
+    while (mSpeech[0] == ' ')
+    {
+        mSpeech = mSpeech.substr(1, mSpeech.size());
+    }
+    while (mSpeech[mSpeech.size()] == ' ')
+    {
+        mSpeech = mSpeech.substr(0, mSpeech.size() - 1);
+    }
+
+    // check for links
+    const std::string::size_type start = mSpeech.find('[');
+    const std::string::size_type end = mSpeech.find(']', start);
+
+    if (start != std::string::npos && end != std::string::npos)
+    {
+        mSpeech.erase(end);
+        std::string::size_type pos = mSpeech.find('@');
+
+        while (pos != std::string::npos)
+        {
+            mSpeech.erase(pos, 2);
+            pos = mSpeech.find('@');
+        }
+
+        pos = mSpeech.find('|');
+
+        if (pos != std::string::npos)
+            mSpeech = mSpeech.substr(pos + 1, mSpeech.size());
+    }
+
+    if (mSpeech != "")
+        mSpeechTime = 500;
 }
 
 void Being::takeDamage(int amount)
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 5539202e..4fa63973 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -61,11 +61,6 @@ SpeechBubble::SpeechBubble():
 
 void SpeechBubble::setText(std::string mText)
 {
-    while (mText[0] == ' ')
-    {
-        mText = mText.substr(1, mText.size());
-    }
-
     mSpeechBox->setMinWidth(140);
     mSpeechBox->setTextWrapped( mText );
 
-- 
cgit v1.2.3-70-g09d2


From 7db9e03f34bf150dbcfec981cc3b4105bda92ada Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 20 Jan 2009 12:35:38 -0700
Subject: Changed item popup drawing to be based on the mouse position, not
 window position.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/itemcontainer.cpp         | 15 +++++++++------
 src/gui/itemlinkhandler.cpp       | 13 ++++++++-----
 src/gui/itempopup.cpp             | 14 ++++++++++++++
 src/gui/itempopup.h               |  1 +
 src/gui/itemshortcutcontainer.cpp | 18 ++++--------------
 5 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 78745158..681bf0ce 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -19,11 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "itemcontainer.h"
+#include <SDL_mouse.h>
 
 #include <guichan/mouseinput.hpp>
 #include <guichan/selectionlistener.hpp>
 
+#include "itemcontainer.h"
+
 #include "../graphics.h"
 #include "../inventory.h"
 #include "../item.h"
@@ -143,6 +145,7 @@ void ItemContainer::recalculateHeight()
 
     const int rows = (mMaxItems / cols) + (mMaxItems % cols > 0 ? 1 : 0);
     const int height = rows * gridHeight + 8;
+
     if (height != getHeight())
         setHeight(height);
 }
@@ -248,16 +251,16 @@ void ItemContainer::mousePressed(gcn::MouseEvent &event)
 // Show ItemTooltip
 void ItemContainer::mouseMoved(gcn::MouseEvent &event)
 {
-    Item *item = mInventory->getItem( getSlotIndex(event.getX(), event.getY() ) );
+    Item *item = mInventory->getItem(getSlotIndex(event.getX(), event.getY()));
 
     if (item)
     {
-        mItemPopup->setPosition(getParent()->getParent()->getX() + 
-                                getParent()->getParent()->getWidth(), 
-                                getParent()->getParent()->getY());
+        int mouseX, mouseY;
+        SDL_GetMouseState(&mouseX, &mouseY);
+
         mItemPopup->setItem(item->getInfo());
         mItemPopup->setOpaque(false);
-        mItemPopup->setVisible(true);
+        mItemPopup->view(mouseX, mouseY);
     }
     else
     {
diff --git a/src/gui/itemlinkhandler.cpp b/src/gui/itemlinkhandler.cpp
index bdfa2ca6..34c12a0c 100644
--- a/src/gui/itemlinkhandler.cpp
+++ b/src/gui/itemlinkhandler.cpp
@@ -19,6 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <SDL_mouse.h>
+
 #include "itemlinkhandler.h"
 #include "itempopup.h"
 
@@ -47,14 +49,15 @@ void ItemLinkHandler::handleLink(const std::string &link)
     if (id > 0)
     {
         const ItemInfo &iteminfo = ItemDB::get(id);
+        int mouseX, mouseY;
+
+        SDL_GetMouseState(&mouseX, &mouseY);
+
         mItemPopup->setItem(iteminfo);
+
         if (mItemPopup->isVisible())
-        {
             mItemPopup->setVisible(false);
-        }
         else
-        {
-            mItemPopup->setVisible(true);
-        }
+            mItemPopup->view(mouseX, mouseY);
     }
 }
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index c0a75193..81e4607b 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -24,6 +24,7 @@
 
 #include "gui.h"
 #include "itempopup.h"
+#include "windowcontainer.h"
 
 #include "widgets/layout.h"
 
@@ -116,3 +117,16 @@ unsigned int ItemPopup::getNumRows()
 {
     return mItemDesc->getNumberOfRows(), mItemEffect->getNumberOfRows();
 }
+
+void ItemPopup::view(int x, int y)
+{
+    if (windowContainer->getWidth() < (x + getWidth() + 5))
+	x = windowContainer->getWidth() - getWidth();
+    if (windowContainer->getHeight() < (y + getHeight() + 5))
+	y = windowContainer->getHeight() - getHeight();
+    else
+        y = y - getHeight() - 5;
+    setPosition(x, y);
+    setVisible(true);
+    requestMoveToTop();
+}
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index 5b7a911a..4206671e 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -36,6 +36,7 @@ class ItemPopup : public Window
 
         void setItem(const ItemInfo &item);
         unsigned int getNumRows();
+        void view(int x, int y);
 
     private:
         gcn::Label *mItemName;
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index 950c042a..40b435cc 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -18,6 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include <SDL_mouse.h>
 
 #include "itemshortcutcontainer.h"
 
@@ -223,23 +224,12 @@ void ItemShortcutContainer::mouseMoved(gcn::MouseEvent &event)
 
     if (item)
     {
-        if (getParent()->getParent()->getWidth() < 
-            getParent()->getParent()->getHeight())
-        {
-            mItemPopup->setPosition(getParent()->getParent()->getX() - 
-                                    mItemPopup->getWidth(), 
-                                    getParent()->getParent()->getY());
-        }
-        else
-        {
-            mItemPopup->setPosition(getParent()->getParent()->getX(), 
-                                    getParent()->getParent()->getY() + 
-                                    getParent()->getParent()->getHeight());
-        }
+        int mouseX, mouseY;
+        SDL_GetMouseState(&mouseX, &mouseY);
 
         mItemPopup->setItem(item->getInfo());
         mItemPopup->setOpaque(false);
-        mItemPopup->setVisible(true);
+        mItemPopup->view(mouseX, mouseY);
     }
     else
     {
-- 
cgit v1.2.3-70-g09d2


From 2805d11b7fa5cfc8a6e1dc739cf40f1aacef2232 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 20 Jan 2009 12:54:46 -0700
Subject: Changed name of AETHYRAROOT to SRCDIR

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 packaging/windows/setup.nsi | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index a151e3cd..629bcf85 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -2,10 +2,10 @@ CRCCheck on
 SetCompress off
 SetCompressor /SOLID lzma
 
-!define AETHYRAROOT "..\.."
+!define SRCDIR "..\.."
 
 ;--- (and without !defines ) ---
-!System "upx\upx.exe --best --crp-ms=999999 --compress-icons=0 --nrv2d ${AETHYRAROOT}\aethyra.exe"
+!System "upx\upx.exe --best --crp-ms=999999 --compress-icons=0 --nrv2d ${SRCDIR}\aethyra.exe"
 
 ; HM NIS Edit helper defines
 !define PRODUCT_NAME "Aethyra"
@@ -22,9 +22,9 @@ SetCompressor /SOLID lzma
 ; MUI Settings
 !define MUI_ABORTWARNING
 ;!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
-!define MUI_ICON "${AETHYRAROOT}\data\icons\aethyra.ico"
+!define MUI_ICON "${SRCDIR}\data\icons\aethyra.ico"
 ;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
-!define MUI_UNICON "${AETHYRAROOT}\data\icons\aethyra.ico"
+!define MUI_UNICON "${SRCDIR}\data\icons\aethyra.ico"
 
 ;Language Selection Dialog Settings
 ;Remember the installer language
@@ -40,7 +40,7 @@ SetCompressor /SOLID lzma
 !define MUI_WELCOMEPAGE_TITLE_3LINES
 !insertmacro MUI_PAGE_WELCOME
 ; License page
-!insertmacro MUI_PAGE_LICENSE "${AETHYRAROOT}\COPYING"
+!insertmacro MUI_PAGE_LICENSE "${SRCDIR}\COPYING"
 ; Directory page
 !insertmacro MUI_PAGE_DIRECTORY
 ; Instfiles page
@@ -161,31 +161,31 @@ Section "Core files (required)" SecCore
   SetOverwrite ifnewer
   SetOutPath "$INSTDIR"
 
-  File "${AETHYRAROOT}\aethyra.exe"
-  File "${AETHYRAROOT}\*.dll"
-  File "${AETHYRAROOT}\AUTHORS"
-  File "${AETHYRAROOT}\COPYING"
-  File "${AETHYRAROOT}\NEWS"
-  File "${AETHYRAROOT}\README"
+  File "${SRCDIR}\aethyra.exe"
+  File "${SRCDIR}\*.dll"
+  File "${SRCDIR}\AUTHORS"
+  File "${SRCDIR}\COPYING"
+  File "${SRCDIR}\NEWS"
+  File "${SRCDIR}\README"
   SetOutPath "$INSTDIR\data\fonts"
-  File "${AETHYRAROOT}\data\fonts\*.ttf"
+  File "${SRCDIR}\data\fonts\*.ttf"
   SetOutPath "$INSTDIR\data\graphics\gui"
-  File "${AETHYRAROOT}\data\graphics\gui\*.png"
-  File "${AETHYRAROOT}\data\graphics\gui\*.xml"
+  File "${SRCDIR}\data\graphics\gui\*.png"
+  File "${SRCDIR}\data\graphics\gui\*.xml"
   SetOutPath "$INSTDIR\data\graphics\images"
-  File /x minimap_*.png ${AETHYRAROOT}\data\graphics\images\*.png
+  File /x minimap_*.png ${SRCDIR}\data\graphics\images\*.png
   SetOutPath "$INSTDIR\data\help"
-  File "${AETHYRAROOT}\data\help\*.txt"
+  File "${SRCDIR}\data\help\*.txt"
   SetOutPath "$INSTDIR\data\icons\"
-  File "${AETHYRAROOT}\data\icons\aethyra.ico"
+  File "${SRCDIR}\data\icons\aethyra.ico"
   SetOutPath "$INSTDIR\data\music"
-  File /nonfatal "${AETHYRAROOT}\data\music\*.ogg"
+  File /nonfatal "${SRCDIR}\data\music\*.ogg"
   SetOutPath "$INSTDIR\docs"
-  File "${AETHYRAROOT}\docs\FAQ.txt"
+  File "${SRCDIR}\docs\FAQ.txt"
   SetOutPath "$INSTDIR\po"
-  File "${AETHYRAROOT}\po\aethyra.pot"
-  File "${AETHYRAROOT}\po\LINGUAS"
-  File "${AETHYRAROOT}\po\*.po"
+  File "${SRCDIR}\po\aethyra.pot"
+  File "${SRCDIR}\po\LINGUAS"
+  File "${SRCDIR}\po\*.po"
 SectionEnd
 
 Section -AdditionalIcons
-- 
cgit v1.2.3-70-g09d2


From 6498f9a6b140385b1614fe59abc4f5981d050050 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 20 Jan 2009 10:09:59 +0000
Subject: Switch the NPC text dialog over to a BrowserBox

---
 src/gui/npc_text.cpp | 46 ++++++++++++++--------------------------------
 src/gui/npc_text.h   | 19 ++++++-------------
 2 files changed, 20 insertions(+), 45 deletions(-)

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 0570d7a9..fde5dc9c 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -22,7 +22,9 @@
 #include <string>
 
 #include "npc_text.h"
-#include "textbox.h"
+#include "browserbox.h"
+#include "button.h"
+#include "scrollarea.h"
 
 #include "../npc.h"
 
@@ -36,10 +38,10 @@ NpcTextDialog::NpcTextDialog():
     setMinWidth(200);
     setMinHeight(150);
 
-    mTextBox = new TextBox;
-    mTextBox->setEditable(false);
+    mBrowserBox = new BrowserBox(BrowserBox::AUTO_WRAP);
+    mBrowserBox->setOpaque(true);
 
-    scrollArea = new ScrollArea(mTextBox);
+    scrollArea = new ScrollArea(mBrowserBox);
     okButton = new Button(_("OK"), "ok", this);
 
     setContentSize(260, 175);
@@ -57,47 +59,27 @@ NpcTextDialog::NpcTextDialog():
     setLocationRelativeTo(getParent());
 }
 
-void NpcTextDialog::setText(const std::string &text)
+void NpcTextDialog::clearText()
 {
-    const gcn::Rectangle &area = getChildrenArea();
-    const int width = area.width;
-
-    mText = text;
-    mTextBox->setMinWidth(width - 30);
-    mTextBox->setTextWrapped(mText);
+    mBrowserBox->clearRows();
 }
 
-void NpcTextDialog::addText(const std::string &text)
+void NpcTextDialog::setText(const std::string &text)
 {
-    setText(mText + text + "\n");
+    mBrowserBox->clearRows();
+    mBrowserBox->addRow(text);
 }
 
-void NpcTextDialog::widgetResized(const gcn::Event &event)
+void NpcTextDialog::addText(const std::string &text)
 {
-    Window::widgetResized(event);
-
-    const gcn::Rectangle &area = getChildrenArea();
-    const int width = area.width;
-    const int height = area.height;
-
-    mTextBox->setMinWidth(width - 30);
-    mTextBox->setTextWrapped(mText);
-
-    scrollArea->setDimension(gcn::Rectangle(
-                5, 5, width - 10, height - 15 - okButton->getHeight()));
-    okButton->setPosition(
-            width - 5 - okButton->getWidth(),
-            height - 5 - okButton->getHeight());
-
-    // Set the text again so that it gets wrapped according to the new size
-    mTextBox->setTextWrapped(mText);
+    mBrowserBox->addRow(text);
 }
 
 void NpcTextDialog::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "ok")
     {
-        setText("");
+        clearText();
         setVisible(false);
         if (current_npc)
             current_npc->nextDialog();
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 75968fa9..90b15abd 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -26,13 +26,10 @@
 
 #include <guichan/actionlistener.hpp>
 
-#include "button.h"
 #include "scrollarea.h"
 #include "window.h"
 
-#include "../guichanfwd.h"
-
-class TextBox;
+class BrowserBox;
 
 /**
  * The npc text dialog.
@@ -50,16 +47,14 @@ class NpcTextDialog : public Window, public gcn::ActionListener
         NpcTextDialog();
 
         /**
-         * Called when resizing the window.
-         *
-         * @param event The calling event
+         * Called when receiving actions from the widgets.
          */
-        void widgetResized(const gcn::Event &event);
+        void action(const gcn::ActionEvent &event);
 
         /**
-         * Called when receiving actions from the widgets.
+         * Clears the text shown in the dialog.
          */
-        void action(const gcn::ActionEvent &event);
+        void clearText();
 
         /**
          * Sets the text shows in the dialog.
@@ -79,9 +74,7 @@ class NpcTextDialog : public Window, public gcn::ActionListener
     private:
         gcn::Button *okButton;
         gcn::ScrollArea *scrollArea;
-        TextBox *mTextBox;
-
-        std::string mText;
+        BrowserBox *mBrowserBox;
 };
 
 #endif // _TMW_NPC_TEXT_H
-- 
cgit v1.2.3-70-g09d2


From 81307dac7d573af4c50eca983843a9575e1b3f03 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 20 Jan 2009 13:31:58 -0700
Subject: Reflowed NPC text dialog to use the layout code, so that window
 resizing isn't broken. Also added a string which should be translated in the
 Buy class for substitution by gettext.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/buy.cpp      |  2 +-
 src/gui/npc_text.cpp | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 0717efa6..496c8cd7 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -42,7 +42,7 @@ BuyDialog::BuyDialog(Network *network):
     Window(_("Buy")), mNetwork(network),
     mMoney(0), mAmountItems(0), mMaxItems(0)
 {
-    setWindowName("Buy");
+    setWindowName(_("Buy"));
     setResizable(true);
     setMinWidth(260);
     setMinHeight(230);
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index fde5dc9c..2d57f460 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -26,6 +26,8 @@
 #include "button.h"
 #include "scrollarea.h"
 
+#include "widgets/layout.h"
+
 #include "../npc.h"
 
 #include "../utils/gettext.h"
@@ -38,24 +40,27 @@ NpcTextDialog::NpcTextDialog():
     setMinWidth(200);
     setMinHeight(150);
 
+    setDefaultSize(0, 0, 260, 175);
+
     mBrowserBox = new BrowserBox(BrowserBox::AUTO_WRAP);
     mBrowserBox->setOpaque(true);
 
     scrollArea = new ScrollArea(mBrowserBox);
     okButton = new Button(_("OK"), "ok", this);
 
-    setContentSize(260, 175);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     scrollArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
-    scrollArea->setDimension(gcn::Rectangle(
-                5, 5, 250, 160 - okButton->getHeight()));
-    okButton->setPosition(
-            260 - 5 - okButton->getWidth(),
-            175 - 5 - okButton->getHeight());
 
     add(scrollArea);
     add(okButton);
 
+    place(0, 0, scrollArea, 5).setPadding(3);
+    place(4, 1, okButton);
+
+    Layout &layout = getLayout();
+    layout.setRowHeight(0, Layout::AUTO_SET);
+
+    loadWindowState();
     setLocationRelativeTo(getParent());
 }
 
-- 
cgit v1.2.3-70-g09d2


From 30ff433fe1546a61a2ccff2fd53cadc843a75476 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 20 Jan 2009 20:41:52 +0100
Subject: Got rid of the useless [ and ] in debug window

---
 src/gui/debugwindow.cpp | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 557c0f5f..3d729fe4 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -47,17 +47,12 @@ DebugWindow::DebugWindow():
     setDefaultSize(0, 0, 400, 60);
     loadWindowState();
 
-    mFPSLabel = new gcn::Label("[0 FPS]");
-
+    mFPSLabel = new gcn::Label("0 FPS");
     mMusicFileLabel = new gcn::Label("Music: ");
-
     mMapLabel = new gcn::Label("Map: ");
-
     mMiniMapLabel = new gcn::Label("Mini-Map: ");
-
-    mTileMouseLabel = new gcn::Label("[Mouse: 0, 0]");
-
-    mParticleCountLabel = new gcn::Label("[Particle count: 0]");
+    mTileMouseLabel = new gcn::Label("Mouse: 0, 0");
+    mParticleCountLabel = new gcn::Label("Particle count: 0");
 
     place(0, 0, mFPSLabel);
     place(3, 0, mTileMouseLabel);
@@ -77,34 +72,33 @@ void DebugWindow::logic()
     int mouseTileX = mouseX / 32 + viewport->getCameraX();
     int mouseTileY = mouseY / 32 + viewport->getCameraY();
 
-    mFPSLabel->setCaption("[" + toString(fps) + " FPS]");
+    mFPSLabel->setCaption(toString(fps) + " FPS");
     mFPSLabel->adjustSize();
 
-    mTileMouseLabel->setCaption("[Mouse: " +
-            toString(mouseTileX) + ", " + toString(mouseTileY) + "]");
+    mTileMouseLabel->setCaption("Mouse: " +
+            toString(mouseTileX) + ", " + toString(mouseTileY));
     mTileMouseLabel->adjustSize();
 
     Map *currentMap = engine->getCurrentMap();
-    if (currentMap != NULL)
+    if (currentMap)
     {
         const std::string music =
-            " [Music: " + currentMap->getProperty("music") + "]";
+            "Music: " + currentMap->getProperty("music");
         mMusicFileLabel->setCaption(music);
         mMusicFileLabel->adjustSize();
 
         const std::string minimap =
-            " [MiniMap: " + currentMap->getProperty("minimap") + "]";
+            "MiniMap: " + currentMap->getProperty("minimap");
         mMiniMapLabel->setCaption(minimap);
         mMiniMapLabel->adjustSize();
 
         const std::string map =
-            " [Map: " + currentMap->getProperty("_filename") + "]";
+            "Map: " + currentMap->getProperty("_filename");
         mMapLabel->setCaption(map);
         mMapLabel->adjustSize();
     }
 
-    mParticleCountLabel->setCaption("[Particle count: " +
-                                    toString(Particle::particleCount)
-                                    +"]");
+    mParticleCountLabel->setCaption("Particle count: " +
+                                    toString(Particle::particleCount));
     mParticleCountLabel->adjustSize();
 }
-- 
cgit v1.2.3-70-g09d2


From babcce6724a0abfe1e98be55ca49124a3459bd87 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 20 Jan 2009 13:38:56 -0700
Subject: Reflowed the NPC list dialog to use the layout code.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/npclistdialog.cpp | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 34b5ab41..e18b2ae8 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -24,6 +24,8 @@
 #include "listbox.h"
 #include "npclistdialog.h"
 
+#include "widgets/layout.h"
+
 #include "../npc.h"
 
 #include "../utils/gettext.h"
@@ -43,23 +45,15 @@ NpcListDialog::NpcListDialog():
 
     setContentSize(260, 175);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    scrollArea->setDimension(gcn::Rectangle(
-                5, 5, 250, 160 - okButton->getHeight()));
-    cancelButton->setPosition(
-            260 - 5 - cancelButton->getWidth(),
-            175 - 5 - cancelButton->getHeight());
-    okButton->setPosition(
-            cancelButton->getX() - 5 - okButton->getWidth(),
-            cancelButton->getY());
-
-    mItemList->setActionEventId("item");
 
-    mItemList->addActionListener(this);
+    place(0, 0, scrollArea, 5).setPadding(3);
+    place(3, 1, cancelButton);
+    place(4, 1, okButton);
 
-    add(scrollArea);
-    add(okButton);
-    add(cancelButton);
+    Layout &layout = getLayout();
+    layout.setRowHeight(0, Layout::AUTO_SET);
 
+    loadWindowState();
     setLocationRelativeTo(getParent());
 }
 
-- 
cgit v1.2.3-70-g09d2


From 55c3448f18d7e93608de4409383f50518b79f8f8 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 20 Jan 2009 13:40:25 -0700
Subject: Removed the now uneeded add calls, which I accidently left in two
 commits ago.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/npc_text.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 2d57f460..2ba95796 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -51,9 +51,6 @@ NpcTextDialog::NpcTextDialog():
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     scrollArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
 
-    add(scrollArea);
-    add(okButton);
-
     place(0, 0, scrollArea, 5).setPadding(3);
     place(4, 1, okButton);
 
-- 
cgit v1.2.3-70-g09d2


From c75f6978e780a4cbe7e4103b7a3187c2ddf75c33 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 20 Jan 2009 13:54:14 -0700
Subject: Fixed window transparency in NPC text (because the browser box was
 told to be opaque, the text area in the NPC window wasn't transparent, and
 was rather noticeable using Aethyra's color scheme, cause it shows up as
 white)

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/npc_text.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 2ba95796..898b9afe 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -43,7 +43,7 @@ NpcTextDialog::NpcTextDialog():
     setDefaultSize(0, 0, 260, 175);
 
     mBrowserBox = new BrowserBox(BrowserBox::AUTO_WRAP);
-    mBrowserBox->setOpaque(true);
+    mBrowserBox->setOpaque(false);
 
     scrollArea = new ScrollArea(mBrowserBox);
     okButton = new Button(_("OK"), "ok", this);
-- 
cgit v1.2.3-70-g09d2


From 1b3ac1ad7a745ed7b7aac1f1dd7514616db8a998 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 20 Jan 2009 16:46:17 -0700
Subject: Reflowed skill dialog, as well as started to work on revising the
 table model (none of the changes yet make visible improvements yet,
 unfortunately).

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/skill.cpp       | 23 ++++++++++++-----------
 src/gui/table_model.cpp | 48 +++++++++++++++++++++++++++++++++++++++++++++---
 src/gui/table_model.h   | 39 +++++++++++++++++++++++++++++++++++++--
 3 files changed, 94 insertions(+), 16 deletions(-)

diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 44f77253..35a41659 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -28,6 +28,8 @@
 #include "skill.h"
 #include "windowcontainer.h"
 
+#include "widgets/layout.h"
+
 #include "../localplayer.h"
 #include "../log.h"
 
@@ -51,7 +53,7 @@ class SkillGuiTableModel : public StaticTableModel
 {
 public:
     SkillGuiTableModel(SkillDialog *dialog) :
-        StaticTableModel(0, 3)
+        StaticTableModel(0, 3, 0xbdb5aa)
     {
         mEntriesNr = 0;
         mDialog = dialog;
@@ -136,16 +138,15 @@ SkillDialog::SkillDialog():
     mTable.setActionEventId("skill");
 
     skillScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    skillScrollArea->setDimension(gcn::Rectangle(5, 5, 230, 180));
-    mPointsLabel->setDimension(gcn::Rectangle(8, 190, 200, 16));
-    mIncButton->setPosition(skillScrollArea->getX(), 210);
-    mUseButton->setPosition(mIncButton->getX() + mIncButton->getWidth() + 5,
-        210);
-
-    add(skillScrollArea);
-    add(mPointsLabel);
-    add(mIncButton);
-    add(mUseButton);
+    skillScrollArea->setOpaque(false);
+
+    place(0, 0, skillScrollArea, 5).setPadding(3);
+    place(0, 1, mPointsLabel, 2);
+    place(3, 2, mIncButton);
+    place(4, 2, mUseButton);
+
+    Layout &layout = getLayout();
+    layout.setRowHeight(0, Layout::AUTO_SET);
 
 //    mSkillListBox->addActionListener(this);
     mTable.addActionListener(this);
diff --git a/src/gui/table_model.cpp b/src/gui/table_model.cpp
index d626423a..f7f0ab54 100644
--- a/src/gui/table_model.cpp
+++ b/src/gui/table_model.cpp
@@ -21,6 +21,7 @@
 
 #include <cstdlib>
 
+#include <guichan/graphics.hpp>
 #include <guichan/widget.hpp>
 
 #include "table_model.h"
@@ -50,14 +51,16 @@ void TableModel::signalAfterUpdate(void)
 }
 
 
-
 #define WIDGET_AT(row, column) (((row) * mColumns) + (column))
 #define DYN_SIZE(h) ((h) >= 0)  // determines whether this size is tagged for auto-detection
 
-StaticTableModel::StaticTableModel(int row, int column) :
+StaticTableModel::StaticTableModel(int row, int column, 
+                                   gcn::Color backgroundColor, bool opacity) :
     mRows(row),
     mColumns(column),
-    mHeight(1)
+    mHeight(1),
+    mBackgroundColor(backgroundColor),
+    mOpaque(opacity)
 {
     mTableModel.resize(row * column, NULL);
     mWidths.resize(column, 1);
@@ -144,3 +147,42 @@ int StaticTableModel::getColumns(void)
 {
     return mColumns;
 }
+
+int StaticTableModel::getWidth(void)
+{
+    int width = 0;
+
+    for (unsigned int i = 0; i < mWidths.size(); i++)
+    {
+        width += mWidths[i];
+    }
+
+    return width;
+}
+
+int StaticTableModel::getHeight(void)
+{
+    return (mColumns * mHeight);
+}
+
+void StaticTableModel::drawBackground(gcn::Graphics *graphics)
+{
+    if (isOpaque())
+    {
+        for (unsigned int i = 0; i < mTableModel.size(); i++)
+        {
+            mTableModel[i]->setBackgroundColor(mBackgroundColor);
+        }
+    }
+}
+
+void StaticTableModel::setOpaque(bool opaque)
+{
+    mOpaque = opaque;
+}
+
+bool StaticTableModel::isOpaque() const
+{
+    return mOpaque;
+}
+
diff --git a/src/gui/table_model.h b/src/gui/table_model.h
index a52a7561..304500bb 100644
--- a/src/gui/table_model.h
+++ b/src/gui/table_model.h
@@ -25,6 +25,7 @@
 #include <set>
 #include <vector>
 
+#include <guichan/color.hpp>
 #include <guichan/gui.hpp>
 
 #include "../guichanfwd.h"
@@ -99,12 +100,14 @@ private:
 class StaticTableModel : public TableModel
 {
 public:
-    StaticTableModel(int width, int height);
+    StaticTableModel(int width, int height, gcn::Color background = 0xffffff,
+                     bool opacity = true);
     virtual ~StaticTableModel(void);
 
     /**
      * Inserts a widget into the table model.
-     * The model is resized to accomodate the widget's width and height, unless column width / row height have been fixed.
+     * The model is resized to accomodate the widget's width and height,
+     * unless column width / row height have been fixed.
      */
     virtual void set(int row, int column, gcn::Widget *widget);
 
@@ -127,9 +130,27 @@ public:
      */
     virtual void resize(void);
 
+    /**
+     * Sets the table to be opaque, that is sets the table
+     * to display its background.
+     *
+     * @param opaque True if the table should be opaque, false otherwise.
+     */
+    virtual void setOpaque(bool opaque);
+
+    /**
+     * Checks if the scroll area is opaque, that is if the scroll area
+     * displays its background.
+     *
+     * @return True if the scroll area is opaque, false otherwise.
+     */
+    virtual bool isOpaque() const;
+
     virtual int getRows(void);
     virtual int getColumns(void);
     virtual int getRowHeight(void);
+    virtual int getWidth(void);
+    virtual int getHeight(void);
     virtual int getColumnWidth(int index);
     virtual gcn::Widget *getElementAt(int row, int column);
 
@@ -137,8 +158,22 @@ public:
 protected:
     int mRows, mColumns;
     int mHeight;
+    bool mOpaque;
     std::vector<gcn::Widget *> mTableModel;
     std::vector<int> mWidths;
+
+    /**
+     * Holds the background color of the table.
+     */
+    gcn::Color mBackgroundColor;
+
+    /**
+     * Draws the background of the table, that is
+     * the area behind the content.
+     *
+     * @param graphics a Graphics object to draw with.
+     */
+    virtual void drawBackground(gcn::Graphics *graphics);
 };
 
 #endif /* !defined(TMW_TABLE_MODEL_H_) */
-- 
cgit v1.2.3-70-g09d2


From 567cd92eae386c28b6af90121d0f8f575dce0687 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 20 Jan 2009 16:55:46 -0700
Subject: Repaired text messages. While trimming out the link code is still a
 good idea for the speech, I accidently trimmed it down to just the item name
 before.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/being.cpp | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index 3e621295..7643c91b 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -187,19 +187,16 @@ void Being::setSpeech(const std::string &text, Uint32 time)
 
     if (start != std::string::npos && end != std::string::npos)
     {
-        mSpeech.erase(end);
-        std::string::size_type pos = mSpeech.find('@');
+        std::string::size_type position = mSpeech.find('|');
+        mSpeech.erase(end, 1);
+        mSpeech.erase(start, (position - start) + 1);
+        position = mSpeech.find('@');
 
-        while (pos != std::string::npos)
+        while (position != std::string::npos)
         {
-            mSpeech.erase(pos, 2);
-            pos = mSpeech.find('@');
+            mSpeech.erase(position, 2);
+            position = mSpeech.find('@');
         }
-
-        pos = mSpeech.find('|');
-
-        if (pos != std::string::npos)
-            mSpeech = mSpeech.substr(pos + 1, mSpeech.size());
     }
 
     if (mSpeech != "")
-- 
cgit v1.2.3-70-g09d2


From 36bd28ec6bfcf1e15fdf4378ce7a5687cad604bd Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 20 Jan 2009 17:24:08 -0700
Subject: Made link searching case insensitive.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/chat.cpp         | 8 ++++++++
 src/resources/itemdb.cpp | 9 ++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index b4b533db..4c03f618 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -364,6 +364,14 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
         if (end != std::string::npos)
         {
             std::string temp = msg.substr(start+1, end-1);
+
+            for (unsigned int i = 0; i < temp.size(); i++)
+            {
+                temp[i] = (char) tolower(temp[i]);
+            }
+
+            std::cout << temp << std::endl;
+
             ItemInfo itemInfo = ItemDB::get(temp);
             msg.insert(end, "@@");
             msg.insert(start+1, "|");
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 53e7530b..d27ad23d 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -124,7 +124,14 @@ void ItemDB::load()
                 NamedItemInfoIterator itr = mNamedItemInfos.find(name);
                 if (itr == mNamedItemInfos.end())
                 {
-                    mNamedItemInfos[name] = itemInfo;
+                    std::string temp = name;
+
+                    for (unsigned int i = 0; i < temp.size(); i++)
+                    {
+                        temp[i] = (char) tolower(temp[i]);
+                    }
+
+                    mNamedItemInfos[temp] = itemInfo;
                 }
                 else
                 {
-- 
cgit v1.2.3-70-g09d2


From c6d75d9aad1775e60cc63516e844cf54623a3974 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 20 Jan 2009 18:05:26 -0700
Subject: Added the ability to parse multiple item links, as well as removing
 extra spaces before or after the [] tags.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/being.cpp            |  9 ++++++---
 src/gui/chat.cpp         | 19 +++++++++++++------
 src/resources/itemdb.cpp |  8 ++++++++
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index 7643c91b..c5a98a2d 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -182,10 +182,10 @@ void Being::setSpeech(const std::string &text, Uint32 time)
     }
 
     // check for links
-    const std::string::size_type start = mSpeech.find('[');
-    const std::string::size_type end = mSpeech.find(']', start);
+    std::string::size_type start = mSpeech.find('[');
+    std::string::size_type end = mSpeech.find(']', start);
 
-    if (start != std::string::npos && end != std::string::npos)
+    while (start != std::string::npos && end != std::string::npos)
     {
         std::string::size_type position = mSpeech.find('|');
         mSpeech.erase(end, 1);
@@ -197,6 +197,9 @@ void Being::setSpeech(const std::string &text, Uint32 time)
             mSpeech.erase(position, 2);
             position = mSpeech.find('@');
         }
+
+        start = mSpeech.find('[', start + 1);
+        end = mSpeech.find(']', start);
     }
 
     if (mSpeech != "")
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 4c03f618..ef625753 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -358,27 +358,34 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
 
     // check for item link
     std::string::size_type start = msg.find('[');
-    if (start != std::string::npos && msg[start+1] != '@')
+    while (start != std::string::npos && msg[start+1] != '@')
     {
         std::string::size_type end = msg.find(']', start);
         if (end != std::string::npos)
         {
-            std::string temp = msg.substr(start+1, end-1);
+            std::string temp = msg.substr(start+1, end - start - 1);
+
+            while (temp[0] == ' ')
+            {
+                temp = temp.substr(1, temp.size());
+            }
+            while (temp[temp.size()] == ' ')
+            {
+                temp = temp.substr(0, temp.size() - 1);
+            }
 
             for (unsigned int i = 0; i < temp.size(); i++)
             {
                 temp[i] = (char) tolower(temp[i]);
             }
 
-            std::cout << temp << std::endl;
-
-            ItemInfo itemInfo = ItemDB::get(temp);
+            const ItemInfo itemInfo = ItemDB::get(temp);
             msg.insert(end, "@@");
             msg.insert(start+1, "|");
             msg.insert(start+1, toString(itemInfo.getId()));
             msg.insert(start+1, "@@");
-
         }
+        start =  msg.find('[', start + 1);
     }
 
     // Prepare ordinary message
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index d27ad23d..cb9fadab 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -125,6 +125,14 @@ void ItemDB::load()
                 if (itr == mNamedItemInfos.end())
                 {
                     std::string temp = name;
+                    while (temp[0] == ' ')
+                    {
+                        temp = temp.substr(1, temp.size());
+                    }
+                    while (temp[temp.size()] == ' ')
+                    {
+                        temp = temp.substr(0, temp.size() - 1);
+                    }
 
                     for (unsigned int i = 0; i < temp.size(); i++)
                     {
-- 
cgit v1.2.3-70-g09d2


From b0ff8cc281d7e7f8f3c2666d6bbe6424fec74f9c Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 20 Jan 2009 18:24:03 -0700
Subject: Fixed y positioning so that popups don't run off of the screen (old
 behavior overprotected the bottom of the window, but didn't protect the top
 at all. Forgot to fix for that earlier)

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/itempopup.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index 81e4607b..f9916a89 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -122,8 +122,8 @@ void ItemPopup::view(int x, int y)
 {
     if (windowContainer->getWidth() < (x + getWidth() + 5))
 	x = windowContainer->getWidth() - getWidth();
-    if (windowContainer->getHeight() < (y + getHeight() + 5))
-	y = windowContainer->getHeight() - getHeight();
+    if ((y - getHeight() - 5) < 0)
+	y = 0;
     else
         y = y - getHeight() - 5;
     setPosition(x, y);
-- 
cgit v1.2.3-70-g09d2


From 8b88dffb8222bb4c59d09e11c00b1046f93d51fe Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 20 Jan 2009 22:47:48 -0700
Subject: Reflowed inventory window to use layout code, as well as fixed the
 npc list dialog to be more consistant with other windows. Also revised the
 skill window to default to being only as big as the number of skills listed.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/inventorywindow.cpp | 93 +++++++++++++++++----------------------------
 src/gui/inventorywindow.h   | 17 +--------
 src/gui/npclistdialog.cpp   | 22 +----------
 src/gui/npclistdialog.h     |  7 ----
 src/gui/skill.cpp           | 42 +++++++++++---------
 5 files changed, 62 insertions(+), 119 deletions(-)

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index efe1cd51..72507d23 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -21,8 +21,11 @@
 
 #include <string>
 
+#include <guichan/font.hpp>
 #include <guichan/mouseinput.hpp>
 
+#include <guichan/widgets/label.hpp>
+
 #include "button.h"
 #include "gui.h"
 #include "inventorywindow.h"
@@ -31,6 +34,8 @@
 #include "scrollarea.h"
 #include "viewport.h"
 
+#include "widgets/layout.h"
+
 #include "../inventory.h"
 #include "../item.h"
 #include "../localplayer.h"
@@ -48,7 +53,7 @@ InventoryWindow::InventoryWindow():
     setWindowName(_("Inventory"));
     setResizable(true);
     setCloseButton(true);
-    setMinWidth(240);
+
     // If you adjust these defaults, don't forget to adjust the trade window's.
     setDefaultSize(115, 25, 322, 200);
 
@@ -68,19 +73,24 @@ InventoryWindow::InventoryWindow():
               mMaxWeight + _(" g Slots: ") + 
               toString(player_node->getInventory()->getNumberOfSlotsUsed()) + 
               "/" + toString(player_node->getInventory()->getInventorySize());
-    mWeightLabel = new TextBox();
-    mWeightLabel->setPosition(8, 8);
+    mWeightLabel = new gcn::Label(mWeight);
 
-    draw();
+    setMinHeight(130);
+    setMinWidth(getFont()->getWidth(mWeight));
 
-    add(mUseButton);
-    add(mDropButton);
-    add(mInvenScroll);
-    add(mWeightLabel);
+    ContainerPlacer place;
+    place = getPlacer(0, 0);
 
-    mUseButton->setSize(60, mUseButton->getHeight());
+    place(0, 0, mInvenScroll, 5, 4);
+    place(0, 4, mWeightLabel, 5);
+    place(3, 5, mDropButton);
+    place(4, 5, mUseButton);
+
+    Layout &layout = getLayout();
+    layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
+    setLocationRelativeTo(getParent());
 }
 
 void InventoryWindow::logic()
@@ -103,7 +113,7 @@ void InventoryWindow::logic()
                  toString(player_node->getInventory()->getNumberOfSlotsUsed()) + 
                  "/" + toString(player_node->getInventory()->getInventorySize());
 
-        draw();
+        setMinWidth(getFont()->getWidth(mWeight));
     }
 }
 
@@ -114,36 +124,30 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
     if (!item)
         return;
 
-    if (event.getId() == "use") {
-        if (item->isEquipment()) {
-            if (item->isEquipped()) {
+    if (event.getId() == "use")
+    {
+        if (item->isEquipment())
+        {
+            if (item->isEquipped())
                 player_node->unequipItem(item);
-            }
-            else {
+            else
                 player_node->equipItem(item);
-            }
         }
-        else {
+        else
             player_node->useItem(item);
-        }
     }
     else if (event.getId() == "drop")
     {
-        if (item->getQuantity() == 1) {
+        if (item->getQuantity() == 1)
             player_node->dropItem(item, 1);
-        }
-        else {
+        else
+        {
             // Choose amount of items to drop
             new ItemAmountWindow(AMOUNT_ITEM_DROP, this, item);
         }
     }
 }
 
-void InventoryWindow::valueChanged(const gcn::SelectionEvent &event)
-{
-    draw();
-}
-
 void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
 {
     Window::mouseClicked(event);
@@ -164,48 +168,19 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
     }
 }
 
-void InventoryWindow::draw()
-{
-    const gcn::Rectangle &area = getChildrenArea();
-    const int width = area.width;
-    const int height = area.height;
-
-    // Update weight information
-    mWeightLabel->setTextWrapped(mWeight);
-    mWeightLabel->setMinWidth(width - 16);
-
-    mUseButton->setPosition(8, height - 8 - mUseButton->getHeight());
-    mDropButton->setPosition(8 + mUseButton->getWidth() + 5,
-            mUseButton->getY());
-
-    mInvenScroll->setSize(width - 16,
-            mUseButton->getY() - (mWeightLabel->getNumberOfRows()*15) - 18);
-    mInvenScroll->setPosition(8, (mWeightLabel->getNumberOfRows()*15) + 10);
-
-    setMinHeight(130 + (mWeightLabel->getNumberOfRows()*15));
-}
-
-void InventoryWindow::widgetResized(const gcn::Event &event)
-{
-    Window::widgetResized(event);
-    draw();
-}
-
 void InventoryWindow::updateButtons()
 {
     const Item *selectedItem = mItems->getSelectedItem();
 
     if (selectedItem && selectedItem->isEquipment())
     {
-        if (selectedItem->isEquipped()) {
+        if (selectedItem->isEquipped())
             mUseButton->setCaption(_("Unequip"));
-        }
-        else {
+        else
             mUseButton->setCaption(_("Equip"));
-        }    }
-    else {
-        mUseButton->setCaption(_("Use"));
     }
+    else
+        mUseButton->setCaption(_("Use"));
 
     mUseButton->setEnabled(selectedItem != 0);
     mDropButton->setEnabled(selectedItem != 0);
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 922dd28f..166bf1c4 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -62,23 +62,8 @@ class InventoryWindow : public Window, gcn::ActionListener,
          */
         Item* getSelectedItem() const;
 
-        /**
-         * Updates labels to currently selected item.
-         */
-        void valueChanged(const gcn::SelectionEvent &event);
-
         void mouseClicked(gcn::MouseEvent &event);
 
-        /**
-         * Updates window drawing.
-         */
-        void draw();
-
-        /**
-         * Called whenever the widget changes size.
-         */
-        void widgetResized(const gcn::Event &event);
-
     private:
         void updateButtons();    /**< Updates button states. */
 
@@ -89,7 +74,7 @@ class InventoryWindow : public Window, gcn::ActionListener,
         std::string mMaxWeight;
         gcn::Button *mUseButton, *mDropButton;
         gcn::ScrollArea *mInvenScroll;
-        TextBox *mWeightLabel;
+        gcn::Label *mWeightLabel;
 
         bool mItemDesc;
 };
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index e18b2ae8..7ecd0a74 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -47,8 +47,8 @@ NpcListDialog::NpcListDialog():
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
 
     place(0, 0, scrollArea, 5).setPadding(3);
-    place(3, 1, cancelButton);
-    place(4, 1, okButton);
+    place(3, 1, okButton);
+    place(4, 1, cancelButton);
 
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
@@ -81,24 +81,6 @@ void NpcListDialog::reset()
     mItems.clear();
 }
 
-void NpcListDialog::widgetResized(const gcn::Event &event)
-{
-    Window::widgetResized(event);
-
-    const gcn::Rectangle &area = getChildrenArea();
-    const int width = area.width;
-    const int height = area.height;
-
-    scrollArea->setDimension(gcn::Rectangle(
-                5, 5, width - 10, height - 15 - okButton->getHeight()));
-    cancelButton->setPosition(
-            width - 5 - cancelButton->getWidth(),
-            height - 5 - cancelButton->getHeight());
-    okButton->setPosition(
-            cancelButton->getX() - 5 - okButton->getWidth(),
-            cancelButton->getY());
-}
-
 void NpcListDialog::action(const gcn::ActionEvent &event)
 {
     int choice = 0;
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index 099d03c0..bc58cdcd 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -50,13 +50,6 @@ class NpcListDialog : public Window, public gcn::ActionListener,
          */
         NpcListDialog();
 
-        /**
-         * Called when resizing the window
-         *
-         * @param event The calling event
-         */
-        void widgetResized(const gcn::Event &event);
-
         /**
          * Called when receiving actions from the widgets.
          */
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 35a41659..bc28123a 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -60,14 +60,17 @@ public:
         update();
     }
 
-    virtual int getRows(void) { return mEntriesNr; }
+    virtual int getRows(void)
+    {
+        return mEntriesNr;
+    }
 
     virtual int getColumnWidth(int index)
     {
-        switch (index) {
-        case 0:  return 160;
-        default: return 35;
-        }
+        if (index == 0)
+            return 160;
+
+        return 35;
     }
 
     virtual int getRowHeight(void)
@@ -82,7 +85,8 @@ public:
         mEntriesNr = mDialog->getSkills().size();
         resize();
 
-        for (int i = 0; i < mEntriesNr; i++) {
+        for (int i = 0; i < mEntriesNr; i++)
+        {
             SKILL *skill = mDialog->getSkills()[i];
             SkillInfo const *info;
             char tmp[128];
@@ -127,6 +131,9 @@ SkillDialog::SkillDialog():
     setCloseButton(true);
     setDefaultSize(windowContainer->getWidth() - 260, 25, 255, 260);
 
+    setMinHeight(50 + mTableModel->getHeight());
+    setMinWidth(200);
+
 //    mSkillListBox = new ListBox(this);
     ScrollArea *skillScrollArea = new ScrollArea(&mTable);
     mPointsLabel = new gcn::Label(strprintf(_("Skill points: %d"), 0));
@@ -166,9 +173,7 @@ void SkillDialog::action(const gcn::ActionEvent &event)
         // Increment skill
         int selectedSkill = mTable.getSelectedRow();//mSkillListBox->getSelected();
         if (selectedSkill >= 0)
-        {
             player_node->raiseSkill(mSkillList[selectedSkill]->id);
-        }
     }
     else if (event.getId() == "skill")
     {
@@ -177,9 +182,7 @@ void SkillDialog::action(const gcn::ActionEvent &event)
                 player_node->mSkillPoint > 0);
     }
     else if (event.getId() == "close")
-    {
         setVisible(false);
-    }
 }
 
 void SkillDialog::update()
@@ -189,7 +192,8 @@ void SkillDialog::update()
 
     int selectedSkill = mTable.getSelectedRow();
 
-    if (selectedSkill >= 0) {
+    if (selectedSkill >= 0)
+    {
         int skillId = mSkillList[selectedSkill]->id;
         bool modifiable;
 
@@ -200,10 +204,12 @@ void SkillDialog::update()
 
         mIncButton->setEnabled(modifiable
                                && player_node->mSkillPoint > 0);
-    } else
+    }
+    else
         mIncButton->setEnabled(false);
 
     mTableModel->update();
+    setMinHeight(50 + mTableModel->getHeight());
 }
 
 int SkillDialog::getNumberOfElements()
@@ -213,10 +219,10 @@ int SkillDialog::getNumberOfElements()
 
 bool SkillDialog::hasSkill(int id)
 {
-    for (unsigned int i = 0; i < mSkillList.size(); i++) {
-        if (mSkillList[i]->id == id) {
+    for (unsigned int i = 0; i < mSkillList.size(); i++)
+    {
+        if (mSkillList[i]->id == id)
             return true;
-        }
     }
     return false;
 }
@@ -232,8 +238,10 @@ void SkillDialog::addSkill(int id, int lvl, int mp)
 
 void SkillDialog::setSkill(int id, int lvl, int mp)
 {
-    for (unsigned int i = 0; i < mSkillList.size(); i++) {
-        if (mSkillList[i]->id == id) {
+    for (unsigned int i = 0; i < mSkillList.size(); i++)
+    {
+        if (mSkillList[i]->id == id)
+        {
             mSkillList[i]->lv = lvl;
             mSkillList[i]->sp = mp;
         }
-- 
cgit v1.2.3-70-g09d2


From 518b19cbdc4037de948dd4b456885d8c6c2b9f41 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 20 Jan 2009 23:10:53 -0700
Subject: Reflowed help dialog to use layout code.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/help.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/gui/help.cpp b/src/gui/help.cpp
index 3594b9a6..2cda898a 100644
--- a/src/gui/help.cpp
+++ b/src/gui/help.cpp
@@ -24,6 +24,8 @@
 #include "help.h"
 #include "scrollarea.h"
 
+#include "widgets/layout.h"
+
 #include "../resources/resourcemanager.h"
 
 #include "../utils/gettext.h"
@@ -32,7 +34,8 @@ HelpWindow::HelpWindow():
     Window(_("Help"))
 {
     setContentSize(455, 350);
-    setWindowName("Help");
+    setWindowName(_("Help"));
+    setResizable(true);
 
     mBrowserBox = new BrowserBox();
     mBrowserBox->setOpaque(false);
@@ -50,6 +53,12 @@ HelpWindow::HelpWindow():
     add(mScrollArea);
     add(okButton);
 
+    place(0, 0, mScrollArea, 5, 3).setPadding(3);
+    place(4, 3, okButton);
+
+    Layout &layout = getLayout();
+    layout.setRowHeight(0, Layout::AUTO_SET);
+
     setLocationRelativeTo(getParent());
 }
 
-- 
cgit v1.2.3-70-g09d2


From f4a57afa912826499ca8ff5a7b74fa69ba04f0ac Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 20 Jan 2009 23:14:44 -0700
Subject: Reflowed emote window using the layout code.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/emotewindow.cpp | 32 +++++++-------------------------
 src/gui/emotewindow.h   | 10 ----------
 2 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/src/gui/emotewindow.cpp b/src/gui/emotewindow.cpp
index 9639d9b6..3653cb68 100644
--- a/src/gui/emotewindow.cpp
+++ b/src/gui/emotewindow.cpp
@@ -29,6 +29,8 @@
 #include "emotecontainer.h"
 #include "scrollarea.h"
 
+#include "widgets/layout.h"
+
 #include "../localplayer.h"
 
 #include "../utils/gettext.h"      
@@ -41,6 +43,7 @@ EmoteWindow::EmoteWindow():
     setResizable(true);
     setCloseButton(true);
     setMinWidth(80);
+    setMinHeight(130);
     setDefaultSize(115, 25, 322, 200);
 
     mUseButton = new Button(_("Use"), "use", this);
@@ -51,10 +54,11 @@ EmoteWindow::EmoteWindow():
     mEmoteScroll = new ScrollArea(mEmotes);
     mEmoteScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
 
-    draw();
+    place(0, 0, mEmoteScroll, 5, 4);
+    place(4, 4, mUseButton);
 
-    add(mUseButton);
-    add(mEmoteScroll);
+    Layout &layout = getLayout();
+    layout.setRowHeight(0, Layout::AUTO_SET);
 
     mUseButton->setSize(60, mUseButton->getHeight());
 
@@ -71,28 +75,6 @@ void EmoteWindow::action(const gcn::ActionEvent &event)
     player_node->emote(emote);
 }
 
-
-void EmoteWindow::draw()
-{
-    const gcn::Rectangle &area = getChildrenArea();
-    const int width = area.width;
-    const int height = area.height;
-
-    mUseButton->setPosition(8, height - 8 - mUseButton->getHeight());
-
-    mEmoteScroll->setSize(width - 16, mUseButton->getY() - 18);
-    mEmoteScroll->setPosition(8,  10);
-
-    setMinHeight(130);
-}
-
-void EmoteWindow::widgetResized(const gcn::Event &event)
-{
-    Window::widgetResized(event);
-    draw();
-}
-
-
 int EmoteWindow::getSelectedEmote() const
 {
     return mEmotes->getSelectedEmote();
diff --git a/src/gui/emotewindow.h b/src/gui/emotewindow.h
index a996db99..e92808dc 100644
--- a/src/gui/emotewindow.h
+++ b/src/gui/emotewindow.h
@@ -56,16 +56,6 @@ class EmoteWindow : public Window, gcn::ActionListener,
          */
         int getSelectedEmote() const;
 
-        /**
-         * Updates window drawing.
-         */
-        void draw();
-
-        /**
-         * Called whenever the widget changes size.
-         */
-        void widgetResized(const gcn::Event &event);
-
     private:
         EmoteContainer *mEmotes;
 
-- 
cgit v1.2.3-70-g09d2


From ca6126a4d2def180183ae86e626dd138c4a14ebe Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 20 Jan 2009 23:26:38 -0700
Subject: Fixed a double free error created by not deleting the older add
 methods from the help window.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/help.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/gui/help.cpp b/src/gui/help.cpp
index 2cda898a..cd249943 100644
--- a/src/gui/help.cpp
+++ b/src/gui/help.cpp
@@ -50,9 +50,6 @@ HelpWindow::HelpWindow():
 
     mBrowserBox->setLinkHandler(this);
 
-    add(mScrollArea);
-    add(okButton);
-
     place(0, 0, mScrollArea, 5, 3).setPadding(3);
     place(4, 3, okButton);
 
-- 
cgit v1.2.3-70-g09d2


From 6033a19dcb843462797dca3182a25bb89bfc002d Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 20 Jan 2009 23:54:56 -0700
Subject: Repaired autobuild script.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 INSTALL      | 2 +-
 autobuild.sh | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/INSTALL b/INSTALL
index 4359d7a8..321cec4d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -54,7 +54,7 @@ run it with "aethyra". By default all files are installed to /usr/local, you can
 pass a different prefix to configure as usual.
 
     NOTE: if the autobuild.sh fails 
-	1.) ./autogen.sh
+	1.) autoreconf -i
 	2.) ./configure
 	3.) make
 	4.) su -c "make install"
diff --git a/autobuild.sh b/autobuild.sh
index d15bd853..7ebbeaad 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -10,10 +10,7 @@ echo "Generating build information using aclocal, autoheader, automake and autoc
 echo
 
 # Regerate configuration files
-aclocal
-autoheader
-automake --gnu --add-missing --copy
-autoconf
+autoreconf -i
 
 echo
 echo "Now you are ready to run ./configure"
-- 
cgit v1.2.3-70-g09d2


From 5dff1647df4a05d956b1e1978ec8918c420b9107 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 20 Jan 2009 23:58:31 -0700
Subject: Repaired the update.sh script.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 update.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/update.sh b/update.sh
index 28dfeca1..b72539c4 100755
--- a/update.sh
+++ b/update.sh
@@ -21,8 +21,10 @@ else
 	cd $file1
 	#execute the git command to download the client files
 	git clone git://gitorious.org/tmw/aethyra.git
+	#change to the aethyra directory
+	cd $file;
 	#issue the auto build script to compile the client
-	./autobuild
+	./autobuild.sh
 	echo "congratulations on installing aethyra enjoy"
 	exit 1;
 fi
-- 
cgit v1.2.3-70-g09d2


From da2b9950c5785381e5e7ed541bc33dbecdb51f9c Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 21 Jan 2009 09:18:58 -0700
Subject: Fixed multiple embeddings of square brackets so that it doesn't crash
 the client. This commit makes it so that all brackets except for the
 innermost brackets are ignored.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/being.cpp    | 7 +++++++
 src/gui/chat.cpp | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/src/being.cpp b/src/being.cpp
index c5a98a2d..8ed66c7a 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -187,6 +187,13 @@ void Being::setSpeech(const std::string &text, Uint32 time)
 
     while (start != std::string::npos && end != std::string::npos)
     {
+        // Catch multiple embeds and ignore them so it doesn't crash the client.
+        while ((mSpeech.find('[', start + 1) != std::string::npos) && 
+               (mSpeech.find('[', start + 1) < end))
+        {
+            start = mSpeech.find('[', start + 1);
+        }
+
         std::string::size_type position = mSpeech.find('|');
         mSpeech.erase(end, 1);
         mSpeech.erase(start, (position - start) + 1);
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index ef625753..a0f12b2c 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -363,6 +363,13 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
         std::string::size_type end = msg.find(']', start);
         if (end != std::string::npos)
         {
+            // Catch multiple embeds and ignore them so it doesn't crash the client.
+            while ((msg.find('[', start + 1) != std::string::npos) && 
+                   (msg.find('[', start + 1) < end))
+            {
+                start = msg.find('[', start + 1);
+            }
+
             std::string temp = msg.substr(start+1, end - start - 1);
 
             while (temp[0] == ' ')
-- 
cgit v1.2.3-70-g09d2


From 4bee113beffd52517ca0414909248ea9b00970cd Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 21 Jan 2009 09:35:04 -0700
Subject: Added the straight IP address for the server to the default servers,
 so that people can see that option if the DNS server isn't resolving the web
 address. While this shouldn't ever be an issue, it could occur in some parts
 of the world at various times and for various reasons.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/login.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index eddae739..7ac76c63 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -56,9 +56,11 @@ LoginDialog::LoginDialog(LoginData *loginData):
     std::vector<std::string> dfltServer;
     dfltServer.push_back("www.aethyra.org"); 
     dfltServer.push_back("www.aethyra.org");
+    dfltServer.push_back("209.168.213.109");
     std::vector<std::string> dfltPort;
     dfltPort.push_back("21001");
     dfltPort.push_back("22001");
+    dfltPort.push_back("21001");
     mServerList = new DropDownList("MostRecent00", dfltServer, dfltPort,
                                    MAX_SERVER_LIST_SIZE);
     mServerListBox = new gcn::ListBox(mServerList);
-- 
cgit v1.2.3-70-g09d2


From 427f1319dc2890dfb2e5ed189d47cb16fa450554 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 21 Jan 2009 10:03:44 -0700
Subject: Reflowed chat window to use layout code.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/chat.cpp | 24 +++++++-----------------
 src/gui/chat.h   |  5 -----
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index a0f12b2c..7ce5d395 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -32,6 +32,8 @@
 #include "sdlinput.h"
 #include "windowcontainer.h"
 
+#include "widgets/layout.h"
+
 #include "../beingmanager.h"
 #include "../configuration.h"
 #include "../extensions.h"
@@ -78,8 +80,11 @@ Window(""), mNetwork(network), mTmpVisible(false)
     mScrollArea->setScrollAmount(0, 1);
     mScrollArea->setOpaque(false);
 
-    add(mScrollArea);
-    add(mChatInput);
+    place(0, 0, mScrollArea, 5, 5);
+    place(0, 5, mChatInput, 5);
+
+    Layout &layout = getLayout();
+    layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
 
@@ -109,21 +114,6 @@ ChatWindow::~ChatWindow()
     delete mRecorder;
 }
 
-void ChatWindow::widgetResized(const gcn::Event &event)
-{
-    Window::widgetResized(event);
-
-    const gcn::Rectangle area = getChildrenArea();
-
-    mChatInput->setPosition(mChatInput->getFrameSize(),
-                            area.height - mChatInput->getHeight() -
-                            mChatInput->getFrameSize());
-    mChatInput->setWidth(area.width - 2 * mChatInput->getFrameSize());
-    mScrollArea->setWidth(area.width - 2 * mScrollArea->getFrameSize());
-    mScrollArea->setHeight(area.height - 2 * mScrollArea->getFrameSize() -
-            mChatInput->getHeight() - 5);
-}
-
 void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
 {
     // Trim whitespace
diff --git a/src/gui/chat.h b/src/gui/chat.h
index 03b2062a..2967e204 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -121,11 +121,6 @@ class ChatWindow : public Window, public gcn::ActionListener,
          */
         ~ChatWindow();
 
-        /**
-         * Called whenever the widget changes size.
-         */
-        void widgetResized(const gcn::Event &event);
-
         /**
          * Adds a line of text to our message list. Parameters:
          *
-- 
cgit v1.2.3-70-g09d2


From e36a6085d16a0269c094e40471bff8ca81857374 Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <crush@themanaworld.org>
Date: Fri, 23 Jan 2009 14:28:39 +0100
Subject: Fixed very minor and rarel occuring mem leak in map reader.

---
 src/resources/mapreader.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 0082a024..9dd1dc62 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -539,6 +539,8 @@ Tileset *MapReader::readTileset(xmlNodePtr node,
                 {
                     map->addAnimation(tileGID, new TileAnimation(ani));
                     logger->log("Animation length: %d", ani->getLength());
+                } else {
+                    delete ani;
                 }
             }
         }
-- 
cgit v1.2.3-70-g09d2


From 7b64259cbdf2987159671c3226b42d902942b275 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 23 Jan 2009 11:19:23 +0100
Subject: Removed unnecessary references to The Mana World in code headers

This dates back to the old days of TMW, but the usage instructions of
GPLv2 don't mention this being necessary. Since it doesn't add anything,
avoid the branding in these sections.
---
 src/animatedsprite.cpp            |  8 ++++----
 src/animatedsprite.h              |  8 ++++----
 src/animationparticle.cpp         |  8 ++++----
 src/animationparticle.h           |  8 ++++----
 src/being.cpp                     |  8 ++++----
 src/being.h                       |  8 ++++----
 src/beingmanager.cpp              |  8 ++++----
 src/beingmanager.h                |  8 ++++----
 src/configlistener.h              |  8 ++++----
 src/configuration.cpp             |  8 ++++----
 src/configuration.h               |  8 ++++----
 src/effectmanager.cpp             | 12 ++++++------
 src/effectmanager.h               | 11 +++++------
 src/engine.cpp                    |  8 ++++----
 src/engine.h                      |  8 ++++----
 src/equipment.cpp                 |  8 ++++----
 src/equipment.h                   |  8 ++++----
 src/floor_item.cpp                |  8 ++++----
 src/floor_item.h                  |  8 ++++----
 src/flooritemmanager.cpp          |  8 ++++----
 src/flooritemmanager.h            |  8 ++++----
 src/game.cpp                      |  8 ++++----
 src/game.h                        |  8 ++++----
 src/graphics.cpp                  |  8 ++++----
 src/graphics.h                    |  8 ++++----
 src/gui/browserbox.cpp            |  8 ++++----
 src/gui/browserbox.h              |  8 ++++----
 src/gui/button.cpp                |  8 ++++----
 src/gui/button.h                  |  8 ++++----
 src/gui/buy.cpp                   |  8 ++++----
 src/gui/buy.h                     |  8 ++++----
 src/gui/buysell.cpp               |  8 ++++----
 src/gui/buysell.h                 |  8 ++++----
 src/gui/char_select.cpp           |  8 ++++----
 src/gui/char_select.h             |  8 ++++----
 src/gui/char_server.cpp           |  8 ++++----
 src/gui/char_server.h             |  8 ++++----
 src/gui/chat.cpp                  |  8 ++++----
 src/gui/chat.h                    |  8 ++++----
 src/gui/chatinput.cpp             |  8 ++++----
 src/gui/chatinput.h               |  8 ++++----
 src/gui/checkbox.cpp              |  8 ++++----
 src/gui/checkbox.h                |  8 ++++----
 src/gui/confirm_dialog.cpp        |  8 ++++----
 src/gui/confirm_dialog.h          |  8 ++++----
 src/gui/connection.cpp            |  8 ++++----
 src/gui/connection.h              |  8 ++++----
 src/gui/debugwindow.cpp           |  8 ++++----
 src/gui/debugwindow.h             |  8 ++++----
 src/gui/equipmentwindow.cpp       |  8 ++++----
 src/gui/equipmentwindow.h         |  8 ++++----
 src/gui/focushandler.cpp          |  8 ++++----
 src/gui/focushandler.h            |  8 ++++----
 src/gui/gccontainer.cpp           |  8 ++++----
 src/gui/gccontainer.h             |  8 ++++----
 src/gui/gui.cpp                   |  8 ++++----
 src/gui/gui.h                     |  8 ++++----
 src/gui/help.cpp                  |  8 ++++----
 src/gui/help.h                    |  8 ++++----
 src/gui/inttextfield.cpp          |  8 ++++----
 src/gui/inttextfield.h            |  8 ++++----
 src/gui/inventorywindow.cpp       |  8 ++++----
 src/gui/inventorywindow.h         |  8 ++++----
 src/gui/item_amount.cpp           |  8 ++++----
 src/gui/item_amount.h             |  8 ++++----
 src/gui/itemcontainer.cpp         |  8 ++++----
 src/gui/itemcontainer.h           |  8 ++++----
 src/gui/itemshortcutcontainer.cpp |  8 ++++----
 src/gui/itemshortcutcontainer.h   |  8 ++++----
 src/gui/linkhandler.h             |  8 ++++----
 src/gui/listbox.cpp               |  8 ++++----
 src/gui/listbox.h                 |  8 ++++----
 src/gui/login.cpp                 |  8 ++++----
 src/gui/login.h                   |  8 ++++----
 src/gui/menuwindow.cpp            |  8 ++++----
 src/gui/menuwindow.h              |  8 ++++----
 src/gui/minimap.cpp               |  8 ++++----
 src/gui/minimap.h                 |  8 ++++----
 src/gui/ministatus.cpp            |  8 ++++----
 src/gui/ministatus.h              |  8 ++++----
 src/gui/npc_text.cpp              |  8 ++++----
 src/gui/npc_text.h                |  8 ++++----
 src/gui/npcintegerdialog.cpp      |  8 ++++----
 src/gui/npcintegerdialog.h        |  8 ++++----
 src/gui/npclistdialog.cpp         |  8 ++++----
 src/gui/npclistdialog.h           |  8 ++++----
 src/gui/npcstringdialog.cpp       |  8 ++++----
 src/gui/npcstringdialog.h         |  8 ++++----
 src/gui/ok_dialog.cpp             |  8 ++++----
 src/gui/ok_dialog.h               |  8 ++++----
 src/gui/passwordfield.cpp         |  8 ++++----
 src/gui/passwordfield.h           |  8 ++++----
 src/gui/playerbox.cpp             |  8 ++++----
 src/gui/playerbox.h               |  8 ++++----
 src/gui/popupmenu.cpp             |  8 ++++----
 src/gui/popupmenu.h               |  8 ++++----
 src/gui/progressbar.cpp           |  8 ++++----
 src/gui/progressbar.h             |  8 ++++----
 src/gui/radiobutton.cpp           |  8 ++++----
 src/gui/radiobutton.h             |  8 ++++----
 src/gui/register.cpp              |  8 ++++----
 src/gui/register.h                |  8 ++++----
 src/gui/scrollarea.cpp            |  8 ++++----
 src/gui/scrollarea.h              |  8 ++++----
 src/gui/sdlinput.cpp              |  2 +-
 src/gui/sdlinput.h                |  2 +-
 src/gui/sell.cpp                  |  8 ++++----
 src/gui/sell.h                    |  8 ++++----
 src/gui/setup.cpp                 |  8 ++++----
 src/gui/setup.h                   |  8 ++++----
 src/gui/setup_audio.cpp           |  8 ++++----
 src/gui/setup_audio.h             |  8 ++++----
 src/gui/setup_joystick.cpp        |  8 ++++----
 src/gui/setup_joystick.h          |  8 ++++----
 src/gui/setup_keyboard.cpp        |  8 ++++----
 src/gui/setup_keyboard.h          |  8 ++++----
 src/gui/setup_players.cpp         |  8 ++++----
 src/gui/setup_players.h           |  8 ++++----
 src/gui/setup_video.cpp           |  8 ++++----
 src/gui/setup_video.h             |  8 ++++----
 src/gui/setuptab.h                |  8 ++++----
 src/gui/shop.cpp                  |  8 ++++----
 src/gui/shop.h                    |  8 ++++----
 src/gui/shoplistbox.cpp           |  8 ++++----
 src/gui/shoplistbox.h             |  8 ++++----
 src/gui/shortcutwindow.cpp        |  8 ++++----
 src/gui/shortcutwindow.h          |  8 ++++----
 src/gui/skill.cpp                 |  8 ++++----
 src/gui/skill.h                   |  8 ++++----
 src/gui/slider.cpp                |  8 ++++----
 src/gui/slider.h                  |  8 ++++----
 src/gui/status.cpp                |  8 ++++----
 src/gui/status.h                  |  8 ++++----
 src/gui/table.cpp                 |  8 ++++----
 src/gui/table.h                   |  8 ++++----
 src/gui/table_model.cpp           |  8 ++++----
 src/gui/table_model.h             |  8 ++++----
 src/gui/textbox.cpp               |  8 ++++----
 src/gui/textbox.h                 |  8 ++++----
 src/gui/textfield.cpp             |  8 ++++----
 src/gui/textfield.h               |  8 ++++----
 src/gui/trade.cpp                 |  8 ++++----
 src/gui/trade.h                   |  8 ++++----
 src/gui/truetypefont.cpp          |  8 ++++----
 src/gui/truetypefont.h            |  8 ++++----
 src/gui/updatewindow.cpp          |  8 ++++----
 src/gui/updatewindow.h            |  8 ++++----
 src/gui/viewport.cpp              |  8 ++++----
 src/gui/viewport.h                |  8 ++++----
 src/gui/widgets/layout.cpp        |  8 ++++----
 src/gui/widgets/layout.h          |  8 ++++----
 src/gui/widgets/layouthelper.cpp  |  8 ++++----
 src/gui/widgets/layouthelper.h    |  8 ++++----
 src/gui/widgets/resizegrip.cpp    |  8 ++++----
 src/gui/widgets/resizegrip.h      |  8 ++++----
 src/gui/widgets/tab.cpp           |  8 ++++----
 src/gui/widgets/tab.h             |  8 ++++----
 src/gui/widgets/tabbedarea.cpp    |  8 ++++----
 src/gui/widgets/tabbedarea.h      |  8 ++++----
 src/gui/window.cpp                |  8 ++++----
 src/gui/window.h                  |  8 ++++----
 src/gui/windowcontainer.cpp       |  8 ++++----
 src/gui/windowcontainer.h         |  8 ++++----
 src/guichanfwd.h                  |  8 ++++----
 src/imageparticle.cpp             |  8 ++++----
 src/imageparticle.h               |  8 ++++----
 src/inventory.cpp                 |  8 ++++----
 src/inventory.h                   |  8 ++++----
 src/item.cpp                      |  8 ++++----
 src/item.h                        |  8 ++++----
 src/itemshortcut.cpp              |  8 ++++----
 src/itemshortcut.h                |  8 ++++----
 src/joystick.cpp                  |  8 ++++----
 src/joystick.h                    |  8 ++++----
 src/keyboardconfig.cpp            |  8 ++++----
 src/keyboardconfig.h              |  8 ++++----
 src/localplayer.cpp               |  8 ++++----
 src/localplayer.h                 |  8 ++++----
 src/lockedarray.h                 |  8 ++++----
 src/log.cpp                       |  8 ++++----
 src/log.h                         |  8 ++++----
 src/logindata.h                   |  8 ++++----
 src/main.cpp                      |  8 ++++----
 src/main.h                        |  8 ++++----
 src/map.cpp                       |  8 ++++----
 src/map.h                         |  8 ++++----
 src/monster.cpp                   |  8 ++++----
 src/monster.h                     |  8 ++++----
 src/net/beinghandler.cpp          |  8 ++++----
 src/net/beinghandler.h            |  8 ++++----
 src/net/buysellhandler.cpp        |  8 ++++----
 src/net/buysellhandler.h          |  8 ++++----
 src/net/charserverhandler.cpp     |  8 ++++----
 src/net/charserverhandler.h       |  8 ++++----
 src/net/chathandler.cpp           |  8 ++++----
 src/net/chathandler.h             |  8 ++++----
 src/net/equipmenthandler.cpp      |  8 ++++----
 src/net/equipmenthandler.h        |  8 ++++----
 src/net/inventoryhandler.cpp      |  8 ++++----
 src/net/inventoryhandler.h        |  8 ++++----
 src/net/itemhandler.cpp           |  8 ++++----
 src/net/itemhandler.h             |  8 ++++----
 src/net/loginhandler.cpp          |  8 ++++----
 src/net/loginhandler.h            |  8 ++++----
 src/net/maploginhandler.cpp       |  8 ++++----
 src/net/maploginhandler.h         |  8 ++++----
 src/net/messagehandler.cpp        |  8 ++++----
 src/net/messagehandler.h          |  8 ++++----
 src/net/messagein.cpp             |  8 ++++----
 src/net/messagein.h               |  8 ++++----
 src/net/messageout.cpp            |  8 ++++----
 src/net/messageout.h              |  8 ++++----
 src/net/network.cpp               |  8 ++++----
 src/net/network.h                 |  8 ++++----
 src/net/npchandler.cpp            |  8 ++++----
 src/net/npchandler.h              |  8 ++++----
 src/net/playerhandler.cpp         |  8 ++++----
 src/net/playerhandler.h           |  8 ++++----
 src/net/protocol.cpp              |  8 ++++----
 src/net/protocol.h                |  8 ++++----
 src/net/skillhandler.cpp          |  8 ++++----
 src/net/skillhandler.h            |  8 ++++----
 src/net/tradehandler.cpp          |  8 ++++----
 src/net/tradehandler.h            |  8 ++++----
 src/npc.cpp                       |  8 ++++----
 src/npc.h                         |  8 ++++----
 src/openglgraphics.cpp            |  8 ++++----
 src/openglgraphics.h              |  8 ++++----
 src/particle.cpp                  |  8 ++++----
 src/particle.h                    |  8 ++++----
 src/particlecontainer.cpp         |  8 ++++----
 src/particlecontainer.h           |  8 ++++----
 src/particleemitter.cpp           |  8 ++++----
 src/particleemitter.h             |  8 ++++----
 src/particleemitterprop.h         |  8 ++++----
 src/player.cpp                    |  8 ++++----
 src/player.h                      |  8 ++++----
 src/player_relations.cpp          |  8 ++++----
 src/player_relations.h            |  8 ++++----
 src/position.cpp                  |  8 ++++----
 src/position.h                    |  8 ++++----
 src/properties.h                  |  8 ++++----
 src/recorder.h                    |  8 ++++----
 src/resources/action.cpp          |  8 ++++----
 src/resources/action.h            |  8 ++++----
 src/resources/ambientoverlay.cpp  |  8 ++++----
 src/resources/ambientoverlay.h    |  8 ++++----
 src/resources/animation.cpp       |  8 ++++----
 src/resources/animation.h         |  8 ++++----
 src/resources/buddylist.cpp       |  8 ++++----
 src/resources/buddylist.h         |  8 ++++----
 src/resources/dye.cpp             |  8 ++++----
 src/resources/dye.h               |  8 ++++----
 src/resources/image.cpp           |  8 ++++----
 src/resources/image.h             |  8 ++++----
 src/resources/imageloader.cpp     |  8 ++++----
 src/resources/imageloader.h       |  8 ++++----
 src/resources/imageset.cpp        |  8 ++++----
 src/resources/imageset.h          |  8 ++++----
 src/resources/imagewriter.cpp     |  8 ++++----
 src/resources/imagewriter.h       |  8 ++++----
 src/resources/itemdb.cpp          |  8 ++++----
 src/resources/itemdb.h            |  8 ++++----
 src/resources/iteminfo.cpp        |  8 ++++----
 src/resources/iteminfo.h          |  8 ++++----
 src/resources/mapreader.cpp       |  8 ++++----
 src/resources/mapreader.h         |  8 ++++----
 src/resources/monsterdb.cpp       |  8 ++++----
 src/resources/monsterdb.h         |  8 ++++----
 src/resources/monsterinfo.cpp     |  8 ++++----
 src/resources/monsterinfo.h       |  8 ++++----
 src/resources/music.cpp           |  8 ++++----
 src/resources/music.h             |  8 ++++----
 src/resources/npcdb.cpp           |  8 ++++----
 src/resources/npcdb.h             |  8 ++++----
 src/resources/resource.cpp        |  8 ++++----
 src/resources/resource.h          |  8 ++++----
 src/resources/resourcemanager.cpp |  8 ++++----
 src/resources/resourcemanager.h   |  8 ++++----
 src/resources/soundeffect.cpp     |  8 ++++----
 src/resources/soundeffect.h       |  8 ++++----
 src/resources/spritedef.cpp       |  8 ++++----
 src/resources/spritedef.h         |  8 ++++----
 src/serverinfo.h                  |  8 ++++----
 src/shopitem.cpp                  |  8 ++++----
 src/shopitem.h                    |  8 ++++----
 src/simpleanimation.cpp           |  8 ++++----
 src/simpleanimation.h             |  8 ++++----
 src/sound.cpp                     |  8 ++++----
 src/sound.h                       |  8 ++++----
 src/sprite.h                      |  8 ++++----
 src/text.cpp                      |  3 +--
 src/text.h                        |  3 +--
 src/textmanager.cpp               |  3 +--
 src/textmanager.h                 |  3 +--
 src/textparticle.cpp              |  8 ++++----
 src/textparticle.h                |  8 ++++----
 src/tileset.h                     |  8 ++++----
 src/utils/dtor.h                  |  8 ++++----
 src/utils/gettext.h               |  8 ++++----
 src/utils/mutex.h                 |  8 ++++----
 src/utils/strprintf.cpp           |  8 ++++----
 src/utils/strprintf.h             |  8 ++++----
 src/utils/tostring.h              |  8 ++++----
 src/utils/trim.h                  |  8 ++++----
 src/utils/xml.cpp                 |  8 ++++----
 src/utils/xml.h                   |  8 ++++----
 src/vector.cpp                    |  8 ++++----
 src/vector.h                      |  8 ++++----
 tools/tmxcopy/main.cpp            |  9 ++++-----
 tools/tmxcopy/map.cpp             |  9 ++++-----
 tools/tmxcopy/tostring.h          |  8 ++++----
 tools/tmxcopy/xmlutils.cpp        |  8 ++++----
 tools/tmxcopy/xmlutils.h          |  8 ++++----
 314 files changed, 1241 insertions(+), 1248 deletions(-)

diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index ba71d0e0..aa2fb4ee 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index ddc663f2..c8a2b3c5 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/animationparticle.cpp b/src/animationparticle.cpp
index 59eacb05..9c1f7ccb 100644
--- a/src/animationparticle.cpp
+++ b/src/animationparticle.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2006 The Mana World Development Team
+ *  Copyright (C) 2006  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/animationparticle.h b/src/animationparticle.h
index eabc2742..03065eb7 100644
--- a/src/animationparticle.h
+++ b/src/animationparticle.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2006 The Mana World Development Team
+ *  Copyright (C) 2006  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/being.cpp b/src/being.cpp
index 8ed66c7a..a0b870e0 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/being.h b/src/being.h
index 6dbcdfdd..1e9954c5 100644
--- a/src/being.h
+++ b/src/being.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index ada1ddfa..b2dc330b 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/beingmanager.h b/src/beingmanager.h
index 0179bed8..267b4655 100644
--- a/src/beingmanager.h
+++ b/src/beingmanager.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/configlistener.h b/src/configlistener.h
index 9fbc4544..e62d41ea 100644
--- a/src/configlistener.h
+++ b/src/configlistener.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 4fb6a42b..04cb4f36 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/configuration.h b/src/configuration.h
index 197e1a41..f7a44410 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp
index 1fdf87e8..cf77de37 100644
--- a/src/effectmanager.cpp
+++ b/src/effectmanager.cpp
@@ -1,25 +1,25 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright 2008 The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
+
 #include "effectmanager.h"
 #include "log.h"
 #include "particle.h"
diff --git a/src/effectmanager.h b/src/effectmanager.h
index e6671498..a9efcdbc 100644
--- a/src/effectmanager.h
+++ b/src/effectmanager.h
@@ -1,23 +1,22 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright 2008 The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #ifndef _EFFECT_MANAGER_H
diff --git a/src/engine.cpp b/src/engine.cpp
index 04e5f287..2a37d888 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/engine.h b/src/engine.h
index 8d387f80..f2852351 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/equipment.cpp b/src/equipment.cpp
index 828de46b..d5e0f656 100644
--- a/src/equipment.cpp
+++ b/src/equipment.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/equipment.h b/src/equipment.h
index e6145d12..50fcbb32 100644
--- a/src/equipment.h
+++ b/src/equipment.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/floor_item.cpp b/src/floor_item.cpp
index 0b114e14..0c4c1c10 100644
--- a/src/floor_item.cpp
+++ b/src/floor_item.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/floor_item.h b/src/floor_item.h
index 4a4e8fb3..589835b4 100644
--- a/src/floor_item.h
+++ b/src/floor_item.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/flooritemmanager.cpp b/src/flooritemmanager.cpp
index 7445b1e9..65556abb 100644
--- a/src/flooritemmanager.cpp
+++ b/src/flooritemmanager.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/flooritemmanager.h b/src/flooritemmanager.h
index 3dbaf988..b527bbd2 100644
--- a/src/flooritemmanager.h
+++ b/src/flooritemmanager.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/game.cpp b/src/game.cpp
index 1d09ebe2..76cf792e 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/game.h b/src/game.h
index 1cc18cae..f674dbf0 100644
--- a/src/game.h
+++ b/src/game.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/graphics.cpp b/src/graphics.cpp
index 55ccc3b4..4af7b723 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/graphics.h b/src/graphics.h
index bc9a95bd..8009ceda 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 7621b856..6fd0482a 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h
index e4411637..c2c427f4 100644
--- a/src/gui/browserbox.h
+++ b/src/gui/browserbox.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index 9653242c..04b96810 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/button.h b/src/gui/button.h
index eecd0dc0..2999a737 100644
--- a/src/gui/button.h
+++ b/src/gui/button.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 496c8cd7..0c8c4d9d 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 7f0f04ac..1b7ebe43 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index 724ae8a1..d060db85 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index d73205b6..0f41e9ed 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 7bfa3c7a..af030280 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index d592ce48..23f5499c 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp
index d5452532..2e823b60 100644
--- a/src/gui/char_server.cpp
+++ b/src/gui/char_server.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/char_server.h b/src/gui/char_server.h
index e05792f8..9419c92d 100644
--- a/src/gui/char_server.h
+++ b/src/gui/char_server.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 7ce5d395..20065106 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/chat.h b/src/gui/chat.h
index 2967e204..e5d0a4a9 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/chatinput.cpp b/src/gui/chatinput.cpp
index afe7f037..43f3cde4 100644
--- a/src/gui/chatinput.cpp
+++ b/src/gui/chatinput.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/chatinput.h b/src/gui/chatinput.h
index 44e22956..fc5c18a3 100644
--- a/src/gui/chatinput.h
+++ b/src/gui/chatinput.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp
index 20e24dee..b8fca2b8 100644
--- a/src/gui/checkbox.cpp
+++ b/src/gui/checkbox.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/checkbox.h b/src/gui/checkbox.h
index f6d8f2e5..ea67ec02 100644
--- a/src/gui/checkbox.h
+++ b/src/gui/checkbox.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp
index 72ce3e16..569fd93f 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirm_dialog.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h
index 109dcea0..63a867da 100644
--- a/src/gui/confirm_dialog.h
+++ b/src/gui/confirm_dialog.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index 174d98e7..15d85bbc 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/connection.h b/src/gui/connection.h
index c3a6208f..0cbb8768 100644
--- a/src/gui/connection.h
+++ b/src/gui/connection.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 3d729fe4..223b7fbd 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h
index 8d8b7822..185915a2 100644
--- a/src/gui/debugwindow.h
+++ b/src/gui/debugwindow.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 47ca61df..ff976b24 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index b669f5b1..c50e154e 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/focushandler.cpp b/src/gui/focushandler.cpp
index f9ea8b7d..dd605be6 100644
--- a/src/gui/focushandler.cpp
+++ b/src/gui/focushandler.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h
index a5218485..a183a1c8 100644
--- a/src/gui/focushandler.h
+++ b/src/gui/focushandler.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/gccontainer.cpp b/src/gui/gccontainer.cpp
index ec3c8a5c..8325ccd4 100644
--- a/src/gui/gccontainer.cpp
+++ b/src/gui/gccontainer.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/gccontainer.h b/src/gui/gccontainer.h
index 2af7f6ad..03dcb785 100644
--- a/src/gui/gccontainer.h
+++ b/src/gui/gccontainer.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 6a399548..99883151 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/gui.h b/src/gui/gui.h
index eb81b87c..2289ae0b 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/help.cpp b/src/gui/help.cpp
index cd249943..6b14f6d8 100644
--- a/src/gui/help.cpp
+++ b/src/gui/help.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/help.h b/src/gui/help.h
index bd200ccf..b4627389 100644
--- a/src/gui/help.h
+++ b/src/gui/help.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/inttextfield.cpp b/src/gui/inttextfield.cpp
index e8e6e69b..fcbe938d 100644
--- a/src/gui/inttextfield.cpp
+++ b/src/gui/inttextfield.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/inttextfield.h b/src/gui/inttextfield.h
index 3f9cd7ad..2a913ef6 100644
--- a/src/gui/inttextfield.h
+++ b/src/gui/inttextfield.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 72507d23..da549841 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 166bf1c4..e14994df 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp
index 03b22fa9..d8682c95 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h
index 08852c8f..e6086f82 100644
--- a/src/gui/item_amount.h
+++ b/src/gui/item_amount.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 681bf0ce..e07a997c 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index 558470bd..0eb940f5 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index 40b435cc..5179ceb8 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <SDL_mouse.h>
diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h
index 07e2c38d..d8ddf110 100644
--- a/src/gui/itemshortcutcontainer.h
+++ b/src/gui/itemshortcutcontainer.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/linkhandler.h b/src/gui/linkhandler.h
index 44f906db..b238f38b 100644
--- a/src/gui/linkhandler.h
+++ b/src/gui/linkhandler.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp
index 7e28e1f5..21b59a07 100644
--- a/src/gui/listbox.cpp
+++ b/src/gui/listbox.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/listbox.h b/src/gui/listbox.h
index 30eb4c79..69ba45f4 100644
--- a/src/gui/listbox.h
+++ b/src/gui/listbox.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 7ac76c63..84e10e97 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/login.h b/src/gui/login.h
index d1d75ebc..c8fcc267 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index 2a175a61..0dcc999f 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/menuwindow.h b/src/gui/menuwindow.h
index 03ec3380..539cdc24 100644
--- a/src/gui/menuwindow.h
+++ b/src/gui/menuwindow.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 61a56445..9292ec05 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004-2005 The Mana World Development Team
+ *  Copyright (C) 2004-2005  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/minimap.h b/src/gui/minimap.h
index b6dbc322..6b2b7f52 100644
--- a/src/gui/minimap.h
+++ b/src/gui/minimap.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004-2005 The Mana World Development Team
+ *  Copyright (C) 2004-2005  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index c4c834c7..04901379 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h
index d7f6f68c..d4804bef 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatus.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 898b9afe..3a0a86a6 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 90b15abd..f6b059ea 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp
index 473c10f6..65a1a7f1 100644
--- a/src/gui/npcintegerdialog.cpp
+++ b/src/gui/npcintegerdialog.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/npcintegerdialog.h b/src/gui/npcintegerdialog.h
index c1bdffe1..d2c5f058 100644
--- a/src/gui/npcintegerdialog.h
+++ b/src/gui/npcintegerdialog.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 7ecd0a74..9f41be67 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index bc58cdcd..242e3a95 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index 500875be..ccb3c411 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/npcstringdialog.h b/src/gui/npcstringdialog.h
index 22054994..e57003e9 100644
--- a/src/gui/npcstringdialog.h
+++ b/src/gui/npcstringdialog.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index ad7b879c..dc66a900 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/ok_dialog.h b/src/gui/ok_dialog.h
index a06ddd7c..78b3d44f 100644
--- a/src/gui/ok_dialog.h
+++ b/src/gui/ok_dialog.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/passwordfield.cpp b/src/gui/passwordfield.cpp
index 01c7e15d..09b6abda 100644
--- a/src/gui/passwordfield.cpp
+++ b/src/gui/passwordfield.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h
index e31b1779..033c4bf9 100644
--- a/src/gui/passwordfield.h
+++ b/src/gui/passwordfield.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index 92722417..e8c19ad4 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/playerbox.h b/src/gui/playerbox.h
index 3ccb5fad..75dfe14c 100644
--- a/src/gui/playerbox.h
+++ b/src/gui/playerbox.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index fde81cd8..88fd273e 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index 3cf949b3..734b826f 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index b4117c80..6671d388 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h
index d2ace66c..670b4ab4 100644
--- a/src/gui/progressbar.h
+++ b/src/gui/progressbar.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/radiobutton.cpp b/src/gui/radiobutton.cpp
index 619ec84f..245112a7 100644
--- a/src/gui/radiobutton.cpp
+++ b/src/gui/radiobutton.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/radiobutton.h b/src/gui/radiobutton.h
index ef4c128c..84c552b9 100644
--- a/src/gui/radiobutton.h
+++ b/src/gui/radiobutton.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index a9cf57cf..9c337d9e 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/register.h b/src/gui/register.h
index 480a7c03..58106a41 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index 07b4027b..1d7f8472 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/scrollarea.h b/src/gui/scrollarea.h
index ebe2c77b..26cba4a6 100644
--- a/src/gui/scrollarea.h
+++ b/src/gui/scrollarea.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index ee94b2c6..f68dc9c8 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -7,7 +7,7 @@
  * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
  *
  * Copyright (c) 2004, 2005, 2006, 2007 Olof Naess�n and Per Larsson
- * Copyright 2007 The Mana World Development Team
+ * Copyright (C) 2007  The Mana World Development Team
  *
  *                                                         Js_./
  * Per Larsson a.k.a finalman                          _RqZ{a<^_aa
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index 72d949e1..67eb13a8 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -7,7 +7,7 @@
  * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
  *
  * Copyright (c) 2004, 2005, 2006, 2007 Olof Naess�n and Per Larsson
- * Copyright 2007 The Mana World Development Team
+ * Copyright (C) 2007  The Mana World Development Team
  *
  *                                                         Js_./
  * Per Larsson a.k.a finalman                          _RqZ{a<^_aa
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index fac0a0b8..7976e32e 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/sell.h b/src/gui/sell.h
index 0bf8b5a6..0aba2909 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index bd5a25f9..dd0f94e5 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/setup.h b/src/gui/setup.h
index 8a775093..1e0359aa 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 7ffff913..7090136e 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h
index 9835a8fb..a91cb6cb 100644
--- a/src/gui/setup_audio.h
+++ b/src/gui/setup_audio.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 187b3e2b..2c726b87 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h
index d2973a89..fec38353 100644
--- a/src/gui/setup_joystick.h
+++ b/src/gui/setup_joystick.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 83c556a2..7ff2ea7f 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h
index 937790af..86dd920b 100644
--- a/src/gui/setup_keyboard.h
+++ b/src/gui/setup_keyboard.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 4bfca983..a4582b48 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index b693a952..a1f1e8aa 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 16a7172f..2ba8b6e8 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index 360daff0..e9cfb36e 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/setuptab.h b/src/gui/setuptab.h
index 9e668a20..c1171fdb 100644
--- a/src/gui/setuptab.h
+++ b/src/gui/setuptab.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp
index a4478a62..a5f59bac 100644
--- a/src/gui/shop.cpp
+++ b/src/gui/shop.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/shop.h b/src/gui/shop.h
index 97b8d173..22b649d0 100644
--- a/src/gui/shop.h
+++ b/src/gui/shop.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp
index e31eee58..b6a12658 100644
--- a/src/gui/shoplistbox.cpp
+++ b/src/gui/shoplistbox.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h
index e856c076..c55db889 100644
--- a/src/gui/shoplistbox.h
+++ b/src/gui/shoplistbox.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index d2b939f5..3a7cf0e0 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h
index 9ac1a52a..3c9bfbea 100644
--- a/src/gui/shortcutwindow.h
+++ b/src/gui/shortcutwindow.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index bc28123a..9d23cc3c 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/skill.h b/src/gui/skill.h
index 2095e098..33298e96 100644
--- a/src/gui/skill.h
+++ b/src/gui/skill.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/slider.cpp b/src/gui/slider.cpp
index afeecf17..37136012 100644
--- a/src/gui/slider.cpp
+++ b/src/gui/slider.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/slider.h b/src/gui/slider.h
index 36bfe698..c2add662 100644
--- a/src/gui/slider.h
+++ b/src/gui/slider.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index e140c42b..f7a5c137 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/status.h b/src/gui/status.h
index aa20d094..795ed533 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/table.cpp b/src/gui/table.cpp
index 264d9864..c4265097 100644
--- a/src/gui/table.cpp
+++ b/src/gui/table.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/table.h b/src/gui/table.h
index b4c607ae..39a48dd5 100644
--- a/src/gui/table.h
+++ b/src/gui/table.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  Copyright (C) 2008  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/table_model.cpp b/src/gui/table_model.cpp
index f7f0ab54..a6904fd1 100644
--- a/src/gui/table_model.cpp
+++ b/src/gui/table_model.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  Copyright (C) 2008  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/table_model.h b/src/gui/table_model.h
index 304500bb..cd4bc6db 100644
--- a/src/gui/table_model.h
+++ b/src/gui/table_model.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  Copyright (C) 2008  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp
index d7b589fa..ee03c79d 100644
--- a/src/gui/textbox.cpp
+++ b/src/gui/textbox.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/textbox.h b/src/gui/textbox.h
index a0f0f947..62385b1e 100644
--- a/src/gui/textbox.h
+++ b/src/gui/textbox.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index 80e3bbcf..3ecf5c82 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/textfield.h b/src/gui/textfield.h
index 3235e3f6..4c887546 100644
--- a/src/gui/textfield.h
+++ b/src/gui/textfield.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 4ae81e44..c89e55a2 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/trade.h b/src/gui/trade.h
index ec7a2a39..910a5183 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index 248afcbf..27b327f2 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
index 3d5d52ff..bb3663cd 100644
--- a/src/gui/truetypefont.h
+++ b/src/gui/truetypefont.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index ba802876..67e05bbd 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index 9cd3405e..6450ece2 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 5fcb7dc9..f258aba8 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index ef8e7a38..0a140ff9 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp
index bcc54cf7..4ffdda36 100644
--- a/src/gui/widgets/layout.cpp
+++ b/src/gui/widgets/layout.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index 9ba97fa1..b9b8b0f8 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/widgets/layouthelper.cpp b/src/gui/widgets/layouthelper.cpp
index 4dddaab3..410de98a 100644
--- a/src/gui/widgets/layouthelper.cpp
+++ b/src/gui/widgets/layouthelper.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2009 The Mana World Development Team
+ *  Copyright (C) 2009  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index b1039fb0..afa92a18 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2009 The Mana World Development Team
+ *  Copyright (C) 2009  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp
index 6009d5f5..4b8bb4da 100644
--- a/src/gui/widgets/resizegrip.cpp
+++ b/src/gui/widgets/resizegrip.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h
index acb934d2..6c517de8 100644
--- a/src/gui/widgets/resizegrip.h
+++ b/src/gui/widgets/resizegrip.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index c53ac85c..c54b2390 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  Copyright (C) 2008  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
index 42964b0f..6b6e06af 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  Copyright (C) 2008  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 205fdc99..c4e22bff 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  Copyright (C) 2008  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 2199264b..8d60409a 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  Copyright (C) 2008  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index d1ada53d..dba65143 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/window.h b/src/gui/window.h
index d864290c..fc808cf4 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/windowcontainer.cpp b/src/gui/windowcontainer.cpp
index d8535f73..2846b1c1 100644
--- a/src/gui/windowcontainer.cpp
+++ b/src/gui/windowcontainer.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/gui/windowcontainer.h b/src/gui/windowcontainer.h
index d783fefd..f087db2c 100644
--- a/src/gui/windowcontainer.h
+++ b/src/gui/windowcontainer.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/guichanfwd.h b/src/guichanfwd.h
index 4fb7ea3e..5fd05dbc 100644
--- a/src/guichanfwd.h
+++ b/src/guichanfwd.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp
index 6d74801e..557b3553 100644
--- a/src/imageparticle.cpp
+++ b/src/imageparticle.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2006 The Mana World Development Team
+ *  Copyright (C) 2006  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/imageparticle.h b/src/imageparticle.h
index c18b30b8..317b17ea 100644
--- a/src/imageparticle.h
+++ b/src/imageparticle.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2006 The Mana World Development Team
+ *  Copyright (C) 2006  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/inventory.cpp b/src/inventory.cpp
index da9aed02..8824e1ba 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/inventory.h b/src/inventory.h
index 91bb7d04..2c5d99e3 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/item.cpp b/src/item.cpp
index bc6b7cc7..9165c6c8 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/item.h b/src/item.h
index bb6fcbdc..2543b594 100644
--- a/src/item.h
+++ b/src/item.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp
index cfe46238..7bfbc88e 100644
--- a/src/itemshortcut.cpp
+++ b/src/itemshortcut.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/itemshortcut.h b/src/itemshortcut.h
index 57800d96..5e448010 100644
--- a/src/itemshortcut.h
+++ b/src/itemshortcut.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/joystick.cpp b/src/joystick.cpp
index 4cee4464..1233c37f 100644
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/joystick.h b/src/joystick.h
index 2baf3e61..867bf96a 100644
--- a/src/joystick.h
+++ b/src/joystick.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 932f6ad2..d7288796 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index 716f9a17..038a33af 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 7d3ff3ab..db7a25f8 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <cassert>
diff --git a/src/localplayer.h b/src/localplayer.h
index 76c810bb..236d63dc 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/lockedarray.h b/src/lockedarray.h
index a3e5dc0a..e32f6305 100644
--- a/src/lockedarray.h
+++ b/src/lockedarray.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/log.cpp b/src/log.cpp
index 96630a96..e50edeb2 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/log.h b/src/log.h
index 30078e35..fcd48757 100644
--- a/src/log.h
+++ b/src/log.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/logindata.h b/src/logindata.h
index 6b733269..ea494e15 100644
--- a/src/logindata.h
+++ b/src/logindata.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/main.cpp b/src/main.cpp
index a0066c66..8490ec94 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/main.h b/src/main.h
index a0fe65cb..0fe2b296 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/map.cpp b/src/map.cpp
index 5d36d772..01844409 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/map.h b/src/map.h
index b299fdb5..57d5b9ac 100644
--- a/src/map.h
+++ b/src/map.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/monster.cpp b/src/monster.cpp
index 04624b8c..f42258bc 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/monster.h b/src/monster.h
index 7a8cd2a7..ecd90766 100644
--- a/src/monster.h
+++ b/src/monster.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 5b689266..69bc462c 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index 9e736751..cb5941fd 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/buysellhandler.cpp b/src/net/buysellhandler.cpp
index b2fe99b9..5292b6f9 100644
--- a/src/net/buysellhandler.cpp
+++ b/src/net/buysellhandler.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h
index 49984840..eb1f5853 100644
--- a/src/net/buysellhandler.h
+++ b/src/net/buysellhandler.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index eb724630..909100e5 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h
index 05f547d0..7e711fd9 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/chathandler.cpp b/src/net/chathandler.cpp
index b73b86b4..bf5a5a37 100644
--- a/src/net/chathandler.cpp
+++ b/src/net/chathandler.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/chathandler.h b/src/net/chathandler.h
index 53ea61d8..6393e401 100644
--- a/src/net/chathandler.h
+++ b/src/net/chathandler.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index 2e0cc562..973de0f6 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/equipmenthandler.h b/src/net/equipmenthandler.h
index 31a747c3..d477885d 100644
--- a/src/net/equipmenthandler.h
+++ b/src/net/equipmenthandler.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp
index 12b7d5ef..3ce0899a 100644
--- a/src/net/inventoryhandler.cpp
+++ b/src/net/inventoryhandler.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index 002fa938..d18e428a 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/itemhandler.cpp b/src/net/itemhandler.cpp
index 9cf85ce7..8c4af4e4 100644
--- a/src/net/itemhandler.cpp
+++ b/src/net/itemhandler.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/itemhandler.h b/src/net/itemhandler.h
index 99fc6b62..621b7097 100644
--- a/src/net/itemhandler.h
+++ b/src/net/itemhandler.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp
index 2b98e4e4..f240618d 100644
--- a/src/net/loginhandler.cpp
+++ b/src/net/loginhandler.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h
index 047434b4..9024136f 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/maploginhandler.cpp b/src/net/maploginhandler.cpp
index bc08d5d6..1b0919fa 100644
--- a/src/net/maploginhandler.cpp
+++ b/src/net/maploginhandler.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/maploginhandler.h b/src/net/maploginhandler.h
index 4d9fa75b..a7267372 100644
--- a/src/net/maploginhandler.h
+++ b/src/net/maploginhandler.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/messagehandler.cpp b/src/net/messagehandler.cpp
index 7a41e1ad..f1561a31 100644
--- a/src/net/messagehandler.cpp
+++ b/src/net/messagehandler.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h
index 952e76a9..f46da788 100644
--- a/src/net/messagehandler.h
+++ b/src/net/messagehandler.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index 387af70c..a288d936 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/messagein.h b/src/net/messagein.h
index 90804497..5cf7cbb5 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp
index 6aa25411..bf4957be 100644
--- a/src/net/messageout.cpp
+++ b/src/net/messageout.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/messageout.h b/src/net/messageout.h
index 3c4cc241..d377229a 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/network.cpp b/src/net/network.cpp
index 60d54a7a..941995c9 100644
--- a/src/net/network.cpp
+++ b/src/net/network.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/network.h b/src/net/network.h
index 6270e0de..db4d7f07 100644
--- a/src/net/network.h
+++ b/src/net/network.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 3cea2d64..82b07d41 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index abb16b7a..f47af523 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 59c7d0d6..d06f1108 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index ec22e704..ceefadf6 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/protocol.cpp b/src/net/protocol.cpp
index a0e21d2e..69d69901 100644
--- a/src/net/protocol.cpp
+++ b/src/net/protocol.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 0538abf4..8f2a2392 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/skillhandler.cpp b/src/net/skillhandler.cpp
index b9a232fb..e2185524 100644
--- a/src/net/skillhandler.cpp
+++ b/src/net/skillhandler.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/skillhandler.h b/src/net/skillhandler.h
index 80095bd3..44a0f894 100644
--- a/src/net/skillhandler.h
+++ b/src/net/skillhandler.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index 07134746..0c7c9205 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index 37ec5024..730c6971 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/npc.cpp b/src/npc.cpp
index 2dbf7f43..d8bd5468 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/npc.h b/src/npc.h
index 1cb9a90f..00494060 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index 24be9438..d3278c1a 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/openglgraphics.h b/src/openglgraphics.h
index ea30e019..6ff80bcc 100644
--- a/src/openglgraphics.h
+++ b/src/openglgraphics.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/particle.cpp b/src/particle.cpp
index 1f067de3..4de9fe29 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2006 The Mana World Development Team
+ *  Copyright (C) 2006  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/particle.h b/src/particle.h
index e1ea92d9..87e4d69d 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2006 The Mana World Development Team
+ *  Copyright (C) 2006  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp
index b90db9f1..d100ba27 100644
--- a/src/particlecontainer.cpp
+++ b/src/particlecontainer.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  Copyright (C) 2008  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/particlecontainer.h b/src/particlecontainer.h
index ae02326e..0181f6e1 100644
--- a/src/particlecontainer.h
+++ b/src/particlecontainer.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  Copyright (C) 2008  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index fef34b22..ca9f7bf5 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2006 The Mana World Development Team
+ *  Copyright (C) 2006  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/particleemitter.h b/src/particleemitter.h
index e16ee241..cc77f215 100644
--- a/src/particleemitter.h
+++ b/src/particleemitter.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2006 The Mana World Development Team
+ *  Copyright (C) 2006  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/particleemitterprop.h b/src/particleemitterprop.h
index f9c329a9..fde78f8f 100644
--- a/src/particleemitterprop.h
+++ b/src/particleemitterprop.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2006 The Mana World Development Team
+ *  Copyright (C) 2006  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/player.cpp b/src/player.cpp
index ca728bef..a72e754d 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/player.h b/src/player.h
index a082a92b..11cccd04 100644
--- a/src/player.h
+++ b/src/player.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/player_relations.cpp b/src/player_relations.cpp
index 5eb47433..057eea94 100644
--- a/src/player_relations.cpp
+++ b/src/player_relations.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  Copyright (C) 2008  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/player_relations.h b/src/player_relations.h
index 56f3d5a4..07ec7fcb 100644
--- a/src/player_relations.h
+++ b/src/player_relations.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  Copyright (C) 2008  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/position.cpp b/src/position.cpp
index cc39a1af..69d50476 100644
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/position.h b/src/position.h
index 7beb3ef7..7ef01466 100644
--- a/src/position.h
+++ b/src/position.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  Copyright (C) 2008  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/properties.h b/src/properties.h
index 038acd91..81714dde 100644
--- a/src/properties.h
+++ b/src/properties.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/recorder.h b/src/recorder.h
index eeaf4821..c9955fd9 100644
--- a/src/recorder.h
+++ b/src/recorder.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/action.cpp b/src/resources/action.cpp
index a017e11c..e2cb11f2 100644
--- a/src/resources/action.cpp
+++ b/src/resources/action.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/action.h b/src/resources/action.h
index 5f159a00..1b5f1fc8 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/ambientoverlay.cpp b/src/resources/ambientoverlay.cpp
index 38d8fc46..32ed47d1 100644
--- a/src/resources/ambientoverlay.cpp
+++ b/src/resources/ambientoverlay.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/ambientoverlay.h b/src/resources/ambientoverlay.h
index 56c70066..1b03a19c 100644
--- a/src/resources/ambientoverlay.h
+++ b/src/resources/ambientoverlay.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp
index 5721c7f0..8d7156a9 100644
--- a/src/resources/animation.cpp
+++ b/src/resources/animation.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/animation.h b/src/resources/animation.h
index 93e100bd..8ebebc6f 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp
index 8c02735a..541acabe 100644
--- a/src/resources/buddylist.cpp
+++ b/src/resources/buddylist.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/buddylist.h b/src/resources/buddylist.h
index 092abc6a..40dd125d 100644
--- a/src/resources/buddylist.h
+++ b/src/resources/buddylist.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index 3be105d8..fd760c3f 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/dye.h b/src/resources/dye.h
index 4fb8fd40..6bec8eb1 100644
--- a/src/resources/dye.h
+++ b/src/resources/dye.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 35b9c254..c3310849 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/image.h b/src/resources/image.h
index a2e52d3d..a0ae66c5 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp
index a7e813d7..8ad6c5d4 100644
--- a/src/resources/imageloader.cpp
+++ b/src/resources/imageloader.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/imageloader.h b/src/resources/imageloader.h
index 7979fd2f..05d7a838 100644
--- a/src/resources/imageloader.h
+++ b/src/resources/imageloader.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index b321439a..92bb3242 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index 26ce99ea..f8939263 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp
index 36805646..c350ac07 100644
--- a/src/resources/imagewriter.cpp
+++ b/src/resources/imagewriter.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h
index 0dcc0c33..a9133846 100644
--- a/src/resources/imagewriter.h
+++ b/src/resources/imagewriter.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index cb9fadab..c32c3459 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 2cc23ec9..78279f4d 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 4c04678a..2f118284 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 773fd17c..5e98d040 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 9dd1dc62..a4ec3b69 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index c85e00d9..bf797690 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 4ee7b89e..c7926260 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h
index 2e186c15..cee1390b 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/monsterdb.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp
index faa759af..503990e7 100644
--- a/src/resources/monsterinfo.cpp
+++ b/src/resources/monsterinfo.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index 8d36cc06..77130be0 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/music.cpp b/src/resources/music.cpp
index ed71d62c..ed78a541 100644
--- a/src/resources/music.cpp
+++ b/src/resources/music.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/music.h b/src/resources/music.h
index 322cfecd..4d2ffd29 100644
--- a/src/resources/music.h
+++ b/src/resources/music.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 0908d67d..88572481 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  Copyright (C) 2008  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h
index 1883d747..c2bd04e4 100644
--- a/src/resources/npcdb.h
+++ b/src/resources/npcdb.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  Copyright (C) 2008  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp
index 82562691..d1c3ada4 100644
--- a/src/resources/resource.cpp
+++ b/src/resources/resource.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/resource.h b/src/resources/resource.h
index 168fd70a..855d09b8 100644
--- a/src/resources/resource.h
+++ b/src/resources/resource.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 7f2cba1d..f193d55d 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index 95519da3..4372195d 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp
index f7b2b874..3a285730 100644
--- a/src/resources/soundeffect.cpp
+++ b/src/resources/soundeffect.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index b9abefd7..b19142b3 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 41b1e789..e8d064d4 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 033de6cd..4759ef4e 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/serverinfo.h b/src/serverinfo.h
index 4d2bb525..d3be62fa 100644
--- a/src/serverinfo.h
+++ b/src/serverinfo.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/shopitem.cpp b/src/shopitem.cpp
index 9888f829..3b90dfdd 100644
--- a/src/shopitem.cpp
+++ b/src/shopitem.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/shopitem.h b/src/shopitem.h
index f0c00ef0..7da77cdf 100644
--- a/src/shopitem.h
+++ b/src/shopitem.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index 544d02b5..17d9ce60 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/simpleanimation.h b/src/simpleanimation.h
index 577268a8..ce8832c3 100644
--- a/src/simpleanimation.h
+++ b/src/simpleanimation.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/sound.cpp b/src/sound.cpp
index 6d440134..78538c09 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/sound.h b/src/sound.h
index 72180607..1b47e4c7 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/sprite.h b/src/sprite.h
index 52825db2..321d6abe 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/text.cpp b/src/text.cpp
index 4d36b8fc..5624bc0a 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -7,8 +7,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   This program is distributed with The Mana Experiment                  *
- *   in the hope that it will be useful,                                   *
+ *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
diff --git a/src/text.h b/src/text.h
index 173a5686..c2ec4154 100644
--- a/src/text.h
+++ b/src/text.h
@@ -7,8 +7,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   This program is distributed with The Mana Experiment                  *
- *   in the hope that it will be useful,                                   *
+ *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
diff --git a/src/textmanager.cpp b/src/textmanager.cpp
index cb5d0bf2..7c5d2713 100644
--- a/src/textmanager.cpp
+++ b/src/textmanager.cpp
@@ -7,8 +7,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   This program is distributed with The Mana Experiment                  *
- *   in the hope that it will be useful,                                   *
+ *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
diff --git a/src/textmanager.h b/src/textmanager.h
index 5b21ba81..6497c335 100644
--- a/src/textmanager.h
+++ b/src/textmanager.h
@@ -7,8 +7,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   This program is distributed with The Mana Experiment                  *
- *   in the hope that it will be useful,                                   *
+ *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
diff --git a/src/textparticle.cpp b/src/textparticle.cpp
index ed9d5717..7e329b4e 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2006 The Mana World Development Team
+ *  Copyright (C) 2006  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/textparticle.h b/src/textparticle.h
index 039c18d7..bc7cd88c 100644
--- a/src/textparticle.h
+++ b/src/textparticle.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2006 The Mana World Development Team
+ *  Copyright (C) 2006  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/tileset.h b/src/tileset.h
index fb855831..040f7ef8 100644
--- a/src/tileset.h
+++ b/src/tileset.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/utils/dtor.h b/src/utils/dtor.h
index 514ea9e7..399cb8c2 100644
--- a/src/utils/dtor.h
+++ b/src/utils/dtor.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/utils/gettext.h b/src/utils/gettext.h
index 0cd9114b..74502bb0 100644
--- a/src/utils/gettext.h
+++ b/src/utils/gettext.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/utils/mutex.h b/src/utils/mutex.h
index 62c6b4e1..31e43e33 100644
--- a/src/utils/mutex.h
+++ b/src/utils/mutex.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  Copyright (C) 2008  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/utils/strprintf.cpp b/src/utils/strprintf.cpp
index c532dd0d..07fb3508 100644
--- a/src/utils/strprintf.cpp
+++ b/src/utils/strprintf.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/utils/strprintf.h b/src/utils/strprintf.h
index 382ab6e0..98ef5065 100644
--- a/src/utils/strprintf.h
+++ b/src/utils/strprintf.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/utils/tostring.h b/src/utils/tostring.h
index d2dd941a..0c3b600f 100644
--- a/src/utils/tostring.h
+++ b/src/utils/tostring.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/utils/trim.h b/src/utils/trim.h
index a7c40ca2..9d0d5600 100644
--- a/src/utils/trim.h
+++ b/src/utils/trim.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index db78d08c..24058558 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/utils/xml.h b/src/utils/xml.h
index 403fe6d9..6af5f1ca 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/vector.cpp b/src/vector.cpp
index 7d5f055a..9b573e88 100644
--- a/src/vector.cpp
+++ b/src/vector.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/vector.h b/src/vector.h
index f32b201a..cd477301 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  Copyright (C) 2007  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/tools/tmxcopy/main.cpp b/tools/tmxcopy/main.cpp
index 92a69c54..ab67afe6 100644
--- a/tools/tmxcopy/main.cpp
+++ b/tools/tmxcopy/main.cpp
@@ -1,20 +1,19 @@
 /*
  *  TMXCopy
- *  Copyright 2007 Philipp Sehmisch
+ *  Copyright (C) 2007  Philipp Sehmisch
  *
- *
- *  TMXCopy is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  TMXCopy is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with TMXCopy; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/tools/tmxcopy/map.cpp b/tools/tmxcopy/map.cpp
index b554aac2..92e661fd 100644
--- a/tools/tmxcopy/map.cpp
+++ b/tools/tmxcopy/map.cpp
@@ -1,20 +1,19 @@
 /*
  *  TMXCopy
- *  Copyright 2007 Philipp Sehmisch
+ *  Copyright (C) 2007  Philipp Sehmisch
  *
- *
- *  TMXCopy is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  TMXCopy is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with TMXCopy; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/tools/tmxcopy/tostring.h b/tools/tmxcopy/tostring.h
index d2dd941a..0c3b600f 100644
--- a/tools/tmxcopy/tostring.h
+++ b/tools/tmxcopy/tostring.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/tools/tmxcopy/xmlutils.cpp b/tools/tmxcopy/xmlutils.cpp
index 8b1b62cf..54dd0869 100644
--- a/tools/tmxcopy/xmlutils.cpp
+++ b/tools/tmxcopy/xmlutils.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/tools/tmxcopy/xmlutils.h b/tools/tmxcopy/xmlutils.h
index 60e8f3cd..9a1f7dab 100644
--- a/tools/tmxcopy/xmlutils.h
+++ b/tools/tmxcopy/xmlutils.h
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-- 
cgit v1.2.3-70-g09d2


From cee64c1215948a92f7b7bd569134c8e8a393f95c Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sat, 24 Jan 2009 15:45:13 +0100
Subject: Tweak margins and set minimum size for chat window

---
 src/gui/chat.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 20065106..031b6811 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -60,6 +60,8 @@ Window(""), mNetwork(network), mTmpVisible(false)
 
     setResizable(true);
     setDefaultSize(0, windowContainer->getHeight() - 123, 600, 123);
+    setMinWidth(150);
+    setMinHeight(90);
 
     mItemLinkHandler = new ItemLinkHandler();
 
@@ -80,11 +82,12 @@ Window(""), mNetwork(network), mTmpVisible(false)
     mScrollArea->setScrollAmount(0, 1);
     mScrollArea->setOpaque(false);
 
-    place(0, 0, mScrollArea, 5, 5);
-    place(0, 5, mChatInput, 5);
+    place(0, 0, mScrollArea, 5, 5).setPadding(0);
+    place(0, 5, mChatInput, 5).setPadding(1);
 
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
+    layout.setMargin(2);
 
     loadWindowState();
 
-- 
cgit v1.2.3-70-g09d2


From c4fd3e6090fb94a77055f4556d906e60e3803d22 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 24 Jan 2009 12:16:45 -0700
Subject: Fixed a few compiler warnings.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/status.cpp      | 6 +++---
 src/gui/table_model.cpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index f7a5c137..5cc0e80b 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -131,9 +131,9 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     mStatsDefenseLabel= new gcn::Label(_("Defense:"));
     mStatsMagicAttackLabel = new gcn::Label(_("M.Attack:"));
     mStatsMagicDefenseLabel = new gcn::Label(_("M.Defense:"));
-    mStatsAccuracyLabel = new gcn::Label(_("\% Accuracy:"));
-    mStatsEvadeLabel = new gcn::Label(_("\% Evade:"));
-    mStatsReflexLabel = new gcn::Label(_("\% Reflex:"));
+    mStatsAccuracyLabel = new gcn::Label(_("% Accuracy:"));
+    mStatsEvadeLabel = new gcn::Label(_("% Evade:"));
+    mStatsReflexLabel = new gcn::Label(_("% Reflex:"));
 
     mStatsAttackPoints = new gcn::Label;
     mStatsDefensePoints = new gcn::Label;
diff --git a/src/gui/table_model.cpp b/src/gui/table_model.cpp
index a6904fd1..0b31369f 100644
--- a/src/gui/table_model.cpp
+++ b/src/gui/table_model.cpp
@@ -59,8 +59,8 @@ StaticTableModel::StaticTableModel(int row, int column,
     mRows(row),
     mColumns(column),
     mHeight(1),
-    mBackgroundColor(backgroundColor),
-    mOpaque(opacity)
+    mOpaque(opacity),
+    mBackgroundColor(backgroundColor)
 {
     mTableModel.resize(row * column, NULL);
     mWidths.resize(column, 1);
-- 
cgit v1.2.3-70-g09d2


From 581206ab0fecbb3afc7afebedac541be51097cf5 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sat, 24 Jan 2009 19:43:26 +0100
Subject: Use standard GUI font also for speech and names

The speech bitmap font can't handle unicode, so it has now been replaced
by the standard GUI font, drawn with a shadow for chat and with a full
outline for names.
---
 data/graphics/gui/CMakeLists.txt           |   1 -
 data/graphics/gui/Makefile.am              |   4 --
 data/graphics/gui/rpgfont_wider-blue.png   | Bin 4431 -> 0 bytes
 data/graphics/gui/rpgfont_wider-green.png  | Bin 4423 -> 0 bytes
 data/graphics/gui/rpgfont_wider-orange.png | Bin 4415 -> 0 bytes
 data/graphics/gui/rpgfont_wider.png        | Bin 4382 -> 0 bytes
 src/being.cpp                              |   3 +-
 src/gui/gui.cpp                            |  67 +++--------------------------
 src/gui/gui.h                              |  11 -----
 src/gui/ministatus.cpp                     |   8 ----
 src/monster.cpp                            |   5 +--
 src/npc.cpp                                |   5 +--
 src/player.cpp                             |   8 +---
 src/text.cpp                               |  35 ++++++++++-----
 src/text.h                                 |   7 +--
 15 files changed, 38 insertions(+), 116 deletions(-)
 delete mode 100644 data/graphics/gui/rpgfont_wider-blue.png
 delete mode 100644 data/graphics/gui/rpgfont_wider-green.png
 delete mode 100644 data/graphics/gui/rpgfont_wider-orange.png
 delete mode 100644 data/graphics/gui/rpgfont_wider.png

diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index e5ecaa12..e569463c 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -27,7 +27,6 @@ SET (FILES
     radioin.png
     radioout.png
     resize.png
-    rpgfont_wider.png
     selection.png
     slider.png
     speech_bubble.png
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 1878fe5a..aaccd79a 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -30,10 +30,6 @@ gui_DATA =				\
 	radioin.png			\
 	radioout.png			\
 	resize.png			\
-	rpgfont_wider.png		\
-    rpgfont_wider-blue.png	\
-    rpgfont_wider-green.png	\
-    rpgfont_wider-orange.png	\
 	selection.png			\
 	slider.png			\
 	speech_bubble.png		\
diff --git a/data/graphics/gui/rpgfont_wider-blue.png b/data/graphics/gui/rpgfont_wider-blue.png
deleted file mode 100644
index b4a27434..00000000
Binary files a/data/graphics/gui/rpgfont_wider-blue.png and /dev/null differ
diff --git a/data/graphics/gui/rpgfont_wider-green.png b/data/graphics/gui/rpgfont_wider-green.png
deleted file mode 100644
index 00098746..00000000
Binary files a/data/graphics/gui/rpgfont_wider-green.png and /dev/null differ
diff --git a/data/graphics/gui/rpgfont_wider-orange.png b/data/graphics/gui/rpgfont_wider-orange.png
deleted file mode 100644
index 18dd67e9..00000000
Binary files a/data/graphics/gui/rpgfont_wider-orange.png and /dev/null differ
diff --git a/data/graphics/gui/rpgfont_wider.png b/data/graphics/gui/rpgfont_wider.png
deleted file mode 100644
index 55ccbbd6..00000000
Binary files a/data/graphics/gui/rpgfont_wider.png and /dev/null differ
diff --git a/src/being.cpp b/src/being.cpp
index a0b870e0..65e9f9d1 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -527,8 +527,7 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
             delete mText;
 
         mText = new Text(mSpeech, mPx + X_SPEECH_OFFSET, mPy - Y_SPEECH_OFFSET,
-                         gcn::Graphics::CENTER, speechFont,
-                         gcn::Color(255, 255, 255));
+                         gcn::Graphics::CENTER, gcn::Color(255, 255, 255));
     }
     else if (mSpeechTime == 0)
     {
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 99883151..5314b9ba 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -42,14 +42,14 @@
 #include "../resources/resourcemanager.h"
 
 // Guichan stuff
-Gui *gui;
-Viewport *viewport;                    /**< Viewport on the map. */
-SDLInput *guiInput;
+Gui *gui = 0;
+Viewport *viewport = 0;                    /**< Viewport on the map. */
+SDLInput *guiInput = 0;
 
 // Fonts used in showing hits
-gcn::Font *hitRedFont;
-gcn::Font *hitBlueFont;
-gcn::Font *hitYellowFont;
+gcn::Font *hitRedFont = 0;
+gcn::Font *hitBlueFont = 0;
+gcn::Font *hitYellowFont = 0;
 // Font used to display speech and player names
 gcn::Font *speechFont;
 
@@ -122,60 +122,6 @@ Gui::Gui(Graphics *graphics):
             + e.getMessage());
     }
 
-    // Set speech font
-    try {
-        speechFont = new gcn::ImageFont("graphics/gui/rpgfont_wider.png",
-                " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@$\\"
-                "�����������륣���������������������"
-                );
-    }
-    catch (gcn::Exception e)
-    {
-        logger->error(std::string("Unable to load rpgfont_wider.png: ")
-            + e.getMessage());
-    }
-
-    // Set npc name font
-    try {
-        npcNameFont = new gcn::ImageFont("graphics/gui/rpgfont_wider-blue.png",
-                " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@$\\"
-                "�����������륣���������������������"
-                );
-    }
-    catch (gcn::Exception e)
-    {
-        logger->error("Unable to load rpgfont_wider-blue.png!");
-    }
-
-    // Set monster name font
-    try {
-        mobNameFont = new gcn::ImageFont("graphics/gui/rpgfont_wider-orange.png",
-                " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@$\\"
-                "�����������륣���������������������"
-                );
-    }
-    catch (gcn::Exception e)
-    {
-        logger->error("Unable to load rpgfont_wider-orange.png!");
-    }
-
-    // Set GM name font
-    try {
-        gmNameFont = new gcn::ImageFont("graphics/gui/rpgfont_wider-green.png",
-                " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@$\\"
-                "�����������륣���������������������"
-                );
-    }
-    catch (gcn::Exception e)
-    {
-        logger->error("Unable to load rpgfont_wider-green.png!");
-    }
-
-
     gcn::Widget::setGlobalFont(mGuiFont);
 
     // Load hits' colourful fonts
@@ -219,7 +165,6 @@ Gui::~Gui()
         mMouseCursors->decRef();
 
     delete mGuiFont;
-    delete speechFont;
     delete viewport;
     delete getTop();
 
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 2289ae0b..bb14d4dc 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -124,17 +124,6 @@ extern SDLInput *guiInput;                    /**< GUI input */
 extern gcn::Font *hitRedFont;
 extern gcn::Font *hitBlueFont;
 extern gcn::Font *hitYellowFont;
-/**
- * Font used to display speech and player names
- */
-extern gcn::Font *speechFont;
-
-/**
- * being name fonts
- */
-extern gcn::Font *npcNameFont;
-extern gcn::Font *mobNameFont;
-extern gcn::Font *gmNameFont;
 
 
 #endif
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 04901379..f2e466f4 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -54,14 +54,6 @@ MiniStatusWindow::MiniStatusWindow():
     mMpLabel->setDimension(mMpBar->getDimension());
     mXpLabel->setDimension(mXpBar->getDimension());
 
-    mHpLabel->setForegroundColor(gcn::Color(255, 255, 255));
-    mMpLabel->setForegroundColor(gcn::Color(255, 255, 255));
-    mXpLabel->setForegroundColor(gcn::Color(255, 255, 255));
-
-    mHpLabel->setFont(speechFont);
-    mMpLabel->setFont(speechFont);
-    mXpLabel->setFont(speechFont);
-
     mHpLabel->setAlignment(gcn::Graphics::CENTER);
     mMpLabel->setAlignment(gcn::Graphics::CENTER);
     mXpLabel->setAlignment(gcn::Graphics::CENTER);
diff --git a/src/monster.cpp b/src/monster.cpp
index f42258bc..4006315b 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -27,8 +27,6 @@
 #include "sound.h"
 #include "text.h"
 
-#include "gui/gui.h"
-
 #include "resources/monsterdb.h"
 
 #include "utils/tostring.h"
@@ -200,8 +198,7 @@ void Monster::showName(bool show)
     {
         mText = new Text(getInfo().getName(), mPx + NAME_X_OFFSET,
                          mPy + NAME_Y_OFFSET - getHeight(),
-                         gcn::Graphics::CENTER,
-                         mobNameFont, gcn::Color(255, 32, 32));
+                         gcn::Graphics::CENTER, gcn::Color(255, 32, 32));
     }
     else
     {
diff --git a/src/npc.cpp b/src/npc.cpp
index d8bd5468..27388880 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -31,8 +31,6 @@
 
 #include "resources/npcdb.h"
 
-#include "gui/gui.h"
-
 NPC *current_npc = 0;
 
 static const int NAME_X_OFFSET = 15;
@@ -89,8 +87,7 @@ void NPC::setName(const std::string &name)
     std::string displayName = name.substr(0, name.find('#', 0));
 
     mName = new Text(displayName, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET,
-                     gcn::Graphics::CENTER, npcNameFont,
-                     gcn::Color(200, 200, 255));
+                     gcn::Graphics::CENTER, gcn::Color(200, 200, 255));
     Being::setName(displayName + " (NPC)");
 }
 
diff --git a/src/player.cpp b/src/player.cpp
index a72e754d..d62018f2 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -27,8 +27,6 @@
 #include "log.h"
 #include "player.h"
 
-#include "gui/gui.h"
-
 #include "resources/itemdb.h"
 #include "resources/iteminfo.h"
 
@@ -54,12 +52,10 @@ void Player::setName(const std::string &name)
     {
         if (mIsGM) {
             mName = new FlashText("(GM) " + name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET,
-                                  gcn::Graphics::CENTER,
-                                  gmNameFont, gcn::Color(255, 255, 255));
+                                  gcn::Graphics::CENTER, gcn::Color(0, 255, 0));
         } else {
             mName = new FlashText(name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET,
-                                  gcn::Graphics::CENTER,
-                                  speechFont, gcn::Color(255, 255, 255));
+                                  gcn::Graphics::CENTER, gcn::Color(255, 255, 255));
         }
         Being::setName(name);
     }
diff --git a/src/text.cpp b/src/text.cpp
index 5624bc0a..ba581dab 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -25,12 +25,12 @@
 #include "text.h"
 #include "textmanager.h"
 
-int Text::mInstances = 0;
+#include "gui/gui.h"
 
+int Text::mInstances = 0;
 
 Text::Text(const std::string &text, int x, int y,
-           gcn::Graphics::Alignment alignment, gcn::Font *font,
-           gcn::Color colour) :
+           gcn::Graphics::Alignment alignment, gcn::Color colour) :
     mText(text), mColour(colour)
 {
     if (textManager == 0)
@@ -38,8 +38,8 @@ Text::Text(const std::string &text, int x, int y,
         textManager = new TextManager();
     }
     ++mInstances;
-    mHeight = font->getHeight();
-    mWidth = font->getWidth(text);
+    mHeight = gui->getFont()->getHeight();
+    mWidth = gui->getFont()->getWidth(text);
     switch (alignment)
     {
         case gcn::Graphics::LEFT:
@@ -55,7 +55,6 @@ Text::Text(const std::string &text, int x, int y,
     mX = x - mXOffset;
     mY = y;
     textManager->addText(this);
-    mFont = font;
 }
 
 void Text::adviseXY(int x, int y)
@@ -75,15 +74,31 @@ Text::~Text()
 
 void Text::draw(Graphics *graphics, int xOff, int yOff)
 {
-    graphics->setFont(mFont);
+    graphics->setFont(gui->getFont());
+
+    // Text shadow
+    graphics->setColor(gcn::Color(0, 0, 0));
+    graphics->drawText(mText, mX - xOff + 1, mY - yOff + 1,
+              gcn::Graphics::LEFT);
+
+    // Text outline
+    graphics->drawText(mText, mX - xOff + 1, mY - yOff,
+              gcn::Graphics::LEFT);
+    graphics->drawText(mText, mX - xOff - 1, mY - yOff,
+              gcn::Graphics::LEFT);
+    graphics->drawText(mText, mX - xOff, mY - yOff + 1,
+              gcn::Graphics::LEFT);
+    graphics->drawText(mText, mX - xOff, mY - yOff - 1,
+              gcn::Graphics::LEFT);
+
     graphics->setColor(mColour);
     graphics->drawText(mText, mX - xOff, mY - yOff, gcn::Graphics::LEFT);
 }
 
 FlashText::FlashText(const std::string &text, int x, int y,
-                     gcn::Graphics::Alignment alignment, gcn::Font *font,
-                     gcn::Color colour) :
-    Text(text, x, y, alignment, font, colour), mTime(0)
+                     gcn::Graphics::Alignment alignment, gcn::Color colour) :
+    Text(text, x, y, alignment, colour),
+    mTime(0)
 {
 }
 
diff --git a/src/text.h b/src/text.h
index c2ec4154..03f2dcbc 100644
--- a/src/text.h
+++ b/src/text.h
@@ -37,8 +37,7 @@ class Text
          * Constructor creates a text object to display on the screen.
          */
         Text(const std::string &text, int x, int y,
-             gcn::Graphics::Alignment alignment, gcn::Font *font,
-             gcn::Color colour);
+             gcn::Graphics::Alignment alignment, gcn::Color colour);
 
         /**
          * Destructor. The text is removed from the screen.
@@ -62,7 +61,6 @@ class Text
         int mHeight;           /**< The height of the text. */
         int mXOffset;          /**< The offset of mX from the desired x. */
         static int mInstances; /**< Instances of text. */
-        gcn::Font *mFont;      /**< The font used. */
         std::string mText;     /**< The text to display. */
         gcn::Color mColour;    /**< The colour of the text. */
 };
@@ -71,8 +69,7 @@ class FlashText : public Text
 {
     public:
         FlashText(const std::string &text, int x, int y,
-                  gcn::Graphics::Alignment alignment, gcn::Font *font,
-                  gcn::Color colour);
+                  gcn::Graphics::Alignment alignment, gcn::Color colour);
 
         /**
          * Remove the text from the screen
-- 
cgit v1.2.3-70-g09d2


From 0b848dd3c46ee8391522f330eaf3ad0f75462e09 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sat, 24 Jan 2009 19:45:33 +0100
Subject: Code reformatting

---
 src/gui/progressbar.cpp  |  2 +-
 src/gui/truetypefont.cpp |  2 --
 src/monster.cpp          |  2 +-
 src/resources/image.h    | 13 ++++++++-----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index 6671d388..5ce01b35 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -98,7 +98,7 @@ void ProgressBar::draw(gcn::Graphics *graphics)
     {
         graphics->setColor(gcn::Color(mRed, mGreen, mBlue, 200));
         graphics->fillRectangle(gcn::Rectangle(4, 4,
-                    (int)(mProgress * (getWidth() - 8)),
+                    (int) (mProgress * (getWidth() - 8)),
                     getHeight() - 8));
     }
 }
diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index 27b327f2..6e8efeff 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.cpp
@@ -115,9 +115,7 @@ void TrueTypeFont::drawString(gcn::Graphics *graphics,
                               int x, int y)
 {
     if (text.empty())
-    {
         return;
-    }
 
     Graphics *g = dynamic_cast<Graphics *>(graphics);
 
diff --git a/src/monster.cpp b/src/monster.cpp
index 4006315b..814a5904 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -183,7 +183,7 @@ Being::TargetCursorSize Monster::getTargetCursorSize() const
     return getInfo().getTargetCursorSize();
 }
 
-const MonsterInfo& Monster::getInfo() const
+const MonsterInfo &Monster::getInfo() const
 {
     return MonsterDB::get(mJob - 1002);
 }
diff --git a/src/resources/image.h b/src/resources/image.h
index a0ae66c5..0974b18b 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -78,7 +78,8 @@ class Image : public Resource
          * @return <code>NULL</code> if an error occurred, a valid pointer
          *         otherwise.
          */
-        static Resource *load(void *buffer, unsigned bufferSize, Dye const &dye);
+        static Resource *load(void *buffer, unsigned bufferSize,
+                              Dye const &dye);
 
         /**
          * Loads an image from an SDL surface.
@@ -93,12 +94,14 @@ class Image : public Resource
         /**
          * Returns the width of the image.
          */
-        virtual int getWidth() const { return mBounds.w; }
+        virtual int getWidth() const
+        { return mBounds.w; }
 
         /**
          * Returns the height of the image.
          */
-        virtual int getHeight() const { return mBounds.h; }
+        virtual int getHeight() const
+        { return mBounds.h; }
 
         /**
          * Creates a new image with the desired clipping rectangle.
@@ -106,7 +109,7 @@ class Image : public Resource
          * @return <code>NULL</code> if creation failed and a valid
          *         object otherwise.
          */
-        virtual Image* getSubImage(int x, int y, int width, int height);
+        virtual Image *getSubImage(int x, int y, int width, int height);
 
         /**
          * Sets the alpha value of this image.
@@ -183,7 +186,7 @@ class SubImage : public Image
          * @return <code>NULL</code> if creation failed and a valid
          *         image otherwise.
          */
-        Image* getSubImage(int x, int y, int width, int height);
+        Image *getSubImage(int x, int y, int width, int height);
 
     private:
         Image *mParent;
-- 
cgit v1.2.3-70-g09d2


From 5e1dc59411cd7973fb4208ae76d0970bd2ea87d6 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 24 Jan 2009 16:44:27 -0700
Subject: Updated DejaVuSans ttf file, as well as adding the bolded version,
 which is used in a few spots.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 data/fonts/CMakeLists.txt      |   1 +
 data/fonts/Makefile.am         |   3 ++-
 data/fonts/dejavusans-bold.ttf | Bin 0 -> 569880 bytes
 data/fonts/dejavusans.ttf      | Bin 569716 -> 619108 bytes
 src/being.cpp                  |   7 ++++---
 src/gui/gui.cpp                |  21 +++++++++++++--------
 src/gui/gui.h                  |   4 ++++
 src/gui/ministatus.cpp         |   8 ++++++++
 src/gui/speechbubble.cpp       |  25 ++++++++++++++++++-------
 src/gui/speechbubble.h         |   1 +
 src/text.cpp                   |   6 +++---
 11 files changed, 54 insertions(+), 22 deletions(-)
 create mode 100644 data/fonts/dejavusans-bold.ttf

diff --git a/data/fonts/CMakeLists.txt b/data/fonts/CMakeLists.txt
index 8393b923..d5b6ed85 100644
--- a/data/fonts/CMakeLists.txt
+++ b/data/fonts/CMakeLists.txt
@@ -1,5 +1,6 @@
 SET (FILES
     dejavusans.ttf
+    dejavusans-bold.ttf
     )
 
 INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/fonts)
diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am
index 1384818c..1b575f7d 100644
--- a/data/fonts/Makefile.am
+++ b/data/fonts/Makefile.am
@@ -2,7 +2,8 @@
 fontdir = $(pkgdatadir)/data/fonts
 
 font_DATA =				\
-	dejavusans.ttf
+	dejavusans.ttf			\
+	dejavusans-bold.ttf
 
 EXTRA_DIST =				\
 	$(font_DATA)
diff --git a/data/fonts/dejavusans-bold.ttf b/data/fonts/dejavusans-bold.ttf
new file mode 100644
index 00000000..ebefb0ca
Binary files /dev/null and b/data/fonts/dejavusans-bold.ttf differ
diff --git a/data/fonts/dejavusans.ttf b/data/fonts/dejavusans.ttf
index 627cef46..6253857c 100644
Binary files a/data/fonts/dejavusans.ttf and b/data/fonts/dejavusans.ttf differ
diff --git a/src/being.cpp b/src/being.cpp
index 65e9f9d1..e30ccee4 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -510,11 +510,12 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
             mText = 0;
         }
 
-        mSpeechBubble->setCaption(mName);
-        mSpeechBubble->setWindowName(mName);
+        if (mName != mSpeechBubble->getCaption())
+            mSpeechBubble->setName(mName);
+
         // Not quite centered, but close enough. However, it's not too important to get 
         // it right right now, as it doesn't take bubble collision into account yet. 
-        mSpeechBubble->setText( mSpeech );
+        mSpeechBubble->setText(mSpeech);
         mSpeechBubble->setPosition(px - (mSpeechBubble->getWidth() * 4 / 11), py - 70 - 
                                         (mSpeechBubble->getNumRows()*14));
         mSpeechBubble->setVisible(true);
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 5314b9ba..fe8cae78 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -50,15 +50,9 @@ SDLInput *guiInput = 0;
 gcn::Font *hitRedFont = 0;
 gcn::Font *hitBlueFont = 0;
 gcn::Font *hitYellowFont = 0;
-// Font used to display speech and player names
-gcn::Font *speechFont;
 
-// Font for displaying NPC names
-gcn::Font *npcNameFont;
-// Font for displaying mob names
-gcn::Font *mobNameFont;
-// Font for displaying GM names
-gcn::Font *gmNameFont;
+// Bolded font
+gcn::Font *boldFont = 0;
 
 class GuiConfigListener : public ConfigListener
 {
@@ -122,6 +116,17 @@ Gui::Gui(Graphics *graphics):
             + e.getMessage());
     }
 
+    // Set bold font
+    path = resman->getPath("fonts/dejavusans-bold.ttf");
+    try {
+        boldFont = new TrueTypeFont(path, 11);
+    }
+    catch (gcn::Exception e)
+    {
+        logger->error(std::string("Unable to load dejavusans-bold.ttf: ")
+            + e.getMessage());
+    }
+
     gcn::Widget::setGlobalFont(mGuiFont);
 
     // Load hits' colourful fonts
diff --git a/src/gui/gui.h b/src/gui/gui.h
index bb14d4dc..9f45a3f3 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -125,5 +125,9 @@ extern gcn::Font *hitRedFont;
 extern gcn::Font *hitBlueFont;
 extern gcn::Font *hitYellowFont;
 
+/**
+ * Bolded text font
+ */
+extern gcn::Font *boldFont;
 
 #endif
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index f2e466f4..6e162141 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -46,6 +46,14 @@ MiniStatusWindow::MiniStatusWindow():
     mMpLabel = new gcn::Label("");
     mXpLabel = new gcn::Label("");
 
+    mHpLabel->setForegroundColor(gcn::Color(50, 50, 50));
+    mMpLabel->setForegroundColor(gcn::Color(50, 50, 50));
+    mXpLabel->setForegroundColor(gcn::Color(50, 50, 50));
+
+    mHpLabel->setFont(boldFont);
+    mMpLabel->setFont(boldFont);
+    mXpLabel->setFont(boldFont);
+
     mHpBar->setPosition(0, 3);
     mMpBar->setPosition(mHpBar->getWidth() + 3, 3);
     mXpBar->setPosition(mMpBar->getX() + mMpBar->getWidth() + 3, 3);
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 4fa63973..eb3232ea 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -22,6 +22,7 @@
 
 #include <guichan/font.hpp>
 
+#include "gui.h"
 #include "speechbubble.h"
 
 #include "../resources/image.h"
@@ -32,7 +33,7 @@
 // TODO: Fix windows so that they can each load their own skins without the
 // other windows overriding another window's skin.
 SpeechBubble::SpeechBubble():
-    Window(_("Message"), false, NULL, "graphics/gui/speechbubble.xml")
+    Window(_(""), false, NULL, "graphics/gui/speechbubble.xml")
 {
     mSpeechBox = new TextBox();
     mSpeechBox->setEditable(false);
@@ -59,28 +60,38 @@ SpeechBubble::SpeechBubble():
     mSpeechBox->setTextWrapped( "" );
 }
 
+void SpeechBubble::setName(const std::string &name)
+{
+    setWindowName(name);
+    setCaption(name);
+}
+
 void SpeechBubble::setText(std::string mText)
 {
     mSpeechBox->setMinWidth(140);
     mSpeechBox->setTextWrapped( mText );
 
+    const int fontHeight = getFont()->getHeight();
     int numRows = mSpeechBox->getNumberOfRows();
 
     if (numRows > 1)
     {
         // 15 == height of each line of text (based on font heights)
         // 14 == speechbubble Top + Bottom graphic pixel heights
-        setContentSize(mSpeechBox->getMinWidth() + 15, 15 + (numRows * 15));
-        mSpeechArea->setDimension(gcn::Rectangle(4, 15, mSpeechBox->getMinWidth() + 5, 
-                                  3 +(numRows * 14)));
+        setContentSize(mSpeechBox->getMinWidth() + fontHeight, fontHeight + 
+                      (numRows * fontHeight));
+        mSpeechArea->setDimension(gcn::Rectangle(4, fontHeight,
+                                  mSpeechBox->getMinWidth() + 5, 
+                                  3 + (numRows * fontHeight)));
     }
     else
     {
-        int width = getFont()->getWidth(this->getCaption());
+        int width = boldFont->getWidth(this->getCaption());
         if (width < getFont()->getWidth(mText))
             width = getFont()->getWidth(mText);
-        setContentSize(width + 15, 30);
-        mSpeechArea->setDimension(gcn::Rectangle(4, 15, width + 5, 17));
+        setContentSize(width + fontHeight, fontHeight * 2);
+        mSpeechArea->setDimension(gcn::Rectangle(4, fontHeight, 
+                                                 width + 5, fontHeight + 2));
     }
 }
 
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
index 9b8eab70..6d8a94d4 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -33,6 +33,7 @@ class SpeechBubble : public Window
 
 	SpeechBubble();
 
+        void setName(const std::string &name);
 	void setText(std::string mText);
 	void setLocation(int x, int y);
 	unsigned int getNumRows();
diff --git a/src/text.cpp b/src/text.cpp
index ba581dab..14ee3919 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -38,8 +38,8 @@ Text::Text(const std::string &text, int x, int y,
         textManager = new TextManager();
     }
     ++mInstances;
-    mHeight = gui->getFont()->getHeight();
-    mWidth = gui->getFont()->getWidth(text);
+    mHeight = boldFont->getHeight();
+    mWidth = boldFont->getWidth(text);
     switch (alignment)
     {
         case gcn::Graphics::LEFT:
@@ -74,7 +74,7 @@ Text::~Text()
 
 void Text::draw(Graphics *graphics, int xOff, int yOff)
 {
-    graphics->setFont(gui->getFont());
+    graphics->setFont(boldFont);
 
     // Text shadow
     graphics->setColor(gcn::Color(0, 0, 0));
-- 
cgit v1.2.3-70-g09d2


From 5c79b920eefb219f0dd4491b709af4f116d3a988 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 24 Jan 2009 18:16:17 -0700
Subject: Tweaks to the speech bubbles so that being status (GM, mob, npc,
 regular player) is displayed in the speech bubbles now. No need to view your
 own name to be able to see whether you're showing as a GM now.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/being.cpp            |  4 ++--
 src/being.h              |  2 ++
 src/gui/speechbubble.cpp | 52 +++++++++++++++++++++++++++++-------------------
 src/gui/speechbubble.h   |  4 +++-
 src/localplayer.cpp      |  1 +
 src/monster.cpp          |  2 ++
 src/npc.cpp              |  2 ++
 src/player.cpp           |  9 +++++++--
 8 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index e30ccee4..3fc679da 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -109,6 +109,7 @@ Being::Being(int id, int job, Map *map):
 
     instances++;
     mSpeech = "";
+    mNameColor = 0x202020;
     mText = 0;
 }
 
@@ -510,8 +511,7 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
             mText = 0;
         }
 
-        if (mName != mSpeechBubble->getCaption())
-            mSpeechBubble->setName(mName);
+        mSpeechBubble->setCaption(mName, mNameColor);
 
         // Not quite centered, but close enough. However, it's not too important to get 
         // it right right now, as it doesn't take bubble collision into account yet. 
diff --git a/src/being.h b/src/being.h
index 1e9954c5..c47864e8 100644
--- a/src/being.h
+++ b/src/being.h
@@ -416,6 +416,8 @@ class Being : public Sprite
         Uint16 mStunMode;		/**< Stun mode; zero if not stunned */
         StatusEffects mStatusEffects;	/**< Bitset of active status effects */
 
+        gcn::Color mNameColor;
+
         std::vector<AnimatedSprite*> mSprites;
         std::vector<int> mSpriteIDs;
         std::vector<std::string> mSpriteColors;
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index eb3232ea..97e3fd73 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -22,6 +22,8 @@
 
 #include <guichan/font.hpp>
 
+#include <guichan/widgets/label.hpp>
+
 #include "gui.h"
 #include "speechbubble.h"
 
@@ -33,23 +35,30 @@
 // TODO: Fix windows so that they can each load their own skins without the
 // other windows overriding another window's skin.
 SpeechBubble::SpeechBubble():
-    Window(_(""), false, NULL, "graphics/gui/speechbubble.xml")
+    Window(_("Speech"), false, NULL, "graphics/gui/speechbubble.xml")
 {
+    // Height == Top Graphic (14px) + 1 Row of Text (15px) + Bottom Graphic (17px)
+    setContentSize(140, 46);
+    setShowTitle(false);
+    setTitleBarHeight(0);
+
+    mCaption = new gcn::Label("");
+    mCaption->setFont(boldFont);
+    mCaption->setPosition(5, 3);
+
     mSpeechBox = new TextBox();
     mSpeechBox->setEditable(false);
     mSpeechBox->setOpaque(false);
 
     mSpeechArea = new ScrollArea(mSpeechBox);
 
-    // Height == Top Graphic (14px) + 1 Row of Text (15px) + Bottom Graphic (17px)
-    setContentSize(140, 46);
-    setTitleBarHeight(5);
-
     mSpeechArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     mSpeechArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    mSpeechArea->setDimension(gcn::Rectangle(4, 15, 130, 28));
+    mSpeechArea->setDimension(gcn::Rectangle(4, boldFont->getHeight() + 3,
+                                             130, 28));
     mSpeechArea->setOpaque(false);
 
+    add(mCaption);
     add(mSpeechArea);
 
     setLocationRelativeTo(getParent());
@@ -60,38 +69,39 @@ SpeechBubble::SpeechBubble():
     mSpeechBox->setTextWrapped( "" );
 }
 
-void SpeechBubble::setName(const std::string &name)
+void SpeechBubble::setCaption(const std::string &name, const gcn::Color &color)
 {
-    setWindowName(name);
-    setCaption(name);
+    mCaption->setCaption(name);
+    mCaption->adjustSize();
+    mCaption->setForegroundColor(color);
 }
 
 void SpeechBubble::setText(std::string mText)
 {
     mSpeechBox->setMinWidth(140);
-    mSpeechBox->setTextWrapped( mText );
+    mSpeechBox->setTextWrapped(mText);
 
     const int fontHeight = getFont()->getHeight();
-    int numRows = mSpeechBox->getNumberOfRows();
+    const int numRows = mSpeechBox->getNumberOfRows() + 1;
 
-    if (numRows > 1)
+    if (numRows > 2)
     {
         // 15 == height of each line of text (based on font heights)
         // 14 == speechbubble Top + Bottom graphic pixel heights
-        setContentSize(mSpeechBox->getMinWidth() + fontHeight, fontHeight + 
-                      (numRows * fontHeight));
-        mSpeechArea->setDimension(gcn::Rectangle(4, fontHeight,
-                                  mSpeechBox->getMinWidth() + 5, 
-                                  3 + (numRows * fontHeight)));
+        setContentSize(mSpeechBox->getMinWidth() + fontHeight,
+                      (numRows * fontHeight) + 6);
+        mSpeechArea->setDimension(gcn::Rectangle(4, fontHeight + 3,
+                                                 mSpeechBox->getMinWidth() + 5, 
+                                                (numRows * fontHeight)));
     }
     else
     {
-        int width = boldFont->getWidth(this->getCaption());
+        int width = mCaption->getWidth() + 8;
         if (width < getFont()->getWidth(mText))
             width = getFont()->getWidth(mText);
-        setContentSize(width + fontHeight, fontHeight * 2);
-        mSpeechArea->setDimension(gcn::Rectangle(4, fontHeight, 
-                                                 width + 5, fontHeight + 2));
+        setContentSize(width + fontHeight, (fontHeight * 2) + 6);
+        mSpeechArea->setDimension(gcn::Rectangle(4, fontHeight + 3, 
+                                                 width + 5, fontHeight));
     }
 }
 
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
index 6d8a94d4..23733813 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -33,12 +33,14 @@ class SpeechBubble : public Window
 
 	SpeechBubble();
 
-        void setName(const std::string &name);
+        void setCaption(const std::string &name,
+                        const gcn::Color &color = 0x000000);
 	void setText(std::string mText);
 	void setLocation(int x, int y);
 	unsigned int getNumRows();
 
     private:
+        gcn::Label *mCaption;
 	TextBox *mSpeechBox;
 	ScrollArea *mSpeechArea;
 };
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index db7a25f8..c6fde7a8 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -173,6 +173,7 @@ void LocalPlayer::logic()
 void LocalPlayer::setGM()
 { 
     mIsGM = !mIsGM;
+    mNameColor = mIsGM ? 0x009000: 0x202020;
     setName(getName());
     config.setValue(getName() + "GMassert", mIsGM);
 }
diff --git a/src/monster.cpp b/src/monster.cpp
index 814a5904..4f2c97e7 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -71,6 +71,8 @@ Monster::Monster(Uint32 id, Uint16 job, Map *map):
             controlParticle(particleEngine->addEffect((*i), 0, 0));
         }
     }
+
+    mNameColor = 0xff2020;
 }
 
 Monster::~Monster() 
diff --git a/src/npc.cpp b/src/npc.cpp
index 27388880..cef98e45 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -67,6 +67,8 @@ NPC::NPC(Uint32 id, Uint16 job, Map *map, Network *network):
         }
     }
     mName = 0;
+
+    mNameColor = 0x21bbbb;
 }
 
 NPC::~NPC()
diff --git a/src/player.cpp b/src/player.cpp
index d62018f2..ad5b568b 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -50,10 +50,15 @@ void Player::setName(const std::string &name)
 {
     if (mName == 0)
     {
-        if (mIsGM) {
+        if (mIsGM)
+        {
+            mNameColor = 0x009000;
             mName = new FlashText("(GM) " + name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET,
                                   gcn::Graphics::CENTER, gcn::Color(0, 255, 0));
-        } else {
+        }
+        else
+        {
+            mNameColor = 0x202020;
             mName = new FlashText(name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET,
                                   gcn::Graphics::CENTER, gcn::Color(255, 255, 255));
         }
-- 
cgit v1.2.3-70-g09d2


From 2a8a230c7768b945f8c53fda15f3e8b184e7da80 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 24 Jan 2009 19:37:31 -0700
Subject: Changed GM status updating to check whether asserting is allowed or
 not, as well as adding in a missing delete.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/chat.cpp | 16 ++++++----------
 src/gui/gui.cpp  |  1 +
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 031b6811..d1069d13 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -137,7 +137,7 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
     else
     {
         // Fix the owner of welcome message.
-        if (line.substr(0, 7) == _("Welcome"))
+        if (line.substr(0, 7) == "Welcome")
         {
             own = BY_SERVER;
         }
@@ -192,6 +192,11 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
             break;
     }
 
+    if (tmp.nick == ": " && tmp.text.substr(0, 17) == "Visible GM status")
+    {
+        player_node->setGM();
+    }
+
     // Get the current system time
     time_t t;
     time(&t);
@@ -391,15 +396,6 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
     // Prepare ordinary message
     if (msg.substr(0, 1) != "/") 
     {
-        // The server never tells you about your own GM status, so work around
-        // this for now by intercepting it here. NOTE: This assumes that the 
-        // assert works, when it's not guaranteed to.
-
-        std::size_t space = msg.find(" ");
-        const std::string command = msg.substr(1, space);
-        if (msg.at(0) == '@' && command == "assert")
-            player_node->setGM();
-
         msg = nick + " : " + msg;
 
         MessageOut outMsg(mNetwork);
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index fe8cae78..dda171e0 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -170,6 +170,7 @@ Gui::~Gui()
         mMouseCursors->decRef();
 
     delete mGuiFont;
+    delete boldFont;
     delete viewport;
     delete getTop();
 
-- 
cgit v1.2.3-70-g09d2


From 30d5f6db2568dc4682cb9ceceb95b2167df8d629 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 24 Jan 2009 20:58:45 -0700
Subject: Removed a few files which aren't being used any more.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 data/graphics/gui/CMakeLists.txt  |   5 -----
 data/graphics/gui/Makefile.am     |   5 -----
 data/graphics/gui/menuitemD.png   | Bin 1694 -> 0 bytes
 data/graphics/gui/menuitemF.png   | Bin 1830 -> 0 bytes
 data/graphics/gui/menuitemN.png   | Bin 1529 -> 0 bytes
 data/graphics/gui/menuitemP.png   | Bin 1733 -> 0 bytes
 data/graphics/gui/thickborder.png | Bin 593 -> 0 bytes
 7 files changed, 10 deletions(-)
 delete mode 100644 data/graphics/gui/menuitemD.png
 delete mode 100644 data/graphics/gui/menuitemF.png
 delete mode 100644 data/graphics/gui/menuitemN.png
 delete mode 100644 data/graphics/gui/menuitemP.png
 delete mode 100644 data/graphics/gui/thickborder.png

diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index e569463c..c5961f7a 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -20,10 +20,6 @@ SET (FILES
     hscroll_right_pressed.png
     item_shortcut_bgr.png
     mouse.png
-    menuitemD.png
-    menuitemF.png
-    menuitemN.png
-    menuitemP.png
     radioin.png
     radioout.png
     resize.png
@@ -39,7 +35,6 @@ SET (FILES
     target-cursor-red-l.png
     target-cursor-red-m.png
     target-cursor-red-s.png
-    thickborder.png
     unknown-item.png
     vscroll_blue.png
     vscroll_down_default.png
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index aaccd79a..921469a1 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -23,10 +23,6 @@ gui_DATA =				\
 	hscroll_right_pressed.png	\
 	item_shortcut_bgr.png		\
 	mouse.png			\
-	menuitemD.png			\
-	menuitemF.png			\
-	menuitemN.png			\
-	menuitemP.png			\
 	radioin.png			\
 	radioout.png			\
 	resize.png			\
@@ -42,7 +38,6 @@ gui_DATA =				\
 	target-cursor-red-l.png		\
 	target-cursor-red-m.png		\
 	target-cursor-red-s.png		\
-	thickborder.png			\
 	unknown-item.png		\
 	vscroll_blue.png		\
 	vscroll_down_default.png	\
diff --git a/data/graphics/gui/menuitemD.png b/data/graphics/gui/menuitemD.png
deleted file mode 100644
index e6654e97..00000000
Binary files a/data/graphics/gui/menuitemD.png and /dev/null differ
diff --git a/data/graphics/gui/menuitemF.png b/data/graphics/gui/menuitemF.png
deleted file mode 100644
index f18a82eb..00000000
Binary files a/data/graphics/gui/menuitemF.png and /dev/null differ
diff --git a/data/graphics/gui/menuitemN.png b/data/graphics/gui/menuitemN.png
deleted file mode 100644
index f813d4c5..00000000
Binary files a/data/graphics/gui/menuitemN.png and /dev/null differ
diff --git a/data/graphics/gui/menuitemP.png b/data/graphics/gui/menuitemP.png
deleted file mode 100644
index ba6e1543..00000000
Binary files a/data/graphics/gui/menuitemP.png and /dev/null differ
diff --git a/data/graphics/gui/thickborder.png b/data/graphics/gui/thickborder.png
deleted file mode 100644
index d3844b71..00000000
Binary files a/data/graphics/gui/thickborder.png and /dev/null differ
-- 
cgit v1.2.3-70-g09d2


From 6f583460139dbf1d0fa11306b684ce9474af6bff Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 24 Jan 2009 21:26:09 -0700
Subject: Minor tweak to speech bubble sizes so that small bubbles are as small
 as they can be and not have text run off.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/speechbubble.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 97e3fd73..a6bb5563 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -96,12 +96,12 @@ void SpeechBubble::setText(std::string mText)
     }
     else
     {
-        int width = mCaption->getWidth() + 8;
+        int width = mCaption->getWidth() + 3;
         if (width < getFont()->getWidth(mText))
             width = getFont()->getWidth(mText);
         setContentSize(width + fontHeight, (fontHeight * 2) + 6);
         mSpeechArea->setDimension(gcn::Rectangle(4, fontHeight + 3, 
-                                                 width + 5, fontHeight));
+                                                 width, fontHeight));
     }
 }
 
-- 
cgit v1.2.3-70-g09d2


From 20adf0056f3b22bf9628daed0967151918f75ad2 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sat, 24 Jan 2009 21:54:45 -0700
Subject: I removed this file a while ago, but it keeps coming back.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 AethyraLin2WinXcompile.cbp | 407 ---------------------------------------------
 1 file changed, 407 deletions(-)
 delete mode 100644 AethyraLin2WinXcompile.cbp

diff --git a/AethyraLin2WinXcompile.cbp b/AethyraLin2WinXcompile.cbp
deleted file mode 100644
index 3397ac02..00000000
--- a/AethyraLin2WinXcompile.cbp
+++ /dev/null
@@ -1,407 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="Aethyra" />
-		<Option pch_mode="0" />
-		<Option default_target="default" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="default">
-				<Option output="aethyra.exe" prefix_auto="0" extension_auto="0" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Option projectResourceIncludeDirsRelation="0" />
-				<Compiler>
-					<Add option="-fexpensive-optimizations" />
-					<Add option="-Os" />
-					<Add option="-O3" />
-					<Add option="-Wall" />
-					<Add option="-DUSE_OPENGL" />
-					<Add option="-DNOGDI" />
-					<Add directory="..\..\..\..\..\..\mingw\include\SDL" />
-					<Add directory="..\aethyra\builds\windows\LinuxXcompileBuildSupport\include" />
-					<Add directory="..\aethyra\builds\windows\LinuxXcompileBuildSupport\include\SDL" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-					<Add library="guichan" />
-					<Add library="guichan_sdl" />
-					<Add library="guichan_opengl" />
-					<Add library="wsock32" />
-					<Add library="SDL_image" />
-					<Add library="SDL_mixer" />
-					<Add library="SDL_net" />
-					<Add library="SDL_ttf" />
-					<Add library="mingw32" />
-					<Add library="SDLmain" />
-					<Add library="SDL.dll" />
-					<Add library="xml2.dll" />
-					<Add library="opengl32" />
-					<Add library="png12.dll" />
-					<Add library="z.dll" />
-					<Add library="physfs" />
-					<Add library="curl.dll" />
-					<Add directory="..\aethyra\builds\windows\LinuxXcompileBuildSupport\lib" />
-				</Linker>
-			</Target>
-			<Target title="unix">
-				<Option platforms="Unix;" />
-				<Option output="tmw" prefix_auto="1" extension_auto="1" />
-				<Option type="0" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="`sdl-config --cflags`" />
-					<Add directory="\usr\local\include\libxml2" />
-				</Compiler>
-				<Linker>
-					<Add option="`sdl-config --libs`" />
-					<Add library="guichan" />
-					<Add library="guichan_sdl" />
-					<Add library="guichan_opengl" />
-					<Add library="GL" />
-					<Add library="physfs" />
-					<Add library="curl" />
-					<Add library="xml2" />
-					<Add library="SDL_mixer" />
-					<Add library="SDL_net" />
-					<Add library="SDL_image" />
-					<Add library="SDL_ttf" />
-					<Add library="png" />
-				</Linker>
-			</Target>
-		</Build>
-		<VirtualTargets>
-			<Add alias="All" targets="default;" />
-		</VirtualTargets>
-		<Unit filename="src\aethyra.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="src\animatedsprite.cpp" />
-		<Unit filename="src\animatedsprite.h" />
-		<Unit filename="src\animationparticle.cpp" />
-		<Unit filename="src\animationparticle.h" />
-		<Unit filename="src\being.cpp" />
-		<Unit filename="src\being.h" />
-		<Unit filename="src\beingmanager.cpp" />
-		<Unit filename="src\beingmanager.h" />
-		<Unit filename="src\configlistener.h" />
-		<Unit filename="src\configuration.cpp" />
-		<Unit filename="src\configuration.h" />
-		<Unit filename="src\effectmanager.cpp" />
-		<Unit filename="src\effectmanager.h" />
-		<Unit filename="src\engine.cpp" />
-		<Unit filename="src\engine.h" />
-		<Unit filename="src\equipment.cpp" />
-		<Unit filename="src\equipment.h" />
-		<Unit filename="src\extensions.h" />
-		<Unit filename="src\floor_item.cpp" />
-		<Unit filename="src\floor_item.h" />
-		<Unit filename="src\flooritemmanager.cpp" />
-		<Unit filename="src\flooritemmanager.h" />
-		<Unit filename="src\game.cpp" />
-		<Unit filename="src\game.h" />
-		<Unit filename="src\graphics.cpp" />
-		<Unit filename="src\graphics.h" />
-		<Unit filename="src\gui\box.cpp" />
-		<Unit filename="src\gui\box.h" />
-		<Unit filename="src\gui\browserbox.cpp" />
-		<Unit filename="src\gui\browserbox.h" />
-		<Unit filename="src\gui\button.cpp" />
-		<Unit filename="src\gui\button.h" />
-		<Unit filename="src\gui\buttonbox.cpp" />
-		<Unit filename="src\gui\buttonbox.h" />
-		<Unit filename="src\gui\buy.cpp" />
-		<Unit filename="src\gui\buy.h" />
-		<Unit filename="src\gui\buysell.cpp" />
-		<Unit filename="src\gui\buysell.h" />
-		<Unit filename="src\gui\char_select.cpp" />
-		<Unit filename="src\gui\char_select.h" />
-		<Unit filename="src\gui\char_server.cpp" />
-		<Unit filename="src\gui\char_server.h" />
-		<Unit filename="src\gui\chat.cpp" />
-		<Unit filename="src\gui\chat.h" />
-		<Unit filename="src\gui\chatinput.cpp" />
-		<Unit filename="src\gui\chatinput.h" />
-		<Unit filename="src\gui\checkbox.cpp" />
-		<Unit filename="src\gui\checkbox.h" />
-		<Unit filename="src\gui\colour.cpp" />
-		<Unit filename="src\gui\colour.h" />
-		<Unit filename="src\gui\confirm_dialog.cpp" />
-		<Unit filename="src\gui\confirm_dialog.h" />
-		<Unit filename="src\gui\connection.cpp" />
-		<Unit filename="src\gui\connection.h" />
-		<Unit filename="src\gui\debugwindow.cpp" />
-		<Unit filename="src\gui\debugwindow.h" />
-		<Unit filename="src\gui\equipmentwindow.cpp" />
-		<Unit filename="src\gui\equipmentwindow.h" />
-		<Unit filename="src\gui\focushandler.cpp" />
-		<Unit filename="src\gui\focushandler.h" />
-		<Unit filename="src\gui\gccontainer.cpp" />
-		<Unit filename="src\gui\gccontainer.h" />
-		<Unit filename="src\gui\gui.cpp" />
-		<Unit filename="src\gui\gui.h" />
-		<Unit filename="src\gui\hbox.cpp" />
-		<Unit filename="src\gui\hbox.h" />
-		<Unit filename="src\gui\help.cpp" />
-		<Unit filename="src\gui\help.h" />
-		<Unit filename="src\gui\inttextfield.cpp" />
-		<Unit filename="src\gui\inttextfield.h" />
-		<Unit filename="src\gui\inventorywindow.cpp" />
-		<Unit filename="src\gui\inventorywindow.h" />
-		<Unit filename="src\gui\item_amount.cpp" />
-		<Unit filename="src\gui\item_amount.h" />
-		<Unit filename="src\gui\itemcontainer.cpp" />
-		<Unit filename="src\gui\itemcontainer.h" />
-		<Unit filename="src\gui\itemshortcutcontainer.cpp" />
-		<Unit filename="src\gui\itemshortcutcontainer.h" />
-		<Unit filename="src\gui\itemshortcutwindow.cpp" />
-		<Unit filename="src\gui\itemshortcutwindow.h" />
-		<Unit filename="src\gui\linkhandler.h" />
-		<Unit filename="src\gui\listbox.cpp" />
-		<Unit filename="src\gui\listbox.h" />
-		<Unit filename="src\gui\login.cpp" />
-		<Unit filename="src\gui\login.h" />
-		<Unit filename="src\gui\menuwindow.cpp" />
-		<Unit filename="src\gui\menuwindow.h" />
-		<Unit filename="src\gui\minimap.cpp" />
-		<Unit filename="src\gui\minimap.h" />
-		<Unit filename="src\gui\ministatus.cpp" />
-		<Unit filename="src\gui\ministatus.h" />
-		<Unit filename="src\gui\npc_text.cpp" />
-		<Unit filename="src\gui\npc_text.h" />
-		<Unit filename="src\gui\npclistdialog.cpp" />
-		<Unit filename="src\gui\npclistdialog.h" />
-		<Unit filename="src\gui\ok_dialog.cpp" />
-		<Unit filename="src\gui\ok_dialog.h" />
-		<Unit filename="src\gui\passwordfield.cpp" />
-		<Unit filename="src\gui\passwordfield.h" />
-		<Unit filename="src\gui\playerbox.cpp" />
-		<Unit filename="src\gui\playerbox.h" />
-		<Unit filename="src\gui\popup_box.h" />
-		<Unit filename="src\gui\popupmenu.cpp" />
-		<Unit filename="src\gui\popupmenu.h" />
-		<Unit filename="src\gui\progressbar.cpp" />
-		<Unit filename="src\gui\progressbar.h" />
-		<Unit filename="src\gui\radiobutton.cpp" />
-		<Unit filename="src\gui\radiobutton.h" />
-		<Unit filename="src\gui\register.cpp" />
-		<Unit filename="src\gui\register.h" />
-		<Unit filename="src\gui\scrollarea.cpp" />
-		<Unit filename="src\gui\scrollarea.h" />
-		<Unit filename="src\gui\sell.cpp" />
-		<Unit filename="src\gui\sell.h" />
-		<Unit filename="src\gui\setup.cpp" />
-		<Unit filename="src\gui\setup.h" />
-		<Unit filename="src\gui\setup_audio.cpp" />
-		<Unit filename="src\gui\setup_audio.h" />
-		<Unit filename="src\gui\setup_colours.cpp" />
-		<Unit filename="src\gui\setup_colours.h" />
-		<Unit filename="src\gui\setup_joystick.cpp" />
-		<Unit filename="src\gui\setup_joystick.h" />
-		<Unit filename="src\gui\setup_keyboard.cpp" />
-		<Unit filename="src\gui\setup_keyboard.h" />
-		<Unit filename="src\gui\setup_players.cpp" />
-		<Unit filename="src\gui\setup_players.h" />
-		<Unit filename="src\gui\setup_video.cpp" />
-		<Unit filename="src\gui\setup_video.h" />
-		<Unit filename="src\gui\setuptab.h" />
-		<Unit filename="src\gui\shop.cpp" />
-		<Unit filename="src\gui\shop.h" />
-		<Unit filename="src\gui\shoplistbox.cpp" />
-		<Unit filename="src\gui\shoplistbox.h" />
-		<Unit filename="src\gui\skill.cpp" />
-		<Unit filename="src\gui\skill.h" />
-		<Unit filename="src\gui\slider.cpp" />
-		<Unit filename="src\gui\slider.h" />
-		<Unit filename="src\gui\speechbubble.cpp" />
-		<Unit filename="src\gui\speechbubble.h" />
-		<Unit filename="src\gui\status.cpp" />
-		<Unit filename="src\gui\status.h" />
-		<Unit filename="src\gui\tabbedcontainer.cpp" />
-		<Unit filename="src\gui\tabbedcontainer.h" />
-		<Unit filename="src\gui\table.cpp" />
-		<Unit filename="src\gui\table.h" />
-		<Unit filename="src\gui\table_model.cpp" />
-		<Unit filename="src\gui\table_model.h" />
-		<Unit filename="src\gui\textbox.cpp" />
-		<Unit filename="src\gui\textbox.h" />
-		<Unit filename="src\gui\textfield.cpp" />
-		<Unit filename="src\gui\textfield.h" />
-		<Unit filename="src\gui\trade.cpp" />
-		<Unit filename="src\gui\trade.h" />
-		<Unit filename="src\gui\truetypefont.cpp"/>
-		<Unit filename="src\gui\truetypefont.h"/>
-		<Unit filename="src\gui\updatewindow.cpp" />
-		<Unit filename="src\gui\updatewindow.h" />
-		<Unit filename="src\gui\vbox.cpp" />
-		<Unit filename="src\gui\vbox.h" />
-		<Unit filename="src\gui\viewport.cpp" />
-		<Unit filename="src\gui\viewport.h" />
-		<Unit filename="src\gui\widgets\dropdown.cpp" />
-		<Unit filename="src\gui\widgets\dropdown.h" />
-		<Unit filename="src\gui\widgets\resizegrip.cpp" />
-		<Unit filename="src\gui\widgets\resizegrip.h" />
-		<Unit filename="src\gui\window.cpp" />
-		<Unit filename="src\gui\window.h" />
-		<Unit filename="src\gui\windowcontainer.cpp" />
-		<Unit filename="src\gui\windowcontainer.h" />
-		<Unit filename="src\guichanfwd.h" />
-		<Unit filename="src\imageparticle.cpp" />
-		<Unit filename="src\imageparticle.h" />
-		<Unit filename="src\inventory.cpp" />
-		<Unit filename="src\inventory.h" />
-		<Unit filename="src\item.cpp" />
-		<Unit filename="src\item.h" />
-		<Unit filename="src\itemshortcut.cpp" />
-		<Unit filename="src\itemshortcut.h" />
-		<Unit filename="src\joystick.cpp" />
-		<Unit filename="src\joystick.h" />
-		<Unit filename="src\keyboardconfig.cpp" />
-		<Unit filename="src\keyboardconfig.h" />
-		<Unit filename="src\localplayer.cpp" />
-		<Unit filename="src\localplayer.h" />
-		<Unit filename="src\lockedarray.h" />
-		<Unit filename="src\log.cpp" />
-		<Unit filename="src\log.h" />
-		<Unit filename="src\logindata.h" />
-		<Unit filename="src\main.cpp" />
-		<Unit filename="src\main.h" />
-		<Unit filename="src\map.cpp" />
-		<Unit filename="src\map.h" />
-		<Unit filename="src\monster.cpp" />
-		<Unit filename="src\monster.h" />
-		<Unit filename="src\net\beinghandler.cpp" />
-		<Unit filename="src\net\beinghandler.h" />
-		<Unit filename="src\net\buysellhandler.cpp" />
-		<Unit filename="src\net\buysellhandler.h" />
-		<Unit filename="src\net\charserverhandler.cpp" />
-		<Unit filename="src\net\charserverhandler.h" />
-		<Unit filename="src\net\chathandler.cpp" />
-		<Unit filename="src\net\chathandler.h" />
-		<Unit filename="src\net\equipmenthandler.cpp" />
-		<Unit filename="src\net\equipmenthandler.h" />
-		<Unit filename="src\net\inventoryhandler.cpp" />
-		<Unit filename="src\net\inventoryhandler.h" />
-		<Unit filename="src\net\itemhandler.cpp" />
-		<Unit filename="src\net\itemhandler.h" />
-		<Unit filename="src\net\loginhandler.cpp" />
-		<Unit filename="src\net\loginhandler.h" />
-		<Unit filename="src\net\maploginhandler.cpp" />
-		<Unit filename="src\net\maploginhandler.h" />
-		<Unit filename="src\net\messagehandler.cpp" />
-		<Unit filename="src\net\messagehandler.h" />
-		<Unit filename="src\net\messagein.cpp" />
-		<Unit filename="src\net\messagein.h" />
-		<Unit filename="src\net\messageout.cpp" />
-		<Unit filename="src\net\messageout.h" />
-		<Unit filename="src\net\network.cpp" />
-		<Unit filename="src\net\network.h" />
-		<Unit filename="src\net\npchandler.cpp" />
-		<Unit filename="src\net\npchandler.h" />
-		<Unit filename="src\net\playerhandler.cpp" />
-		<Unit filename="src\net\playerhandler.h" />
-		<Unit filename="src\net\protocol.cpp" />
-		<Unit filename="src\net\protocol.h" />
-		<Unit filename="src\net\skillhandler.cpp" />
-		<Unit filename="src\net\skillhandler.h" />
-		<Unit filename="src\net\tradehandler.cpp" />
-		<Unit filename="src\net\tradehandler.h" />
-		<Unit filename="src\npc.cpp" />
-		<Unit filename="src\npc.h" />
-		<Unit filename="src\openglgraphics.cpp" />
-		<Unit filename="src\openglgraphics.h" />
-		<Unit filename="src\particle.cpp" />
-		<Unit filename="src\particle.h" />
-		<Unit filename="src\particlecontainer.cpp" />
-		<Unit filename="src\particlecontainer.h" />
-		<Unit filename="src\particleemitter.cpp" />
-		<Unit filename="src\particleemitter.h" />
-		<Unit filename="src\particleemitterprop.h" />
-		<Unit filename="src\party.cpp" />
-		<Unit filename="src\party.h" />
-		<Unit filename="src\player.cpp" />
-		<Unit filename="src\player.h" />
-		<Unit filename="src\player_relations.cpp" />
-		<Unit filename="src\player_relations.h" />
-		<Unit filename="src\properties.h" />
-		<Unit filename="src\recorder.cpp" />
-		<Unit filename="src\recorder.h" />
-		<Unit filename="src\resources\action.cpp" />
-		<Unit filename="src\resources\action.h" />
-		<Unit filename="src\resources\ambientoverlay.cpp" />
-		<Unit filename="src\resources\ambientoverlay.h" />
-		<Unit filename="src\resources\animation.cpp" />
-		<Unit filename="src\resources\animation.h" />
-		<Unit filename="src\resources\buddylist.cpp" />
-		<Unit filename="src\resources\colordb.cpp" />
-		<Unit filename="src\resources\colordb.h" />
-		<Unit filename="src\resources\dye.cpp" />
-		<Unit filename="src\resources\dye.h" />
-		<Unit filename="src\resources\image.cpp" />
-		<Unit filename="src\resources\image.h" />
-		<Unit filename="src\resources\imageloader.cpp" />
-		<Unit filename="src\resources\imageloader.h" />
-		<Unit filename="src\resources\imageset.cpp" />
-		<Unit filename="src\resources\imageset.h" />
-		<Unit filename="src\resources\imagewriter.cpp" />
-		<Unit filename="src\resources\imagewriter.h" />
-		<Unit filename="src\resources\itemdb.cpp" />
-		<Unit filename="src\resources\itemdb.h" />
-		<Unit filename="src\resources\iteminfo.cpp" />
-		<Unit filename="src\resources\iteminfo.h" />
-		<Unit filename="src\resources\mapreader.cpp" />
-		<Unit filename="src\resources\mapreader.h" />
-		<Unit filename="src\resources\monsterdb.cpp" />
-		<Unit filename="src\resources\monsterdb.h" />
-		<Unit filename="src\resources\monsterinfo.cpp" />
-		<Unit filename="src\resources\monsterinfo.h" />
-		<Unit filename="src\resources\music.cpp" />
-		<Unit filename="src\resources\music.h" />
-		<Unit filename="src\resources\npcdb.cpp" />
-		<Unit filename="src\resources\npcdb.h" />
-		<Unit filename="src\resources\resource.cpp" />
-		<Unit filename="src\resources\resource.h" />
-		<Unit filename="src\resources\resourcemanager.cpp" />
-		<Unit filename="src\resources\resourcemanager.h" />
-		<Unit filename="src\resources\soundeffect.cpp" />
-		<Unit filename="src\resources\soundeffect.h" />
-		<Unit filename="src\resources\spritedef.cpp" />
-		<Unit filename="src\resources\spritedef.h" />
-		<Unit filename="src\serverinfo.h" />
-		<Unit filename="src\shopitem.cpp" />
-		<Unit filename="src\shopitem.h" />
-		<Unit filename="src\simpleanimation.cpp" />
-		<Unit filename="src\simpleanimation.h" />
-		<Unit filename="src\sound.cpp" />
-		<Unit filename="src\sound.h" />
-		<Unit filename="src\sprite.h" />
-		<Unit filename="src\text.cpp" />
-		<Unit filename="src\text.h" />
-		<Unit filename="src\textmanager.cpp" />
-		<Unit filename="src\textmanager.h" />
-		<Unit filename="src\textparticle.cpp" />
-		<Unit filename="src\textparticle.h" />
-		<Unit filename="src\tileset.h" />
-		<Unit filename="src\utils\base64.cpp" />
-		<Unit filename="src\utils\base64.h" />
-		<Unit filename="src\utils\dtor.h" />
-		<Unit filename="src\utils\tostring.h" />
-		<Unit filename="src\utils\xml.cpp" />
-		<Unit filename="src\utils\xml.h" />
-		<Unit filename="src\vector.h" />
-		<Unit filename="src\winver.h" />
-		<Extensions>
-			<code_completion />
-			<envvars set="default" />
-			<debugger />
-			<AutoVersioning>
-				<Scheme minor_max="10" build_max="0" rev_max="0" rev_rand_max="10" build_times_to_increment_minor="100" />
-				<Settings autoincrement="1" date_declarations="1" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />
-				<Changes_Log show_changes_editor="0" app_title="released version %M.%m.%b of %p" changeslog_path="ChangesLog.txt" />
-			</AutoVersioning>
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
-- 
cgit v1.2.3-70-g09d2


From edd500dd27bb648840abfe1cecb0767d7b2ba3ae Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <crush@themanaworld.org>
Date: Sun, 25 Jan 2009 03:36:13 +0100
Subject: Fixed performance hickups caused by animations due to buggy tick
 timer. A tad less performant than the intended solution but at least it is
 constantly so.

---
 src/engine.cpp |  1 +
 src/map.cpp    | 23 ++++++++++++-----------
 src/map.h      |  6 +++++-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/engine.cpp b/src/engine.cpp
index 2a37d888..ab13450e 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -157,5 +157,6 @@ void Engine::logic()
 {
     beingManager->logic();
     particleEngine->update();
+    mCurrentMap->update();
     gui->logic();
 }
diff --git a/src/map.cpp b/src/map.cpp
index 01844409..57b79ef4 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -64,7 +64,6 @@ struct Location
 
 TileAnimation::TileAnimation(Animation *ani):
     mAnimation(ani),
-    mLastUpdate(tick_time),
     mLastImage(NULL)
 {
 }
@@ -72,8 +71,7 @@ TileAnimation::TileAnimation(Animation *ani):
 void TileAnimation::update()
 {
     //update animation
-    mAnimation.update(tick_time - mLastUpdate);
-    mLastUpdate = tick_time;
+    mAnimation.update(1);
 
     // exchange images
     Image *img = mAnimation.getCurrentImage();
@@ -231,6 +229,17 @@ bool spriteCompare(const Sprite *a, const Sprite *b)
     return a->getPixelY() < b->getPixelY();
 }
 
+void Map::update()
+{
+    //update animated tiles
+    for (std::map<int, TileAnimation*>::iterator iAni = mTileAnimations.begin();
+         iAni != mTileAnimations.end();
+         iAni++)
+    {
+        iAni->second->update();
+    }
+}
+
 void Map::draw(Graphics *graphics, int scrollX, int scrollY)
 {
     int endPixelY = graphics->getHeight() + scrollY + mTileHeight - 1;
@@ -246,14 +255,6 @@ void Map::draw(Graphics *graphics, int scrollX, int scrollY)
     // Make sure sprites are sorted
     mSprites.sort(spriteCompare);
 
-    //update animated tiles
-    for (std::map<int, TileAnimation*>::iterator iAni = mTileAnimations.begin();
-         iAni != mTileAnimations.end();
-         iAni++)
-    {
-        iAni->second->update();
-    }
-
     // draw the game world
     Layers::const_iterator layeri = mLayers.begin();
     for (; layeri != mLayers.end(); ++layeri)
diff --git a/src/map.h b/src/map.h
index 57d5b9ac..73be3dd2 100644
--- a/src/map.h
+++ b/src/map.h
@@ -78,7 +78,6 @@ class TileAnimation
     private:
         std::list<std::pair<MapLayer*, int> > mAffected;
         SimpleAnimation mAnimation;
-        int mLastUpdate;
         Image* mLastImage;
 };
 
@@ -159,6 +158,11 @@ class Map : public Properties
          */
         void initializeOverlays();
 
+        /**
+         * Updates animations. Called every game tick.
+         */
+        void update();
+
         /**
          * Draws the map to the given graphics output. This method draws all
          * layers, sprites and overlay effects.
-- 
cgit v1.2.3-70-g09d2


From 537d390ae65e9b8a2701c04baa22962f7db0f093 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 25 Jan 2009 21:30:47 +0100
Subject: Made the labels on the progress bars more readable

---
 src/gui/button.cpp      | 20 ++++++++++----------
 src/gui/button.h        |  7 ++++---
 src/gui/ministatus.cpp  | 30 +++---------------------------
 src/gui/ministatus.h    | 11 ++++-------
 src/gui/progressbar.cpp | 24 ++++++++++++++++++++++--
 src/gui/progressbar.h   | 33 ++++++++++++++++++++++++---------
 6 files changed, 67 insertions(+), 58 deletions(-)

diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index 04b96810..9b624015 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -19,12 +19,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <algorithm>
-
-#include <guichan/exception.hpp>
-#include <guichan/graphics.hpp>
-#include <guichan/imagefont.hpp>
-
 #include "button.h"
 
 #include "../graphics.h"
@@ -34,6 +28,12 @@
 
 #include "../utils/dtor.h"
 
+#include <guichan/exception.hpp>
+#include <guichan/graphics.hpp>
+#include <guichan/font.hpp>
+
+#include <algorithm>
+
 int Button::mInstances = 0;
 
 enum{
@@ -52,10 +52,10 @@ struct ButtonData
 };
 
 static ButtonData const data[BUTTON_COUNT] = {
-    {"graphics/gui/button.png", 0, 0},
-    {"graphics/gui/buttonhi.png", 9, 4},
-    {"graphics/gui/buttonpress.png", 16, 19},
-    {"graphics/gui/button_disabled.png", 25, 23}
+    { "graphics/gui/button.png", 0, 0 },
+    { "graphics/gui/buttonhi.png", 9, 4 },
+    { "graphics/gui/buttonpress.png", 16, 19 },
+    { "graphics/gui/button_disabled.png", 25, 23 }
 };
 
 ImageRect Button::button[BUTTON_COUNT];
diff --git a/src/gui/button.h b/src/gui/button.h
index 2999a737..51f6cffc 100644
--- a/src/gui/button.h
+++ b/src/gui/button.h
@@ -35,7 +35,8 @@ class ImageRect;
  *
  * \ingroup GUI
  */
-class Button : public gcn::Button {
+class Button : public gcn::Button
+{
     public:
         /**
          * Default constructor.
@@ -46,7 +47,7 @@ class Button : public gcn::Button {
          * Constructor, sets the caption of the button to the given string and
          * adds the given action listener.
          */
-        Button(const std::string& caption, const std::string &actionEventId,
+        Button(const std::string &caption, const std::string &actionEventId,
                 gcn::ActionListener *listener);
 
         /**
@@ -57,7 +58,7 @@ class Button : public gcn::Button {
         /**
          * Draws the button.
          */
-        void draw(gcn::Graphics* graphics);
+        void draw(gcn::Graphics *graphics);
 
         /**
          * Enable/Disable highlighting
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 6e162141..4c22e63d 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -19,8 +19,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/widgets/label.hpp>
-
 #include "gui.h"
 #include "ministatus.h"
 #include "progressbar.h"
@@ -42,36 +40,14 @@ MiniStatusWindow::MiniStatusWindow():
     mHpBar = new ProgressBar(1.0f, 100, 20, 0, 171, 34);
     mMpBar = new ProgressBar(1.0f, 100, 20, 26, 102, 230);
     mXpBar = new ProgressBar(1.0f, 100, 20, 143, 192, 211);
-    mHpLabel = new gcn::Label("");
-    mMpLabel = new gcn::Label("");
-    mXpLabel = new gcn::Label("");
-
-    mHpLabel->setForegroundColor(gcn::Color(50, 50, 50));
-    mMpLabel->setForegroundColor(gcn::Color(50, 50, 50));
-    mXpLabel->setForegroundColor(gcn::Color(50, 50, 50));
-
-    mHpLabel->setFont(boldFont);
-    mMpLabel->setFont(boldFont);
-    mXpLabel->setFont(boldFont);
 
     mHpBar->setPosition(0, 3);
     mMpBar->setPosition(mHpBar->getWidth() + 3, 3);
     mXpBar->setPosition(mMpBar->getX() + mMpBar->getWidth() + 3, 3);
 
-    mHpLabel->setDimension(mHpBar->getDimension());
-    mMpLabel->setDimension(mMpBar->getDimension());
-    mXpLabel->setDimension(mXpBar->getDimension());
-
-    mHpLabel->setAlignment(gcn::Graphics::CENTER);
-    mMpLabel->setAlignment(gcn::Graphics::CENTER);
-    mXpLabel->setAlignment(gcn::Graphics::CENTER);
-
     add(mHpBar);
     add(mMpBar);
     add(mXpBar);
-    add(mHpLabel);
-    add(mMpLabel);
-    add(mXpLabel);
 
     setContentSize(mXpBar->getX() + mXpBar->getWidth(),
                    mXpBar->getY() + mXpBar->getHeight());
@@ -106,8 +82,8 @@ void MiniStatusWindow::update()
     mXpBar->setProgress(xp);
 
     // Update labels
-    mHpLabel->setCaption(toString(player_node->mHp));
-    mMpLabel->setCaption(toString(player_node->mMp));
+    mHpBar->setText(toString(player_node->mHp));
+    mMpBar->setText(toString(player_node->mMp));
 
     std::stringstream updatedText;
     updatedText << (float) ((int) (xp * 10000.0f)) / 100.0f << "%";
@@ -125,7 +101,7 @@ void MiniStatusWindow::update()
     }
     */
 
-    mXpLabel->setCaption(updatedText.str());
+    mXpBar->setText(updatedText.str());
 }
 
 void MiniStatusWindow::draw(gcn::Graphics *graphics)
diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h
index d4804bef..d2bcef1c 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatus.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MINISTATUS_H
-#define _TMW_MINISTATUS_H
+#ifndef MINISTATUS_H
+#define MINISTATUS_H
 
 #include <iosfwd>
 
@@ -44,13 +44,13 @@ class MiniStatusWindow : public Window
         MiniStatusWindow();
 
         /**
-         * Draw this window
+         * Draw this window.
          */
         void draw(gcn::Graphics *graphics);
 
     private:
         /**
-         * Updates this dialog with values from player_node
+         * Updates this dialog with values from player_node.
          */
         void update();
 
@@ -60,9 +60,6 @@ class MiniStatusWindow : public Window
         ProgressBar *mHpBar;
         ProgressBar *mMpBar;
         ProgressBar *mXpBar;
-        gcn::Label *mHpLabel;
-        gcn::Label *mMpLabel;
-        gcn::Label *mXpLabel;
 };
 
 #endif
diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index 5ce01b35..ecc0017d 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -19,6 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "gui.h"
 #include "progressbar.h"
 
 #include "../graphics.h"
@@ -26,6 +27,8 @@
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
 
+#include <guichan/font.hpp>
+
 ImageRect ProgressBar::mBorder;
 int ProgressBar::mInstances = 0;
 
@@ -94,13 +97,30 @@ void ProgressBar::draw(gcn::Graphics *graphics)
         drawImageRect(0, 0, getWidth(), getHeight(), mBorder);
 
     // The bar
-    if (mProgress > 0)
-    {
+    if (mProgress > 0) {
         graphics->setColor(gcn::Color(mRed, mGreen, mBlue, 200));
         graphics->fillRectangle(gcn::Rectangle(4, 4,
                     (int) (mProgress * (getWidth() - 8)),
                     getHeight() - 8));
     }
+
+    // The label
+    if (!mText.empty()) {
+        gcn::Font *f = boldFont;
+        const int textX = getWidth() / 2;
+        const int textY = (getHeight() - f->getHeight()) / 2;
+
+        graphics->setFont(f);
+
+        graphics->setColor(gcn::Color(0, 0, 0));
+        graphics->drawText(mText, textX + 1, textY, gcn::Graphics::CENTER);
+        graphics->drawText(mText, textX, textY - 1, gcn::Graphics::CENTER);
+        graphics->drawText(mText, textX, textY + 1, gcn::Graphics::CENTER);
+        graphics->drawText(mText, textX - 1, textY, gcn::Graphics::CENTER);
+
+        graphics->setColor(gcn::Color(255, 255, 255));
+        graphics->drawText(mText, textX, textY, gcn::Graphics::CENTER);
+    }
 }
 
 void ProgressBar::setProgress(float progress)
diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h
index 670b4ab4..e874b56d 100644
--- a/src/gui/progressbar.h
+++ b/src/gui/progressbar.h
@@ -25,6 +25,7 @@
 #include <guichan/widget.hpp>
 
 #include <SDL_types.h>
+#include <string>
 
 #include "../guichanfwd.h"
 
@@ -35,7 +36,8 @@ class ImageRect;
  *
  * \ingroup GUI
  */
-class ProgressBar : public gcn::Widget {
+class ProgressBar : public gcn::Widget
+{
     public:
         /**
          * Constructor, initializes the progress with the given value.
@@ -67,7 +69,7 @@ class ProgressBar : public gcn::Widget {
         /**
          * Returns the current progress.
          */
-        float getProgress() { return mProgress; }
+        float getProgress() const { return mProgress; }
 
         /**
          * Change the filling of the progress bar.
@@ -75,24 +77,37 @@ class ProgressBar : public gcn::Widget {
         void setColor(Uint8, Uint8 green, Uint8 blue);
 
         /**
-         * Get The red value of color
+         * Returns the red value of color.
          */
-        Uint8 getRed() { return mRed; }
+        Uint8 getRed() const { return mRed; }
 
-         /**
-         * Get The red value of color
+        /**
+         * Returns the green value of color.
+         */
+        Uint8 getGreen() const { return mGreen; }
+
+        /**
+         * Returns the blue value of color.
+         */
+        Uint8 getBlue() const { return mBlue; }
+
+        /**
+         * Sets the text shown on the progress bar.
          */
-        Uint8 getGreen() { return mGreen; }
+        void setText(const std::string &text)
+        { mText = text; }
 
         /**
-         * Get The red value of color
+         * Returns the text shown on the progress bar.
          */
-        Uint8 getBlue() { return mBlue; }
+        const std::string &text() const
+        { return mText; }
 
     private:
         float mProgress;
         Uint8 mRed, mGreen, mBlue;
         Uint8 mRedToGo, mGreenToGo, mBlueToGo;
+        std::string mText;
 
         static ImageRect mBorder;
         static int mInstances;
-- 
cgit v1.2.3-70-g09d2


From 50eae6ebe793295986071e748f3698154158d6cd Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 25 Jan 2009 22:00:00 +0100
Subject: Removed the TMW branding from header guards

---
 src/animatedsprite.h             |  4 ++--
 src/being.h                      |  4 ++--
 src/beingmanager.h               |  4 ++--
 src/configlistener.h             |  4 ++--
 src/configuration.h              |  4 ++--
 src/emoteshortcut.h              |  4 ++--
 src/equipment.h                  |  4 ++--
 src/floor_item.h                 |  4 ++--
 src/flooritemmanager.h           |  4 ++--
 src/game.h                       |  4 ++--
 src/gui/browserbox.h             |  4 ++--
 src/gui/button.h                 |  4 ++--
 src/gui/buttonbox.h              |  4 ++--
 src/gui/buy.h                    |  4 ++--
 src/gui/buysell.h                |  4 ++--
 src/gui/chat.h                   |  4 ++--
 src/gui/chatinput.h              |  4 ++--
 src/gui/checkbox.h               |  4 ++--
 src/gui/confirm_dialog.h         |  4 ++--
 src/gui/connection.h             |  4 ++--
 src/gui/debugwindow.h            |  4 ++--
 src/gui/emotecontainer.h         |  4 ++--
 src/gui/emoteshortcutcontainer.h |  4 ++--
 src/gui/emotewindow.h            |  4 ++--
 src/gui/equipmentwindow.h        |  4 ++--
 src/gui/focushandler.h           |  4 ++--
 src/gui/gccontainer.h            |  4 ++--
 src/gui/gui.h                    |  4 ++--
 src/gui/help.h                   |  4 ++--
 src/gui/inventorywindow.cpp      |  2 +-
 src/gui/inventorywindow.h        |  4 ++--
 src/gui/item_amount.h            |  6 +++---
 src/gui/itemcontainer.h          |  4 ++--
 src/gui/itemlinkhandler.h        |  4 ++--
 src/gui/itempopup.h              |  6 +++---
 src/gui/itemshortcutcontainer.h  |  4 ++--
 src/gui/linkhandler.h            |  4 ++--
 src/gui/listbox.h                |  4 ++--
 src/gui/login.h                  |  4 ++--
 src/gui/menuwindow.h             |  4 ++--
 src/gui/minimap.h                |  4 ++--
 src/gui/npc_text.h               |  6 +++---
 src/gui/npcintegerdialog.h       |  6 +++---
 src/gui/npclistdialog.h          |  6 +++---
 src/gui/npcstringdialog.h        |  6 +++---
 src/gui/passwordfield.h          |  4 ++--
 src/gui/playerbox.h              |  4 ++--
 src/gui/popupmenu.h              |  4 ++--
 src/gui/progressbar.h            |  4 ++--
 src/gui/radiobutton.h            |  6 +++---
 src/gui/register.h               |  4 ++--
 src/gui/scrollarea.h             |  4 ++--
 src/gui/sdlinput.h               |  4 ++--
 src/gui/sell.h                   |  4 ++--
 src/gui/setup.h                  |  4 ++--
 src/gui/setup_audio.h            |  4 ++--
 src/gui/setup_joystick.h         |  4 ++--
 src/gui/setup_keyboard.h         |  4 ++--
 src/gui/setup_players.h          |  4 ++--
 src/gui/setup_video.h            |  4 ++--
 src/gui/setuptab.h               |  4 ++--
 src/gui/shoplistbox.h            |  4 ++--
 src/gui/shortcutcontainer.h      |  4 ++--
 src/gui/shortcutwindow.h         |  4 ++--
 src/gui/skill.h                  |  4 ++--
 src/gui/slider.h                 |  4 ++--
 src/gui/status.h                 |  4 ++--
 src/gui/table.h                  |  6 +++---
 src/gui/table_model.h            |  6 +++---
 src/gui/textbox.h                |  4 ++--
 src/gui/textfield.h              |  4 ++--
 src/gui/trade.h                  |  4 ++--
 src/gui/truetypefont.h           |  4 ++--
 src/gui/viewport.h               |  4 ++--
 src/gui/widgets/layout.h         |  6 +++---
 src/gui/widgets/resizegrip.h     |  4 ++--
 src/gui/widgets/tab.h            |  4 ++--
 src/gui/widgets/tabbedarea.h     |  4 ++--
 src/gui/window.h                 |  4 ++--
 src/gui/windowcontainer.h        |  4 ++--
 src/guichanfwd.h                 |  4 ++--
 src/item.h                       |  4 ++--
 src/itemshortcut.h               |  4 ++--
 src/joystick.h                   |  6 +++---
 src/keyboardconfig.h             |  4 ++--
 src/localplayer.h                |  4 ++--
 src/lockedarray.h                |  4 ++--
 src/logindata.h                  |  4 ++--
 src/main.cpp                     |  2 +-
 src/main.h                       |  4 ++--
 src/map.h                        |  4 ++--
 src/monster.h                    |  4 ++--
 src/net/beinghandler.h           |  4 ++--
 src/net/buysellhandler.h         |  4 ++--
 src/net/charserverhandler.h      |  4 ++--
 src/net/chathandler.h            |  4 ++--
 src/net/equipmenthandler.h       |  4 ++--
 src/net/inventoryhandler.h       |  4 ++--
 src/net/itemhandler.h            |  4 ++--
 src/net/loginhandler.h           |  4 ++--
 src/net/maploginhandler.h        |  4 ++--
 src/net/messagehandler.h         |  4 ++--
 src/net/messagein.h              |  4 ++--
 src/net/messageout.h             |  4 ++--
 src/net/network.h                | 12 +++++++-----
 src/net/npchandler.h             |  4 ++--
 src/net/partyhandler.h           |  4 ++--
 src/net/playerhandler.h          |  4 ++--
 src/net/protocol.h               |  4 ++--
 src/net/skillhandler.h           |  4 ++--
 src/net/tradehandler.h           |  4 ++--
 src/npc.h                        |  4 ++--
 src/openglgraphics.h             |  4 ++--
 src/party.h                      |  4 ++--
 src/player.h                     |  4 ++--
 src/player_relations.h           |  6 +++---
 src/position.h                   |  6 +++---
 src/properties.h                 |  4 ++--
 src/recorder.h                   | 10 +++++-----
 src/resources/action.h           |  4 ++--
 src/resources/ambientoverlay.h   |  4 ++--
 src/resources/animation.h        |  4 ++--
 src/resources/buddylist.h        |  6 +++---
 src/resources/colordb.h          |  4 ++--
 src/resources/dye.h              |  4 ++--
 src/resources/emotedb.h          |  4 ++--
 src/resources/image.h            |  4 ++--
 src/resources/imageloader.h      |  4 ++--
 src/resources/imageset.h         |  4 ++--
 src/resources/itemdb.h           |  4 ++--
 src/resources/iteminfo.h         |  4 ++--
 src/resources/mapreader.h        |  4 ++--
 src/resources/monsterdb.h        |  4 ++--
 src/resources/monsterinfo.h      |  4 ++--
 src/resources/music.h            |  4 ++--
 src/resources/npcdb.h            |  4 ++--
 src/resources/resource.h         |  4 ++--
 src/resources/resourcemanager.h  |  4 ++--
 src/resources/soundeffect.h      |  4 ++--
 src/resources/spritedef.h        |  4 ++--
 src/serverinfo.h                 |  4 ++--
 src/shopitem.h                   |  4 ++--
 src/simpleanimation.h            |  4 ++--
 src/sound.h                      |  4 ++--
 src/sprite.h                     |  4 ++--
 src/text.h                       |  7 ++++---
 src/textmanager.h                |  7 ++++---
 src/tileset.h                    |  4 ++--
 src/utils/base64.h               |  6 +++---
 src/utils/dtor.h                 |  4 ++--
 src/utils/gettext.h              |  4 ++--
 src/utils/mutex.h                |  6 +++---
 src/utils/strprintf.h            |  4 ++--
 src/utils/tostring.h             |  4 ++--
 src/utils/trim.h                 |  4 ++--
 src/utils/xml.h                  |  4 ++--
 src/vector.h                     |  6 +++---
 157 files changed, 341 insertions(+), 337 deletions(-)

diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index c8a2b3c5..b196b990 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ANIMATEDSPRITE_H
-#define _TMW_ANIMATEDSPRITE_H
+#ifndef ANIMATEDSPRITE_H
+#define ANIMATEDSPRITE_H
 
 #include "resources/spritedef.h"
 
diff --git a/src/being.h b/src/being.h
index c47864e8..80295db8 100644
--- a/src/being.h
+++ b/src/being.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_BEING_H
-#define _TMW_BEING_H
+#ifndef BEING_H
+#define BEING_H
 
 #include <list>
 #include <memory>
diff --git a/src/beingmanager.h b/src/beingmanager.h
index 267b4655..11721709 100644
--- a/src/beingmanager.h
+++ b/src/beingmanager.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_BEINGMANAGER_H
-#define _TMW_BEINGMANAGER_H
+#ifndef BEINGMANAGER_H
+#define BEINGMANAGER_H
 
 #include "being.h"
 
diff --git a/src/configlistener.h b/src/configlistener.h
index e62d41ea..51d58144 100644
--- a/src/configlistener.h
+++ b/src/configlistener.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_CONFIGLISTENER_H
-#define _TMW_CONFIGLISTENER_H
+#ifndef CONFIGLISTENER_H
+#define CONFIGLISTENER_H
 
 #include <iosfwd>
 
diff --git a/src/configuration.h b/src/configuration.h
index f7a44410..0cc4e29f 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_CONFIGURATION_H
-#define _TMW_CONFIGURATION_H
+#ifndef CONFIGURATION_H
+#define CONFIGURATION_H
 
 #include <cassert>
 #include <libxml/xmlwriter.h>
diff --git a/src/emoteshortcut.h b/src/emoteshortcut.h
index 14162f73..3f907e1b 100644
--- a/src/emoteshortcut.h
+++ b/src/emoteshortcut.h
@@ -19,8 +19,8 @@
  *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _AETHYRA_EMOTESHORTCUT_H__
-#define _AETHYRA_EMOTESHORTCUT_H__
+#ifndef EMOTESHORTCUT_H__
+#define EMOTESHORTCUT_H__
 
 #define SHORTCUT_EMOTES 12
 
diff --git a/src/equipment.h b/src/equipment.h
index 50fcbb32..ace76e63 100644
--- a/src/equipment.h
+++ b/src/equipment.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_EQUIPMENT_H_
-#define _TMW_EQUIPMENT_H_
+#ifndef EQUIPMENT_H
+#define EQUIPMENT_H
 
 class Item;
 
diff --git a/src/floor_item.h b/src/floor_item.h
index 589835b4..a7299bfb 100644
--- a/src/floor_item.h
+++ b/src/floor_item.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_FLOORITEM_H_
-#define _TMW_FLOORITEM_H_
+#ifndef FLOORITEM_H
+#define FLOORITEM_H
 
 #include "graphics.h"
 #include "item.h"
diff --git a/src/flooritemmanager.h b/src/flooritemmanager.h
index b527bbd2..3f96b587 100644
--- a/src/flooritemmanager.h
+++ b/src/flooritemmanager.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_FLOORITEMMANAGER_H
-#define _TMW_FLOORITEMMANAGER_H
+#ifndef FLOORITEMMANAGER_H
+#define FLOORITEMMANAGER_H
 
 #include <list>
 
diff --git a/src/game.h b/src/game.h
index f674dbf0..4f512d97 100644
--- a/src/game.h
+++ b/src/game.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GAME_
-#define _TMW_GAME_
+#ifndef GAME_
+#define GAME_
 
 #include <iosfwd>
 #include <memory>
diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h
index c2c427f4..4290f0a2 100644
--- a/src/gui/browserbox.h
+++ b/src/gui/browserbox.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __TMW_BROWSERBOX_H__
-#define __TMW_BROWSERBOX_H__
+#ifndef BROWSERBOX_H
+#define BROWSERBOX_H
 
 #include <iosfwd>
 #include <vector>
diff --git a/src/gui/button.h b/src/gui/button.h
index 51f6cffc..d8ed9fa7 100644
--- a/src/gui/button.h
+++ b/src/gui/button.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_BUTTON_H
-#define _TMW_BUTTON_H
+#ifndef BUTTON_H
+#define BUTTON_H
 
 #include <iosfwd>
 
diff --git a/src/gui/buttonbox.h b/src/gui/buttonbox.h
index 1741f7ba..6d0e46b6 100644
--- a/src/gui/buttonbox.h
+++ b/src/gui/buttonbox.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_BUTTONBOX_H
-#define _TMW_BUTTONBOX_H
+#ifndef BUTTONBOX_H
+#define BUTTONBOX_H
 
 #include <string>
 
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 1b7ebe43..423918ce 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_BUY_H
-#define _TMW_BUY_H
+#ifndef BUY_H
+#define BUY_H
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index 0f41e9ed..60a6398d 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_BUYSELL_H
-#define _TMW_BUYSELL_H
+#ifndef BUYSELL_H
+#define BUYSELL_H
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/chat.h b/src/gui/chat.h
index e5d0a4a9..176fccb7 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_CHAT_H
-#define _TMW_CHAT_H
+#ifndef CHAT_H
+#define CHAT_H
 
 #include <fstream>
 #include <list>
diff --git a/src/gui/chatinput.h b/src/gui/chatinput.h
index fc5c18a3..d98e120b 100644
--- a/src/gui/chatinput.h
+++ b/src/gui/chatinput.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_CHATINPUT_H
-#define _TMW_CHATINPUT_H
+#ifndef CHATINPUT_H
+#define CHATINPUT_H
 
 #include <guichan/focuslistener.hpp>
 
diff --git a/src/gui/checkbox.h b/src/gui/checkbox.h
index ea67ec02..d92fc822 100644
--- a/src/gui/checkbox.h
+++ b/src/gui/checkbox.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_CHECKBOX_H
-#define _TMW_CHECKBOX_H
+#ifndef CHECKBOX_H
+#define CHECKBOX_H
 
 #include <iosfwd>
 
diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h
index 63a867da..fb8290c8 100644
--- a/src/gui/confirm_dialog.h
+++ b/src/gui/confirm_dialog.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_OPTION_DIALOG_H
-#define _TMW_OPTION_DIALOG_H
+#ifndef OPTION_DIALOG_H
+#define OPTION_DIALOG_H
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/connection.h b/src/gui/connection.h
index 0cbb8768..3caa611f 100644
--- a/src/gui/connection.h
+++ b/src/gui/connection.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_CONNECTION_H
-#define _TMW_CONNECTION_H
+#ifndef CONNECTION_H
+#define CONNECTION_H
 
 #include "window.h"
 
diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h
index 185915a2..00119d15 100644
--- a/src/gui/debugwindow.h
+++ b/src/gui/debugwindow.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_DEBUGWINDOW_H
-#define _TMW_DEBUGWINDOW_H
+#ifndef DEBUGWINDOW_H
+#define DEBUGWINDOW_H
 
 #include <iosfwd>
 
diff --git a/src/gui/emotecontainer.h b/src/gui/emotecontainer.h
index 2231e01a..8e52a206 100644
--- a/src/gui/emotecontainer.h
+++ b/src/gui/emotecontainer.h
@@ -19,8 +19,8 @@
  *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _AETHYRA_EMOTECONTAINER_H__
-#define _AETHYRA_EMOTECONTAINER_H__
+#ifndef EMOTECONTAINER_H__
+#define EMOTECONTAINER_H__
 
 #include <list>
 #include <vector>
diff --git a/src/gui/emoteshortcutcontainer.h b/src/gui/emoteshortcutcontainer.h
index f8a07dcc..71485259 100644
--- a/src/gui/emoteshortcutcontainer.h
+++ b/src/gui/emoteshortcutcontainer.h
@@ -19,8 +19,8 @@
  *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _AETHYRA_EMOTESHORTCUTCONTAINER_H__
-#define _AETHYRA_EMOTESHORTCUTCONTAINER_H__
+#ifndef EMOTESHORTCUTCONTAINER_H__
+#define EMOTESHORTCUTCONTAINER_H__
 
 #include <vector>
 
diff --git a/src/gui/emotewindow.h b/src/gui/emotewindow.h
index e92808dc..eaea1f7c 100644
--- a/src/gui/emotewindow.h
+++ b/src/gui/emotewindow.h
@@ -19,8 +19,8 @@
  *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _AETHYRA_EMOTEWINDOW_H
-#define _AETHYRA_EMOTEWINDOW_H
+#ifndef EMOTEWINDOW_H
+#define EMOTEWINDOW_H
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index c50e154e..3a3f37f4 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_EQUIPMENT_H
-#define _TMW_EQUIPMENT_H
+#ifndef EQUIPMENTWINDOW_H
+#define EQUIPMENTWINDOW_H
 
 #include "window.h"
 #include "../inventory.h"
diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h
index a183a1c8..124b5472 100644
--- a/src/gui/focushandler.h
+++ b/src/gui/focushandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_FOCUSHANDLER_H
-#define _TMW_FOCUSHANDLER_H
+#ifndef FOCUSHANDLER_H
+#define FOCUSHANDLER_H
 
 #include <list>
 
diff --git a/src/gui/gccontainer.h b/src/gui/gccontainer.h
index 03dcb785..0a573645 100644
--- a/src/gui/gccontainer.h
+++ b/src/gui/gccontainer.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_GCCONTAINER_H
-#define _TMW_GUI_GCCONTAINER_H
+#ifndef GUI_GCCONTAINER_H
+#define GUI_GCCONTAINER_H
 
 #include <list>
 
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 9f45a3f3..9681d44a 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI
-#define _TMW_GUI
+#ifndef GUI
+#define GUI
 
 #include <guichan/gui.hpp>
 
diff --git a/src/gui/help.h b/src/gui/help.h
index b4627389..2ba74c0a 100644
--- a/src/gui/help.h
+++ b/src/gui/help.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_HELP_H
-#define _TMW_HELP_H
+#ifndef HELP_H
+#define HELP_H
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index da549841..64227c2d 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -109,7 +109,7 @@ void InventoryWindow::logic()
 
         // Adjust widgets
         mWeight = _("Weight: ") + mTotalWeight + " g / " +
-                  mMaxWeight + _(" g  Slots: ") + 
+                  mMaxWeight + _(" g Slots: ") + 
                  toString(player_node->getInventory()->getNumberOfSlotsUsed()) + 
                  "/" + toString(player_node->getInventory()->getInventorySize());
 
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index e14994df..000112e8 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_INVENTORYWINDOW_H
-#define _TMW_INVENTORYWINDOW_H
+#ifndef INVENTORYWINDOW_H
+#define INVENTORYWINDOW_H
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h
index e6086f82..d8eedadb 100644
--- a/src/gui/item_amount.h
+++ b/src/gui/item_amount.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ITEM_AMOUNT_WINDOW_H
-#define _TMW_ITEM_AMOUNT_WINDOW_H
+#ifndef ITEM_AMOUNT_WINDOW_H
+#define ITEM_AMOUNT_WINDOW_H
 
 #include <iosfwd>
 
@@ -69,4 +69,4 @@ class ItemAmountWindow : public Window, public gcn::ActionListener
         gcn::Slider *mItemAmountSlide;
 };
 
-#endif /* _TMW_ITEM_AMOUNT_WINDOW_H */
+#endif /* ITEM_AMOUNT_WINDOW_H */
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index 0eb940f5..aac06bae 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ITEMCONTAINER_H__
-#define _TMW_ITEMCONTAINER_H__
+#ifndef ITEMCONTAINER_H
+#define ITEMCONTAINER_H
 
 #include <list>
 
diff --git a/src/gui/itemlinkhandler.h b/src/gui/itemlinkhandler.h
index 973aab75..cd6fd900 100644
--- a/src/gui/itemlinkhandler.h
+++ b/src/gui/itemlinkhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ITEM_LINK_HANDLER_H_
-#define _TMW_ITEM_LINK_HANDLER_H_
+#ifndef ITEM_LINK_HANDLER_H_
+#define ITEM_LINK_HANDLER_H_
 
 #include "linkhandler.h"
 
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index 4206671e..8ae2c98f 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ITEMPOPUP_H__
-#define _TMW_ITEMPOPUP_H__
+#ifndef ITEMPOPUP_H__
+#define ITEMPOPUP_H__
 
 #include "scrollarea.h"
 #include "textbox.h"
@@ -46,4 +46,4 @@ class ItemPopup : public Window
         ScrollArea *mItemEffectScroll;
 };
 
-#endif // _TMW_ITEMPOPUP_H__
+#endif // ITEMPOPUP_H__
diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h
index d8ddf110..9b61ca86 100644
--- a/src/gui/itemshortcutcontainer.h
+++ b/src/gui/itemshortcutcontainer.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ITEMSHORTCUTCONTAINER_H__
-#define _TMW_ITEMSHORTCUTCONTAINER_H__
+#ifndef ITEMSHORTCUTCONTAINER_H
+#define ITEMSHORTCUTCONTAINER_H
 
 #include <guichan/mouselistener.hpp>
 #include <guichan/widget.hpp>
diff --git a/src/gui/linkhandler.h b/src/gui/linkhandler.h
index b238f38b..ecc05b13 100644
--- a/src/gui/linkhandler.h
+++ b/src/gui/linkhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_LINK_HANDLER_H_
-#define _TMW_LINK_HANDLER_H_
+#ifndef LINK_HANDLER_H
+#define LINK_HANDLER_H
 
 #include <string>
 
diff --git a/src/gui/listbox.h b/src/gui/listbox.h
index 69ba45f4..3d0062bc 100644
--- a/src/gui/listbox.h
+++ b/src/gui/listbox.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_LISTBOX_H
-#define _TMW_LISTBOX_H
+#ifndef LISTBOX_H
+#define LISTBOX_H
 
 #include <guichan/widgets/listbox.hpp>
 
diff --git a/src/gui/login.h b/src/gui/login.h
index c8fcc267..b85e5ae1 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_LOGIN_H
-#define _TMW_LOGIN_H
+#ifndef LOGIN_H
+#define LOGIN_H
 
 #include <iosfwd>
 #include <string>
diff --git a/src/gui/menuwindow.h b/src/gui/menuwindow.h
index 539cdc24..9b784c35 100644
--- a/src/gui/menuwindow.h
+++ b/src/gui/menuwindow.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MENU_H
-#define _TMW_MENU_H
+#ifndef MENU_H
+#define MENU_H
 
 #include "window.h"
 
diff --git a/src/gui/minimap.h b/src/gui/minimap.h
index 6b2b7f52..b4574ad5 100644
--- a/src/gui/minimap.h
+++ b/src/gui/minimap.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MINIMAP_H
-#define _TMW_MINIMAP_H
+#ifndef MINIMAP_H
+#define MINIMAP_H
 
 #include "window.h"
 
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index f6b059ea..b4b6f1af 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NPC_TEXT_H
-#define _TMW_NPC_TEXT_H
+#ifndef NPC_TEXT_H
+#define NPC_TEXT_H
 
 #include <iosfwd>
 
@@ -77,4 +77,4 @@ class NpcTextDialog : public Window, public gcn::ActionListener
         BrowserBox *mBrowserBox;
 };
 
-#endif // _TMW_NPC_TEXT_H
+#endif // NPC_TEXT_H
diff --git a/src/gui/npcintegerdialog.h b/src/gui/npcintegerdialog.h
index d2c5f058..983c46fe 100644
--- a/src/gui/npcintegerdialog.h
+++ b/src/gui/npcintegerdialog.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_NPCINTEGERDIALOG_H
-#define _TMW_GUI_NPCINTEGERDIALOG_H
+#ifndef GUI_NPCINTEGERDIALOG_H
+#define GUI_NPCINTEGERDIALOG_H
 
 #include <iosfwd>
 #include <vector>
@@ -77,4 +77,4 @@ class NpcIntegerDialog : public Window, public gcn::ActionListener,
         gcn::Button *resetButton;
 };
 
-#endif // _TMW_GUI_NPCINTEGERDIALOG_H
+#endif // GUI_NPCINTEGERDIALOG_H
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index 242e3a95..ffeced3d 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_NPCLISTDIALOG_H
-#define _TMW_GUI_NPCLISTDIALOG_H
+#ifndef GUI_NPCLISTDIALOG_H
+#define GUI_NPCLISTDIALOG_H
 
 #include <iosfwd>
 #include <vector>
@@ -86,4 +86,4 @@ class NpcListDialog : public Window, public gcn::ActionListener,
         std::vector<std::string> mItems;
 };
 
-#endif // _TMW_GUI_NPCLISTDIALOG_H
+#endif // GUI_NPCLISTDIALOG_H
diff --git a/src/gui/npcstringdialog.h b/src/gui/npcstringdialog.h
index e57003e9..5aea2de0 100644
--- a/src/gui/npcstringdialog.h
+++ b/src/gui/npcstringdialog.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_NPCSTRINGDIALOG_H
-#define _TMW_GUI_NPCSTRINGDIALOG_H
+#ifndef GUI_NPCSTRINGDIALOG_H
+#define GUI_NPCSTRINGDIALOG_H
 
 #include <iosfwd>
 #include <vector>
@@ -75,4 +75,4 @@ class NpcStringDialog : public Window, public gcn::ActionListener
         gcn::Button *cancelButton;
 };
 
-#endif // _TMW_GUI_NPCSTRINGDIALOG_H
+#endif // GUI_NPCSTRINGDIALOG_H
diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h
index 033c4bf9..e01bedbd 100644
--- a/src/gui/passwordfield.h
+++ b/src/gui/passwordfield.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_PASSWORDFIELD_H_
-#define _TMW_PASSWORDFIELD_H_
+#ifndef PASSWORDFIELD_H
+#define PASSWORDFIELD_H
 
 #include "textfield.h"
 
diff --git a/src/gui/playerbox.h b/src/gui/playerbox.h
index 75dfe14c..5aacd26f 100644
--- a/src/gui/playerbox.h
+++ b/src/gui/playerbox.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __TMW_PLAYERBOX_H__
-#define __TMW_PLAYERBOX_H__
+#ifndef PLAYERBOX_H
+#define PLAYERBOX_H
 
 #include <guichan/widgets/scrollarea.hpp>
 
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index 734b826f..715a9bb5 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_POPUP_MENU_H
-#define _TMW_POPUP_MENU_H
+#ifndef POPUP_MENU_H
+#define POPUP_MENU_H
 
 #include "linkhandler.h"
 #include "window.h"
diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h
index e874b56d..ee0a5f81 100644
--- a/src/gui/progressbar.h
+++ b/src/gui/progressbar.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_PROGRESSBAR_H
-#define _TMW_PROGRESSBAR_H
+#ifndef PROGRESSBAR_H
+#define PROGRESSBAR_H
 
 #include <guichan/widget.hpp>
 
diff --git a/src/gui/radiobutton.h b/src/gui/radiobutton.h
index 84c552b9..dcd62802 100644
--- a/src/gui/radiobutton.h
+++ b/src/gui/radiobutton.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_RADIOBUTTON_H
-#define _TMW_RADIOBUTTON_H
+#ifndef RADIOBUTTON_H
+#define RADIOBUTTON_H
 
 #include <guichan/widgets/radiobutton.hpp>
 
@@ -63,4 +63,4 @@ class RadioButton : public gcn::RadioButton {
         static Image *radioDisabledChecked;
 };
 
-#endif /* _TMW_RADIOBUTTON_H */
+#endif /* RADIOBUTTON_H */
diff --git a/src/gui/register.h b/src/gui/register.h
index 58106a41..4b95a07b 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_REGISTER_H
-#define _TMW_REGISTER_H
+#ifndef REGISTER_H
+#define REGISTER_H
 
 #include <iosfwd>
 
diff --git a/src/gui/scrollarea.h b/src/gui/scrollarea.h
index 26cba4a6..4fababfa 100644
--- a/src/gui/scrollarea.h
+++ b/src/gui/scrollarea.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __TMW_SCROLLAREA_H__
-#define __TMW_SCROLLAREA_H__
+#ifndef SCROLLAREA_H
+#define SCROLLAREA_H
 
 #include <guichan/widgets/scrollarea.hpp>
 
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index 67eb13a8..3901589a 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -55,8 +55,8 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _TMW_SDLINPUT_
-#define _TMW_SDLINPUT_
+#ifndef SDLINPUT_
+#define SDLINPUT_
 
 #include <queue>
 
diff --git a/src/gui/sell.h b/src/gui/sell.h
index 0aba2909..8e639a3d 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SELL_H
-#define _TMW_SELL_H
+#ifndef SELL_H
+#define SELL_H
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
diff --git a/src/gui/setup.h b/src/gui/setup.h
index 1e0359aa..e4eb0902 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SETUP_H
-#define _TMW_SETUP_H
+#ifndef SETUP_H
+#define SETUP_H
 
 #include <list>
 
diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h
index a91cb6cb..2f5cd736 100644
--- a/src/gui/setup_audio.h
+++ b/src/gui/setup_audio.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_SETUP_AUDIO_H
-#define _TMW_GUI_SETUP_AUDIO_H
+#ifndef GUI_SETUP_AUDIO_H
+#define GUI_SETUP_AUDIO_H
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h
index fec38353..2dc56439 100644
--- a/src/gui/setup_joystick.h
+++ b/src/gui/setup_joystick.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_SETUP_JOYSTICK_H
-#define _TMW_GUI_SETUP_JOYSTICK_H
+#ifndef GUI_SETUP_JOYSTICK_H
+#define GUI_SETUP_JOYSTICK_H
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h
index 86dd920b..d4966053 100644
--- a/src/gui/setup_keyboard.h
+++ b/src/gui/setup_keyboard.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_SETUP_KEYBOARD_H
-#define _TMW_GUI_SETUP_KEYBOARD_H
+#ifndef GUI_SETUP_KEYBOARD_H
+#define GUI_SETUP_KEYBOARD_H
 
 #include <string>
 
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index a1f1e8aa..22c8a9b6 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_SETUP_PLAYERS_H
-#define _TMW_GUI_SETUP_PLAYERS_H
+#ifndef GUI_SETUP_PLAYERS_H
+#define GUI_SETUP_PLAYERS_H
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index e9cfb36e..d863fb64 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_SETUP_VIDEO_H
-#define _TMW_GUI_SETUP_VIDEO_H
+#ifndef GUI_SETUP_VIDEO_H
+#define GUI_SETUP_VIDEO_H
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
diff --git a/src/gui/setuptab.h b/src/gui/setuptab.h
index c1171fdb..3e0c51e2 100644
--- a/src/gui/setuptab.h
+++ b/src/gui/setuptab.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_SETUPTAB_H
-#define _TMW_GUI_SETUPTAB_H
+#ifndef GUI_SETUPTAB_H
+#define GUI_SETUPTAB_H
 
 #include "gccontainer.h"
 
diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h
index c55db889..733af4eb 100644
--- a/src/gui/shoplistbox.h
+++ b/src/gui/shoplistbox.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SHOPLISTBOX_H
-#define _TMW_SHOPLISTBOX_H
+#ifndef SHOPLISTBOX_H
+#define SHOPLISTBOX_H
 
 #include "listbox.h"
 #include "shop.h"
diff --git a/src/gui/shortcutcontainer.h b/src/gui/shortcutcontainer.h
index 9d0584d3..d841f4d8 100644
--- a/src/gui/shortcutcontainer.h
+++ b/src/gui/shortcutcontainer.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SHORTCUTCONTAINER_H__
-#define _TMW_SHORTCUTCONTAINER_H__
+#ifndef SHORTCUTCONTAINER_H__
+#define SHORTCUTCONTAINER_H__
 
 #include <guichan/mouselistener.hpp>
 #include <guichan/widget.hpp>
diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h
index 3c9bfbea..0168669e 100644
--- a/src/gui/shortcutwindow.h
+++ b/src/gui/shortcutwindow.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SHORTCUTWINDOW_H
-#define _TMW_SHORTCUTWINDOW_H
+#ifndef SHORTCUTWINDOW_H
+#define SHORTCUTWINDOW_H
 
 #include "window.h"
 
diff --git a/src/gui/skill.h b/src/gui/skill.h
index 33298e96..955666d9 100644
--- a/src/gui/skill.h
+++ b/src/gui/skill.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SKILL_H
-#define _TMW_SKILL_H
+#ifndef SKILL_H
+#define SKILL_H
 
 #include <vector>
 
diff --git a/src/gui/slider.h b/src/gui/slider.h
index c2add662..c14c5be9 100644
--- a/src/gui/slider.h
+++ b/src/gui/slider.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SLIDER_H
-#define _TMW_SLIDER_H
+#ifndef SLIDER_H
+#define SLIDER_H
 
 #include <guichan/widgets/slider.hpp>
 
diff --git a/src/gui/status.h b/src/gui/status.h
index 795ed533..14a7617e 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_STATUS_H
-#define _TMW_STATUS_H
+#ifndef STATUS_H
+#define STATUS_H
 
 #include <iosfwd>
 
diff --git a/src/gui/table.h b/src/gui/table.h
index 39a48dd5..e3fd8cf6 100644
--- a/src/gui/table.h
+++ b/src/gui/table.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef TMW_TABLE_H_
-#define TMW_TABLE_H_
+#ifndef TABLE_H
+#define TABLE_H
 
 #include <vector>
 
@@ -148,4 +148,4 @@ private:
 };
 
 
-#endif /* !defined(TMW_TABLE_H_) */
+#endif /* !defined(TABLE_H) */
diff --git a/src/gui/table_model.h b/src/gui/table_model.h
index cd4bc6db..1c36ca46 100644
--- a/src/gui/table_model.h
+++ b/src/gui/table_model.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef TMW_TABLE_MODEL_H_
-#define TMW_TABLE_MODEL_H_
+#ifndef TABLE_MODEL_H
+#define TABLE_MODEL_H
 
 #include <set>
 #include <vector>
@@ -176,4 +176,4 @@ protected:
     virtual void drawBackground(gcn::Graphics *graphics);
 };
 
-#endif /* !defined(TMW_TABLE_MODEL_H_) */
+#endif /* !defined(TABLE_MODEL_H) */
diff --git a/src/gui/textbox.h b/src/gui/textbox.h
index 62385b1e..98b60402 100644
--- a/src/gui/textbox.h
+++ b/src/gui/textbox.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __TMW_TEXTBOX_H__
-#define __TMW_TEXTBOX_H__
+#ifndef TEXTBOX_H
+#define TEXTBOX_H
 
 #include <guichan/widgets/textbox.hpp>
 
diff --git a/src/gui/textfield.h b/src/gui/textfield.h
index 4c887546..a2432175 100644
--- a/src/gui/textfield.h
+++ b/src/gui/textfield.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __TMW_TEXTFIELD_H__
-#define __TMW_TEXTFIELD_H__
+#ifndef TEXTFIELD_H
+#define TEXTFIELD_H
 
 #include <guichan/widgets/textfield.hpp>
 
diff --git a/src/gui/trade.h b/src/gui/trade.h
index 910a5183..df724038 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_TRADE_H
-#define _TMW_TRADE_H
+#ifndef TRADE_H
+#define TRADE_H
 
 #include <memory>
 
diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
index bb3663cd..288be49a 100644
--- a/src/gui/truetypefont.h
+++ b/src/gui/truetypefont.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_TRUETYPEFONT_H
-#define _TMW_TRUETYPEFONT_H
+#ifndef TRUETYPEFONT_H
+#define TRUETYPEFONT_H
 
 #include <string>
 
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 0a140ff9..5ed40166 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_VIEWPORT_H_
-#define _TMW_VIEWPORT_H_
+#ifndef VIEWPORT_H
+#define VIEWPORT_H
 
 #include <guichan/mouselistener.hpp>
 
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index b9b8b0f8..20a4222d 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_WIDGET_LAYOUT_H__
-#define _TMW_WIDGET_LAYOUT_H__
+#ifndef WIDGET_LAYOUT_H
+#define WIDGET_LAYOUT_H
 
 #include <vector>
 
@@ -317,4 +317,4 @@ class Layout: public LayoutCell
         bool mComputed;
 };
 
-#endif // _TMW_WIDGET_LAYOUT_H__
+#endif // WIDGET_LAYOUT_H
diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h
index 6c517de8..7f1329a2 100644
--- a/src/gui/widgets/resizegrip.h
+++ b/src/gui/widgets/resizegrip.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_RESIZEGRIP_H
-#define _TMW_RESIZEGRIP_H
+#ifndef RESIZEGRIP_H
+#define RESIZEGRIP_H
 
 #include <guichan/widget.hpp>
 
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
index 6b6e06af..8382df83 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_TAB_H
-#define _TMW_TAB_H
+#ifndef TAB_H
+#define TAB_H
 
 #include <guichan/widgets/tab.hpp>
 
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 8d60409a..01d70380 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_TABBEDAREA_H
-#define _TMW_TABBEDAREA_H
+#ifndef TABBEDAREA_H
+#define TABBEDAREA_H
 
 #include <guichan/widget.hpp>
 #include <guichan/widgets/tabbedarea.hpp>
diff --git a/src/gui/window.h b/src/gui/window.h
index fc808cf4..51b5186d 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_WINDOW_H__
-#define _TMW_WINDOW_H__
+#ifndef WINDOW_H
+#define WINDOW_H
 
 #include <guichan/widgetlistener.hpp>
 
diff --git a/src/gui/windowcontainer.h b/src/gui/windowcontainer.h
index f087db2c..a3e80223 100644
--- a/src/gui/windowcontainer.h
+++ b/src/gui/windowcontainer.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_WINDOWCONTAINER_H_
-#define _TMW_WINDOWCONTAINER_H_
+#ifndef WINDOWCONTAINER_H
+#define WINDOWCONTAINER_H
 
 #include <guichan/widgets/container.hpp>
 
diff --git a/src/guichanfwd.h b/src/guichanfwd.h
index 5fd05dbc..2e97db68 100644
--- a/src/guichanfwd.h
+++ b/src/guichanfwd.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUICHANFWD_H
-#define _TMW_GUICHANFWD_H
+#ifndef GUICHANFWD_H
+#define GUICHANFWD_H
 
 namespace gcn {
     class ActionListener;
diff --git a/src/item.h b/src/item.h
index 2543b594..3ea4a905 100644
--- a/src/item.h
+++ b/src/item.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _ITEM_H_
-#define _ITEM_H_
+#ifndef ITEM_H
+#define ITEM_H
 
 #include "resources/itemdb.h"
 
diff --git a/src/itemshortcut.h b/src/itemshortcut.h
index 5e448010..95e17f44 100644
--- a/src/itemshortcut.h
+++ b/src/itemshortcut.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ITEMSHORTCUT_H__
-#define _TMW_ITEMSHORTCUT_H__
+#ifndef ITEMSHORTCUT_H
+#define ITEMSHORTCUT_H
 
 #define SHORTCUT_ITEMS 12
 
diff --git a/src/joystick.h b/src/joystick.h
index 867bf96a..a7090293 100644
--- a/src/joystick.h
+++ b/src/joystick.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_JOYSTICK_H
-#define _TMW_JOYSTICK_H
+#ifndef JOYSTICK_H
+#define JOYSTICK_H
 
 #include <SDL.h>
 
@@ -98,4 +98,4 @@ class Joystick
         void doCalibration();
 };
 
-#endif // _TMW_JOYSTICK_H
+#endif // JOYSTICK_H
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index 038a33af..2077126d 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_KEYBOARDCONFIG_H
-#define _TMW_KEYBOARDCONFIG_H
+#ifndef KEYBOARDCONFIG_H
+#define KEYBOARDCONFIG_H
 
 #include <string>
 
diff --git a/src/localplayer.h b/src/localplayer.h
index 236d63dc..4e0b205f 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_LOCALPLAYER_H
-#define _TMW_LOCALPLAYER_H
+#ifndef LOCALPLAYER_H
+#define LOCALPLAYER_H
 
 #include "player.h"
 #include "simpleanimation.h"
diff --git a/src/lockedarray.h b/src/lockedarray.h
index e32f6305..2b4b099d 100644
--- a/src/lockedarray.h
+++ b/src/lockedarray.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_LOCKEDARRAY_H
-#define _TMW_LOCKEDARRAY_H
+#ifndef LOCKEDARRAY_H
+#define LOCKEDARRAY_H
 
 #include <algorithm>
 
diff --git a/src/logindata.h b/src/logindata.h
index ea494e15..410d2e73 100644
--- a/src/logindata.h
+++ b/src/logindata.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_LOGINDATA_H
-#define _TMW_LOGINDATA_H
+#ifndef LOGINDATA_H
+#define LOGINDATA_H
 
 #include <string>
 
diff --git a/src/main.cpp b/src/main.cpp
index 8490ec94..b933742a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -680,7 +680,7 @@ void charLogin(Network *network, LoginData *loginData)
     outMsg.writeInt32(loginData->session_ID1);
     outMsg.writeInt32(loginData->session_ID2);
     // [Fate] The next word is unused by the old char server, so we squeeze in tmw client version information
-    outMsg.writeInt16(TMW_CLIENT_PROTOCOL_VERSION);
+    outMsg.writeInt16(CLIENT_PROTOCOL_VERSION);
     outMsg.writeInt8(loginData->sex);
 
     // We get 4 useless bytes before the real answer comes in
diff --git a/src/main.h b/src/main.h
index 0fe2b296..df2c4397 100644
--- a/src/main.h
+++ b/src/main.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MAIN_H
-#define _TMW_MAIN_H
+#ifndef MAIN_H
+#define MAIN_H
 
 #include <string>
 
diff --git a/src/map.h b/src/map.h
index 73be3dd2..bd4cb122 100644
--- a/src/map.h
+++ b/src/map.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MAP_H_
-#define _TMW_MAP_H_
+#ifndef MAP_H
+#define MAP_H
 
 #include <list>
 #include <vector>
diff --git a/src/monster.h b/src/monster.h
index ecd90766..8d7f8ae7 100644
--- a/src/monster.h
+++ b/src/monster.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MONSTER_H
-#define _TMW_MONSTER_H
+#ifndef MONSTER_H
+#define MONSTER_H
 
 #include "being.h"
 
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index cb5941fd..54b82075 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_BEINGHANDLER_H
-#define _TMW_NET_BEINGHANDLER_H
+#ifndef NET_BEINGHANDLER_H
+#define NET_BEINGHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h
index eb1f5853..0ede7b48 100644
--- a/src/net/buysellhandler.h
+++ b/src/net/buysellhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_BUYSELLHANDLER_H
-#define _TMW_NET_BUYSELLHANDLER_H
+#ifndef NET_BUYSELLHANDLER_H
+#define NET_BUYSELLHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h
index 7e711fd9..37b378f2 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_CHARSERVERHANDLER_H
-#define _TMW_NET_CHARSERVERHANDLER_H
+#ifndef NET_CHARSERVERHANDLER_H
+#define NET_CHARSERVERHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/chathandler.h b/src/net/chathandler.h
index 6393e401..ff649205 100644
--- a/src/net/chathandler.h
+++ b/src/net/chathandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_CHATHANDLER_H
-#define _TMW_NET_CHATHANDLER_H
+#ifndef NET_CHATHANDLER_H
+#define NET_CHATHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/equipmenthandler.h b/src/net/equipmenthandler.h
index d477885d..c66d7932 100644
--- a/src/net/equipmenthandler.h
+++ b/src/net/equipmenthandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_EQUIPMENTHANDLER_H
-#define _TMW_NET_EQUIPMENTHANDLER_H
+#ifndef NET_EQUIPMENTHANDLER_H
+#define NET_EQUIPMENTHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index d18e428a..336b2e98 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_INVENTORYHANDLER_H
-#define _TMW_NET_INVENTORYHANDLER_H
+#ifndef NET_INVENTORYHANDLER_H
+#define NET_INVENTORYHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/itemhandler.h b/src/net/itemhandler.h
index 621b7097..0cb3b42a 100644
--- a/src/net/itemhandler.h
+++ b/src/net/itemhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_ITEMHANDLER_H
-#define _TMW_NET_ITEMHANDLER_H
+#ifndef NET_ITEMHANDLER_H
+#define NET_ITEMHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h
index 9024136f..c847b4c1 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_LOGINHANDLER_H
-#define _TMW_NET_LOGINHANDLER_H
+#ifndef NET_LOGINHANDLER_H
+#define NET_LOGINHANDLER_H
 
 #include <string>
 
diff --git a/src/net/maploginhandler.h b/src/net/maploginhandler.h
index a7267372..c7fee70c 100644
--- a/src/net/maploginhandler.h
+++ b/src/net/maploginhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_MAPLOGINHANDLER_H
-#define _TMW_NET_MAPLOGINHANDLER_H
+#ifndef NET_MAPLOGINHANDLER_H
+#define NET_MAPLOGINHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h
index f46da788..45cdf8cd 100644
--- a/src/net/messagehandler.h
+++ b/src/net/messagehandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_MESSAGEHANDLER_H
-#define _TMW_NET_MESSAGEHANDLER_H
+#ifndef NET_MESSAGEHANDLER_H
+#define NET_MESSAGEHANDLER_H
 
 #include <SDL_types.h>
 
diff --git a/src/net/messagein.h b/src/net/messagein.h
index 5cf7cbb5..0ff6e78a 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MESSAGEIN_
-#define _TMW_MESSAGEIN_
+#ifndef MESSAGEIN_
+#define MESSAGEIN_
 
 #include <SDL_types.h>
 #include <string>
diff --git a/src/net/messageout.h b/src/net/messageout.h
index d377229a..b3a4ef68 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MESSAGEOUT_
-#define _TMW_MESSAGEOUT_
+#ifndef MESSAGEOUT_
+#define MESSAGEOUT_
 
 #include <iosfwd>
 #include <SDL_types.h>
diff --git a/src/net/network.h b/src/net/network.h
index db4d7f07..c035f55c 100644
--- a/src/net/network.h
+++ b/src/net/network.h
@@ -19,17 +19,19 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NETWORK_
-#define _TMW_NETWORK_
+#ifndef NETWORK_
+#define NETWORK_
 
 #include <map>
 #include <SDL_net.h>
 #include <SDL_thread.h>
 #include <string>
 
-#define TMW_CLIENT_PROTOCOL_VERSION	1
-	/**< Protocol version, reported to the eAthena char and mapserver who
-             can adjust the protocol accordingly */
+/**
+ * Protocol version, reported to the eAthena char and mapserver who can adjust
+ * the protocol accordingly.
+ */
+#define CLIENT_PROTOCOL_VERSION      1
 
 class MessageHandler;
 class MessageIn;
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index f47af523..7ac962eb 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_NPCHANDLER_H
-#define _TMW_NET_NPCHANDLER_H
+#ifndef NET_NPCHANDLER_H
+#define NET_NPCHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h
index daabc52f..08d85ad0 100644
--- a/src/net/partyhandler.h
+++ b/src/net/partyhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_PARTYHANDLER_H
-#define _TMW_NET_PARTYHANDLER_H
+#ifndef PARTYHANDLER_H
+#define PARTYHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index ceefadf6..1a7c8da3 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_PLAYERHANDLER_H
-#define _TMW_NET_PLAYERHANDLER_H
+#ifndef NET_PLAYERHANDLER_H
+#define NET_PLAYERHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 8f2a2392..fd08c45d 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_PROTOCOL_
-#define _TMW_PROTOCOL_
+#ifndef PROTOCOL_
+#define PROTOCOL_
 
 /*********************************
  * Packets from server to client *
diff --git a/src/net/skillhandler.h b/src/net/skillhandler.h
index 44a0f894..2b55605d 100644
--- a/src/net/skillhandler.h
+++ b/src/net/skillhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_SKILLHANDLER_H
-#define _TMW_NET_SKILLHANDLER_H
+#ifndef NET_SKILLHANDLER_H
+#define NET_SKILLHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index 730c6971..d479e43f 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NET_TRADEHANDLER_H
-#define _TMW_NET_TRADEHANDLER_H
+#ifndef NET_TRADEHANDLER_H
+#define NET_TRADEHANDLER_H
 
 #include "messagehandler.h"
 
diff --git a/src/npc.h b/src/npc.h
index 00494060..dd8d7f5d 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NPC_H
-#define _TMW_NPC_H
+#ifndef NPC_H
+#define NPC_H
 
 #include "player.h"
 
diff --git a/src/openglgraphics.h b/src/openglgraphics.h
index 6ff80bcc..566d6252 100644
--- a/src/openglgraphics.h
+++ b/src/openglgraphics.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_OPENGLGRAPHICS_H
-#define _TMW_OPENGLGRAPHICS_H
+#ifndef OPENGLGRAPHICS_H
+#define OPENGLGRAPHICS_H
 
 #include "graphics.h"
 
diff --git a/src/party.h b/src/party.h
index 0e1afc3c..8d6dce47 100644
--- a/src/party.h
+++ b/src/party.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_PARTY_H
-#define _TMW_PARTY_H
+#ifndef PARTY_H
+#define PARTY_H
 
 #include <string>
 
diff --git a/src/player.h b/src/player.h
index 11cccd04..5fe9963a 100644
--- a/src/player.h
+++ b/src/player.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_PLAYER_H
-#define _TMW_PLAYER_H
+#ifndef PLAYER_H
+#define PLAYER_H
 
 #include "being.h"
 #include "text.h"
diff --git a/src/player_relations.h b/src/player_relations.h
index 07ec7fcb..0f8bb4e3 100644
--- a/src/player_relations.h
+++ b/src/player_relations.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef TMW_PLAYER_RELATIONS_H_
-#define TMW_PLAYER_RELATIONS_H_
+#ifndef PLAYER_RELATIONS_H
+#define PLAYER_RELATIONS_H
 
 #include <list>
 #include <map>
@@ -239,4 +239,4 @@ private:
 extern PlayerRelationsManager player_relations; // singleton representation of player relations
 
 
-#endif /* !defined(TMW_PLAYER_RELATIONS_H_) */
+#endif /* !defined(PLAYER_RELATIONS_H) */
diff --git a/src/position.h b/src/position.h
index 7ef01466..cbcf8c99 100644
--- a/src/position.h
+++ b/src/position.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef TMW_POSITION_H
-#define TMW_POSITION_H
+#ifndef POSITION_H
+#define POSITION_H
 
 #include <list>
 #include <iostream>
@@ -55,4 +55,4 @@ std::ostream& operator <<(std::ostream &os, const Position &p);
  */
 std::ostream& operator <<(std::ostream &os, const Path &path);
 
-#endif // TMW_POSITION_H
+#endif // POSITION_H
diff --git a/src/properties.h b/src/properties.h
index 81714dde..91367552 100644
--- a/src/properties.h
+++ b/src/properties.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_PROPERTIES_H_
-#define _TMW_PROPERTIES_H_
+#ifndef PROPERTIES_H
+#define PROPERTIES_H
 
 #include <map>
 #include <sstream>
diff --git a/src/recorder.h b/src/recorder.h
index c9955fd9..4a220166 100644
--- a/src/recorder.h
+++ b/src/recorder.h
@@ -1,8 +1,8 @@
 /*
- *  The Mana World
- *  Copyright (C) 2004  The Mana World Development Team
+ *  Aethyra
+ *  Copyright (C) 2008 Aethyra Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_RECORD_H
-#define _TMW_RECORD_H
+#ifndef RECORD_H
+#define RECORD_H
 
 #include <fstream>
 #include <string>
diff --git a/src/resources/action.h b/src/resources/action.h
index 1b5f1fc8..649d3828 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ACTION_H
-#define _TMW_ACTION_H
+#ifndef ACTION_H
+#define ACTION_H
 
 #include <map>
 
diff --git a/src/resources/ambientoverlay.h b/src/resources/ambientoverlay.h
index 1b03a19c..65f9891d 100644
--- a/src/resources/ambientoverlay.h
+++ b/src/resources/ambientoverlay.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_RESOURCES_AMBIENTOVERLAY_H_
-#define _TMW_RESOURCES_AMBIENTOVERLAY_H_
+#ifndef RESOURCES_AMBIENTOVERLAY_H
+#define RESOURCES_AMBIENTOVERLAY_H
 
 class Graphics;
 class Image;
diff --git a/src/resources/animation.h b/src/resources/animation.h
index 8ebebc6f..0c461ebe 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ANIMATION_H
-#define _TMW_ANIMATION_H
+#ifndef ANIMATION_H
+#define ANIMATION_H
 
 #include <vector>
 
diff --git a/src/resources/buddylist.h b/src/resources/buddylist.h
index 40dd125d..d769b2b8 100644
--- a/src/resources/buddylist.h
+++ b/src/resources/buddylist.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_BUDDYLIST_H
-#define _TMW_BUDDYLIST_H
+#ifndef BUDDYLIST_H
+#define BUDDYLIST_H
 
 #include <list>
 #include <string>
@@ -76,4 +76,4 @@ class BuddyList : public gcn::ListModel {
         std::string mFilename;            /* File to work with */
 };
 
-#endif /* _TMW_BUDDYLIST_H */
+#endif /* BUDDYLIST_H */
diff --git a/src/resources/colordb.h b/src/resources/colordb.h
index 2b750fa3..da36048a 100644
--- a/src/resources/colordb.h
+++ b/src/resources/colordb.h
@@ -19,8 +19,8 @@
  *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _AETHYRA_COLOR_MANAGER_H
-#define _AETHYRA_COLOR_MANAGER_H
+#ifndef COLOR_MANAGER_H
+#define COLOR_MANAGER_H
 
 #include <map>
 #include <string>
diff --git a/src/resources/dye.h b/src/resources/dye.h
index 6bec8eb1..1db16c6a 100644
--- a/src/resources/dye.h
+++ b/src/resources/dye.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_DYE_H
-#define _TMW_DYE_H
+#ifndef DYE_H
+#define DYE_H
 
 #include <string>
 #include <vector>
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index 73354ec0..0962edad 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -19,8 +19,8 @@
  *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _AETHYRA_EMOTE_DB_H
-#define _AETHYRA_EMOTE_DB_H
+#ifndef EMOTE_DB_H
+#define EMOTE_DB_H
 
 #include <list>
 #include <map>
diff --git a/src/resources/image.h b/src/resources/image.h
index 0974b18b..a4048803 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_IMAGE_H
-#define _TMW_IMAGE_H
+#ifndef IMAGE_H
+#define IMAGE_H
 
 #include <SDL.h>
 
diff --git a/src/resources/imageloader.h b/src/resources/imageloader.h
index 05d7a838..0ac7c899 100644
--- a/src/resources/imageloader.h
+++ b/src/resources/imageloader.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_IMAGELOADER_H
-#define _TMW_IMAGELOADER_H
+#ifndef IMAGELOADER_H
+#define IMAGELOADER_H
 
 #include <string>
 
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index f8939263..f59c76bb 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_IMAGESET_H
-#define _TMW_IMAGESET_H
+#ifndef IMAGESET_H
+#define IMAGESET_H
 
 #include <vector>
 
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 78279f4d..e7c23ca2 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ITEM_MANAGER_H
-#define _TMW_ITEM_MANAGER_H
+#ifndef ITEM_MANAGER_H
+#define ITEM_MANAGER_H
 
 #include <map>
 
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 5e98d040..86725ca2 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ITEMINFO_H_
-#define _TMW_ITEMINFO_H_
+#ifndef ITEMINFO_H
+#define ITEMINFO_H
 
 #include <map>
 #include <string>
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index bf797690..ef945c3f 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MAPREADER_H_
-#define _TMW_MAPREADER_H_
+#ifndef MAPREADER_H
+#define MAPREADER_H
 
 #include <iosfwd>
 
diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h
index cee1390b..6fbde55f 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/monsterdb.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MONSTER_DB_H
-#define _TMW_MONSTER_DB_H
+#ifndef MONSTER_DB_H
+#define MONSTER_DB_H
 
 #include <map>
 
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index 77130be0..75464035 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MONSTERINFO_H_
-#define _TMW_MONSTERINFO_H_
+#ifndef MONSTERINFO_H
+#define MONSTERINFO_H
 
 #include <list>
 #include <map>
diff --git a/src/resources/music.h b/src/resources/music.h
index 4d2ffd29..65f1ee88 100644
--- a/src/resources/music.h
+++ b/src/resources/music.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MUSIC_H
-#define _TMW_MUSIC_H
+#ifndef MUSIC_H
+#define MUSIC_H
 
 #include <SDL_mixer.h>
 
diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h
index c2bd04e4..af6764bf 100644
--- a/src/resources/npcdb.h
+++ b/src/resources/npcdb.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NPC_DB_H
-#define _TMW_NPC_DB_H
+#ifndef NPC_DB_H
+#define NPC_DB_H
 
 #include <list>
 #include <map>
diff --git a/src/resources/resource.h b/src/resources/resource.h
index 855d09b8..303b82c8 100644
--- a/src/resources/resource.h
+++ b/src/resources/resource.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_RESOURCE_H
-#define _TMW_RESOURCE_H
+#ifndef RESOURCE_H
+#define RESOURCE_H
 
 #include <ctime>
 #include <string>
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index 4372195d..7996e816 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_RESOURCE_MANAGER_H
-#define _TMW_RESOURCE_MANAGER_H
+#ifndef RESOURCE_MANAGER_H
+#define RESOURCE_MANAGER_H
 
 #include <ctime>
 #include <map>
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index b19142b3..05ec9e54 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SOUND_EFFECT_H
-#define _TMW_SOUND_EFFECT_H
+#ifndef SOUND_EFFECT_H
+#define SOUND_EFFECT_H
 
 #include <SDL_mixer.h>
 
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 4759ef4e..99d570f1 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SPRITEDEF_H
-#define _TMW_SPRITEDEF_H
+#ifndef SPRITEDEF_H
+#define SPRITEDEF_H
 
 #include <map>
 #include <string>
diff --git a/src/serverinfo.h b/src/serverinfo.h
index d3be62fa..c38d13c7 100644
--- a/src/serverinfo.h
+++ b/src/serverinfo.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SERVERINFO_
-#define _TMW_SERVERINFO_
+#ifndef SERVERINFO_
+#define SERVERINFO_
 
 #include <string>
 
diff --git a/src/shopitem.h b/src/shopitem.h
index 7da77cdf..3353ebe7 100644
--- a/src/shopitem.h
+++ b/src/shopitem.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _SHOPITEM_H_
-#define _SHOPITEM_H_
+#ifndef _SHOPITEM_H
+#define _SHOPITEM_H
 
 #include "item.h"
 
diff --git a/src/simpleanimation.h b/src/simpleanimation.h
index ce8832c3..a7178145 100644
--- a/src/simpleanimation.h
+++ b/src/simpleanimation.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SIMPLEANIMAION_H
-#define _TMW_SIMPLEANIMAION_H
+#ifndef SIMPLEANIMAION_H
+#define SIMPLEANIMAION_H
 
 #include "resources/animation.h"
 
diff --git a/src/sound.h b/src/sound.h
index 1b47e4c7..05b2def3 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SOUND_H
-#define _TMW_SOUND_H
+#ifndef SOUND_H
+#define SOUND_H
 
 #include <SDL_mixer.h>
 #include <string>
diff --git a/src/sprite.h b/src/sprite.h
index 321d6abe..a6384e94 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SPRITE_H_
-#define _TMW_SPRITE_H_
+#ifndef SPRITE_H
+#define SPRITE_H
 
 class Graphics;
 
diff --git a/src/text.h b/src/text.h
index 03f2dcbc..43d6b5ea 100644
--- a/src/text.h
+++ b/src/text.h
@@ -18,8 +18,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _AETHYRA_TEXT_H
-#define _AETHYRA_TEXT_H
+#ifndef TEXT_H
+#define TEXT_H
 
 #include "graphics.h"
 #include "guichanfwd.h"
@@ -89,4 +89,5 @@ class FlashText : public Text
     private:
         int mTime;             /**< Time left for flashing */
 };
-#endif
+
+#endif // TEXT_H
diff --git a/src/textmanager.h b/src/textmanager.h
index 6497c335..a08660d5 100644
--- a/src/textmanager.h
+++ b/src/textmanager.h
@@ -18,8 +18,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _AETHYRA_TEXTMANAGER_H
-#define _AETHYRA_TEXTMANAGER_H
+#ifndef TEXTMANAGER_H
+#define TEXTMANAGER_H
 
 #include <list>
 
@@ -71,4 +71,5 @@ class TextManager
 };
 
 extern TextManager *textManager;
-#endif
+
+#endif // TEXTMANAGER_H
diff --git a/src/tileset.h b/src/tileset.h
index 040f7ef8..d4de7ba5 100644
--- a/src/tileset.h
+++ b/src/tileset.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_TILESET_H_
-#define _TMW_TILESET_H_
+#ifndef TILESET_H
+#define TILESET_H
 
 #include "resources/imageset.h"
 
diff --git a/src/utils/base64.h b/src/utils/base64.h
index c802207b..92c23016 100644
--- a/src/utils/base64.h
+++ b/src/utils/base64.h
@@ -27,10 +27,10 @@
    +----------------------------------------------------------------------+
  */
 
-#ifndef _TMW_BASE64_H
-#define _TMW_BASE64_H
+#ifndef BASE64_H
+#define BASE64_H
 
 extern unsigned char *php3_base64_encode(const unsigned char *, int, int *);
 extern unsigned char *php3_base64_decode(const unsigned char *, int, int *);
 
-#endif /* _TMW_BASE64_H */
+#endif /* BASE64_H */
diff --git a/src/utils/dtor.h b/src/utils/dtor.h
index 399cb8c2..0b71fa50 100644
--- a/src/utils/dtor.h
+++ b/src/utils/dtor.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_UTILS_DTOR_H
-#define _TMW_UTILS_DTOR_H
+#ifndef UTILS_DTOR_H
+#define UTILS_DTOR_H
 
 #include <algorithm>
 #include <functional>
diff --git a/src/utils/gettext.h b/src/utils/gettext.h
index 74502bb0..5281d491 100644
--- a/src/utils/gettext.h
+++ b/src/utils/gettext.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_UTILS_GETTEXT_H
-#define _TMW_UTILS_GETTEXT_H
+#ifndef UTILS_GETTEXT_H
+#define UTILS_GETTEXT_H
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/src/utils/mutex.h b/src/utils/mutex.h
index 31e43e33..5e5df8f8 100644
--- a/src/utils/mutex.h
+++ b/src/utils/mutex.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef TMW_MUTEX_H
-#define TMW_MUTEX_H
+#ifndef MUTEX_H
+#define MUTEX_H
 
 #include <SDL_thread.h>
 
@@ -94,4 +94,4 @@ inline MutexLocker::~MutexLocker()
     mMutex->unlock();
 }
 
-#endif // TMW_MUTEX_H
+#endif // MUTEX_H
diff --git a/src/utils/strprintf.h b/src/utils/strprintf.h
index 98ef5065..78e7a04c 100644
--- a/src/utils/strprintf.h
+++ b/src/utils/strprintf.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_UTILS_STRPRINTF_H
-#define _TMW_UTILS_STRPRINTF_H
+#ifndef UTILS_STRPRINTF_H
+#define UTILS_STRPRINTF_H
 
 #include <string>
 
diff --git a/src/utils/tostring.h b/src/utils/tostring.h
index 0c3b600f..5ac1d3aa 100644
--- a/src/utils/tostring.h
+++ b/src/utils/tostring.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_UTILS_TOSTRING_H
-#define _TMW_UTILS_TOSTRING_H
+#ifndef UTILS_TOSTRING_H
+#define UTILS_TOSTRING_H
 
 #include <sstream>
 
diff --git a/src/utils/trim.h b/src/utils/trim.h
index 9d0d5600..b7474ac7 100644
--- a/src/utils/trim.h
+++ b/src/utils/trim.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_UTILS_TRIM_H_
-#define _TMW_UTILS_TRIM_H_
+#ifndef UTILS_TRIM_H
+#define UTILS_TRIM_H
 
 #include <string>
 
diff --git a/src/utils/xml.h b/src/utils/xml.h
index 6af5f1ca..2e08dd50 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_XML_H
-#define _TMW_XML_H
+#ifndef XML_H
+#define XML_H
 
 #include <string>
 
diff --git a/src/vector.h b/src/vector.h
index cd477301..6dd461ac 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_VECTOR_H_
-#define _TMW_VECTOR_H_
+#ifndef VECTOR_H
+#define VECTOR_H
 
 #include <math.h>
 
@@ -187,4 +187,4 @@ class Vector
  */
 std::ostream& operator <<(std::ostream &os, const Vector &v);
 
-#endif // _TMW_VECTOR_H_
+#endif // VECTOR_H
-- 
cgit v1.2.3-70-g09d2


From decf5b650667830fcfe0838688ed0ca12481399f Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 25 Jan 2009 22:00:00 +0100
Subject: Removed the TMW branding from header guards

---
 tools/tmxcopy/base64.h   | 6 +++---
 tools/tmxcopy/tostring.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/tmxcopy/base64.h b/tools/tmxcopy/base64.h
index c802207b..92c23016 100644
--- a/tools/tmxcopy/base64.h
+++ b/tools/tmxcopy/base64.h
@@ -27,10 +27,10 @@
    +----------------------------------------------------------------------+
  */
 
-#ifndef _TMW_BASE64_H
-#define _TMW_BASE64_H
+#ifndef BASE64_H
+#define BASE64_H
 
 extern unsigned char *php3_base64_encode(const unsigned char *, int, int *);
 extern unsigned char *php3_base64_decode(const unsigned char *, int, int *);
 
-#endif /* _TMW_BASE64_H */
+#endif /* BASE64_H */
diff --git a/tools/tmxcopy/tostring.h b/tools/tmxcopy/tostring.h
index 0c3b600f..5ac1d3aa 100644
--- a/tools/tmxcopy/tostring.h
+++ b/tools/tmxcopy/tostring.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_UTILS_TOSTRING_H
-#define _TMW_UTILS_TOSTRING_H
+#ifndef UTILS_TOSTRING_H
+#define UTILS_TOSTRING_H
 
 #include <sstream>
 
-- 
cgit v1.2.3-70-g09d2


From 6544a9fbe8c601f5333569a9f59131c3f6700595 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 25 Jan 2009 18:29:35 -0700
Subject: Modified the inventory window to be more TMW translation friendly.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/inventorywindow.cpp | 25 +++++++++++++++----------
 src/gui/inventorywindow.h   |  5 ++++-
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 64227c2d..76f83996 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -38,7 +38,6 @@
 
 #include "../inventory.h"
 #include "../item.h"
-#include "../localplayer.h"
 
 #include "../resources/iteminfo.h"
 
@@ -46,8 +45,9 @@
 #include "../utils/strprintf.h"
 #include "../utils/tostring.h"
 
-InventoryWindow::InventoryWindow():
+InventoryWindow::InventoryWindow(int invSize):
     Window(_("Inventory")),
+    mSize(invSize),
     mItemDesc(false)
 {
     setWindowName(_("Inventory"));
@@ -69,10 +69,13 @@ InventoryWindow::InventoryWindow():
     mTotalWeight = toString(player_node->mTotalWeight);
     mMaxWeight = toString(player_node->mMaxWeight);
 
-    mWeight = _("Weight: ") + mTotalWeight + " g / " +
-              mMaxWeight + _(" g Slots: ") + 
-              toString(player_node->getInventory()->getNumberOfSlotsUsed()) + 
-              "/" + toString(player_node->getInventory()->getInventorySize());
+    mWeight = strprintf(_("Weight: %d  g / %d g"),
+                              player_node->mTotalWeight,
+                              player_node->mMaxWeight) + " " +
+              strprintf(_("Slots used: %d / %d"),
+                              player_node->getInventory()->getNumberOfSlotsUsed(),
+                              mSize);
+
     mWeightLabel = new gcn::Label(mWeight);
 
     setMinHeight(130);
@@ -108,10 +111,12 @@ void InventoryWindow::logic()
         mMaxWeight = toString(player_node->mMaxWeight);
 
         // Adjust widgets
-        mWeight = _("Weight: ") + mTotalWeight + " g / " +
-                  mMaxWeight + _(" g Slots: ") + 
-                 toString(player_node->getInventory()->getNumberOfSlotsUsed()) + 
-                 "/" + toString(player_node->getInventory()->getInventorySize());
+        mWeight = strprintf(_("Weight: %d  g / %d g"),
+                              player_node->mTotalWeight,
+                              player_node->mMaxWeight) + " " +
+                  strprintf(_("Slots used: %d / %d"),
+                              player_node->getInventory()->getNumberOfSlotsUsed(),
+                              mSize);
 
         setMinWidth(getFont()->getWidth(mWeight));
     }
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 000112e8..33b6ff52 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -29,6 +29,7 @@
 #include "window.h"
 
 #include "../guichanfwd.h"
+#include "../localplayer.h"
 
 class Item;
 class ItemContainer;
@@ -45,7 +46,7 @@ class InventoryWindow : public Window, gcn::ActionListener,
         /**
          * Constructor.
          */
-        InventoryWindow();
+        InventoryWindow(int invSize = INVENTORY_SIZE);
 
         /**
          * Logic (updates buttons and weight information).
@@ -76,6 +77,8 @@ class InventoryWindow : public Window, gcn::ActionListener,
         gcn::ScrollArea *mInvenScroll;
         gcn::Label *mWeightLabel;
 
+        int mSize;
+
         bool mItemDesc;
 };
 
-- 
cgit v1.2.3-70-g09d2


From a0d344b356e61991b1b1adf92187a483c9304ce8 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 25 Jan 2009 18:33:02 -0700
Subject: Refreshed translation files.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 po/ar.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/ca.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/cs.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/da.po    | 415 +++++++++++++++++++++++++++++++-----------------------------
 po/de.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/en_GB.po | 398 +++++++++++++++++++++++++++++----------------------------
 po/eo.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/es.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/fi.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/fr.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/he.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/hr.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/id.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/it.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/ja.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/nl.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/pl.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/pt.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/pt_BR.po | 398 +++++++++++++++++++++++++++++----------------------------
 po/ru.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/sk.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/sv.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/th.po    | 398 +++++++++++++++++++++++++++++----------------------------
 po/zh_CN.po | 398 +++++++++++++++++++++++++++++----------------------------
 24 files changed, 4863 insertions(+), 4706 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index f7a89bab..5cc16db9 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-07-16 18:28+0000\n"
 "Last-Translator: صقر بن عبدالله <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "شراء"
 
@@ -27,7 +28,7 @@ msgstr "شراء"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "السعر: %d GP / الإجمالي: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "مغادرة"
 
@@ -55,8 +56,8 @@ msgstr "بيع"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -155,345 +156,340 @@ msgstr "إنشاء"
 msgid "Select Server"
 msgstr "إنتقاء الشخصيّة"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "إنشاء"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "الخادوم:"
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -547,13 +543,13 @@ msgstr "جارِ الاتّصال..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "استخدام"
 
@@ -562,41 +558,39 @@ msgstr "استخدام"
 msgid "Equipment"
 msgstr "العتاد"
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "الجردة"
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "إسقاط"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr "تجريد من العتاد"
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr "استعمال العتاد"
 
@@ -624,11 +618,11 @@ msgstr "المنفذ:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr "ترك"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "تسجيل"
@@ -639,7 +633,7 @@ msgid "Status"
 msgstr "الحالة"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr "مهارات"
 
@@ -670,7 +664,7 @@ msgstr ""
 msgid "Reset"
 msgstr "تسجيل"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr "NPC"
 
@@ -678,74 +672,78 @@ msgstr "NPC"
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@تجارة|متاجرة مع %s@@"
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@مهاجمة|هاجم %s@@"
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@محادثة|تحدّث مع NPC@@"
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr "@@إلغاء|إلغاء@@"
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@اقتطاف|اقتطاف %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@استخدام|استخدام العتاد@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr "@@استخدام|استخدام العتاد@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr "@@استخدم|استخدم@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr "@@إسقاط|إسقاط@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr "@@الوصف|الوصف@@"
 
@@ -915,7 +913,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1074,37 +1072,36 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 #, fuzzy
 msgid "skills.xml"
 msgstr "مهارات"
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "استخدام"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1157,16 +1154,16 @@ msgstr "دفاع %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1283,6 +1280,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1527,45 +1528,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1643,20 +1649,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1837,155 +1843,155 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
 msgstr "الجردة"
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "إنشاء"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #~ msgid "Color:"
 #~ msgstr "لون الشعر:"
 
diff --git a/po/ca.po b/po/ca.po
index 0cb17dc2..c081f406 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-07-03 17:21+0000\n"
 "Last-Translator: Habari <thomas.becerril@gmail.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr ""
 
@@ -27,7 +28,7 @@ msgstr ""
 msgid "Price: %d GP / Total: %d GP"
 msgstr "preu %d GP / total %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "sortir"
 
@@ -54,8 +55,8 @@ msgstr ""
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -153,345 +154,340 @@ msgstr ""
 msgid "Select Server"
 msgstr ""
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "canvi"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr ""
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -543,13 +539,13 @@ msgstr ""
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr ""
 
@@ -558,41 +554,39 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr ""
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr ""
 
@@ -620,11 +614,11 @@ msgstr ""
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr ""
@@ -635,7 +629,7 @@ msgid "Status"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr ""
 
@@ -664,7 +658,7 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr ""
 
@@ -672,71 +666,75 @@ msgstr ""
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 msgid "@@trade|Trade With "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 msgid "@@attack|Attack "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr ""
 
@@ -904,7 +902,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1060,35 +1058,34 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 msgid "skills.xml"
 msgstr ""
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 msgid "use"
 msgstr ""
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1136,16 +1133,16 @@ msgstr ""
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1257,6 +1254,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1499,45 +1500,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1615,19 +1621,19 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1804,153 +1810,153 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 msgid "Invite to party"
 msgstr ""
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 msgid "   /create"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Name: "
 #~ msgstr "nom"
diff --git a/po/cs.po b/po/cs.po
index 350551d6..8058838d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-12-17 16:31+0000\n"
 "Last-Translator: Lubos <alvinx12@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Nákup"
 
@@ -27,7 +28,7 @@ msgstr "Nákup"
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr ""
 
@@ -54,8 +55,8 @@ msgstr "Prodej"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -155,345 +156,340 @@ msgstr "Vytvořit"
 msgid "Select Server"
 msgstr "Server:"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Vytvořit"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -547,13 +543,13 @@ msgstr "Připojuji se..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr ""
 
@@ -562,41 +558,39 @@ msgstr ""
 msgid "Equipment"
 msgstr "Vybavení"
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventář"
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "Upustit"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr "Vybavit"
 
@@ -624,11 +618,11 @@ msgstr "Port:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Registrace"
@@ -639,7 +633,7 @@ msgid "Status"
 msgstr "Stav"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr "Dovednosti"
 
@@ -670,7 +664,7 @@ msgstr ""
 msgid "Reset"
 msgstr "Registrace"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr ""
 
@@ -678,71 +672,75 @@ msgstr ""
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 msgid "@@trade|Trade With "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 msgid "@@attack|Attack "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr ""
 
@@ -912,7 +910,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1068,36 +1066,35 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 #, fuzzy
 msgid "skills.xml"
 msgstr "Dovednosti"
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 msgid "use"
 msgstr ""
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1150,16 +1147,16 @@ msgstr "Obrana %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1275,6 +1272,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1518,45 +1519,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1634,20 +1640,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1828,155 +1834,155 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
 msgstr "Inventář"
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "Vytvořit"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "Barva vlasů:"
diff --git a/po/da.po b/po/da.po
index fecbf3f6..6581fb79 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-12-28 14:45+0000\n"
 "Last-Translator: GonzoDark AKA IchigoBlack <Gonzo.Dark@gmail.com>\n"
 "Language-Team: Danish <none@none.none>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Køb"
 
@@ -27,7 +28,7 @@ msgstr "Køb"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Pris: %d GP / Total: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "Afslut"
 
@@ -55,8 +56,8 @@ msgstr "Sælg"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -155,280 +156,275 @@ msgstr "Opret"
 msgid "Select Server"
 msgstr "Vælg Server"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr "OK"
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Chat"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr "Velkommen"
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr "Global meddelelse: "
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, fuzzy, c-format
 msgid "Global announcement from %s: "
 msgstr "Global meddelelse fra "
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, fuzzy, c-format
 msgid "Whispering to %s: %s"
 msgstr "Hvisker til "
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr "Prøver at sende en blank gruppe besked."
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr "Retur bringer focus på chatten."
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr "Besked lukker chat."
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr "Enter bringer nu focus på chatten."
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr "Besked lukker nu chat."
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Mulighederne til /toggle er \"yes\", \"no\", \"true\", \"false\", \"1\", \"0"
 "\"."
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 #, fuzzy
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr "Ukendt gruppe kommando... Skriv \"/help party\" for mere information."
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr "Trylleformularen findes ikke!"
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr "Den nuværende server understøtter ikke trylleformulare"
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr "Til stede: "
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr "Fremmøde skrives til loggen"
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr "Ukendt kommando"
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr "Handel fejlede!"
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr "Emote fejlede!"
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr "Sæt dig fejlede!"
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr "Chat skabelsen fejlede!"
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr "Kunne ikke tilslutte sig gruppen!"
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr "Kan ikke råbe!"
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du er ikke nået til det rette Niveau endnu!"
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr "Utilstrækkelig HP!"
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr "Utilstrækkelig SP!"
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr "Du har ingen memorandaer!"
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr "Det kan du ikke gøre lige nu!"
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr "Det ser ud til at du har behov for flere Zeny... ;-)"
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kan ikke bruge denne færdighed med dette slags våben!"
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr "Du har behov for en rød krystal mere"
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr "Du har behov for en blå krystal mere"
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr "Du har for meget på dig, til at kunne gøre dette"
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr "Hmm? Hvad er det?"
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr "Warp mislykkede..."
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr "Kunne ikke stjæle noget som helst..."
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr "Giften havde ingen effekt..."
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr "Det nuværende gruppe præfiks er "
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr "Gruppens præfiks skal være et bogstav langt. "
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr "Kan ikke bruge '/' som præfikset"
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Ændre præfikset til "
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr "--Hjælp--"
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr "/announce: Global meddelelse (Kun for GM)"
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr "/clear: Rydder dette vindue"
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr "/help: Viser denne hjælp"
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr "/msg <navn> <besked>: Alternativ form for /whisper"
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr "/present: Får listen af tilstedeværende brugere"
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr "/toggle: Bestemmer om <retur> bringer focus på chat loggen."
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr "/where: Viser bane navnet"
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr "/w <navn> <besked>: Kort form for /whisper"
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 "/whisper <navn> <besked>: Sender en privat besked til det givne brugernavn"
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr "/who: Viser antalet af online brugere"
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr "For at få mere information, skriv /help <kommando>"
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr "Kommando: /announce <besked>"
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr "*** kun tilgængelig for en GM ***"
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Denne kommando sender beskeden <besked> til alle brugere online."
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr "Kommando: /clear"
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr "Denne commando rydder chat loggen"
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr "Kommando: /help"
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr "Denne kommando viser en liste over alle tilgængelige kommandoer"
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr "Kommando: /help <kommando>"
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr "Denne kommando viser hjælp for <kommando>"
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr "Kommando: /present"
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -437,11 +433,11 @@ msgstr ""
 "lytteradius, og sender listen til enten record loggen, hvis du optager, "
 "ellers er det chat loggen."
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr "Kommando /toggle <tilstand>"
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 #, fuzzy
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
@@ -450,7 +446,7 @@ msgstr ""
 "Denne kommando bestemmer om retur, skal bruges til at fokusere på chat "
 "loggen, ellerom chat om chat loggen, automatisk skal slå fra."
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
@@ -459,56 +455,56 @@ msgstr ""
 "af chat vindue til, eller \"0\", \"no\", \"false\" for at slå fokusering af "
 "chat vindue fra."
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr "Kommando: /toggle"
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr "Denne kommando viser fokusering af chat vinduets status."
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr "kommando: /where"
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr "Denne kommando viser det nuværende bane navn."
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr "Kommando: /msg <navn> <besked>"
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr "Kommando: /whisper <navn> <besked>"
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr "Kommando: /w <navn> <besked>"
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr "Denne kommando sender beskeden <besked> til <navn>."
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Hvis navnet har mellemrum i det, skal det omringes med følgende (\")."
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr "Kommando: /who"
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 "Denne kommando viser det antal af online brugere, der nuværende er online."
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr "Ukendt kommando"
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr "Skriv /help for at få en liste med kommandoer"
 
@@ -562,13 +558,13 @@ msgstr "Opretter forbindelse..."
 msgid "Unable to load selection.png"
 msgstr "Kan ikke loade valgte-billede.png"
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr "Emote"
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "Brug"
 
@@ -577,41 +573,39 @@ msgstr "Brug"
 msgid "Equipment"
 msgstr "Udstyr"
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr "Hjælp"
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr "Luk"
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventarliste"
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "Smid"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr "Vægt: "
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
-msgstr " g Pladser: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
+msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
-msgstr " g  Pladser: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
+msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr "Tag af"
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr "Tag på"
 
@@ -639,11 +633,11 @@ msgstr "Port:"
 msgid "Recent:"
 msgstr "Nuværende:"
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr "Behold"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Registrer"
@@ -654,7 +648,7 @@ msgid "Status"
 msgstr "Status"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr "Færdigheder"
 
@@ -685,7 +679,7 @@ msgstr ""
 msgid "Reset"
 msgstr "Nuværende:"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr "NPC"
 
@@ -693,74 +687,78 @@ msgstr "NPC"
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Byt Med "
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Angrib "
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr "@@friend|Bliv ven med "
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr "@@disregard|Se bort fra "
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr "@@ignore|Bloker "
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr "@@unignore|Fjern blokering "
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr "@@ignore|Bloker fuldstændig "
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr "@@party-invite|Inviter "
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Snak Til NPC@@"
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuller@@"
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Saml Op %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Tag af@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr "@@use|Tag på@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr "@@use|Brug@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Smid@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr "@@description|Beskrivelse@@"
 
@@ -931,7 +929,7 @@ msgstr "Se bort fra"
 msgid "Ignored"
 msgstr "Ignorer"
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr "???"
 
@@ -1090,38 +1088,38 @@ msgstr "Partikel effekt opsætningen er ændret"
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten, eller skifter bane."
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 #, fuzzy
 msgid "skills.xml"
 msgstr "Færdigheder"
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr "Færdigheds points: %d"
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr "Op"
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr "inc"
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "Brug"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr "Fejl under loading af færdigheds fil: %s"
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
-msgstr "Besked"
+#: ../src/gui/speechbubble.cpp:38
+#, fuzzy
+msgid "Speech"
+msgstr "Snakke bobler"
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
@@ -1173,17 +1171,17 @@ msgstr "M.Forsvar:"
 
 #: ../src/gui/status.cpp:134
 #, fuzzy, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr "% Nøjagtighed:"
 
 #: ../src/gui/status.cpp:135
 #, fuzzy, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr "% Undvig:"
 
 #: ../src/gui/status.cpp:136
 #, fuzzy
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr "% Refleks:"
 
 #: ../src/gui/status.cpp:280
@@ -1302,6 +1300,10 @@ msgstr "%s allerede her"
 msgid "Completed"
 msgstr "Udført"
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr "Besked"
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1553,45 +1555,50 @@ msgstr "Emote Database: Emote med manglende ID i emotes.xml!"
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr "EmoteDB: Warning, unknown emote ID %d requested"
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr "Startede genstans database..."
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr "Ukendt genstand"
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr "ItemDB: Fejl under læsningen af items.xml!"
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr "ItemDB: Ugyldig eller manglende genstand ID i items.xml!"
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr "ItemDB: Ny definition af genstand ID %d"
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr "Unavngivet"
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr "Udlæser genstands databasen..."
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr "ItemDB: Fejl, ukendt genstand ID# %d"
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr "ItemDB: Ignorerer ukendt lyd begivenhed '%s'"
@@ -1671,20 +1678,20 @@ msgstr "Forbindelsen til serveren er tabt, programmet vil nu lukke"
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer indkomne handels anmodninger"
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr "Accepter indkomne handels anmodninger"
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Er du sikker på at du gerne vil stoppe?"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr "nej"
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr "Advarsel: guichan indput untagelse: %s"
@@ -1866,166 +1873,178 @@ msgstr "Opretter forbindelse til karakter serveren..."
 msgid "Connecting to account server..."
 msgstr "Opretter forbindelse til bruger serveren..."
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 #, fuzzy
 msgid "Could not create party."
 msgstr "Kunne ikke tilslutte sig gruppen!"
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
 msgstr "Inventarliste"
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, fuzzy, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr " vil gerne handle med dig, vil du acceptere?"
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 #, fuzzy
 msgid "Command: /party <command> <args>"
 msgstr "Kommando: /help <kommando>"
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "Opret"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 #, fuzzy
 msgid "This command implements the partying function."
 msgstr "Denne kommando viser hjælp for <kommando>"
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 #, fuzzy
 msgid "Command: /party new <party-name>"
 msgstr "Kommando /toggle <tilstand>"
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 #, fuzzy
 msgid "Command: /party create <party-name>"
 msgstr "Kommando /toggle <tilstand>"
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 #, fuzzy
 msgid "This command sets the party prefix character."
 msgstr "Denne commando rydder chat loggen"
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 #, fuzzy
 msgid "Command: /party prefix"
 msgstr "Kommando: /present"
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 #, fuzzy
 msgid "This command reports the current party prefix character."
 msgstr "Denne commando rydder chat loggen"
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 #, fuzzy
 msgid "Command: /party leave"
 msgstr "Kommando: /present"
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 #, fuzzy
 msgid "This command causes the player to leave the party."
 msgstr "Denne kommando viser fokusering af chat vinduets status."
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 #, fuzzy
 msgid "Unknown /party command."
 msgstr "Ukendt kommando"
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 #, fuzzy
 msgid "Type /help party for a list of options."
 msgstr "Skriv /help for at få en liste med kommandoer"
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
+#~ msgid "Weight: "
+#~ msgstr "Vægt: "
+
+#~ msgid " g Slots: "
+#~ msgstr " g Pladser: "
+
+#~ msgid " g  Slots: "
+#~ msgstr " g  Pladser: "
+
+#~ msgid "Welcome"
+#~ msgstr "Velkommen"
 
 #, fuzzy
 #~ msgid "Color:"
diff --git a/po/de.po b/po/de.po
index 898a2e8c..c6875299 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-10-13 00:25+0000\n"
 "Last-Translator: Aeneas Jaißle <Unknown>\n"
 "Language-Team: German\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Kaufen"
 
@@ -27,7 +28,7 @@ msgstr "Kaufen"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preis: %d GP / Summe: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "Beenden"
 
@@ -55,8 +56,8 @@ msgstr "Verkaufen"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -155,346 +156,341 @@ msgstr "Erstellen"
 msgid "Select Server"
 msgstr "Spielfigur auswählen"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Erstellen"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Ändere OpenGL"
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -548,13 +544,13 @@ msgstr "Verbinde..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "Benutzen"
 
@@ -563,41 +559,39 @@ msgstr "Benutzen"
 msgid "Equipment"
 msgstr "Ausrüstung"
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventar"
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "Wegwerfen"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr "Ablegen"
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr "Ausrüsten"
 
@@ -625,11 +619,11 @@ msgstr "Port:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr "Erinnern"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Registrieren"
@@ -640,7 +634,7 @@ msgid "Status"
 msgstr "Status"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr "Fertigkeiten"
 
@@ -671,7 +665,7 @@ msgstr ""
 msgid "Reset"
 msgstr "Registrieren"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr "NPC"
 
@@ -679,74 +673,78 @@ msgstr "NPC"
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Mit %s handeln@@"
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|%s angreifen@@"
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Mit NSC reden@@"
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Abbrechen@@"
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|%s aufheben@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Ausrüsten@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr "@@use|Ausrüsten@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr "@@use|Nutzen@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Fallen lassen@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr "@@description|Beschreibung@@"
 
@@ -916,7 +914,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1077,37 +1075,36 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 #, fuzzy
 msgid "skills.xml"
 msgstr "Fertigkeiten"
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "Benutzen"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1160,16 +1157,16 @@ msgstr "Verteidigung %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1286,6 +1283,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1530,45 +1531,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1646,20 +1652,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1840,155 +1846,155 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
 msgstr "Inventar"
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "Erstellen"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "Haarfarbe"
diff --git a/po/en_GB.po b/po/en_GB.po
index 503f24c9..f57e117b 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-05-10 16:51+0000\n"
 "Last-Translator: Me <Glich.Glich@googlemail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Buy"
 
@@ -27,7 +28,7 @@ msgstr "Buy"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Price: %d GP / Total: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "Exit"
 
@@ -55,8 +56,8 @@ msgstr "Sell"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -155,346 +156,341 @@ msgstr "Create"
 msgid "Select Server"
 msgstr "Select Character"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Create"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Changing OpenGL"
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -548,13 +544,13 @@ msgstr "Connecting..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "Use"
 
@@ -563,41 +559,39 @@ msgstr "Use"
 msgid "Equipment"
 msgstr "Equipment"
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventory"
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "Drop"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr "Unequip"
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr "Equip"
 
@@ -625,11 +619,11 @@ msgstr "Port:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr "Keep"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Register"
@@ -640,7 +634,7 @@ msgid "Status"
 msgstr "Status"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr "Skills"
 
@@ -671,7 +665,7 @@ msgstr ""
 msgid "Reset"
 msgstr "Register"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr "NPC"
 
@@ -679,74 +673,78 @@ msgstr "NPC"
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Trade With %s@@"
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Attack %s@@"
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Talk To NPC@@"
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancel@@"
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Pick Up %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Equip@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr "@@use|Equip@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr "@@use|Use@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Drop@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr "@@description|Description@@"
 
@@ -915,7 +913,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1074,37 +1072,36 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Restart needed for changes to take effect."
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 #, fuzzy
 msgid "skills.xml"
 msgstr "Skills"
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "Use"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1157,16 +1154,16 @@ msgstr "Defense %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1283,6 +1280,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1527,45 +1528,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1643,20 +1649,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Are you sure you want to delete this character?"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1837,155 +1843,155 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
 msgstr "Inventory"
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "Create"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #~ msgid "Color:"
 #~ msgstr "Colour:"
 
diff --git a/po/eo.po b/po/eo.po
index bf33fedd..3fe64f4c 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-11-10 22:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr ""
 
@@ -27,7 +28,7 @@ msgstr ""
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr ""
 
@@ -54,8 +55,8 @@ msgstr ""
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -153,344 +154,339 @@ msgstr ""
 msgid "Select Server"
 msgstr ""
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 msgid "Chat"
 msgstr ""
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr ""
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -542,13 +538,13 @@ msgstr ""
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr ""
 
@@ -557,41 +553,39 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr ""
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr ""
 
@@ -619,11 +613,11 @@ msgstr ""
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr ""
@@ -634,7 +628,7 @@ msgid "Status"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr ""
 
@@ -663,7 +657,7 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr ""
 
@@ -671,71 +665,75 @@ msgstr ""
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 msgid "@@trade|Trade With "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 msgid "@@attack|Attack "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr ""
 
@@ -902,7 +900,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1058,35 +1056,34 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 msgid "skills.xml"
 msgstr ""
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 msgid "use"
 msgstr ""
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1134,16 +1131,16 @@ msgstr ""
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1255,6 +1252,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1497,45 +1498,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1613,19 +1619,19 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1802,149 +1808,149 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 msgid "Invite to party"
 msgstr ""
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 msgid "   /create"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
-
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
diff --git a/po/es.po b/po/es.po
index 6f250db8..e7336e21 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-10-15 01:37+0000\n"
 "Last-Translator: catalania <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Comprar"
 
@@ -27,7 +28,7 @@ msgstr "Comprar"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Precio: %d GP / Total: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "Salir"
 
@@ -55,8 +56,8 @@ msgstr "Vender"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -155,346 +156,341 @@ msgstr "Crear"
 msgid "Select Server"
 msgstr "Seleccionar personaje"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Crear"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Cambiar a OpenGL"
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -548,13 +544,13 @@ msgstr "Conectando…"
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "Usar"
 
@@ -563,41 +559,39 @@ msgstr "Usar"
 msgid "Equipment"
 msgstr "Equipo"
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventario"
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "tirar"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr "quitarselo"
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr "Equipar"
 
@@ -625,11 +619,11 @@ msgstr "Puerto:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr "Mantener"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Registrar"
@@ -640,7 +634,7 @@ msgid "Status"
 msgstr "Estado"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -671,7 +665,7 @@ msgstr ""
 msgid "Reset"
 msgstr "Registrar"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr "NPC"
 
@@ -679,74 +673,78 @@ msgstr "NPC"
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Comerciar con %s@@"
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Atacar a %s@@"
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Hablar al NPC@@"
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Recoger %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Equipar@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr "@@use|Equipar@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr "@@use|Usar@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Tirar@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr "@@description|Descripción@@"
 
@@ -916,7 +914,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1075,37 +1073,36 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Se necesita reiniciar para aplicar los cambios."
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 #, fuzzy
 msgid "skills.xml"
 msgstr "Habilidades"
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "Usar"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1158,16 +1155,16 @@ msgstr "Defensa %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1284,6 +1281,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1528,45 +1529,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1644,20 +1650,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "¿Seguro que quieres borrar este personaje?"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1838,155 +1844,155 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
 msgstr "Inventario"
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "Crear"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "Color de pelo:"
diff --git a/po/fi.po b/po/fi.po
index 7e76ee69..b0d0a060 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-12-30 10:23+0000\n"
 "Last-Translator: ville-v <villev90@gmail.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Osta"
 
@@ -27,7 +28,7 @@ msgstr "Osta"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Kappalehinta: %d GP / Yhteensä: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "Sulje"
 
@@ -55,8 +56,8 @@ msgstr "Myy"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -156,346 +157,341 @@ msgstr "Luo"
 msgid "Select Server"
 msgstr "Vaihda palvelinta"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Luo"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Vaihdetaan OpenGL -toimintatilaan"
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -549,13 +545,13 @@ msgstr "Yhdistetään..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "Käytä"
 
@@ -564,41 +560,39 @@ msgstr "Käytä"
 msgid "Equipment"
 msgstr "Varusteet"
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Tavaraluettelo"
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "Pudota"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr "Ota käyttöön"
 
@@ -626,11 +620,11 @@ msgstr "Portti:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Rekisteröidy"
@@ -641,7 +635,7 @@ msgid "Status"
 msgstr "Hahmon tiedot"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr "Taidot"
 
@@ -672,7 +666,7 @@ msgstr ""
 msgid "Reset"
 msgstr "Rekisteröidy"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr "Epäpelattava hahmo"
 
@@ -680,74 +674,78 @@ msgstr "Epäpelattava hahmo"
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Vaihda tavaroita %s kanssa@@"
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Hyökkää %s kimppuun@@"
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Puhu epäpelattavalle hahmolle@@"
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Peruuta@@"
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Poimi %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Ota varuste käyttöön@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr "@@use|Ota varuste käyttöön@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr "@@use|Käytä@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Pudota maahan@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr "@@description|Kuvaus@@"
 
@@ -917,7 +915,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1076,37 +1074,36 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 #, fuzzy
 msgid "skills.xml"
 msgstr "Taidot"
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "Käytä"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1159,16 +1156,16 @@ msgstr "Puolustus %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1285,6 +1282,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1529,45 +1530,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1645,20 +1651,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1839,155 +1845,155 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
 msgstr "Tavaraluettelo"
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "Luo"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "Hiusten väri:"
diff --git a/po/fr.po b/po/fr.po
index 8a51b872..c022f93f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-12-26 10:43+0000\n"
 "Last-Translator: Johan Serre <Unknown>\n"
 "Language-Team: French\n"
@@ -18,7 +18,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Acheter"
 
@@ -28,7 +29,7 @@ msgstr "Acheter"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Prix : %d PO / Total : %d PO"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "Quitter"
 
@@ -56,8 +57,8 @@ msgstr "Vendre"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -156,346 +157,341 @@ msgstr "Créer"
 msgid "Select Server"
 msgstr "Choix du personnage"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Créer"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Serveur :"
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Changement OpenGL"
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -549,13 +545,13 @@ msgstr "Connexion..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "Utiliser"
 
@@ -564,41 +560,39 @@ msgstr "Utiliser"
 msgid "Equipment"
 msgstr "Équipement"
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventaire"
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "Lâcher"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr "Retirer"
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr "Équiper"
 
@@ -626,11 +620,11 @@ msgstr "Port :"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr "Conserver"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "S'inscrire"
@@ -641,7 +635,7 @@ msgid "Status"
 msgstr "Statut"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr "Compétences"
 
@@ -672,7 +666,7 @@ msgstr ""
 msgid "Reset"
 msgstr "S'inscrire"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr "PNJ"
 
@@ -680,74 +674,78 @@ msgstr "PNJ"
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Troquer avec %s@@"
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Attaquer %s@@"
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Parler au PNJ@@"
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuler@@"
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Ramasser %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Équiper@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr "@@use|Équiper@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr "@@use|Utiliser@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Lâcher@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr "@@description|Description@@"
 
@@ -917,7 +915,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1080,37 +1078,36 @@ msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 #, fuzzy
 msgid "skills.xml"
 msgstr "Compétences"
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "Utiliser"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1163,16 +1160,16 @@ msgstr "Défense %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1289,6 +1286,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1533,45 +1534,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1649,20 +1655,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1843,155 +1849,155 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
 msgstr "Inventaire"
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "Créer"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "Couleur des cheveux"
diff --git a/po/he.po b/po/he.po
index 6d9c6bbd..977c53ff 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-10-20 00:23+0000\n"
 "Last-Translator: Ddorda <d.dorda@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "קנה"
 
@@ -27,7 +28,7 @@ msgstr "קנה"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "מחיר: %d זהב / סה\"כ %d זהב"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "יציאה"
 
@@ -55,8 +56,8 @@ msgstr "מכר"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -156,346 +157,341 @@ msgstr "צור"
 msgid "Select Server"
 msgstr "החלף שרת"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "צור"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "שרת:"
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "משנה OpenGL"
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -549,13 +545,13 @@ msgstr "מתחבר..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "השתמש"
 
@@ -564,41 +560,39 @@ msgstr "השתמש"
 msgid "Equipment"
 msgstr "ציוד"
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "ציוד"
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "השלך"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr "הורד"
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr "החזק"
 
@@ -626,11 +620,11 @@ msgstr "פורט:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "הרשם"
@@ -641,7 +635,7 @@ msgid "Status"
 msgstr "מצב"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr "כישורים"
 
@@ -672,7 +666,7 @@ msgstr ""
 msgid "Reset"
 msgstr "הרשם"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr "NPC"
 
@@ -680,74 +674,78 @@ msgstr "NPC"
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|סחור עם %s@@"
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|תקוף את %s@@"
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|דבר אל NPC@@"
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|ביטול@@"
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|הרם %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|החזק@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr "@@use|החזק@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr "@@use|Use@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr "@@drop|השלך@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr "@@description|תיאור@@"
 
@@ -917,7 +915,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1076,37 +1074,36 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 #, fuzzy
 msgid "skills.xml"
 msgstr "כישורים"
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "השתמש"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1159,16 +1156,16 @@ msgstr "הגנה %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1285,6 +1282,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1529,45 +1530,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1645,20 +1651,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1839,155 +1845,155 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
 msgstr "ציוד"
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "צור"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "צבע שיער:"
diff --git a/po/hr.po b/po/hr.po
index d11e1daf..d58b5edb 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-12-28 23:36+0000\n"
 "Last-Translator: Dino Paskvan <dpaskvan@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Kupi"
 
@@ -27,7 +28,7 @@ msgstr "Kupi"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cijena: %d zlatnika / Ukupno: %d zlatnika"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "Izlaz"
 
@@ -54,8 +55,8 @@ msgstr ""
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -154,345 +155,340 @@ msgstr "Stvori"
 msgid "Select Server"
 msgstr ""
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Stvori"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr ""
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -544,13 +540,13 @@ msgstr "Spajanje..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "Upotrijebi"
 
@@ -559,41 +555,39 @@ msgstr "Upotrijebi"
 msgid "Equipment"
 msgstr "Oprema"
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Zalihe"
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "Ispusti"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr "Skini opremu"
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr "Opremi"
 
@@ -621,11 +615,11 @@ msgstr ""
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Registriraj se"
@@ -636,7 +630,7 @@ msgid "Status"
 msgstr "Stanje"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr "Vještine"
 
@@ -667,7 +661,7 @@ msgstr ""
 msgid "Reset"
 msgstr "Registriraj se"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr ""
 
@@ -675,72 +669,76 @@ msgstr ""
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 msgid "@@trade|Trade With "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 msgid "@@attack|Attack "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "Skini opremu"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr ""
 
@@ -910,7 +908,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1066,37 +1064,36 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 #, fuzzy
 msgid "skills.xml"
 msgstr "Vještine"
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "Upotrijebi"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1145,16 +1142,16 @@ msgstr ""
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1271,6 +1268,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1514,45 +1515,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1630,20 +1636,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Da li ste sigurni da želite obrisati ovog lika?"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1824,155 +1830,155 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
 msgstr "Zalihe"
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "Stvori"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "Boja kose:"
diff --git a/po/id.po b/po/id.po
index 9083ca14..5404910e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-03-26 09:11+0000\n"
 "Last-Translator: ActiveFile <activefile@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Beli"
 
@@ -27,7 +28,7 @@ msgstr "Beli"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Harga: %d GP / Jumlah: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "Keluar"
 
@@ -55,8 +56,8 @@ msgstr "Jual"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -155,346 +156,341 @@ msgstr "Buat"
 msgid "Select Server"
 msgstr "Pilih Karakter"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Buat"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Mengubah OpenGL"
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -548,13 +544,13 @@ msgstr "Menyambung..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "Gunakan"
 
@@ -563,41 +559,39 @@ msgstr "Gunakan"
 msgid "Equipment"
 msgstr "Perlengkapan"
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "Jatuh"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr ""
 
@@ -625,11 +619,11 @@ msgstr "Port:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr "Pertahankan"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Mendaftar"
@@ -640,7 +634,7 @@ msgid "Status"
 msgstr "Status"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr "Keahlian"
 
@@ -671,7 +665,7 @@ msgstr ""
 msgid "Reset"
 msgstr "Mendaftar"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr "NPC"
 
@@ -679,74 +673,78 @@ msgstr "NPC"
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Dagang Dengan %s@@"
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Serang%s@@"
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Bicara dengan NPC@@"
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Batal@@"
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Ambil %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Melengkapi@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr "@@use|Melengkapi@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr "@@use|Gunakan@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Buang@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr "@@description|Deskripsi@@"
 
@@ -916,7 +914,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1075,37 +1073,36 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 #, fuzzy
 msgid "skills.xml"
 msgstr "Keahlian"
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "Gunakan"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1158,16 +1155,16 @@ msgstr "Pertahanan %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1284,6 +1281,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1528,45 +1529,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1644,20 +1650,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1838,155 +1844,155 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
 msgstr "Inventaris"
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "Buat"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "Warna Rambut:"
diff --git a/po/it.po b/po/it.po
index 55ccd26b..e04ef0dc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2007-12-03 01:45+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Italian\n"
@@ -19,7 +19,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Compra"
 
@@ -29,7 +30,7 @@ msgstr "Compra"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Prezzo: %d GP / Totale: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "Esci"
 
@@ -57,8 +58,8 @@ msgstr "Vendi"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -157,346 +158,341 @@ msgstr "Create"
 msgid "Select Server"
 msgstr "Scelta Personaggio"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Create"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Modifica OpenGL"
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -550,13 +546,13 @@ msgstr "Connessione..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "Usa"
 
@@ -565,41 +561,39 @@ msgstr "Usa"
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventario"
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "Lascia"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr "Rimuovi"
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr "Equipaggia"
 
@@ -627,11 +621,11 @@ msgstr "Porta:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr "Mantieni"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Registra"
@@ -642,7 +636,7 @@ msgid "Status"
 msgstr "Stato"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr "Abilità"
 
@@ -673,7 +667,7 @@ msgstr ""
 msgid "Reset"
 msgstr "Registra"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr "NPC"
 
@@ -681,74 +675,78 @@ msgstr "NPC"
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Scambia Con %s@@"
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Attacca %s@@"
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Parla con NPC@@"
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancella@@"
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Raccogli %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Equipaggia@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr "@@use|Equipaggia@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr "@@usa|Usa@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Lascia@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr "@@description|Descrizione@@"
 
@@ -918,7 +916,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1077,37 +1075,36 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 #, fuzzy
 msgid "skills.xml"
 msgstr "Abilità"
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "Usa"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1160,16 +1157,16 @@ msgstr "Difesa %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1286,6 +1283,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1530,45 +1531,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1646,20 +1652,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Sei sicuro di voler cancellare questo personaggio?"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1840,155 +1846,155 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
 msgstr "Inventario"
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "Create"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "Colore Capelli"
diff --git a/po/ja.po b/po/ja.po
index 789a1f34..e1308cef 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-06-28 16:27+0000\n"
 "Last-Translator: fate <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "買う"
 
@@ -27,7 +28,7 @@ msgstr "買う"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "価格: %d GP / 合計: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "終了"
 
@@ -54,8 +55,8 @@ msgstr ""
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -154,345 +155,340 @@ msgstr "作成"
 msgid "Select Server"
 msgstr "キャラを選択"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "作成"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "サーバ:"
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -546,13 +542,13 @@ msgstr "接続しています..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "使う"
 
@@ -561,41 +557,39 @@ msgstr "使う"
 msgid "Equipment"
 msgstr ""
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr ""
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr ""
 
@@ -623,11 +617,11 @@ msgstr "ポート:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr ""
@@ -638,7 +632,7 @@ msgid "Status"
 msgstr "状態"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr ""
 
@@ -667,7 +661,7 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr ""
 
@@ -675,73 +669,77 @@ msgstr ""
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 msgid "@@trade|Trade With "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|%sを攻撃する@@"
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|NPCを喋る@@"
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|使う@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr "@@use|使う@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr ""
 
@@ -911,7 +909,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1067,36 +1065,35 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 msgid "skills.xml"
 msgstr ""
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "使う"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1145,16 +1142,16 @@ msgstr ""
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1271,6 +1268,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1514,45 +1515,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1630,20 +1636,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "このキャラは消してもいいですか?"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1824,154 +1830,154 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 msgid "Invite to party"
 msgstr ""
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "作成"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "髪の色："
diff --git a/po/nl.po b/po/nl.po
index 421c0b96..3cfcb63c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-10-10 00:04+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Dutch\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Kopen"
 
@@ -27,7 +28,7 @@ msgstr "Kopen"
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -55,8 +56,8 @@ msgstr ""
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -155,346 +156,341 @@ msgstr "Aanmaken"
 msgid "Select Server"
 msgstr "Kies Personage"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Aanmaken"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Veranderen van OpenGL"
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -548,13 +544,13 @@ msgstr "Verbinden..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "Gebruiken"
 
@@ -563,41 +559,39 @@ msgstr "Gebruiken"
 msgid "Equipment"
 msgstr "Uitrusting"
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr "Afdoen"
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr "Uitrusten"
 
@@ -625,11 +619,11 @@ msgstr "Poort:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr "Behouden"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Aanmelden"
@@ -640,7 +634,7 @@ msgid "Status"
 msgstr "Status"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr "Vaardigheden"
 
@@ -671,7 +665,7 @@ msgstr ""
 msgid "Reset"
 msgstr "Aanmelden"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr "NPC"
 
@@ -679,74 +673,78 @@ msgstr "NPC"
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Handelen met %s@@"
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|%s aanvallen@@"
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Praat met NPC@@"
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuleren@@"
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|%s oppakken@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Uitrusten@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr "@@use|Uitrusten@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr "@@use|Gebruiken@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Neerleggen@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr "@@description|Beschrijving@@"
 
@@ -916,7 +914,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1075,37 +1073,36 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 #, fuzzy
 msgid "skills.xml"
 msgstr "Vaardigheden"
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "Gebruiken"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1154,16 +1151,16 @@ msgstr ""
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1280,6 +1277,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1524,45 +1525,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1640,20 +1646,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1834,155 +1840,155 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
 msgstr "Inventaris"
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "Aanmaken"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "Haarkleur:"
diff --git a/po/pl.po b/po/pl.po
index 7b18329f..b0d0f951 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-10-10 05:26+0000\n"
 "Last-Translator: Michał Trzebiatowski <Unknown>\n"
 "Language-Team: <pl@li.org>\n"
@@ -19,7 +19,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Kup"
 
@@ -29,7 +30,7 @@ msgstr "Kup"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cena: %d GP / Razem: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "Wyjdź"
 
@@ -57,8 +58,8 @@ msgstr "Sprzedaj"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -157,346 +158,341 @@ msgstr "Stwórz"
 msgid "Select Server"
 msgstr "Wybierz postać"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Stwórz"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Serwer:"
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Zmień ustawienia OpenGL"
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -550,13 +546,13 @@ msgstr "Łączenie..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "Użyj"
 
@@ -565,41 +561,39 @@ msgstr "Użyj"
 msgid "Equipment"
 msgstr "Ekwipunek"
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inwentarz"
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "Upuść"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr "Zdejmij"
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr "Załóż"
 
@@ -627,11 +621,11 @@ msgstr "Port:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr "Zachowaj"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Rejestruj"
@@ -642,7 +636,7 @@ msgid "Status"
 msgstr "Stan"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr "Zdolności"
 
@@ -673,7 +667,7 @@ msgstr ""
 msgid "Reset"
 msgstr "Rejestruj"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr "NPC"
 
@@ -681,74 +675,78 @@ msgstr "NPC"
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Targ z %s@@"
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Atakuj %s@@"
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Rozmawiaj z NPC@@"
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Anuluj@@"
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Podnieś %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Załóż@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr "@@use|Załóż@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr "@@use|Użyj@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Upuść@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr "@@description|Opis@@"
 
@@ -918,7 +916,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1078,37 +1076,36 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 #, fuzzy
 msgid "skills.xml"
 msgstr "Zdolności"
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "Użyj"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1161,16 +1158,16 @@ msgstr "Obrona %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1287,6 +1284,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1531,45 +1532,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1647,20 +1653,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1841,155 +1847,155 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
 msgstr "Inwentarz"
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "Stwórz"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "Kolor włosów:"
diff --git a/po/pt.po b/po/pt.po
index c8609174..cd7c0d70 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-02-03 10:14+0000\n"
 "Last-Translator: Tiago Silva <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Comprar"
 
@@ -27,7 +28,7 @@ msgstr "Comprar"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preço: %d GP / Total: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "Sair"
 
@@ -55,8 +56,8 @@ msgstr "Vender"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -155,346 +156,341 @@ msgstr "Criar"
 msgid "Select Server"
 msgstr "Seleccione um Personagem"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Criar"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Mudando OpenGL"
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -548,13 +544,13 @@ msgstr "Conectando..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "Usar"
 
@@ -563,41 +559,39 @@ msgstr "Usar"
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventário"
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "Largar"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr "Equipar"
 
@@ -625,11 +619,11 @@ msgstr "Porta:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr "Manter"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Registo"
@@ -640,7 +634,7 @@ msgid "Status"
 msgstr "Estado"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr "Competências"
 
@@ -671,7 +665,7 @@ msgstr ""
 msgid "Reset"
 msgstr "Registo"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr "NPC"
 
@@ -679,74 +673,78 @@ msgstr "NPC"
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Negociar com %s@@"
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Atacar %s@@"
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Falar com o NPC@@"
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Apanhar %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Equipar@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr "@@use|Equipar@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr "@@use|Usar@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Largar@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr "@@descrição|Descrição@@"
 
@@ -916,7 +914,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1075,37 +1073,36 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "É necessário reiniciar para as alterações terem efeito."
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 #, fuzzy
 msgid "skills.xml"
 msgstr "Competências"
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "Usar"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1166,16 +1163,16 @@ msgstr ""
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1292,6 +1289,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1536,45 +1537,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1652,20 +1658,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Tem a certeza que quer apagar este personagem"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1846,155 +1852,155 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
 msgstr "Inventário"
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "Criar"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "Cor de Cabelo:"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0326b3f6..7f4bb8fa 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-12-14 21:37+0000\n"
 "Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Comprar"
 
@@ -27,7 +28,7 @@ msgstr "Comprar"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preço: %d GP / Total: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "Sair"
 
@@ -55,8 +56,8 @@ msgstr "Vender"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -155,346 +156,341 @@ msgstr "Criar"
 msgid "Select Server"
 msgstr "Selecionar personagem"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Criar"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Trocando OpenGL"
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -548,13 +544,13 @@ msgstr "Conectando..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "Usar"
 
@@ -563,41 +559,39 @@ msgstr "Usar"
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventório"
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "Descartar"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr "Equipar"
 
@@ -625,11 +619,11 @@ msgstr "Porta:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr "Manter"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Registrar"
@@ -640,7 +634,7 @@ msgid "Status"
 msgstr "Status"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -671,7 +665,7 @@ msgstr ""
 msgid "Reset"
 msgstr "Registrar"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr "NPC"
 
@@ -679,74 +673,78 @@ msgstr "NPC"
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@Negociar|Negociar com %s@@"
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@atacar|Atacar %s@@"
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@falar|Falar com NPC@@"
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancelar|Cancelar@@"
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pegar|Pegar %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@usar|Equipar@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr "@@usar|Equipar@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr "@@usar|Usar@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr "@@descartar|Descartar@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr "@@descrição|Descrição@@"
 
@@ -916,7 +914,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1075,37 +1073,36 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 #, fuzzy
 msgid "skills.xml"
 msgstr "Habilidades"
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "Usar"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1158,16 +1155,16 @@ msgstr "Defesa %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1284,6 +1281,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1528,45 +1529,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1644,20 +1650,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Tem certeza de que deseja excluir este personagem?"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1838,155 +1844,155 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
 msgstr "Inventório"
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "Criar"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "Cor do Cabelo:"
diff --git a/po/ru.po b/po/ru.po
index f33bb093..db077dd7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-01-08 11:50+0000\n"
 "Last-Translator: idle sign <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Купить"
 
@@ -27,7 +28,7 @@ msgstr "Купить"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Стоимость: %d GP / Всегоl: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "Выход"
 
@@ -55,8 +56,8 @@ msgstr "Продать"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -155,346 +156,341 @@ msgstr "Создать"
 msgid "Select Server"
 msgstr "Выбор персонажа"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Создать"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Сервер:"
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Переключение на OpenGL"
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -548,13 +544,13 @@ msgstr "Соединение..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "Использовать"
 
@@ -563,41 +559,39 @@ msgstr "Использовать"
 msgid "Equipment"
 msgstr "Снаряжение"
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Инвентарь"
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "Сбросить"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr "Снять"
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr "Надеть"
 
@@ -625,11 +619,11 @@ msgstr "Порт:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr "Оставить"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Зарегистрироваться"
@@ -640,7 +634,7 @@ msgid "Status"
 msgstr "Состояние"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr "Умения"
 
@@ -671,7 +665,7 @@ msgstr ""
 msgid "Reset"
 msgstr "Зарегистрироваться"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr "NPC"
 
@@ -679,74 +673,78 @@ msgstr "NPC"
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Торговать с %s@@"
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Атаковать %s@@"
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Говорить с NPC@@"
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancelОтмена@@"
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Подобрать %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Надеть@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr "@@use|Надеть@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr "@@use|Использовать@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Сбросить@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr "@@description|Описание@@"
 
@@ -916,7 +914,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1075,37 +1073,36 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 #, fuzzy
 msgid "skills.xml"
 msgstr "Умения"
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "Использовать"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1158,16 +1155,16 @@ msgstr "Защита %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1284,6 +1281,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1528,45 +1529,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1644,20 +1650,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Вы уверены, что хотите удалить этого персонажа?"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1838,155 +1844,155 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
 msgstr "Инвентарь"
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "Создать"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "Цвет волос:"
diff --git a/po/sk.po b/po/sk.po
index 2cd774d2..8fadb2cb 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-12-30 14:07+0000\n"
 "Last-Translator: TomasKovacik <nail@nodomain.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Kúpiť"
 
@@ -27,7 +28,7 @@ msgstr "Kúpiť"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cena: %d GP / Spolu: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "Ukončiť"
 
@@ -54,8 +55,8 @@ msgstr ""
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -154,345 +155,340 @@ msgstr "Vytvoriť"
 msgid "Select Server"
 msgstr ""
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Vytvoriť"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr ""
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -544,13 +540,13 @@ msgstr ""
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr ""
 
@@ -559,41 +555,39 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr ""
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr ""
 
@@ -621,11 +615,11 @@ msgstr ""
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr ""
@@ -636,7 +630,7 @@ msgid "Status"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr ""
 
@@ -665,7 +659,7 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr ""
 
@@ -673,71 +667,75 @@ msgstr ""
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 msgid "@@trade|Trade With "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 msgid "@@attack|Attack "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr ""
 
@@ -907,7 +905,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1063,35 +1061,34 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 msgid "skills.xml"
 msgstr ""
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 msgid "use"
 msgstr ""
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1139,16 +1136,16 @@ msgstr ""
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1262,6 +1259,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1505,45 +1506,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1621,20 +1627,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1811,154 +1817,154 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 msgid "Invite to party"
 msgstr ""
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "Vytvoriť"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "Farba vlasov:"
diff --git a/po/sv.po b/po/sv.po
index 1213a38c..8f9514eb 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-05-07 19:04+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "Köp"
 
@@ -27,7 +28,7 @@ msgstr "Köp"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Pris: %d GP / Totalt: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -55,8 +56,8 @@ msgstr "Sälj"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -155,346 +156,341 @@ msgstr "Skapa"
 msgid "Select Server"
 msgstr "Välj karaktär"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Skapa"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Ändrar OpenGL"
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -548,13 +544,13 @@ msgstr "Ansluter..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "Använd"
 
@@ -563,41 +559,39 @@ msgstr "Använd"
 msgid "Equipment"
 msgstr "Utrustning"
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventarium"
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "Släpp"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr "Avrusta"
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr "Utrusta"
 
@@ -625,11 +619,11 @@ msgstr "Port:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr "Behåll"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "Registrera"
@@ -640,7 +634,7 @@ msgid "Status"
 msgstr "Status"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr "Färdigheter"
 
@@ -671,7 +665,7 @@ msgstr ""
 msgid "Reset"
 msgstr "Registrera"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr "NPC"
 
@@ -679,74 +673,78 @@ msgstr "NPC"
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Handla med %s@@"
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Attackera %s@@"
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Prata med NPC@@"
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Avbryt@@"
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Plocka upp %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Utrusta@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr "@@use|Utrusta@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr "@@use|Använd@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Släpp@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr "@@description|Beskrivning@@"
 
@@ -916,7 +914,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1075,37 +1073,36 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 #, fuzzy
 msgid "skills.xml"
 msgstr "Färdigheter"
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "Använd"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1158,16 +1155,16 @@ msgstr "Försvar %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1284,6 +1281,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1528,45 +1529,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1644,20 +1650,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Är du säker på att du vill ta bort den här karaktären?"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1838,155 +1844,155 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
 msgstr "Inventarium"
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "Skapa"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "Hårfärg:"
diff --git a/po/th.po b/po/th.po
index 2df6c357..a41c8a9d 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-11-25 06:16+0000\n"
 "Last-Translator: Tharawut Paripaiboon <Unknown>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "ซื้อ"
 
@@ -27,7 +28,7 @@ msgstr "ซื้อ"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "ราคา: %d GP / ทั้งหมด: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "ออก"
 
@@ -54,8 +55,8 @@ msgstr ""
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -154,345 +155,340 @@ msgstr "สร้าง"
 msgid "Select Server"
 msgstr ""
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "สร้าง"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr ""
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -544,13 +540,13 @@ msgstr "กำลังเชื่อมต่อ..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "ใช้"
 
@@ -559,41 +555,39 @@ msgstr "ใช้"
 msgid "Equipment"
 msgstr ""
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "ทิ้ง"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr ""
 
@@ -621,11 +615,11 @@ msgstr ""
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "สมัครสมาชิก"
@@ -636,7 +630,7 @@ msgid "Status"
 msgstr "สถานะ"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr ""
 
@@ -666,7 +660,7 @@ msgstr ""
 msgid "Reset"
 msgstr "สมัครสมาชิก"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr "NPC"
 
@@ -674,71 +668,75 @@ msgstr "NPC"
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 msgid "@@trade|Trade With "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 msgid "@@attack|Attack "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr ""
 
@@ -908,7 +906,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1064,36 +1062,35 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 msgid "skills.xml"
 msgstr ""
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "ใช้"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1142,16 +1139,16 @@ msgstr ""
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1268,6 +1265,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1511,45 +1512,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1627,20 +1633,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1821,154 +1827,154 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 msgid "Invite to party"
 msgstr ""
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "สร้าง"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "สีผม:"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index feed8d0e..a20235ae 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-19 13:00-0700\n"
+"POT-Creation-Date: 2009-01-25 18:28-0700\n"
 "PO-Revision-Date: 2008-09-17 14:41+0000\n"
 "Last-Translator: luojie-dune <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:60 ../src/gui/buysell.cpp:34
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr "买"
 
@@ -27,7 +28,7 @@ msgstr "买"
 msgid "Price: %d GP / Total: %d GP"
 msgstr "价格：%d GP/总数：%d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:656
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
 msgstr "退出"
 
@@ -55,8 +56,8 @@ msgstr "出售"
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:77 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:42 ../src/gui/npcstringdialog.cpp:42
+#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
+#: ../src/gui/npclistdialog.cpp:44 ../src/gui/npcstringdialog.cpp:42
 #: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/setup.cpp:121
 #: ../src/gui/trade.cpp:65 ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
@@ -155,346 +156,341 @@ msgstr "建立"
 msgid "Select Server"
 msgstr "选择较色"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:76
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:41
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:43
+#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
+#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
+#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:52 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "建立"
 
-#. Fix the owner of welcome message.
-#: ../src/gui/chat.cpp:138
-msgid "Welcome"
-msgstr ""
-
-#: ../src/gui/chat.cpp:150
+#: ../src/gui/chat.cpp:152
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:155
+#: ../src/gui/chat.cpp:157
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:169 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "服务器："
 
-#: ../src/gui/chat.cpp:321
+#: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:340
+#: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:443
+#: ../src/gui/chat.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:444
+#: ../src/gui/chat.cpp:480
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:454
+#: ../src/gui/chat.cpp:490
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:462
+#: ../src/gui/chat.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:467
+#: ../src/gui/chat.cpp:503
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:474
+#: ../src/gui/chat.cpp:510
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:556
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:523
+#: ../src/gui/chat.cpp:559
 msgid "The current server doesn't support spells"
 msgstr ""
 
-#: ../src/gui/chat.cpp:558 ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:594 ../src/gui/chat.cpp:599
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:595
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:568
+#: ../src/gui/chat.cpp:604
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:580
+#: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:583
+#: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:586
+#: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:589
+#: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:592
+#: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:595
+#: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:604
+#: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:607
+#: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:613
+#: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:616
+#: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:619
+#: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:643
+#: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:724
+#: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:729
+#: ../src/gui/chat.cpp:773
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:735
+#: ../src/gui/chat.cpp:779
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:740
+#: ../src/gui/chat.cpp:784
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "改变成OpenGL"
 
-#: ../src/gui/chat.cpp:750
+#: ../src/gui/chat.cpp:794
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:753
+#: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:754
+#: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:755
+#: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:757
+#: ../src/gui/chat.cpp:801
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:758
+#: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:760
+#: ../src/gui/chat.cpp:804
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:762
+#: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:763
+#: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:764
+#: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:766
+#: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:767
+#: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:771
+#: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:772
+#: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:773
+#: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:778
+#: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:784
+#: ../src/gui/chat.cpp:828
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:787
+#: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:788
+#: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:796
+#: ../src/gui/chat.cpp:840
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:797
+#: ../src/gui/chat.cpp:841
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:851
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:852
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:855
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:858
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:819
+#: ../src/gui/chat.cpp:863
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:820
+#: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:825
+#: ../src/gui/chat.cpp:869
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:826
+#: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:827
+#: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:879
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:841
+#: ../src/gui/chat.cpp:885
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:842
+#: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
 msgstr ""
 
@@ -548,13 +544,13 @@ msgstr "连接中..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:38 ../src/gui/emotewindow.cpp:40
+#: ../src/gui/emotewindow.cpp:40 ../src/gui/emotewindow.cpp:42
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:46 ../src/gui/inventorywindow.cpp:54
-#: ../src/gui/inventorywindow.cpp:207 ../src/gui/skill.cpp:132
+#: ../src/gui/emotewindow.cpp:49 ../src/gui/inventorywindow.cpp:60
+#: ../src/gui/inventorywindow.cpp:188 ../src/gui/skill.cpp:141
 msgid "Use"
 msgstr "使用"
 
@@ -563,41 +559,39 @@ msgstr "使用"
 msgid "Equipment"
 msgstr "装备"
 
-#: ../src/gui/help.cpp:32
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:40
+#: ../src/gui/help.cpp:43
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:45 ../src/gui/inventorywindow.cpp:47
+#: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "清单"
 
-#: ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
 msgstr "丢弃"
 
 #. Adjust widgets
-#: ../src/gui/inventorywindow.cpp:66 ../src/gui/inventorywindow.cpp:100
-msgid "Weight: "
-msgstr ""
-
-#: ../src/gui/inventorywindow.cpp:67
-msgid " g Slots: "
+#: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
+#, c-format
+msgid "Weight: %d  g / %d g"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:101
-msgid " g  Slots: "
+#: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
+#, c-format
+msgid "Slots used: %d / %d"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:200
+#: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
 msgstr "卸下装备"
 
-#: ../src/gui/inventorywindow.cpp:203
+#: ../src/gui/inventorywindow.cpp:185
 msgid "Equip"
 msgstr "装备"
 
@@ -625,11 +619,11 @@ msgstr "端口："
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:75
+#: ../src/gui/login.cpp:77
 msgid "Keep"
 msgstr "保持"
 
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:76
+#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
 #: ../src/gui/register.cpp:92
 msgid "Register"
 msgstr "注册"
@@ -640,7 +634,7 @@ msgid "Status"
 msgstr "状态"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:117 ../src/gui/skill.cpp:124
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
 msgid "Skills"
 msgstr "技能"
 
@@ -671,7 +665,7 @@ msgstr ""
 msgid "Reset"
 msgstr "注册"
 
-#: ../src/gui/npclistdialog.cpp:32 ../src/gui/npc_text.cpp:32
+#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
 msgid "NPC"
 msgstr "NPC"
 
@@ -679,74 +673,78 @@ msgstr "NPC"
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:81
+#: ../src/gui/popupmenu.cpp:82
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@交易|与%s交易@@"
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:83
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@攻击|攻击%s@@"
 
-#: ../src/gui/popupmenu.cpp:88
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:92
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:96 ../src/gui/popupmenu.cpp:101
+#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97
+#: ../src/gui/popupmenu.cpp:98
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:109
+#: ../src/gui/popupmenu.cpp:110
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:118
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@谈话|和NPC谈话@@"
 
-#: ../src/gui/popupmenu.cpp:127 ../src/gui/popupmenu.cpp:143
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
+#: ../src/gui/popupmenu.cpp:309
 msgid "@@cancel|Cancel@@"
 msgstr "@@取消|取消@@"
 
-#: ../src/gui/popupmenu.cpp:139
+#: ../src/gui/popupmenu.cpp:140
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@捡起|捡起%s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:298
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@使用|装备@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
 msgstr "@@使用|装备@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:303
 msgid "@@use|Use@@"
 msgstr "@@使用|使用@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:305
 msgid "@@drop|Drop@@"
 msgstr "@@丢弃|丢弃@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:306
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:307
 msgid "@@description|Description@@"
 msgstr "@@描述|描述@@"
 
@@ -916,7 +914,7 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:78
+#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
@@ -1075,37 +1073,36 @@ msgstr ""
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "只有改变生效后才能重启"
 
-#: ../src/gui/skill.cpp:39
+#: ../src/gui/skill.cpp:41
 #, fuzzy
 msgid "skills.xml"
 msgstr "技能"
 
-#: ../src/gui/skill.cpp:130 ../src/gui/skill.cpp:186
+#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:131
+#: ../src/gui/skill.cpp:140
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:132
+#: ../src/gui/skill.cpp:141
 #, fuzzy
 msgid "use"
 msgstr "使用"
 
-#: ../src/gui/skill.cpp:257
+#: ../src/gui/skill.cpp:266
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:35 ../src/net/playerhandler.cpp:193
-#: ../src/net/playerhandler.cpp:248
-msgid "Message"
+#: ../src/gui/speechbubble.cpp:38
+msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
@@ -1158,16 +1155,16 @@ msgstr "防护 %+d"
 
 #: ../src/gui/status.cpp:134
 #, c-format
-msgid "\\% Accuracy:"
+msgid "% Accuracy:"
 msgstr ""
 
 #: ../src/gui/status.cpp:135
 #, c-format
-msgid "\\% Evade:"
+msgid "% Evade:"
 msgstr ""
 
 #: ../src/gui/status.cpp:136
-msgid "\\% Reflex:"
+msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
@@ -1284,6 +1281,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
 #: ../src/net/playerhandler.cpp:194
 msgid ""
 "You are carrying more then half your weight. You are unable to regain health."
@@ -1528,45 +1529,50 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:52
+#: ../src/resources/itemdb.cpp:53
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:56
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:60
+#: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:65
+#: ../src/resources/itemdb.cpp:66
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:77
+#: ../src/resources/itemdb.cpp:78
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:82
+#: ../src/resources/itemdb.cpp:83
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:99
+#: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:142
+#: ../src/resources/itemdb.cpp:146
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:172
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:160
+#: ../src/resources/itemdb.cpp:190
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:199
+#: ../src/resources/itemdb.cpp:246
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1644,20 +1650,20 @@ msgstr ""
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:544
+#: ../src/game.cpp:546
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:656
+#: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "你确定想删除这个较色"
 
-#: ../src/game.cpp:662
+#: ../src/game.cpp:648
 msgid "no"
 msgstr ""
 
-#: ../src/game.cpp:804
+#: ../src/game.cpp:788
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr ""
@@ -1838,155 +1844,155 @@ msgstr ""
 msgid "Connecting to account server..."
 msgstr ""
 
-#: ../src/party.cpp:54
+#: ../src/party.cpp:55
 msgid "Not yet implemented!"
 msgstr ""
 
-#: ../src/party.cpp:63
+#: ../src/party.cpp:64
 msgid "Party command not known."
 msgstr ""
 
-#: ../src/party.cpp:70
+#: ../src/party.cpp:71
 msgid "Party name is missing."
 msgstr ""
 
-#: ../src/party.cpp:83
+#: ../src/party.cpp:84
 msgid "Left party."
 msgstr ""
 
-#: ../src/party.cpp:91
+#: ../src/party.cpp:92
 msgid "Party successfully created."
 msgstr ""
 
-#: ../src/party.cpp:96
+#: ../src/party.cpp:97
 msgid "Could not create party."
 msgstr ""
 
-#: ../src/party.cpp:105
+#: ../src/party.cpp:106
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: ../src/party.cpp:109
+#: ../src/party.cpp:110
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: ../src/party.cpp:113
+#: ../src/party.cpp:114
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: ../src/party.cpp:125
+#: ../src/party.cpp:126
 msgid "You can't have a blank party name!"
 msgstr ""
 
-#: ../src/party.cpp:129
+#: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
 msgstr "清单"
 
-#: ../src/party.cpp:130
+#: ../src/party.cpp:131
 #, c-format
 msgid "%s invites you to join the %s party, do you accept?"
 msgstr ""
 
-#: ../src/party.cpp:148
+#: ../src/party.cpp:149
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: ../src/party.cpp:159
+#: ../src/party.cpp:161
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:176
+#: ../src/party.cpp:171
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/party.cpp:178
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:177
+#: ../src/party.cpp:179
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:178
+#: ../src/party.cpp:180
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:181
 #, fuzzy
 msgid "   /create"
 msgstr "建立"
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:182
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:183
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:184
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:190
+#: ../src/party.cpp:192
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:191
+#: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:194
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:198
+#: ../src/party.cpp:200
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:199
+#: ../src/party.cpp:201
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:203
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:205
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:204
+#: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:212
+#: ../src/party.cpp:214
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:213
+#: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:217
+#: ../src/party.cpp:219
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:218
+#: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#: ../src/party.cpp:169
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "头发颜色"
-- 
cgit v1.2.3-70-g09d2


From 3af5ae54fc5a7fd7b0a6eab778a857b0899ef8f2 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 25 Jan 2009 23:35:48 +0100
Subject: Updated all translation files

---
 po/ar.po    |  34 +----
 po/ca.po    |   6 +-
 po/cs.po    |  21 +--
 po/da.po    |  33 ++---
 po/de.po    | 287 +++++++++++++++++--------------------
 po/en_GB.po |  28 +---
 po/eo.po    |   2 +-
 po/es.po    |  32 +----
 po/fi.po    |  32 +----
 po/fr.po    |  32 +----
 po/he.po    |  32 +----
 po/hr.po    |  29 +---
 po/id.po    |  32 +----
 po/it.po    |  32 +----
 po/ja.po    |  29 +---
 po/nl.po    | 233 ++++++++++++++----------------
 po/pl.po    |  32 +----
 po/pt.po    |  32 +----
 po/pt_BR.po | 448 ++++++++++++++++++++++++++++-----------------------------
 po/ru.po    |  32 +----
 po/sk.po    |  29 +---
 po/sv.po    |  32 +----
 po/th.po    |  13 +-
 po/zh_CN.po | 468 ++++++++++++++++++++++++++++++------------------------------
 24 files changed, 762 insertions(+), 1218 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index 5cc16db9..01d1d025 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2008-07-16 18:28+0000\n"
 "Last-Translator: صقر بن عبدالله <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -328,8 +328,9 @@ msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
 #: ../src/gui/chat.cpp:784
+#, fuzzy
 msgid "Changing prefix to "
-msgstr ""
+msgstr "تغيير OpenGL"
 
 #: ../src/gui/chat.cpp:794
 msgid "-- Help --"
@@ -831,9 +832,8 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-#, fuzzy
 msgid "Colors"
-msgstr "لون الشعر:"
+msgstr ""
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
@@ -1452,9 +1452,8 @@ msgid "Trade: You and "
 msgstr ""
 
 #: ../src/net/tradehandler.cpp:127
-#, fuzzy
 msgid "Trade with "
-msgstr "@@تجارة|متاجرة مع %s@@"
+msgstr ""
 
 #: ../src/net/tradehandler.cpp:128
 #, fuzzy
@@ -1992,29 +1991,6 @@ msgstr ""
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#~ msgid "Color:"
-#~ msgstr "لون الشعر:"
-
-#, fuzzy
-#~ msgid "Description:"
-#~ msgstr "الوصف: %s"
-
-#, fuzzy
-#~ msgid "Effect:"
-#~ msgstr "التأثير: %s"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "الاسم:"
-
-#, fuzzy
-#~ msgid "Effect: "
-#~ msgstr "التأثير: %s"
-
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "الوصف: %s"
-
 #~ msgid "Unregister"
 #~ msgstr "إلغاء التسجيل"
 
diff --git a/po/ca.po b/po/ca.po
index c081f406..02a59b21 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2008-07-03 17:21+0000\n"
 "Last-Translator: Habari <thomas.becerril@gmail.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -1956,7 +1956,3 @@ msgstr ""
 #: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "nom"
diff --git a/po/cs.po b/po/cs.po
index 8058838d..343646c9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2008-12-17 16:31+0000\n"
 "Last-Translator: Lubos <alvinx12@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -828,9 +828,8 @@ msgid "Keyboard"
 msgstr "Klávesnice"
 
 #: ../src/gui/setup.cpp:97
-#, fuzzy
 msgid "Colors"
-msgstr "Barva vlasů:"
+msgstr ""
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
@@ -1983,22 +1982,6 @@ msgstr ""
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Color:"
-#~ msgstr "Barva vlasů:"
-
-#, fuzzy
-#~ msgid "Description:"
-#~ msgstr "Popis: %s"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "Jméno:"
-
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "Popis: %s"
-
 #~ msgid "Remember Username"
 #~ msgstr "Zapamatovat uživatelské jméno"
 
diff --git a/po/da.po b/po/da.po
index 6581fb79..f0be3f84 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2008-12-28 14:45+0000\n"
 "Last-Translator: GonzoDark AKA IchigoBlack <Gonzo.Dark@gmail.com>\n"
 "Language-Team: Danish <none@none.none>\n"
@@ -169,6 +169,7 @@ msgid "Chat"
 msgstr "Chat"
 
 #: ../src/gui/chat.cpp:152
+#, fuzzy
 msgid "Global announcement: "
 msgstr "Global meddelelse: "
 
@@ -592,9 +593,9 @@ msgstr "Smid"
 
 #. Adjust widgets
 #: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
-#, c-format
+#, fuzzy, c-format
 msgid "Weight: %d  g / %d g"
-msgstr ""
+msgstr "Vægt: "
 
 #: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
 #, c-format
@@ -1180,7 +1181,6 @@ msgid "% Evade:"
 msgstr "% Undvig:"
 
 #: ../src/gui/status.cpp:136
-#, fuzzy
 msgid "% Reflex:"
 msgstr "% Refleks:"
 
@@ -1730,11 +1730,11 @@ msgstr " kan ikke laves, men det findes ikke! Lukker."
 #: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
-msgstr "Starter Aethyra Version %s"
+msgstr ""
 
 #: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
-msgstr "Starter Aethyra - Version er ikke defineret"
+msgstr ""
 
 #. Initialize SDL
 #: ../src/main.cpp:297
@@ -1815,7 +1815,7 @@ msgstr "  -v --version    : Viser den nuværende version"
 
 #: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
-msgstr "Aethyra version "
+msgstr ""
 
 #: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
@@ -2034,8 +2034,15 @@ msgstr "Ukendt kommando"
 msgid "Type /help party for a list of options."
 msgstr "Skriv /help for at få en liste med kommandoer"
 
-#~ msgid "Weight: "
-#~ msgstr "Vægt: "
+#, fuzzy
+#~ msgid "%s whispers:"
+#~ msgstr "Tillad hviskere"
+
+#~ msgid "Remember Username"
+#~ msgstr "Husk Brugernavn"
+
+#~ msgid "Welcome"
+#~ msgstr "Velkommen"
 
 #~ msgid " g Slots: "
 #~ msgstr " g Pladser: "
@@ -2043,9 +2050,6 @@ msgstr "Skriv /help for at få en liste med kommandoer"
 #~ msgid " g  Slots: "
 #~ msgstr " g  Pladser: "
 
-#~ msgid "Welcome"
-#~ msgstr "Velkommen"
-
 #, fuzzy
 #~ msgid "Color:"
 #~ msgstr "Farve:"
@@ -2070,9 +2074,6 @@ msgstr "Skriv /help for at få en liste med kommandoer"
 #~ msgid "Description: "
 #~ msgstr "Beskrivelse: "
 
-#~ msgid "Remember Username"
-#~ msgstr "Husk Brugernavn"
-
 #~ msgid "Account and Character Management"
 #~ msgstr "Ret konto og karakter"
 
@@ -2131,7 +2132,7 @@ msgstr "Skriv /help for at få en liste med kommandoer"
 #~ msgstr "E-mail:"
 
 #~ msgid "Choose your Mana World Server"
-#~ msgstr "Vælg din Aethyra Server"
+#~ msgstr "Vælg din Mana World Server"
 
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Skriv både adressen og porten på serveren."
diff --git a/po/de.po b/po/de.po
index c6875299..f231780f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
-"PO-Revision-Date: 2008-10-13 00:25+0000\n"
-"Last-Translator: Aeneas Jaißle <Unknown>\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
+"PO-Revision-Date: 2009-01-19 20:15+0000\n"
+"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Launchpad-Export-Date: 2009-01-25 22:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
@@ -45,9 +45,8 @@ msgid "Effect: %s"
 msgstr "Effekt: %s"
 
 #: ../src/gui/buysell.cpp:30
-#, fuzzy
 msgid "Shop"
-msgstr "Stopp"
+msgstr "Geschäft"
 
 #: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
@@ -95,9 +94,9 @@ msgstr "Stufe: %d"
 
 #: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
 #: ../src/gui/char_select.cpp:188
-#, fuzzy, c-format
+#, c-format
 msgid "Job Level: %d"
-msgstr "Stufe: %d"
+msgstr ""
 
 #: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
@@ -128,7 +127,7 @@ msgstr "Ok"
 #: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
-msgstr ""
+msgstr "Gold: %d"
 
 #: ../src/gui/char_select.cpp:247
 msgid "Create Character"
@@ -152,15 +151,14 @@ msgid "Create"
 msgstr "Erstellen"
 
 #: ../src/gui/char_server.cpp:51
-#, fuzzy
 msgid "Select Server"
-msgstr "Spielfigur auswählen"
+msgstr "Server auswählen"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
 #: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
 #: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
-msgstr ""
+msgstr "Ok"
 
 #: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
@@ -184,7 +182,7 @@ msgstr "Server:"
 #: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
-msgstr ""
+msgstr "Flüsternd zu %s: %s"
 
 #: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
@@ -233,23 +231,23 @@ msgstr ""
 
 #: ../src/gui/chat.cpp:604
 msgid "Unknown command"
-msgstr ""
+msgstr "Unbekannter Befehl"
 
 #: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
-msgstr ""
+msgstr "Handel fehlgeschlagen!"
 
 #: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
-msgstr ""
+msgstr "Emote fehlgeschlagen!"
 
 #: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
-msgstr ""
+msgstr "Sitzen fehlgeschlagen!"
 
 #: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
-msgstr ""
+msgstr "Chat-Erstellung fehlgeschlagen!"
 
 #: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
@@ -277,43 +275,43 @@ msgstr ""
 
 #: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
-msgstr ""
+msgstr "Du kannst dies momentan nicht tun!"
 
 #: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
-msgstr ""
+msgstr "Schmalhans ist dein Küchenmeister... ;-)"
 
 #: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr ""
+msgstr "Du kannst diese Fähigkeit nicht mit dieser Waffenart benutzen!"
 
 #: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
-msgstr ""
+msgstr "Du brauchst noch einen roten Edelstein!"
 
 #: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
-msgstr ""
+msgstr "Du brauchst noch einen blauen Edelstein!"
 
 #: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
-msgstr ""
+msgstr "Du schleppst zuviel herum um das zu machen!"
 
 #: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
-msgstr ""
+msgstr "Eha? Was ist das?"
 
 #: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
-msgstr ""
+msgstr "Warp fehlgeschlagen..."
 
 #: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
-msgstr ""
+msgstr "Konnte nichts stehlen..."
 
 #: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
-msgstr ""
+msgstr "Das Gift hatte keine Wirkung..."
 
 #: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
@@ -488,7 +486,7 @@ msgstr ""
 
 #: ../src/gui/chat.cpp:885
 msgid "Unknown command."
-msgstr ""
+msgstr "Unbekannter Befehl."
 
 #: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
@@ -499,12 +497,14 @@ msgid "GM"
 msgstr ""
 
 #: ../src/gui/colour.cpp:34
+#, fuzzy
 msgid "Player"
-msgstr ""
+msgstr "Spieler"
 
 #: ../src/gui/colour.cpp:35
+#, fuzzy
 msgid "Whisper"
-msgstr ""
+msgstr "%s flüstert:"
 
 #: ../src/gui/colour.cpp:36
 msgid "Is"
@@ -513,7 +513,7 @@ msgstr ""
 #: ../src/gui/colour.cpp:37
 #, fuzzy
 msgid "Party"
-msgstr "Port:"
+msgstr "Los!"
 
 #: ../src/gui/colour.cpp:38
 #, fuzzy
@@ -561,11 +561,11 @@ msgstr "Ausrüstung"
 
 #: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
-msgstr ""
+msgstr "Hilfe"
 
 #: ../src/gui/help.cpp:43
 msgid "Close"
-msgstr ""
+msgstr "Schließen"
 
 #: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
@@ -578,14 +578,14 @@ msgstr "Wegwerfen"
 
 #. Adjust widgets
 #: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
-#, c-format
+#, fuzzy, c-format
 msgid "Weight: %d  g / %d g"
-msgstr ""
+msgstr "Gewicht: %d / %d"
 
 #: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
 #, c-format
 msgid "Slots used: %d / %d"
-msgstr ""
+msgstr "Sockel benutzt: %d / %d"
 
 #: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
@@ -724,9 +724,8 @@ msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|%s aufheben@@"
 
 #: ../src/gui/popupmenu.cpp:298
-#, fuzzy
 msgid "@@use|Unequip@@"
-msgstr "@@use|Ausrüsten@@"
+msgstr ""
 
 #: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
@@ -834,11 +833,11 @@ msgstr "Tastatur"
 #: ../src/gui/setup.cpp:97
 #, fuzzy
 msgid "Colors"
-msgstr "Haarfarbe"
+msgstr "Schließen"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
-msgstr ""
+msgstr "Spieler"
 
 #: ../src/gui/setup_colours.cpp:53
 msgid "Red: "
@@ -874,12 +873,11 @@ msgstr "Kreise den Steuerknüppel"
 
 #: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
-msgstr ""
+msgstr "Zuordnen"
 
 #: ../src/gui/setup_keyboard.cpp:91
-#, fuzzy
 msgid "Default"
-msgstr "Löschen"
+msgstr "Standard"
 
 #: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
@@ -890,21 +888,20 @@ msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
 #: ../src/gui/setup_players.cpp:54
-#, fuzzy
 msgid "Name"
-msgstr "Name :"
+msgstr "Name"
 
 #: ../src/gui/setup_players.cpp:55
 msgid "Relation"
-msgstr ""
+msgstr "Beziehung"
 
 #: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
-msgstr ""
+msgstr "Neutral"
 
 #: ../src/gui/setup_players.cpp:60
 msgid "Friend"
-msgstr ""
+msgstr "Freund"
 
 #: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
@@ -912,7 +909,7 @@ msgstr ""
 
 #: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
-msgstr ""
+msgstr "Ignoriert"
 
 #: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
@@ -920,15 +917,15 @@ msgstr ""
 
 #: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
-msgstr ""
+msgstr "Spielerliste sichern"
 
 #: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
-msgstr ""
+msgstr "Handeln erlauben"
 
 #: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
-msgstr ""
+msgstr "Flüstern erlauben"
 
 #: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
@@ -1006,11 +1003,11 @@ msgstr "Hoch"
 
 #: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
-msgstr ""
+msgstr "Mittel"
 
 #: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
-msgstr ""
+msgstr "max"
 
 #: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
@@ -1087,7 +1084,7 @@ msgstr ""
 
 #: ../src/gui/skill.cpp:140
 msgid "Up"
-msgstr ""
+msgstr "Erhöhen"
 
 #: ../src/gui/skill.cpp:140
 msgid "inc"
@@ -1108,95 +1105,85 @@ msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
-#, fuzzy, c-format
+#, c-format
 msgid "Job: %d"
-msgstr "Stufe: %d"
+msgstr ""
 
 #: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
-#, fuzzy, c-format
+#, c-format
 msgid "Money: %d GP"
-msgstr "Geld: %d"
+msgstr "Geld: %d GP"
 
 #. ----------------------
 #. Stats Part
 #. ----------------------
 #. Static Labels
 #: ../src/gui/status.cpp:125
-#, fuzzy
 msgid "Stats"
-msgstr "Status"
+msgstr "Statistiken"
 
 #: ../src/gui/status.cpp:126
 msgid "Total"
-msgstr ""
+msgstr "Gesamt"
 
 #: ../src/gui/status.cpp:127
 msgid "Cost"
-msgstr ""
+msgstr "Preis"
 
 #. Derived Stats
 #: ../src/gui/status.cpp:130
-#, fuzzy
 msgid "Attack:"
-msgstr "Angriff %+d"
+msgstr "Angriff:"
 
 #: ../src/gui/status.cpp:131
-#, fuzzy
 msgid "Defense:"
-msgstr "Verteidigung %+d"
+msgstr "Verteidigung:"
 
 #: ../src/gui/status.cpp:132
-#, fuzzy
 msgid "M.Attack:"
-msgstr "Angriff %+d"
+msgstr "M.Angriff:"
 
 #: ../src/gui/status.cpp:133
-#, fuzzy
 msgid "M.Defense:"
-msgstr "Verteidigung %+d"
+msgstr "M.Verteidigung:"
 
 #: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
-msgstr ""
+msgstr "% Genauigkeit"
 
 #: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
-msgstr ""
+msgstr "% Ausweichen:"
 
 #: ../src/gui/status.cpp:136
 msgid "% Reflex:"
-msgstr ""
+msgstr "% Reaktion:"
 
 #: ../src/gui/status.cpp:280
-#, fuzzy
 msgid "Strength"
-msgstr "Stärke:"
+msgstr "Stärke"
 
 #: ../src/gui/status.cpp:281
-#, fuzzy
 msgid "Agility"
-msgstr "Agilität:"
+msgstr "Beweglichkeit"
 
 #: ../src/gui/status.cpp:282
-#, fuzzy
 msgid "Vitality"
-msgstr "Vitalität:"
+msgstr "Gesundheit"
 
 #: ../src/gui/status.cpp:283
-#, fuzzy
 msgid "Intelligence"
-msgstr "Intelligenz:"
+msgstr "Intelligenz"
 
 #: ../src/gui/status.cpp:284
-#, fuzzy
 msgid "Dexterity"
-msgstr "Geschicklichkeit:"
+msgstr "Ausdauer"
 
 #: ../src/gui/status.cpp:285
 msgid "Luck"
-msgstr ""
+msgstr "Glück"
 
 #: ../src/gui/status.cpp:303
 #, c-format
@@ -1204,12 +1191,13 @@ msgid "Remaining Status Points: %d"
 msgstr ""
 
 #: ../src/gui/trade.cpp:51
+#, fuzzy
 msgid "Trade: You"
-msgstr ""
+msgstr "Handeln"
 
 #: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
-msgstr ""
+msgstr "Handeln"
 
 #: ../src/gui/trade.cpp:63
 msgid "Add"
@@ -1235,11 +1223,11 @@ msgstr ""
 
 #: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
-msgstr ""
+msgstr "Aktualisiere..."
 
 #: ../src/gui/updatewindow.cpp:115
 msgid "Play"
-msgstr ""
+msgstr "Los!"
 
 #: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
@@ -1281,7 +1269,7 @@ msgstr ""
 
 #: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
-msgstr ""
+msgstr "Fertig"
 
 #: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
 msgid "Message"
@@ -1301,8 +1289,9 @@ msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
 #: ../src/net/playerhandler.cpp:220
+#, fuzzy
 msgid "You are not that alive anymore."
-msgstr ""
+msgstr "Du kannst dies momentan nicht tun!"
 
 #: ../src/net/playerhandler.cpp:221
 msgid "The cold hands of the grim reaper are grabbing for your soul."
@@ -1457,7 +1446,7 @@ msgstr ""
 #: ../src/net/tradehandler.cpp:127
 #, fuzzy
 msgid "Trade with "
-msgstr "@@trade|Mit %s handeln@@"
+msgstr "Handeln"
 
 #: ../src/net/tradehandler.cpp:128
 #, fuzzy
@@ -1484,12 +1473,14 @@ msgid "Failed adding item for unknown reason."
 msgstr ""
 
 #: ../src/net/tradehandler.cpp:207
+#, fuzzy
 msgid "Trade canceled."
-msgstr ""
+msgstr "Handel fehlgeschlagen!"
 
 #: ../src/net/tradehandler.cpp:214
+#, fuzzy
 msgid "Trade completed."
-msgstr ""
+msgstr "Fertig"
 
 #: ../src/resources/colordb.cpp:56
 #, c-format
@@ -1536,8 +1527,9 @@ msgid "Initializing item database..."
 msgstr ""
 
 #: ../src/resources/itemdb.cpp:56
+#, fuzzy
 msgid "Unknown item"
-msgstr ""
+msgstr "Unbekannter Befehl"
 
 #: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
@@ -1558,7 +1550,7 @@ msgstr ""
 
 #: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
-msgstr ""
+msgstr "Unbenannt"
 
 #: ../src/resources/itemdb.cpp:146
 #, c-format
@@ -1580,8 +1572,9 @@ msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
 
 #: ../src/resources/monsterdb.cpp:44
+#, fuzzy
 msgid "unnamed"
-msgstr ""
+msgstr "Unbenannt"
 
 #: ../src/resources/monsterdb.cpp:46
 msgid "Initializing monster database..."
@@ -1633,8 +1626,9 @@ msgid "Screenshot saved to ~/"
 msgstr ""
 
 #: ../src/game.cpp:399
+#, fuzzy
 msgid "Saving screenshot failed!"
-msgstr ""
+msgstr "Sitzen fehlgeschlagen!"
 
 #: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
@@ -1797,7 +1791,7 @@ msgstr ""
 #: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
-msgstr "Verbinde..."
+msgstr "Verbinde zu [account server]..."
 
 #: ../src/main.cpp:616
 #, c-format
@@ -1807,7 +1801,7 @@ msgstr ""
 #: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
-msgstr "Verbinde..."
+msgstr "Verbinde zu [character server]..."
 
 #: ../src/main.cpp:692
 #, c-format
@@ -1817,7 +1811,7 @@ msgstr ""
 #: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
-msgstr "Verbinde..."
+msgstr "Verbinde zu [map server]..."
 
 #: ../src/main.cpp:699
 #, fuzzy, c-format
@@ -1834,17 +1828,16 @@ msgid "Got disconnected from server!"
 msgstr ""
 
 #: ../src/main.cpp:1067
-#, fuzzy
 msgid "Connecting to map server..."
-msgstr "Verbinde..."
+msgstr "Verbinde zu [map server]..."
 
 #: ../src/main.cpp:1075
 msgid "Connecting to character server..."
-msgstr ""
+msgstr "Verbinde zu [character server]..."
 
 #: ../src/main.cpp:1083
 msgid "Connecting to account server..."
-msgstr ""
+msgstr "Verbinde zu [account server]..."
 
 #: ../src/party.cpp:55
 msgid "Not yet implemented!"
@@ -1867,8 +1860,9 @@ msgid "Party successfully created."
 msgstr ""
 
 #: ../src/party.cpp:97
+#, fuzzy
 msgid "Could not create party."
-msgstr ""
+msgstr "Konnte nichts stehlen..."
 
 #: ../src/party.cpp:106
 #, c-format
@@ -1988,55 +1982,23 @@ msgid "This command causes the player to leave the party."
 msgstr ""
 
 #: ../src/party.cpp:219
+#, fuzzy
 msgid "Unknown /party command."
-msgstr ""
+msgstr "Unbekannter Befehl."
 
 #: ../src/party.cpp:220
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Color:"
-#~ msgstr "Haarfarbe"
-
-#, fuzzy
-#~ msgid "Description:"
-#~ msgstr "Beschreibung: %s"
-
-#, fuzzy
-#~ msgid "Effect:"
-#~ msgstr "Effekt: %s"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "Name :"
-
-#, fuzzy
-#~ msgid "Effect: "
-#~ msgstr "Effekt: %s"
-
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "Beschreibung: %s"
-
 #~ msgid "Remember Username"
 #~ msgstr "Benutzernamen merken"
 
-#~ msgid "Account and Character Management"
-#~ msgstr "Account- und Charakterverwaltung"
+#~ msgid "Change"
+#~ msgstr "Ändern"
 
 #~ msgid "Unregister"
 #~ msgstr "Abmelden"
 
-#~ msgid "Change Password"
-#~ msgstr "Kennwort ändern"
-
-#~ msgid "Change Email Address"
-#~ msgstr "Email-Adresse ändern"
-
-#~ msgid "Account: %s"
-#~ msgstr "Account: %s"
-
 #~ msgid "Willpower:"
 #~ msgstr "Willenskraft:"
 
@@ -2058,15 +2020,6 @@ msgstr ""
 #~ msgid "Select amount of items to split."
 #~ msgstr "Wähle aus, wieviel Gegenstände Du aufteilen möchtest."
 
-#~ msgid "Guilds"
-#~ msgstr "Gilden"
-
-#~ msgid "@@guild|Invite %s@@"
-#~ msgstr "@@guild|%s einladen@@"
-
-#~ msgid "@@party|Invite %s to join your party@@"
-#~ msgstr "@@party|%s in deine Gruppe einladen@@"
-
 #~ msgid "@@split|Split@@"
 #~ msgstr "@@split|Aufteilen@@"
 
@@ -2085,18 +2038,12 @@ msgstr ""
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Bitte die Adresse und den Port eines Servers eingeben"
 
-#~ msgid "Visible names"
-#~ msgstr "Sichtbare Namen"
-
 #~ msgid "Propose trade"
 #~ msgstr "Handel vorschlagen"
 
 #~ msgid "Confirm trade"
 #~ msgstr "Handel bestätigen"
 
-#~ msgid "Change"
-#~ msgstr "Ändern"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
@@ -2111,3 +2058,27 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Gesamtgewicht : %d - Maximales Gewicht : %d"
+
+#~ msgid "Account and Character Management"
+#~ msgstr "Account- und Charakterverwaltung"
+
+#~ msgid "Change Password"
+#~ msgstr "Kennwort ändern"
+
+#~ msgid "Change Email Address"
+#~ msgstr "Email-Adresse ändern"
+
+#~ msgid "Account: %s"
+#~ msgstr "Account: %s"
+
+#~ msgid "Guilds"
+#~ msgstr "Gilden"
+
+#~ msgid "@@guild|Invite %s@@"
+#~ msgstr "@@guild|%s einladen@@"
+
+#~ msgid "@@party|Invite %s to join your party@@"
+#~ msgstr "@@party|%s in deine Gruppe einladen@@"
+
+#~ msgid "Visible names"
+#~ msgstr "Sichtbare Namen"
diff --git a/po/en_GB.po b/po/en_GB.po
index f57e117b..e12513a5 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2008-05-10 16:51+0000\n"
 "Last-Translator: Me <Glich.Glich@googlemail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -1452,9 +1452,8 @@ msgid "Trade: You and "
 msgstr ""
 
 #: ../src/net/tradehandler.cpp:127
-#, fuzzy
 msgid "Trade with "
-msgstr "@@trade|Trade With %s@@"
+msgstr ""
 
 #: ../src/net/tradehandler.cpp:128
 #, fuzzy
@@ -1992,29 +1991,6 @@ msgstr ""
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#~ msgid "Color:"
-#~ msgstr "Colour:"
-
-#, fuzzy
-#~ msgid "Description:"
-#~ msgstr "Description: %s"
-
-#, fuzzy
-#~ msgid "Effect:"
-#~ msgstr "Effect: %s"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "Name:"
-
-#, fuzzy
-#~ msgid "Effect: "
-#~ msgstr "Effect: %s"
-
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "Description: %s"
-
 #~ msgid "Unregister"
 #~ msgstr "Unregister"
 
diff --git a/po/eo.po b/po/eo.po
index 3fe64f4c..d28a0524 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2008-11-10 22:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
diff --git a/po/es.po b/po/es.po
index e7336e21..4c720088 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2008-10-15 01:37+0000\n"
 "Last-Translator: catalania <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -832,9 +832,8 @@ msgid "Keyboard"
 msgstr "Teclado"
 
 #: ../src/gui/setup.cpp:97
-#, fuzzy
 msgid "Colors"
-msgstr "Color de pelo:"
+msgstr ""
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
@@ -1453,9 +1452,8 @@ msgid "Trade: You and "
 msgstr ""
 
 #: ../src/net/tradehandler.cpp:127
-#, fuzzy
 msgid "Trade with "
-msgstr "@@trade|Comerciar con %s@@"
+msgstr ""
 
 #: ../src/net/tradehandler.cpp:128
 #, fuzzy
@@ -1993,30 +1991,6 @@ msgstr ""
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Color:"
-#~ msgstr "Color de pelo:"
-
-#, fuzzy
-#~ msgid "Description:"
-#~ msgstr "Descripción: %s"
-
-#, fuzzy
-#~ msgid "Effect:"
-#~ msgstr "Efecto: %s"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "Nombre:"
-
-#, fuzzy
-#~ msgid "Effect: "
-#~ msgstr "Efecto: %s"
-
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "Descripción: %s"
-
 #~ msgid "Unregister"
 #~ msgstr "Cancelar Cuenta"
 
diff --git a/po/fi.po b/po/fi.po
index b0d0a060..b8d3135e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2008-12-30 10:23+0000\n"
 "Last-Translator: ville-v <villev90@gmail.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -833,9 +833,8 @@ msgid "Keyboard"
 msgstr "Näppäimistö"
 
 #: ../src/gui/setup.cpp:97
-#, fuzzy
 msgid "Colors"
-msgstr "Hiusten väri:"
+msgstr ""
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
@@ -1454,9 +1453,8 @@ msgid "Trade: You and "
 msgstr ""
 
 #: ../src/net/tradehandler.cpp:127
-#, fuzzy
 msgid "Trade with "
-msgstr "@@trade|Vaihda tavaroita %s kanssa@@"
+msgstr ""
 
 #: ../src/net/tradehandler.cpp:128
 #, fuzzy
@@ -1994,30 +1992,6 @@ msgstr ""
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Color:"
-#~ msgstr "Hiusten väri:"
-
-#, fuzzy
-#~ msgid "Description:"
-#~ msgstr "Kuvaus: %s"
-
-#, fuzzy
-#~ msgid "Effect:"
-#~ msgstr "Vaikutus: %s"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "Nimi:"
-
-#, fuzzy
-#~ msgid "Effect: "
-#~ msgstr "Vaikutus: %s"
-
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "Kuvaus: %s"
-
 #~ msgid "Remember Username"
 #~ msgstr "Muista käyttäjätunnus"
 
diff --git a/po/fr.po b/po/fr.po
index c022f93f..ffd28301 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2008-12-26 10:43+0000\n"
 "Last-Translator: Johan Serre <Unknown>\n"
 "Language-Team: French\n"
@@ -833,9 +833,8 @@ msgid "Keyboard"
 msgstr "Clavier"
 
 #: ../src/gui/setup.cpp:97
-#, fuzzy
 msgid "Colors"
-msgstr "Couleur des cheveux"
+msgstr ""
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
@@ -1458,9 +1457,8 @@ msgid "Trade: You and "
 msgstr ""
 
 #: ../src/net/tradehandler.cpp:127
-#, fuzzy
 msgid "Trade with "
-msgstr "@@trade|Troquer avec %s@@"
+msgstr ""
 
 #: ../src/net/tradehandler.cpp:128
 #, fuzzy
@@ -1998,30 +1996,6 @@ msgstr ""
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Color:"
-#~ msgstr "Couleur des cheveux"
-
-#, fuzzy
-#~ msgid "Description:"
-#~ msgstr "Description : %s"
-
-#, fuzzy
-#~ msgid "Effect:"
-#~ msgstr "Effet : %s"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "Nom :"
-
-#, fuzzy
-#~ msgid "Effect: "
-#~ msgstr "Effet : %s"
-
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "Description : %s"
-
 #~ msgid "Remember Username"
 #~ msgstr "Se souvenir du nom d'utilisateur"
 
diff --git a/po/he.po b/po/he.po
index 977c53ff..c0106af9 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2008-10-20 00:23+0000\n"
 "Last-Translator: Ddorda <d.dorda@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -833,9 +833,8 @@ msgid "Keyboard"
 msgstr "מקלדת"
 
 #: ../src/gui/setup.cpp:97
-#, fuzzy
 msgid "Colors"
-msgstr "צבע שיער:"
+msgstr ""
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
@@ -1454,9 +1453,8 @@ msgid "Trade: You and "
 msgstr ""
 
 #: ../src/net/tradehandler.cpp:127
-#, fuzzy
 msgid "Trade with "
-msgstr "@@trade|סחור עם %s@@"
+msgstr ""
 
 #: ../src/net/tradehandler.cpp:128
 #, fuzzy
@@ -1994,30 +1992,6 @@ msgstr ""
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Color:"
-#~ msgstr "צבע שיער:"
-
-#, fuzzy
-#~ msgid "Description:"
-#~ msgstr "תיאור: %s"
-
-#, fuzzy
-#~ msgid "Effect:"
-#~ msgstr "השפעה: %s"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "שם:"
-
-#, fuzzy
-#~ msgid "Effect: "
-#~ msgstr "השפעה: %s"
-
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "תיאור: %s"
-
 #~ msgid "Remember Username"
 #~ msgstr "זכור שם משתמש"
 
diff --git a/po/hr.po b/po/hr.po
index d58b5edb..b063a02d 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2008-12-28 23:36+0000\n"
 "Last-Translator: Dino Paskvan <dpaskvan@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -826,9 +826,8 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-#, fuzzy
 msgid "Colors"
-msgstr "Boja kose:"
+msgstr ""
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
@@ -1979,30 +1978,6 @@ msgstr ""
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Color:"
-#~ msgstr "Boja kose:"
-
-#, fuzzy
-#~ msgid "Description:"
-#~ msgstr "Opis: %s"
-
-#, fuzzy
-#~ msgid "Effect:"
-#~ msgstr "Učinak: %s"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "Ime:"
-
-#, fuzzy
-#~ msgid "Effect: "
-#~ msgstr "Učinak: %s"
-
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "Opis: %s"
-
 #~ msgid "Remember Username"
 #~ msgstr "Zapamti korisničko ime"
 
diff --git a/po/id.po b/po/id.po
index 5404910e..bad76619 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2008-03-26 09:11+0000\n"
 "Last-Translator: ActiveFile <activefile@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -832,9 +832,8 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-#, fuzzy
 msgid "Colors"
-msgstr "Warna Rambut:"
+msgstr ""
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
@@ -1453,9 +1452,8 @@ msgid "Trade: You and "
 msgstr ""
 
 #: ../src/net/tradehandler.cpp:127
-#, fuzzy
 msgid "Trade with "
-msgstr "@@trade|Dagang Dengan %s@@"
+msgstr ""
 
 #: ../src/net/tradehandler.cpp:128
 #, fuzzy
@@ -1993,30 +1991,6 @@ msgstr ""
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Color:"
-#~ msgstr "Warna Rambut:"
-
-#, fuzzy
-#~ msgid "Description:"
-#~ msgstr "Deskripsi: %s"
-
-#, fuzzy
-#~ msgid "Effect:"
-#~ msgstr "Efek: %s"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "Nama:"
-
-#, fuzzy
-#~ msgid "Effect: "
-#~ msgstr "Efek: %s"
-
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "Deskripsi: %s"
-
 #~ msgid "Unregister"
 #~ msgstr "Tidak terdaftar"
 
diff --git a/po/it.po b/po/it.po
index e04ef0dc..da6b668a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2007-12-03 01:45+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Italian\n"
@@ -834,9 +834,8 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-#, fuzzy
 msgid "Colors"
-msgstr "Colore Capelli"
+msgstr ""
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
@@ -1455,9 +1454,8 @@ msgid "Trade: You and "
 msgstr ""
 
 #: ../src/net/tradehandler.cpp:127
-#, fuzzy
 msgid "Trade with "
-msgstr "@@trade|Scambia Con %s@@"
+msgstr ""
 
 #: ../src/net/tradehandler.cpp:128
 #, fuzzy
@@ -1995,30 +1993,6 @@ msgstr ""
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Color:"
-#~ msgstr "Colore Capelli"
-
-#, fuzzy
-#~ msgid "Description:"
-#~ msgstr "Descrizione : %s"
-
-#, fuzzy
-#~ msgid "Effect:"
-#~ msgstr "Effetto : %s"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "Nome :"
-
-#, fuzzy
-#~ msgid "Effect: "
-#~ msgstr "Effetto : %s"
-
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "Descrizione : %s"
-
 #~ msgid "Unregister"
 #~ msgstr "Cancella registrazione"
 
diff --git a/po/ja.po b/po/ja.po
index e1308cef..032fdf5e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2008-06-28 16:27+0000\n"
 "Last-Translator: fate <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -827,9 +827,8 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-#, fuzzy
 msgid "Colors"
-msgstr "髪の色："
+msgstr ""
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
@@ -1978,30 +1977,6 @@ msgstr ""
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Color:"
-#~ msgstr "髪の色："
-
-#, fuzzy
-#~ msgid "Description:"
-#~ msgstr "名状: %s"
-
-#, fuzzy
-#~ msgid "Effect:"
-#~ msgstr "効用: %s"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "名前:"
-
-#, fuzzy
-#~ msgid "Effect: "
-#~ msgstr "効用: %s"
-
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "名状: %s"
-
 #~ msgid "Unregister"
 #~ msgstr "登録削除"
 
diff --git a/po/nl.po b/po/nl.po
index 3cfcb63c..f1ddc094 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
-"PO-Revision-Date: 2008-10-10 00:04+0000\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
+"PO-Revision-Date: 2009-01-18 16:53+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Dutch\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Launchpad-Export-Date: 2009-01-25 22:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
@@ -45,13 +45,12 @@ msgid "Effect: %s"
 msgstr "Effect: %s"
 
 #: ../src/gui/buysell.cpp:30
-#, fuzzy
 msgid "Shop"
-msgstr "Stoppen"
+msgstr "Winkel"
 
 #: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
-msgstr ""
+msgstr "Verkopen"
 
 #: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:98
 #: ../src/gui/char_select.cpp:265 ../src/gui/char_server.cpp:59
@@ -95,9 +94,9 @@ msgstr "Level: %d"
 
 #: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
 #: ../src/gui/char_select.cpp:188
-#, fuzzy, c-format
+#, c-format
 msgid "Job Level: %d"
-msgstr "Level: %d"
+msgstr ""
 
 #: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
@@ -123,12 +122,12 @@ msgstr "Verwijderen"
 #: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
 #: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
-msgstr "Oké"
+msgstr "OK"
 
 #: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
-msgstr ""
+msgstr "Goud: %d"
 
 #: ../src/gui/char_select.cpp:247
 msgid "Create Character"
@@ -152,15 +151,14 @@ msgid "Create"
 msgstr "Aanmaken"
 
 #: ../src/gui/char_server.cpp:51
-#, fuzzy
 msgid "Select Server"
-msgstr "Kies Personage"
+msgstr "Server Selecteren"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
 #: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
 #: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
@@ -169,13 +167,14 @@ msgid "Chat"
 msgstr "Aanmaken"
 
 #: ../src/gui/chat.cpp:152
+#, fuzzy
 msgid "Global announcement: "
-msgstr ""
+msgstr "/announce: Globale aankondiging (alleen voor GM)"
 
 #: ../src/gui/chat.cpp:157
-#, c-format
+#, fuzzy, c-format
 msgid "Global announcement from %s: "
-msgstr ""
+msgstr "/announce: Globale aankondiging (alleen voor GM)"
 
 #: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
@@ -233,7 +232,7 @@ msgstr ""
 
 #: ../src/gui/chat.cpp:604
 msgid "Unknown command"
-msgstr ""
+msgstr "Onbekende opdracht"
 
 #: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
@@ -245,7 +244,7 @@ msgstr ""
 
 #: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
-msgstr ""
+msgstr "Zitten niet mogelijk!"
 
 #: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
@@ -281,7 +280,7 @@ msgstr ""
 
 #: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
-msgstr ""
+msgstr "Het ziet ernaar uit dat je meer geld nodig hebt... ;-)"
 
 #: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
@@ -297,7 +296,7 @@ msgstr ""
 
 #: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
-msgstr ""
+msgstr "Je draagt teveel bij je om dit te doen!"
 
 #: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
@@ -338,7 +337,7 @@ msgstr ""
 
 #: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
-msgstr ""
+msgstr "/announce: Globale aankondiging (alleen voor GM)"
 
 #: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
@@ -374,7 +373,7 @@ msgstr ""
 
 #: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
-msgstr ""
+msgstr "/who: Geef het aantal online gebruikers weer"
 
 #: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
@@ -382,7 +381,7 @@ msgstr ""
 
 #: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
-msgstr ""
+msgstr "Commando: /announce <msg>"
 
 #: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
@@ -394,7 +393,7 @@ msgstr ""
 
 #: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
-msgstr ""
+msgstr "Commando: /clear"
 
 #: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
@@ -402,7 +401,7 @@ msgstr ""
 
 #: ../src/gui/chat.cpp:828
 msgid "Command: /help"
-msgstr ""
+msgstr "Commando: /help"
 
 #: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
@@ -410,15 +409,16 @@ msgstr ""
 
 #: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
-msgstr ""
+msgstr "Commando: /help <commando>"
 
 #: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
 msgstr ""
 
 #: ../src/gui/chat.cpp:840
+#, fuzzy
 msgid "Command: /present"
-msgstr ""
+msgstr "Commando: /where"
 
 #: ../src/gui/chat.cpp:841
 msgid ""
@@ -427,8 +427,9 @@ msgid ""
 msgstr ""
 
 #: ../src/gui/chat.cpp:851
+#, fuzzy
 msgid "Command: /toggle <state>"
-msgstr ""
+msgstr "Commando: /announce <msg>"
 
 #: ../src/gui/chat.cpp:852
 msgid ""
@@ -443,8 +444,9 @@ msgid ""
 msgstr ""
 
 #: ../src/gui/chat.cpp:858
+#, fuzzy
 msgid "Command: /toggle"
-msgstr ""
+msgstr "Commando: /clear"
 
 #: ../src/gui/chat.cpp:859
 msgid "This command displays the return toggle status."
@@ -452,15 +454,16 @@ msgstr ""
 
 #: ../src/gui/chat.cpp:863
 msgid "Command: /where"
-msgstr ""
+msgstr "Commando: /where"
 
 #: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
 msgstr ""
 
 #: ../src/gui/chat.cpp:869
+#, fuzzy
 msgid "Command: /msg <nick> <msg>"
-msgstr ""
+msgstr "Commando: /announce <msg>"
 
 #: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
@@ -492,19 +495,21 @@ msgstr ""
 
 #: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
-msgstr ""
+msgstr "Type /help voor een lijst van commando's."
 
 #: ../src/gui/colour.cpp:33
 msgid "GM"
 msgstr ""
 
 #: ../src/gui/colour.cpp:34
+#, fuzzy
 msgid "Player"
-msgstr ""
+msgstr "Spelers"
 
 #: ../src/gui/colour.cpp:35
+#, fuzzy
 msgid "Whisper"
-msgstr ""
+msgstr "%s fluistert:"
 
 #: ../src/gui/colour.cpp:36
 msgid "Is"
@@ -513,7 +518,7 @@ msgstr ""
 #: ../src/gui/colour.cpp:37
 #, fuzzy
 msgid "Party"
-msgstr "Poort:"
+msgstr "Spelen"
 
 #: ../src/gui/colour.cpp:38
 #, fuzzy
@@ -565,7 +570,7 @@ msgstr ""
 
 #: ../src/gui/help.cpp:43
 msgid "Close"
-msgstr ""
+msgstr "Sluiten"
 
 #: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
@@ -578,9 +583,9 @@ msgstr "Neerleggen"
 
 #. Adjust widgets
 #: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
-#, c-format
+#, fuzzy, c-format
 msgid "Weight: %d  g / %d g"
-msgstr ""
+msgstr "Gewicht: %d / %d"
 
 #: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
 #, c-format
@@ -609,7 +614,7 @@ msgstr "Inloggen"
 
 #: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
-msgstr "Wachtword:"
+msgstr "Wachtwoord:"
 
 #: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
 msgid "Port:"
@@ -640,7 +645,7 @@ msgstr "Vaardigheden"
 
 #: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
-msgstr ""
+msgstr "Sneltoets"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
 #: ../src/gui/setup.cpp:52 ../src/main.cpp:787
@@ -724,9 +729,8 @@ msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|%s oppakken@@"
 
 #: ../src/gui/popupmenu.cpp:298
-#, fuzzy
 msgid "@@use|Unequip@@"
-msgstr "@@use|Uitrusten@@"
+msgstr ""
 
 #: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
@@ -754,11 +758,11 @@ msgstr "Bevestigen:"
 
 #: ../src/gui/register.cpp:90
 msgid "Male"
-msgstr ""
+msgstr "Mannelijk"
 
 #: ../src/gui/register.cpp:91
 msgid "Female"
-msgstr ""
+msgstr "Vrouwelijk"
 
 #: ../src/gui/register.cpp:159
 #, c-format
@@ -829,16 +833,16 @@ msgstr "Joystick"
 
 #: ../src/gui/setup.cpp:93
 msgid "Keyboard"
-msgstr ""
+msgstr "Toetsenbord"
 
 #: ../src/gui/setup.cpp:97
 #, fuzzy
 msgid "Colors"
-msgstr "Haarkleur:"
+msgstr "Sluiten"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
-msgstr ""
+msgstr "Spelers"
 
 #: ../src/gui/setup_colours.cpp:53
 msgid "Red: "
@@ -874,12 +878,11 @@ msgstr "Maak rondjes met de stick"
 
 #: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
-msgstr ""
+msgstr "Toewijzen"
 
 #: ../src/gui/setup_keyboard.cpp:91
-#, fuzzy
 msgid "Default"
-msgstr "Verwijderen"
+msgstr "Standaard"
 
 #: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
@@ -890,21 +893,20 @@ msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
 #: ../src/gui/setup_players.cpp:54
-#, fuzzy
 msgid "Name"
-msgstr "Naam:"
+msgstr "Naam"
 
 #: ../src/gui/setup_players.cpp:55
 msgid "Relation"
-msgstr ""
+msgstr "Relatie"
 
 #: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
-msgstr ""
+msgstr "Neutraal"
 
 #: ../src/gui/setup_players.cpp:60
 msgid "Friend"
-msgstr ""
+msgstr "Vriend"
 
 #: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
@@ -912,7 +914,7 @@ msgstr ""
 
 #: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
-msgstr ""
+msgstr "Genegeerd"
 
 #: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
@@ -1006,11 +1008,11 @@ msgstr "hoog"
 
 #: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
-msgstr ""
+msgstr "gemiddeld"
 
 #: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
-msgstr ""
+msgstr "max"
 
 #: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
@@ -1106,31 +1108,30 @@ msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
-#, fuzzy, c-format
+#, c-format
 msgid "Job: %d"
-msgstr "Level: %d"
+msgstr ""
 
 #: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
-#, fuzzy, c-format
+#, c-format
 msgid "Money: %d GP"
-msgstr "Geld: %d"
+msgstr "Geld: %d GP"
 
 #. ----------------------
 #. Stats Part
 #. ----------------------
 #. Static Labels
 #: ../src/gui/status.cpp:125
-#, fuzzy
 msgid "Stats"
-msgstr "Status"
+msgstr ""
 
 #: ../src/gui/status.cpp:126
 msgid "Total"
-msgstr ""
+msgstr "Totaal"
 
 #: ../src/gui/status.cpp:127
 msgid "Cost"
-msgstr ""
+msgstr "Kosten"
 
 #. Derived Stats
 #: ../src/gui/status.cpp:130
@@ -1164,29 +1165,24 @@ msgid "% Reflex:"
 msgstr ""
 
 #: ../src/gui/status.cpp:280
-#, fuzzy
 msgid "Strength"
-msgstr "Sterkte:"
+msgstr ""
 
 #: ../src/gui/status.cpp:281
-#, fuzzy
 msgid "Agility"
-msgstr "Agiliteit:"
+msgstr ""
 
 #: ../src/gui/status.cpp:282
-#, fuzzy
 msgid "Vitality"
-msgstr "Vitaliteit:"
+msgstr ""
 
 #: ../src/gui/status.cpp:283
-#, fuzzy
 msgid "Intelligence"
-msgstr "Intelligentie:"
+msgstr ""
 
 #: ../src/gui/status.cpp:284
-#, fuzzy
 msgid "Dexterity"
-msgstr "Dexteriteit:"
+msgstr ""
 
 #: ../src/gui/status.cpp:285
 msgid "Luck"
@@ -1207,12 +1203,12 @@ msgstr ""
 
 #: ../src/gui/trade.cpp:63
 msgid "Add"
-msgstr ""
+msgstr "Toevoegen"
 
 #: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
 #, c-format
 msgid "You get %d GP."
-msgstr ""
+msgstr "Jij krijgt %d GP."
 
 #: ../src/gui/trade.cpp:83
 msgid "You give:"
@@ -1229,11 +1225,11 @@ msgstr ""
 
 #: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
-msgstr ""
+msgstr "Actualiseren..."
 
 #: ../src/gui/updatewindow.cpp:115
 msgid "Play"
-msgstr ""
+msgstr "Spelen"
 
 #: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
@@ -1275,7 +1271,7 @@ msgstr ""
 
 #: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
-msgstr ""
+msgstr "Voltooid"
 
 #: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
 msgid "Message"
@@ -1449,9 +1445,8 @@ msgid "Trade: You and "
 msgstr ""
 
 #: ../src/net/tradehandler.cpp:127
-#, fuzzy
 msgid "Trade with "
-msgstr "@@trade|Handelen met %s@@"
+msgstr ""
 
 #: ../src/net/tradehandler.cpp:128
 #, fuzzy
@@ -1482,8 +1477,9 @@ msgid "Trade canceled."
 msgstr ""
 
 #: ../src/net/tradehandler.cpp:214
+#, fuzzy
 msgid "Trade completed."
-msgstr ""
+msgstr "Voltooid"
 
 #: ../src/resources/colordb.cpp:56
 #, c-format
@@ -1530,8 +1526,9 @@ msgid "Initializing item database..."
 msgstr ""
 
 #: ../src/resources/itemdb.cpp:56
+#, fuzzy
 msgid "Unknown item"
-msgstr ""
+msgstr "Onbekende opdracht"
 
 #: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
@@ -1552,7 +1549,7 @@ msgstr ""
 
 #: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
-msgstr ""
+msgstr "Naamloos"
 
 #: ../src/resources/itemdb.cpp:146
 #, c-format
@@ -1574,8 +1571,9 @@ msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
 
 #: ../src/resources/monsterdb.cpp:44
+#, fuzzy
 msgid "unnamed"
-msgstr ""
+msgstr "Naamloos"
 
 #: ../src/resources/monsterdb.cpp:46
 msgid "Initializing monster database..."
@@ -1627,8 +1625,9 @@ msgid "Screenshot saved to ~/"
 msgstr ""
 
 #: ../src/game.cpp:399
+#, fuzzy
 msgid "Saving screenshot failed!"
-msgstr ""
+msgstr "Zitten niet mogelijk!"
 
 #: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
@@ -1791,7 +1790,7 @@ msgstr ""
 #: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
-msgstr "Verbinden..."
+msgstr "Verbinden met de account server..."
 
 #: ../src/main.cpp:616
 #, c-format
@@ -1801,7 +1800,7 @@ msgstr ""
 #: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
-msgstr "Verbinden..."
+msgstr "Verbinden met de karakter server..."
 
 #: ../src/main.cpp:692
 #, c-format
@@ -1811,7 +1810,7 @@ msgstr ""
 #: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
-msgstr "Verbinden..."
+msgstr "Verbinden met de map server..."
 
 #: ../src/main.cpp:699
 #, fuzzy, c-format
@@ -1825,20 +1824,19 @@ msgstr ""
 
 #: ../src/main.cpp:862
 msgid "Got disconnected from server!"
-msgstr ""
+msgstr "De verbinding met de server werd verbroken!"
 
 #: ../src/main.cpp:1067
-#, fuzzy
 msgid "Connecting to map server..."
-msgstr "Verbinden..."
+msgstr "Verbinden met de map server..."
 
 #: ../src/main.cpp:1075
 msgid "Connecting to character server..."
-msgstr ""
+msgstr "Verbinden met de karakter server..."
 
 #: ../src/main.cpp:1083
 msgid "Connecting to account server..."
-msgstr ""
+msgstr "Verbinden met de account server..."
 
 #: ../src/party.cpp:55
 msgid "Not yet implemented!"
@@ -1907,8 +1905,9 @@ msgid "/party <command> <params>: Party commands."
 msgstr ""
 
 #: ../src/party.cpp:178
+#, fuzzy
 msgid "Command: /party <command> <args>"
-msgstr ""
+msgstr "Commando: /help <commando>"
 
 #: ../src/party.cpp:179
 msgid "where <command> can be one of:"
@@ -1940,8 +1939,9 @@ msgid "Type /help party <command> for further help."
 msgstr ""
 
 #: ../src/party.cpp:192
+#, fuzzy
 msgid "Command: /party new <party-name>"
-msgstr ""
+msgstr "Commando: /announce <msg>"
 
 #: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
@@ -1966,52 +1966,35 @@ msgid ""
 msgstr ""
 
 #: ../src/party.cpp:205
+#, fuzzy
 msgid "Command: /party prefix"
-msgstr ""
+msgstr "Commando: /clear"
 
 #: ../src/party.cpp:206
 msgid "This command reports the current party prefix character."
 msgstr ""
 
 #: ../src/party.cpp:214
+#, fuzzy
 msgid "Command: /party leave"
-msgstr ""
+msgstr "Commando: /clear"
 
 #: ../src/party.cpp:215
 msgid "This command causes the player to leave the party."
 msgstr ""
 
 #: ../src/party.cpp:219
+#, fuzzy
 msgid "Unknown /party command."
-msgstr ""
+msgstr "Onbekende opdracht"
 
 #: ../src/party.cpp:220
-msgid "Type /help party for a list of options."
-msgstr ""
-
-#, fuzzy
-#~ msgid "Color:"
-#~ msgstr "Haarkleur:"
-
 #, fuzzy
-#~ msgid "Description:"
-#~ msgstr "Beschrijving: %s"
-
-#, fuzzy
-#~ msgid "Effect:"
-#~ msgstr "Effect: %s"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "Naam:"
-
-#, fuzzy
-#~ msgid "Effect: "
-#~ msgstr "Effect: %s"
+msgid "Type /help party for a list of options."
+msgstr "Type /help voor een lijst van commando's."
 
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "Beschrijving: %s"
+#~ msgid "Remember Username"
+#~ msgstr "Onthoud Naam"
 
 #~ msgid "Unregister"
 #~ msgstr "Registreren"
diff --git a/po/pl.po b/po/pl.po
index b0d0f951..6d252a09 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2008-10-10 05:26+0000\n"
 "Last-Translator: Michał Trzebiatowski <Unknown>\n"
 "Language-Team: <pl@li.org>\n"
@@ -834,9 +834,8 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-#, fuzzy
 msgid "Colors"
-msgstr "Kolor włosów:"
+msgstr ""
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
@@ -1456,9 +1455,8 @@ msgid "Trade: You and "
 msgstr ""
 
 #: ../src/net/tradehandler.cpp:127
-#, fuzzy
 msgid "Trade with "
-msgstr "@@trade|Targ z %s@@"
+msgstr ""
 
 #: ../src/net/tradehandler.cpp:128
 #, fuzzy
@@ -1996,30 +1994,6 @@ msgstr ""
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Color:"
-#~ msgstr "Kolor włosów:"
-
-#, fuzzy
-#~ msgid "Description:"
-#~ msgstr "Opis: %s"
-
-#, fuzzy
-#~ msgid "Effect:"
-#~ msgstr "Efekt: %s"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "Imię:"
-
-#, fuzzy
-#~ msgid "Effect: "
-#~ msgstr "Efekt: %s"
-
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "Opis: %s"
-
 #~ msgid "Unregister"
 #~ msgstr "Wyrejestruj"
 
diff --git a/po/pt.po b/po/pt.po
index cd7c0d70..2f9efcb9 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2008-02-03 10:14+0000\n"
 "Last-Translator: Tiago Silva <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -832,9 +832,8 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-#, fuzzy
 msgid "Colors"
-msgstr "Cor de Cabelo:"
+msgstr ""
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
@@ -1461,9 +1460,8 @@ msgid "Trade: You and "
 msgstr ""
 
 #: ../src/net/tradehandler.cpp:127
-#, fuzzy
 msgid "Trade with "
-msgstr "@@trade|Negociar com %s@@"
+msgstr ""
 
 #: ../src/net/tradehandler.cpp:128
 #, fuzzy
@@ -2001,30 +1999,6 @@ msgstr ""
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Color:"
-#~ msgstr "Cor de Cabelo:"
-
-#, fuzzy
-#~ msgid "Description:"
-#~ msgstr "Descrição: %s"
-
-#, fuzzy
-#~ msgid "Effect:"
-#~ msgstr "Efeito: %s"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "Nome:"
-
-#, fuzzy
-#~ msgid "Effect: "
-#~ msgstr "Efeito: %s"
-
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "Descrição: %s"
-
 #~ msgid "Unregister"
 #~ msgstr "Remover o Registo"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7f4bb8fa..b7a1cd10 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
-"PO-Revision-Date: 2008-12-14 21:37+0000\n"
-"Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
+"PO-Revision-Date: 2009-01-21 20:48+0000\n"
+"Last-Translator: Bruno <brunorafaelcardoso@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Launchpad-Export-Date: 2009-01-25 22:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
@@ -45,9 +45,8 @@ msgid "Effect: %s"
 msgstr "Efeito: %s"
 
 #: ../src/gui/buysell.cpp:30
-#, fuzzy
 msgid "Shop"
-msgstr "Parar"
+msgstr "Loja"
 
 #: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
@@ -69,7 +68,7 @@ msgstr "Confimar exclusão do personagem"
 
 #: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
-msgstr "Tem certeza de que deseja excluir este personagem?"
+msgstr "Tem certeza que deseja excluir este personagem?"
 
 #: ../src/gui/char_select.cpp:81
 msgid "Select Character"
@@ -95,9 +94,9 @@ msgstr "Nível: %d"
 
 #: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
 #: ../src/gui/char_select.cpp:188
-#, fuzzy, c-format
+#, c-format
 msgid "Job Level: %d"
-msgstr "Nível: %d"
+msgstr "Nível de Trabalho: %d"
 
 #: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
@@ -128,7 +127,7 @@ msgstr "Ok"
 #: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
-msgstr ""
+msgstr "Ouro: %d"
 
 #: ../src/gui/char_select.cpp:247
 msgid "Create Character"
@@ -152,15 +151,14 @@ msgid "Create"
 msgstr "Criar"
 
 #: ../src/gui/char_server.cpp:51
-#, fuzzy
 msgid "Select Server"
-msgstr "Selecionar personagem"
+msgstr "Selecionar Servidor"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
 #: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
 #: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
@@ -169,13 +167,14 @@ msgid "Chat"
 msgstr "Criar"
 
 #: ../src/gui/chat.cpp:152
+#, fuzzy
 msgid "Global announcement: "
-msgstr ""
+msgstr "Anúncio geral:"
 
 #: ../src/gui/chat.cpp:157
-#, c-format
+#, fuzzy, c-format
 msgid "Global announcement from %s: "
-msgstr ""
+msgstr "Anúncio geral de %s:"
 
 #: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
@@ -184,7 +183,7 @@ msgstr "Servidor:"
 #: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
-msgstr ""
+msgstr "Sussurrando para %s: %s"
 
 #: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
@@ -233,87 +232,87 @@ msgstr ""
 
 #: ../src/gui/chat.cpp:604
 msgid "Unknown command"
-msgstr ""
+msgstr "Comando desconhecido"
 
 #: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
-msgstr ""
+msgstr "Falha na negociação!"
 
 #: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
-msgstr ""
+msgstr "Falha no Emote!"
 
 #: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
-msgstr ""
+msgstr "Falha ao sentar!"
 
 #: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
-msgstr ""
+msgstr "Falha ao criar Chat!"
 
 #: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
-msgstr ""
+msgstr "Impossivel entrar no grupo!"
 
 #: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
-msgstr ""
+msgstr "Impossivel gritar!"
 
 #: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
-msgstr ""
+msgstr "Você ainda não tem nivel necessário!"
 
 #: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
-msgstr ""
+msgstr "HP insuficiente!"
 
 #: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
-msgstr ""
+msgstr "SP insuficiente!"
 
 #: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
-msgstr ""
+msgstr "Você não tem nenhuma nota armazenada"
 
 #: ../src/gui/chat.cpp:652
 msgid "You cannot do that right now!"
-msgstr ""
+msgstr "Você não pode fazer isso agora!"
 
 #: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
-msgstr ""
+msgstr "Parece que você precisa de mais Zenyz... ;-)"
 
 #: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr ""
+msgstr "Você não pode usar essa Skill com esse tipo de arma."
 
 #: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
-msgstr ""
+msgstr "Você precisa de outra gema vermelha!"
 
 #: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
-msgstr ""
+msgstr "Você precisa de outra gema azul!"
 
 #: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
-msgstr ""
+msgstr "Você está com muita carga para fazer isso!"
 
 #: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
-msgstr ""
+msgstr "Hã? O que é isso?"
 
 #: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
-msgstr ""
+msgstr "Falha ao transportar..."
 
 #: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
-msgstr ""
+msgstr "Não foi possível roubar nada..."
 
 #: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
-msgstr ""
+msgstr "Veneno não surtiu efeito..."
 
 #: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
@@ -334,23 +333,24 @@ msgstr "Trocando OpenGL"
 
 #: ../src/gui/chat.cpp:794
 msgid "-- Help --"
-msgstr ""
+msgstr "--Ajuda--"
 
 #: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
-msgstr ""
+msgstr "/announce: Aviso geral (Apenas GM)"
 
 #: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
-msgstr ""
+msgstr "/clear: limpa esta janela"
 
 #: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
-msgstr ""
+msgstr "/help: Mostra esta ajuda"
 
 #: ../src/gui/chat.cpp:801
+#, fuzzy
 msgid "/msg <nick> <message>: Alternate form for /whisper"
-msgstr ""
+msgstr "/w <nick> <mensagem>: Forma mais curta para /whisper"
 
 #: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
@@ -362,63 +362,64 @@ msgstr ""
 
 #: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
-msgstr ""
+msgstr "/where: mostra o nome do mapa"
 
 #: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
-msgstr ""
+msgstr "/w <nick> <mensagem>: Forma mais curta para /whisper"
 
 #: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
-msgstr ""
+msgstr "/whisper <nick> <mensagem>: Envia uma mensagem particular"
 
 #: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
-msgstr ""
+msgstr "/who Mostra os jogadores online"
 
 #: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
-msgstr ""
+msgstr "Para mais informações, digite /help <comando>"
 
 #: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
-msgstr ""
+msgstr "Comandos: /announce <msg>"
 
 #: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
-msgstr ""
+msgstr "*** Disponivel apenas para GM's ***"
 
 #: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
+msgstr "Este comando envia uma mensagem <msg> para todos os jogadores online."
 
 #: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
-msgstr ""
+msgstr "Comandos: /clear"
 
 #: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
-msgstr ""
+msgstr "Limpa os logs do chat anterior."
 
 #: ../src/gui/chat.cpp:828
 msgid "Command: /help"
-msgstr ""
+msgstr "Comando: /help"
 
 #: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
-msgstr ""
+msgstr "Exibe uma lista de todos os comandos disponiveis."
 
 #: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
-msgstr ""
+msgstr "Comando: /help <comando>"
 
 #: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
-msgstr ""
+msgstr "Exibe o conteudo de ajuda de <comando>"
 
 #: ../src/gui/chat.cpp:840
+#, fuzzy
 msgid "Command: /present"
-msgstr ""
+msgstr "Comando: /where"
 
 #: ../src/gui/chat.cpp:841
 msgid ""
@@ -427,8 +428,9 @@ msgid ""
 msgstr ""
 
 #: ../src/gui/chat.cpp:851
+#, fuzzy
 msgid "Command: /toggle <state>"
-msgstr ""
+msgstr "Comandos: /announce <msg>"
 
 #: ../src/gui/chat.cpp:852
 msgid ""
@@ -443,68 +445,73 @@ msgid ""
 msgstr ""
 
 #: ../src/gui/chat.cpp:858
+#, fuzzy
 msgid "Command: /toggle"
-msgstr ""
+msgstr "Comandos: /clear"
 
 #: ../src/gui/chat.cpp:859
+#, fuzzy
 msgid "This command displays the return toggle status."
-msgstr ""
+msgstr "Mostra o nome do mapa atual."
 
 #: ../src/gui/chat.cpp:863
 msgid "Command: /where"
-msgstr ""
+msgstr "Comando: /where"
 
 #: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
-msgstr ""
+msgstr "Mostra o nome do mapa atual."
 
 #: ../src/gui/chat.cpp:869
+#, fuzzy
 msgid "Command: /msg <nick> <msg>"
-msgstr ""
+msgstr "Comando: /w <nick> <msg>"
 
 #: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
-msgstr ""
+msgstr "Comando: /whisper <nick> <msg>"
 
 #: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
-msgstr ""
+msgstr "Comando: /w <nick> <msg>"
 
 #: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
-msgstr ""
+msgstr "Envia uma mensagem <msg> para <nick>."
 
 #: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
+msgstr "Se <nick> possuir espaços, coloque dentro de parenteses (\")."
 
 #: ../src/gui/chat.cpp:879
 msgid "Command: /who"
-msgstr ""
+msgstr "Comando: /who"
 
 #: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
-msgstr ""
+msgstr "Exibe o total de jogadores online."
 
 #: ../src/gui/chat.cpp:885
 msgid "Unknown command."
-msgstr ""
+msgstr "Comando desconhecido."
 
 #: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
-msgstr ""
+msgstr "Digite /help para uma lista de todos os comandos."
 
 #: ../src/gui/colour.cpp:33
 msgid "GM"
 msgstr ""
 
 #: ../src/gui/colour.cpp:34
+#, fuzzy
 msgid "Player"
-msgstr ""
+msgstr "Jogadores"
 
 #: ../src/gui/colour.cpp:35
+#, fuzzy
 msgid "Whisper"
-msgstr ""
+msgstr "%s sussura:"
 
 #: ../src/gui/colour.cpp:36
 msgid "Is"
@@ -513,7 +520,7 @@ msgstr ""
 #: ../src/gui/colour.cpp:37
 #, fuzzy
 msgid "Party"
-msgstr "Porta:"
+msgstr "Jogar"
 
 #: ../src/gui/colour.cpp:38
 #, fuzzy
@@ -561,11 +568,11 @@ msgstr "Equipamento"
 
 #: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
-msgstr ""
+msgstr "Ajuda"
 
 #: ../src/gui/help.cpp:43
 msgid "Close"
-msgstr ""
+msgstr "Fechar"
 
 #: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
@@ -578,14 +585,14 @@ msgstr "Descartar"
 
 #. Adjust widgets
 #: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
-#, c-format
+#, fuzzy, c-format
 msgid "Weight: %d  g / %d g"
-msgstr ""
+msgstr "Capacidade: %d / %d"
 
 #: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
 #, c-format
 msgid "Slots used: %d / %d"
-msgstr ""
+msgstr "Slots usados: %d/%d"
 
 #: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
@@ -688,8 +695,9 @@ msgid "@@friend|Befriend "
 msgstr ""
 
 #: ../src/gui/popupmenu.cpp:92
+#, fuzzy
 msgid "@@disregard|Disregard "
-msgstr ""
+msgstr "Desconsiderado"
 
 #: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
@@ -724,9 +732,8 @@ msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pegar|Pegar %s@@"
 
 #: ../src/gui/popupmenu.cpp:298
-#, fuzzy
 msgid "@@use|Unequip@@"
-msgstr "@@usar|Equipar@@"
+msgstr "@@usar|Desequipar@@"
 
 #: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
@@ -834,11 +841,11 @@ msgstr "Teclado"
 #: ../src/gui/setup.cpp:97
 #, fuzzy
 msgid "Colors"
-msgstr "Cor do Cabelo:"
+msgstr "Fechar"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
-msgstr ""
+msgstr "Jogadores"
 
 #: ../src/gui/setup_colours.cpp:53
 msgid "Red: "
@@ -870,49 +877,47 @@ msgstr "Parar"
 
 #: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
-msgstr ""
+msgstr "Gire o bastão"
 
 #: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
-msgstr ""
+msgstr "Atribuir"
 
 #: ../src/gui/setup_keyboard.cpp:91
-#, fuzzy
 msgid "Default"
-msgstr "Excluir"
+msgstr "Padrão"
 
 #: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
-msgstr ""
+msgstr "Conflitos nas teclas detectado."
 
 #: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
-msgstr ""
+msgstr "Corrija-os, ou o jogo irá se comportar de forma estranha."
 
 #: ../src/gui/setup_players.cpp:54
-#, fuzzy
 msgid "Name"
-msgstr "Nome:"
+msgstr "Nome"
 
 #: ../src/gui/setup_players.cpp:55
 msgid "Relation"
-msgstr ""
+msgstr "Relação"
 
 #: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
-msgstr ""
+msgstr "Neutro"
 
 #: ../src/gui/setup_players.cpp:60
 msgid "Friend"
-msgstr ""
+msgstr "Amigo"
 
 #: ../src/gui/setup_players.cpp:61
 msgid "Disregarded"
-msgstr ""
+msgstr "Desconsiderado"
 
 #: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
-msgstr ""
+msgstr "Ignorado"
 
 #: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
@@ -920,19 +925,19 @@ msgstr ""
 
 #: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
-msgstr ""
+msgstr "Salvar lista de jogadores"
 
 #: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
-msgstr ""
+msgstr "Permitir trocas"
 
 #: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
-msgstr ""
+msgstr "Permitir sussuros"
 
 #: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
-msgstr ""
+msgstr "Quando ignorado:"
 
 #: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
@@ -955,8 +960,9 @@ msgid "Custom cursor"
 msgstr "Cursor customizado"
 
 #: ../src/gui/setup_video.cpp:120
+#, fuzzy
 msgid "Particle effects"
-msgstr ""
+msgstr "Detalhe de partículas"
 
 #: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
@@ -976,11 +982,11 @@ msgstr "Opacidade da GUI"
 
 #: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
-msgstr ""
+msgstr "Rolar radius"
 
 #: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
-msgstr ""
+msgstr "Rolar Laziness"
 
 #: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
@@ -988,7 +994,7 @@ msgstr "Ambiente FX"
 
 #: ../src/gui/setup_video.cpp:149
 msgid "Particle Detail"
-msgstr ""
+msgstr "Detalhe de partículas"
 
 #: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
@@ -1006,11 +1012,11 @@ msgstr "alto"
 
 #: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
-msgstr ""
+msgstr "médio"
 
 #: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
-msgstr ""
+msgstr "máximo"
 
 #: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
@@ -1081,11 +1087,11 @@ msgstr "Habilidades"
 #: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
-msgstr ""
+msgstr "Pontos de habilidade: %d"
 
 #: ../src/gui/skill.cpp:140
 msgid "Up"
-msgstr ""
+msgstr "Acima"
 
 #: ../src/gui/skill.cpp:140
 msgid "inc"
@@ -1106,108 +1112,99 @@ msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
-#, fuzzy, c-format
+#, c-format
 msgid "Job: %d"
-msgstr "Nível: %d"
+msgstr "Trabalho: %d"
 
 #: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
-#, fuzzy, c-format
+#, c-format
 msgid "Money: %d GP"
-msgstr "Dinheiro: %d"
+msgstr "Dinheiro: %d GP"
 
 #. ----------------------
 #. Stats Part
 #. ----------------------
 #. Static Labels
 #: ../src/gui/status.cpp:125
-#, fuzzy
 msgid "Stats"
 msgstr "Status"
 
 #: ../src/gui/status.cpp:126
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #: ../src/gui/status.cpp:127
 msgid "Cost"
-msgstr ""
+msgstr "Custo"
 
 #. Derived Stats
 #: ../src/gui/status.cpp:130
-#, fuzzy
 msgid "Attack:"
-msgstr "Ataque %+d"
+msgstr "Ataque:"
 
 #: ../src/gui/status.cpp:131
-#, fuzzy
 msgid "Defense:"
-msgstr "Defesa %+d"
+msgstr "Defesa:"
 
 #: ../src/gui/status.cpp:132
-#, fuzzy
 msgid "M.Attack:"
-msgstr "Ataque %+d"
+msgstr "M. Ataque:"
 
 #: ../src/gui/status.cpp:133
-#, fuzzy
 msgid "M.Defense:"
-msgstr "Defesa %+d"
+msgstr "M. Defesa:"
 
 #: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
-msgstr ""
+msgstr "% Acuracidade:"
 
 #: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
-msgstr ""
+msgstr "% Evasão:"
 
 #: ../src/gui/status.cpp:136
 msgid "% Reflex:"
-msgstr ""
+msgstr "% Reflexo:"
 
 #: ../src/gui/status.cpp:280
-#, fuzzy
 msgid "Strength"
-msgstr "Força:"
+msgstr "Força"
 
 #: ../src/gui/status.cpp:281
-#, fuzzy
 msgid "Agility"
-msgstr "Agilidade:"
+msgstr "Agilidade"
 
 #: ../src/gui/status.cpp:282
-#, fuzzy
 msgid "Vitality"
-msgstr "Vitalidade:"
+msgstr "Vitalidade"
 
 #: ../src/gui/status.cpp:283
-#, fuzzy
 msgid "Intelligence"
-msgstr "Inteligência:"
+msgstr "Inteligência"
 
 #: ../src/gui/status.cpp:284
-#, fuzzy
 msgid "Dexterity"
-msgstr "Destreza:"
+msgstr "Destreza"
 
 #: ../src/gui/status.cpp:285
 msgid "Luck"
-msgstr ""
+msgstr "Sorte"
 
 #: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
-msgstr ""
+msgstr "Pontos de Status Restantes: %d"
 
 #: ../src/gui/trade.cpp:51
+#, fuzzy
 msgid "Trade: You"
-msgstr ""
+msgstr "Comércio"
 
 #: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
-msgstr ""
+msgstr "Comércio"
 
 #: ../src/gui/trade.cpp:63
 msgid "Add"
@@ -1225,6 +1222,7 @@ msgstr "Você dá:"
 #: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
+"Falha ao adicionar item. Você não pode duplicar um tipo de item na janela."
 
 #: ../src/gui/updatewindow.cpp:78
 #, c-format
@@ -1233,11 +1231,11 @@ msgstr ""
 
 #: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
-msgstr ""
+msgstr "Atualizando..."
 
 #: ../src/gui/updatewindow.cpp:115
 msgid "Play"
-msgstr ""
+msgstr "Jogar"
 
 #: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
@@ -1279,7 +1277,7 @@ msgstr ""
 
 #: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
-msgstr ""
+msgstr "Concluído"
 
 #: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
 msgid "Message"
@@ -1299,8 +1297,9 @@ msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
 #: ../src/net/playerhandler.cpp:220
+#, fuzzy
 msgid "You are not that alive anymore."
-msgstr ""
+msgstr "Você não pode fazer isso agora!"
 
 #: ../src/net/playerhandler.cpp:221
 msgid "The cold hands of the grim reaper are grabbing for your soul."
@@ -1362,13 +1361,15 @@ msgstr ""
 
 #. Monty Python reference from a couple of skits
 #: ../src/net/playerhandler.cpp:233
+#, fuzzy
 msgid "You are no more."
-msgstr ""
+msgstr "Você não tem nenhuma nota armazenada"
 
 #. Monty Python reference from the dead parrot sketch starting now
 #: ../src/net/playerhandler.cpp:234
+#, fuzzy
 msgid "You have ceased to be."
-msgstr ""
+msgstr "Você não tem nenhuma nota armazenada"
 
 #: ../src/net/playerhandler.cpp:235
 msgid "You've expired and gone to meet your maker."
@@ -1455,7 +1456,7 @@ msgstr ""
 #: ../src/net/tradehandler.cpp:127
 #, fuzzy
 msgid "Trade with "
-msgstr "@@Negociar|Negociar com %s@@"
+msgstr "Comércio"
 
 #: ../src/net/tradehandler.cpp:128
 #, fuzzy
@@ -1482,12 +1483,14 @@ msgid "Failed adding item for unknown reason."
 msgstr ""
 
 #: ../src/net/tradehandler.cpp:207
+#, fuzzy
 msgid "Trade canceled."
-msgstr ""
+msgstr "Falha na negociação!"
 
 #: ../src/net/tradehandler.cpp:214
+#, fuzzy
 msgid "Trade completed."
-msgstr ""
+msgstr "Concluído"
 
 #: ../src/resources/colordb.cpp:56
 #, c-format
@@ -1534,8 +1537,9 @@ msgid "Initializing item database..."
 msgstr ""
 
 #: ../src/resources/itemdb.cpp:56
+#, fuzzy
 msgid "Unknown item"
-msgstr ""
+msgstr "Comando desconhecido"
 
 #: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
@@ -1556,7 +1560,7 @@ msgstr ""
 
 #: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
-msgstr ""
+msgstr "Sem nome"
 
 #: ../src/resources/itemdb.cpp:146
 #, c-format
@@ -1578,8 +1582,9 @@ msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
 
 #: ../src/resources/monsterdb.cpp:44
+#, fuzzy
 msgid "unnamed"
-msgstr ""
+msgstr "Sem nome"
 
 #: ../src/resources/monsterdb.cpp:46
 msgid "Initializing monster database..."
@@ -1631,8 +1636,9 @@ msgid "Screenshot saved to ~/"
 msgstr ""
 
 #: ../src/game.cpp:399
+#, fuzzy
 msgid "Saving screenshot failed!"
-msgstr ""
+msgstr "Falha ao sentar!"
 
 #: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
@@ -1657,7 +1663,7 @@ msgstr ""
 #: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
-msgstr "Tem certeza de que deseja excluir este personagem?"
+msgstr "Tem certeza que deseja excluir este personagem?"
 
 #: ../src/game.cpp:648
 msgid "no"
@@ -1757,8 +1763,9 @@ msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
 #: ../src/main.cpp:503
+#, fuzzy
 msgid "  -h --help       : Display this help"
-msgstr ""
+msgstr "/help: Mostra esta ajuda"
 
 #: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
@@ -1795,7 +1802,7 @@ msgstr ""
 #: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
-msgstr "Conectando..."
+msgstr "Conectando ao servidor de contas..."
 
 #: ../src/main.cpp:616
 #, c-format
@@ -1805,7 +1812,7 @@ msgstr ""
 #: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
-msgstr "Conectando..."
+msgstr "Conectando ao servidor de personagens..."
 
 #: ../src/main.cpp:692
 #, c-format
@@ -1815,7 +1822,7 @@ msgstr ""
 #: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
-msgstr "Conectando..."
+msgstr "Conectando ao servidor de mapas..."
 
 #: ../src/main.cpp:699
 #, fuzzy, c-format
@@ -1829,20 +1836,19 @@ msgstr ""
 
 #: ../src/main.cpp:862
 msgid "Got disconnected from server!"
-msgstr ""
+msgstr "Você foi desconectado do servidor!"
 
 #: ../src/main.cpp:1067
-#, fuzzy
 msgid "Connecting to map server..."
-msgstr "Conectando..."
+msgstr "Conectando ao servidor de mapas..."
 
 #: ../src/main.cpp:1075
 msgid "Connecting to character server..."
-msgstr ""
+msgstr "Conectando ao servidor de personagens..."
 
 #: ../src/main.cpp:1083
 msgid "Connecting to account server..."
-msgstr ""
+msgstr "Conectando ao servidor de contas..."
 
 #: ../src/party.cpp:55
 msgid "Not yet implemented!"
@@ -1865,8 +1871,9 @@ msgid "Party successfully created."
 msgstr ""
 
 #: ../src/party.cpp:97
+#, fuzzy
 msgid "Could not create party."
-msgstr ""
+msgstr "Impossivel entrar no grupo!"
 
 #: ../src/party.cpp:106
 #, c-format
@@ -1911,8 +1918,9 @@ msgid "/party <command> <params>: Party commands."
 msgstr ""
 
 #: ../src/party.cpp:178
+#, fuzzy
 msgid "Command: /party <command> <args>"
-msgstr ""
+msgstr "Comando: /help <comando>"
 
 #: ../src/party.cpp:179
 msgid "where <command> can be one of:"
@@ -1936,16 +1944,18 @@ msgid "   /leave"
 msgstr ""
 
 #: ../src/party.cpp:184
+#, fuzzy
 msgid "This command implements the partying function."
-msgstr ""
+msgstr "Exibe o conteudo de ajuda de <comando>"
 
 #: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
 #: ../src/party.cpp:192
+#, fuzzy
 msgid "Command: /party new <party-name>"
-msgstr ""
+msgstr "Comandos: /announce <msg>"
 
 #: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
@@ -1960,8 +1970,9 @@ msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
 #: ../src/party.cpp:201
+#, fuzzy
 msgid "This command sets the party prefix character."
-msgstr ""
+msgstr "Limpa os logs do chat anterior."
 
 #: ../src/party.cpp:203
 msgid ""
@@ -1970,71 +1981,47 @@ msgid ""
 msgstr ""
 
 #: ../src/party.cpp:205
+#, fuzzy
 msgid "Command: /party prefix"
-msgstr ""
+msgstr "Comandos: /clear"
 
 #: ../src/party.cpp:206
+#, fuzzy
 msgid "This command reports the current party prefix character."
-msgstr ""
+msgstr "Limpa os logs do chat anterior."
 
 #: ../src/party.cpp:214
+#, fuzzy
 msgid "Command: /party leave"
-msgstr ""
+msgstr "Comandos: /clear"
 
 #: ../src/party.cpp:215
+#, fuzzy
 msgid "This command causes the player to leave the party."
-msgstr ""
+msgstr "Limpa os logs do chat anterior."
 
 #: ../src/party.cpp:219
+#, fuzzy
 msgid "Unknown /party command."
-msgstr ""
+msgstr "Comando desconhecido."
 
 #: ../src/party.cpp:220
-msgid "Type /help party for a list of options."
-msgstr ""
-
-#, fuzzy
-#~ msgid "Color:"
-#~ msgstr "Cor do Cabelo:"
-
-#, fuzzy
-#~ msgid "Description:"
-#~ msgstr "Descrição: %s"
-
-#, fuzzy
-#~ msgid "Effect:"
-#~ msgstr "Efeito: %s"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "Nome:"
-
 #, fuzzy
-#~ msgid "Effect: "
-#~ msgstr "Efeito: %s"
-
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "Descrição: %s"
+msgid "Type /help party for a list of options."
+msgstr "Digite /help para uma lista de todos os comandos."
 
 #~ msgid "Remember Username"
 #~ msgstr "Lembrar nome de usuário"
 
-#~ msgid "Account and Character Management"
-#~ msgstr "Gerenciamento de Conta e Personagem"
+#~ msgid "Mystery Skill"
+#~ msgstr "Habilidade Mistério"
+
+#~ msgid "Change"
+#~ msgstr "Mudar"
 
 #~ msgid "Unregister"
 #~ msgstr "Cancelar Registro"
 
-#~ msgid "Change Password"
-#~ msgstr "Alterar senha"
-
-#~ msgid "Change Email Address"
-#~ msgstr "Alterar e-mail"
-
-#~ msgid "Account: %s"
-#~ msgstr "Conta: %s"
-
 #~ msgid "Willpower:"
 #~ msgstr "Força de Vontade:"
 
@@ -2056,15 +2043,6 @@ msgstr ""
 #~ msgid "Select amount of items to split."
 #~ msgstr "Selecionar montante de itens para dividir."
 
-#~ msgid "Guilds"
-#~ msgstr "Guildas"
-
-#~ msgid "@@guild|Invite %s@@"
-#~ msgstr "@@guilda|convidar %s@@"
-
-#~ msgid "@@party|Invite %s to join your party@@"
-#~ msgstr "@@grupo|Convidar %s para entrar para o seu grupo"
-
 #~ msgid "@@split|Split@@"
 #~ msgstr "@@dividir|Dividir@@"
 
@@ -2083,18 +2061,12 @@ msgstr ""
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Por favor especifique ambos os Endereços e a Porta do servidor"
 
-#~ msgid "Visible names"
-#~ msgstr "Nomes visíveis"
-
 #~ msgid "Propose trade"
 #~ msgstr "Propor negócio"
 
 #~ msgid "Confirm trade"
 #~ msgstr "Confirmar negócio"
 
-#~ msgid "Change"
-#~ msgstr "Mudar"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
@@ -2109,3 +2081,27 @@ msgstr ""
 
 #~ msgid "Total Weight: %d - Maximum Weight: %d"
 #~ msgstr "Peso Total: %d - Peso Máximo: %d"
+
+#~ msgid "Account and Character Management"
+#~ msgstr "Gerenciamento de Conta e Personagem"
+
+#~ msgid "Change Password"
+#~ msgstr "Alterar senha"
+
+#~ msgid "Change Email Address"
+#~ msgstr "Alterar e-mail"
+
+#~ msgid "Account: %s"
+#~ msgstr "Conta: %s"
+
+#~ msgid "Guilds"
+#~ msgstr "Guildas"
+
+#~ msgid "@@guild|Invite %s@@"
+#~ msgstr "@@guilda|convidar %s@@"
+
+#~ msgid "@@party|Invite %s to join your party@@"
+#~ msgstr "@@grupo|Convidar %s para entrar para o seu grupo"
+
+#~ msgid "Visible names"
+#~ msgstr "Nomes visíveis"
diff --git a/po/ru.po b/po/ru.po
index db077dd7..bdd40333 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2008-01-08 11:50+0000\n"
 "Last-Translator: idle sign <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -832,9 +832,8 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-#, fuzzy
 msgid "Colors"
-msgstr "Цвет волос:"
+msgstr ""
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
@@ -1453,9 +1452,8 @@ msgid "Trade: You and "
 msgstr ""
 
 #: ../src/net/tradehandler.cpp:127
-#, fuzzy
 msgid "Trade with "
-msgstr "@@trade|Торговать с %s@@"
+msgstr ""
 
 #: ../src/net/tradehandler.cpp:128
 #, fuzzy
@@ -1993,30 +1991,6 @@ msgstr ""
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Color:"
-#~ msgstr "Цвет волос:"
-
-#, fuzzy
-#~ msgid "Description:"
-#~ msgstr "Описание: %s"
-
-#, fuzzy
-#~ msgid "Effect:"
-#~ msgstr "Эффект: %s"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "Имя:"
-
-#, fuzzy
-#~ msgid "Effect: "
-#~ msgstr "Эффект: %s"
-
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "Описание: %s"
-
 #~ msgid "Unregister"
 #~ msgstr "Удалить регистрацию"
 
diff --git a/po/sk.po b/po/sk.po
index 8fadb2cb..080ef28c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2008-12-30 14:07+0000\n"
 "Last-Translator: TomasKovacik <nail@nodomain.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -823,9 +823,8 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-#, fuzzy
 msgid "Colors"
-msgstr "Farba vlasov:"
+msgstr ""
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
@@ -1965,30 +1964,6 @@ msgstr ""
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Color:"
-#~ msgstr "Farba vlasov:"
-
-#, fuzzy
-#~ msgid "Description:"
-#~ msgstr "Popis: %s"
-
-#, fuzzy
-#~ msgid "Effect:"
-#~ msgstr "Effekt: %s"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "Meno"
-
-#, fuzzy
-#~ msgid "Effect: "
-#~ msgstr "Effekt: %s"
-
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "Popis: %s"
-
 #~ msgid "Account and Character Management"
 #~ msgstr "Účet a správa postáv"
 
diff --git a/po/sv.po b/po/sv.po
index 8f9514eb..3ae9a674 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2008-05-07 19:04+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -832,9 +832,8 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-#, fuzzy
 msgid "Colors"
-msgstr "Hårfärg:"
+msgstr ""
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
@@ -1453,9 +1452,8 @@ msgid "Trade: You and "
 msgstr ""
 
 #: ../src/net/tradehandler.cpp:127
-#, fuzzy
 msgid "Trade with "
-msgstr "@@trade|Handla med %s@@"
+msgstr ""
 
 #: ../src/net/tradehandler.cpp:128
 #, fuzzy
@@ -1993,30 +1991,6 @@ msgstr ""
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Color:"
-#~ msgstr "Hårfärg:"
-
-#, fuzzy
-#~ msgid "Description:"
-#~ msgstr "Beskrivning: %s"
-
-#, fuzzy
-#~ msgid "Effect:"
-#~ msgstr "Effekt: %s"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "Namn:"
-
-#, fuzzy
-#~ msgid "Effect: "
-#~ msgstr "Effekt: %s"
-
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "Beskrivning: %s"
-
 #~ msgid "Unregister"
 #~ msgstr "Avregistrera"
 
diff --git a/po/th.po b/po/th.po
index a41c8a9d..3798f1dc 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
 "PO-Revision-Date: 2008-11-25 06:16+0000\n"
 "Last-Translator: Tharawut Paripaiboon <Unknown>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -824,9 +824,8 @@ msgid "Keyboard"
 msgstr ""
 
 #: ../src/gui/setup.cpp:97
-#, fuzzy
 msgid "Colors"
-msgstr "สีผม:"
+msgstr ""
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
@@ -1975,14 +1974,6 @@ msgstr ""
 msgid "Type /help party for a list of options."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Color:"
-#~ msgstr "สีผม:"
-
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "ชื่อ:"
-
 #~ msgid "Change Password"
 #~ msgstr "เปลี่ยนรหัสผ่าน"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a20235ae..4638cfbe 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,26 +7,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 18:28-0700\n"
-"PO-Revision-Date: 2008-09-17 14:41+0000\n"
-"Last-Translator: luojie-dune <Unknown>\n"
-"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
+"POT-Creation-Date: 2009-01-25 18:51-0700\n"
+"PO-Revision-Date: 2009-01-21 22:42+0800\n"
+"Last-Translator: Hong Hao <oahong@gmail.com>\n"
+"Language-Team: Simplified Chinese <themanaworld-devel@lists.sourceforge."
+"net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Launchpad-Export-Date: 2009-01-21 13:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Plural-Forms: nplurals=2; plural=1;\n"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-Country: China\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
 #: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
 #: ../src/gui/buysell.cpp:34
 msgid "Buy"
-msgstr "买"
+msgstr "购买"
 
 #: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
 #: ../src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
-msgstr "价格：%d GP/总数：%d GP"
+msgstr "价格：%d 金币/总数：%d 金币"
 
 #: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:640
 msgid "Quit"
@@ -42,12 +47,11 @@ msgstr "描述：%s"
 #: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
-msgstr "影响: %s"
+msgstr "效果：%s"
 
 #: ../src/gui/buysell.cpp:30
-#, fuzzy
 msgid "Shop"
-msgstr "停止"
+msgstr "商店"
 
 #: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
 msgid "Sell"
@@ -65,21 +69,21 @@ msgstr "取消"
 
 #: ../src/gui/char_select.cpp:62
 msgid "Confirm Character Delete"
-msgstr ""
+msgstr "确认删除角色"
 
 #: ../src/gui/char_select.cpp:63
 msgid "Are you sure you want to delete this character?"
-msgstr "你确定想删除这个较色"
+msgstr "你确定想删除这个角色？"
 
 #: ../src/gui/char_select.cpp:81
 msgid "Select Character"
-msgstr "选择较色"
+msgstr "选择角色"
 
 #: ../src/gui/char_select.cpp:88 ../src/gui/char_select.cpp:173
 #: ../src/gui/char_select.cpp:186
 #, c-format
 msgid "Name: %s"
-msgstr "名字：%s"
+msgstr "姓名：%s"
 
 #. ----------------------
 #. Status Part
@@ -95,9 +99,9 @@ msgstr "等级：%d"
 
 #: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:175
 #: ../src/gui/char_select.cpp:188
-#, fuzzy, c-format
+#, c-format
 msgid "Job Level: %d"
-msgstr "等级：%d"
+msgstr "职业等级：%d"
 
 #: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:189
 #, c-format
@@ -106,11 +110,11 @@ msgstr "金钱：%d"
 
 #: ../src/gui/char_select.cpp:93
 msgid "Previous"
-msgstr "上一页"
+msgstr "上一个"
 
 #: ../src/gui/char_select.cpp:94
 msgid "Next"
-msgstr "下一页"
+msgstr "下一个"
 
 #: ../src/gui/char_select.cpp:95
 msgid "New"
@@ -123,12 +127,12 @@ msgstr "删除"
 #: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
 #: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
 msgid "Ok"
-msgstr "OK"
+msgstr "确认"
 
 #: ../src/gui/char_select.cpp:176
 #, c-format
 msgid "Gold: %d"
-msgstr ""
+msgstr "金币：%d"
 
 #: ../src/gui/char_select.cpp:247
 msgid "Create Character"
@@ -137,30 +141,29 @@ msgstr "创建角色"
 #: ../src/gui/char_select.cpp:257 ../src/gui/login.cpp:51
 #: ../src/gui/register.cpp:80
 msgid "Name:"
-msgstr "名称"
+msgstr "姓名："
 
 #: ../src/gui/char_select.cpp:260
 msgid "Hair Color:"
-msgstr "头发颜色"
+msgstr "发色："
 
 #: ../src/gui/char_select.cpp:263
 msgid "Hair Style:"
-msgstr "发型"
+msgstr "发型："
 
 #: ../src/gui/char_select.cpp:264
 msgid "Create"
 msgstr "建立"
 
 #: ../src/gui/char_server.cpp:51
-#, fuzzy
 msgid "Select Server"
-msgstr "选择较色"
+msgstr "选择服务器"
 
 #: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
 #: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:43
 #: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
 msgid "OK"
-msgstr ""
+msgstr "确定"
 
 #: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
@@ -169,13 +172,14 @@ msgid "Chat"
 msgstr "建立"
 
 #: ../src/gui/chat.cpp:152
+#, fuzzy
 msgid "Global announcement: "
-msgstr ""
+msgstr "全局公告："
 
 #: ../src/gui/chat.cpp:157
-#, c-format
+#, fuzzy, c-format
 msgid "Global announcement from %s: "
-msgstr ""
+msgstr "%s 全局公告："
 
 #: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
@@ -184,7 +188,7 @@ msgstr "服务器："
 #: ../src/gui/chat.cpp:327
 #, c-format
 msgid "Whispering to %s: %s"
-msgstr ""
+msgstr "对%s窃窃私语：%s"
 
 #: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
@@ -233,87 +237,88 @@ msgstr ""
 
 #: ../src/gui/chat.cpp:604
 msgid "Unknown command"
-msgstr ""
+msgstr "未知指令"
 
 #: ../src/gui/chat.cpp:616
 msgid "Trade failed!"
-msgstr ""
+msgstr "交易失败！"
 
 #: ../src/gui/chat.cpp:619
 msgid "Emote failed!"
-msgstr ""
+msgstr "发送表情失败！"
 
 #: ../src/gui/chat.cpp:622
 msgid "Sit failed!"
-msgstr ""
+msgstr "原地休息失败！"
 
 #: ../src/gui/chat.cpp:625
 msgid "Chat creating failed!"
-msgstr ""
+msgstr "聊天创建失败！"
 
 #: ../src/gui/chat.cpp:628
 msgid "Could not join party!"
-msgstr ""
+msgstr "不能加入工会！"
 
 #: ../src/gui/chat.cpp:631
 msgid "Cannot shout!"
-msgstr ""
+msgstr "无法呼喊！"
 
 #: ../src/gui/chat.cpp:640
 msgid "You have not yet reached a high enough lvl!"
-msgstr ""
+msgstr "你还没有达到足够的等级！"
 
 #: ../src/gui/chat.cpp:643
 msgid "Insufficient HP!"
-msgstr ""
+msgstr "HP不足！"
 
 #: ../src/gui/chat.cpp:646
 msgid "Insufficient SP!"
-msgstr ""
+msgstr "SP不足！"
 
 #: ../src/gui/chat.cpp:649
 msgid "You have no memos!"
-msgstr ""
+msgstr "没有备忘录"
 
 #: ../src/gui/chat.cpp:652
+#, fuzzy
 msgid "You cannot do that right now!"
-msgstr ""
+msgstr "你现在无法办到！"
 
 #: ../src/gui/chat.cpp:655
 msgid "Seems you need more Zeny... ;-)"
-msgstr ""
+msgstr "你需要更多钞票……;-)"
 
 #: ../src/gui/chat.cpp:658
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr ""
+msgstr "此武器无法用来使用此项技能！"
 
 #: ../src/gui/chat.cpp:661
 msgid "You need another red gem!"
-msgstr ""
+msgstr "你需要另一颗红宝石！"
 
 #: ../src/gui/chat.cpp:664
 msgid "You need another blue gem!"
-msgstr ""
+msgstr "你需要另一颗蓝宝石！"
 
 #: ../src/gui/chat.cpp:667
 msgid "You're carrying to much to do this!"
-msgstr ""
+msgstr "你已负重太多，无法办到！"
 
 #: ../src/gui/chat.cpp:670
 msgid "Huh? What's that?"
-msgstr ""
+msgstr "啊？那是什么？"
 
 #: ../src/gui/chat.cpp:679
 msgid "Warp failed..."
-msgstr ""
+msgstr "传送失败..."
 
 #: ../src/gui/chat.cpp:682
 msgid "Could not steal anything..."
-msgstr ""
+msgstr "无法偷取任何物品..."
 
 #: ../src/gui/chat.cpp:685
 msgid "Poison had no effect..."
-msgstr ""
+msgstr "毒药无效..."
 
 #: ../src/gui/chat.cpp:768
 msgid "The current party prefix is "
@@ -334,23 +339,24 @@ msgstr "改变成OpenGL"
 
 #: ../src/gui/chat.cpp:794
 msgid "-- Help --"
-msgstr ""
+msgstr "-- 帮助 --"
 
 #: ../src/gui/chat.cpp:797
 msgid "/announce: Global announcement (GM only)"
-msgstr ""
+msgstr "/announce: 全局通告（只有GM可使用）"
 
 #: ../src/gui/chat.cpp:798
 msgid "/clear: Clears this window"
-msgstr ""
+msgstr "/clear: 清除聊天记录"
 
 #: ../src/gui/chat.cpp:799
 msgid "/help: Display this help"
-msgstr ""
+msgstr "/help: 显示帮助信息"
 
 #: ../src/gui/chat.cpp:801
+#, fuzzy
 msgid "/msg <nick> <message>: Alternate form for /whisper"
-msgstr ""
+msgstr "/w <昵称> <信息>: /whisper的缩写形式"
 
 #: ../src/gui/chat.cpp:802
 msgid "/present: Get list of players present"
@@ -362,63 +368,64 @@ msgstr ""
 
 #: ../src/gui/chat.cpp:806
 msgid "/where: Display map name"
-msgstr ""
+msgstr "/where: 显示地图名称"
 
 #: ../src/gui/chat.cpp:807
 msgid "/w <nick> <message>: Short form for /whisper"
-msgstr ""
+msgstr "/w <昵称> <信息>: /whisper的缩写形式"
 
 #: ../src/gui/chat.cpp:808
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
-msgstr ""
+msgstr "/whisper <昵称> <信息>： 发送一条私密信息 <信息> 给 <昵称>"
 
 #: ../src/gui/chat.cpp:810
 msgid "/who: Display number of online users"
-msgstr ""
+msgstr "/who: 显示在线用户数"
 
 #: ../src/gui/chat.cpp:811
 msgid "For more information, type /help <command>"
-msgstr ""
+msgstr "输入/help <指令> 获取更多帮助信息"
 
 #: ../src/gui/chat.cpp:815
 msgid "Command: /announce <msg>"
-msgstr ""
+msgstr "指令： /announce <信息>"
 
 #: ../src/gui/chat.cpp:816
 msgid "*** only available to a GM ***"
-msgstr ""
+msgstr "*** 只有GM可用 ***"
 
 #: ../src/gui/chat.cpp:817
 msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
+msgstr "该指令会发送<信息>给所有在线用户。"
 
 #: ../src/gui/chat.cpp:822
 msgid "Command: /clear"
-msgstr ""
+msgstr "指令： /clear"
 
 #: ../src/gui/chat.cpp:823
 msgid "This command clears the chat log of previous chat."
-msgstr ""
+msgstr "该指令可清除历史聊天记录。"
 
 #: ../src/gui/chat.cpp:828
 msgid "Command: /help"
-msgstr ""
+msgstr "指令： /help"
 
 #: ../src/gui/chat.cpp:829
 msgid "This command displays a list of all commands available."
-msgstr ""
+msgstr "该指令可显示所有可用指令。"
 
 #: ../src/gui/chat.cpp:831
 msgid "Command: /help <command>"
-msgstr ""
+msgstr "指令： /help <指令>"
 
 #: ../src/gui/chat.cpp:832
 msgid "This command displays help on <command>."
-msgstr ""
+msgstr "该指令显现<指令>的帮助信息"
 
 #: ../src/gui/chat.cpp:840
+#, fuzzy
 msgid "Command: /present"
-msgstr ""
+msgstr "指令: /where"
 
 #: ../src/gui/chat.cpp:841
 msgid ""
@@ -427,8 +434,9 @@ msgid ""
 msgstr ""
 
 #: ../src/gui/chat.cpp:851
+#, fuzzy
 msgid "Command: /toggle <state>"
-msgstr ""
+msgstr "指令： /announce <信息>"
 
 #: ../src/gui/chat.cpp:852
 msgid ""
@@ -443,68 +451,73 @@ msgid ""
 msgstr ""
 
 #: ../src/gui/chat.cpp:858
+#, fuzzy
 msgid "Command: /toggle"
-msgstr ""
+msgstr "指令： /clear"
 
 #: ../src/gui/chat.cpp:859
+#, fuzzy
 msgid "This command displays the return toggle status."
-msgstr ""
+msgstr "该条指令显示当前地图名。"
 
 #: ../src/gui/chat.cpp:863
 msgid "Command: /where"
-msgstr ""
+msgstr "指令: /where"
 
 #: ../src/gui/chat.cpp:864
 msgid "This command displays the name of the current map."
-msgstr ""
+msgstr "该条指令显示当前地图名。"
 
 #: ../src/gui/chat.cpp:869
+#, fuzzy
 msgid "Command: /msg <nick> <msg>"
-msgstr ""
+msgstr "指令： /w <昵称> <信息>"
 
 #: ../src/gui/chat.cpp:870
 msgid "Command: /whisper <nick> <msg>"
-msgstr ""
+msgstr "指令： /whisper <昵称> <信息>"
 
 #: ../src/gui/chat.cpp:871
 msgid "Command: /w <nick> <msg>"
-msgstr ""
+msgstr "指令： /w <昵称> <信息>"
 
 #: ../src/gui/chat.cpp:872
 msgid "This command sends the message <msg> to <nick>."
-msgstr ""
+msgstr "该条指令发送信息 <msg> 给 <nick>"
 
 #: ../src/gui/chat.cpp:874
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
+msgstr "如果<昵称>之间有空格，用双引号(\")括起来。"
 
 #: ../src/gui/chat.cpp:879
 msgid "Command: /who"
-msgstr ""
+msgstr "指令： /who"
 
 #: ../src/gui/chat.cpp:880
 msgid "This command displays the number of players currently online."
-msgstr ""
+msgstr "该条指令可显现当前在线用户总数。"
 
 #: ../src/gui/chat.cpp:885
 msgid "Unknown command."
-msgstr ""
+msgstr "未知命令"
 
 #: ../src/gui/chat.cpp:886
 msgid "Type /help for a list of commands."
-msgstr ""
+msgstr "输入 /help 获取指令列表。"
 
 #: ../src/gui/colour.cpp:33
 msgid "GM"
 msgstr ""
 
 #: ../src/gui/colour.cpp:34
+#, fuzzy
 msgid "Player"
-msgstr ""
+msgstr "玩家"
 
 #: ../src/gui/colour.cpp:35
+#, fuzzy
 msgid "Whisper"
-msgstr ""
+msgstr "%s悄悄对你说："
 
 #: ../src/gui/colour.cpp:36
 msgid "Is"
@@ -513,7 +526,7 @@ msgstr ""
 #: ../src/gui/colour.cpp:37
 #, fuzzy
 msgid "Party"
-msgstr "端口："
+msgstr "开始"
 
 #: ../src/gui/colour.cpp:38
 #, fuzzy
@@ -561,16 +574,16 @@ msgstr "装备"
 
 #: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
 msgid "Help"
-msgstr ""
+msgstr "帮助"
 
 #: ../src/gui/help.cpp:43
 msgid "Close"
-msgstr ""
+msgstr "关闭"
 
 #: ../src/gui/inventorywindow.cpp:49 ../src/gui/inventorywindow.cpp:53
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
-msgstr "清单"
+msgstr "物品栏"
 
 #: ../src/gui/inventorywindow.cpp:61
 msgid "Drop"
@@ -578,14 +591,14 @@ msgstr "丢弃"
 
 #. Adjust widgets
 #: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
-#, c-format
+#, fuzzy, c-format
 msgid "Weight: %d  g / %d g"
-msgstr ""
+msgstr "负重：%d / %d"
 
 #: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
 #, c-format
 msgid "Slots used: %d / %d"
-msgstr ""
+msgstr "已使用槽： %d / %d"
 
 #: ../src/gui/inventorywindow.cpp:183
 msgid "Unequip"
@@ -605,7 +618,7 @@ msgstr "请选择丢弃的物品数量"
 
 #: ../src/gui/login.cpp:49
 msgid "Login"
-msgstr "登陆"
+msgstr "登录"
 
 #: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
 msgid "Password:"
@@ -645,7 +658,7 @@ msgstr "快捷键"
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
 #: ../src/gui/setup.cpp:52 ../src/main.cpp:787
 msgid "Setup"
-msgstr "安装"
+msgstr "设置"
 
 #: ../src/gui/minimap.cpp:39
 #, fuzzy
@@ -688,8 +701,9 @@ msgid "@@friend|Befriend "
 msgstr ""
 
 #: ../src/gui/popupmenu.cpp:92
+#, fuzzy
 msgid "@@disregard|Disregard "
-msgstr ""
+msgstr "无视"
 
 #: ../src/gui/popupmenu.cpp:93
 msgid "@@ignore|Ignore "
@@ -724,9 +738,8 @@ msgid "@@pickup|Pick Up %s@@"
 msgstr "@@捡起|捡起%s@@"
 
 #: ../src/gui/popupmenu.cpp:298
-#, fuzzy
 msgid "@@use|Unequip@@"
-msgstr "@@使用|装备@@"
+msgstr "@@使用|卸载@@"
 
 #: ../src/gui/popupmenu.cpp:300
 msgid "@@use|Equip@@"
@@ -750,15 +763,15 @@ msgstr "@@描述|描述@@"
 
 #: ../src/gui/register.cpp:82
 msgid "Confirm:"
-msgstr "确定"
+msgstr "确认："
 
 #: ../src/gui/register.cpp:90
 msgid "Male"
-msgstr ""
+msgstr "帅哥"
 
 #: ../src/gui/register.cpp:91
 msgid "Female"
-msgstr ""
+msgstr "美女"
 
 #: ../src/gui/register.cpp:159
 #, c-format
@@ -768,7 +781,7 @@ msgstr ""
 #: ../src/gui/register.cpp:168
 #, c-format
 msgid "The username needs to be at least %d characters long."
-msgstr "用户名至少需要%d个字符"
+msgstr "用户名至少需要%d个字符。"
 
 #: ../src/gui/register.cpp:176
 #, c-format
@@ -783,7 +796,7 @@ msgstr "密码需要至少%d个字符"
 #: ../src/gui/register.cpp:192
 #, c-format
 msgid "The password needs to be less than %d characters long."
-msgstr "密码不能少于%d个字符"
+msgstr "密码不能少于%d个字符。"
 
 #. Password does not match with the confirmation one
 #: ../src/gui/register.cpp:199
@@ -829,16 +842,16 @@ msgstr "游戏杆"
 
 #: ../src/gui/setup.cpp:93
 msgid "Keyboard"
-msgstr ""
+msgstr "键盘"
 
 #: ../src/gui/setup.cpp:97
 #, fuzzy
 msgid "Colors"
-msgstr "头发颜色"
+msgstr "关闭"
 
 #: ../src/gui/setup.cpp:101
 msgid "Players"
-msgstr ""
+msgstr "玩家"
 
 #: ../src/gui/setup_colours.cpp:53
 msgid "Red: "
@@ -874,45 +887,44 @@ msgstr "旋转手柄"
 
 #: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
-msgstr ""
+msgstr "分配"
 
 #: ../src/gui/setup_keyboard.cpp:91
-#, fuzzy
 msgid "Default"
-msgstr "删除"
+msgstr "预设"
 
 #: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
-msgstr ""
+msgstr "检测到按键冲突。"
 
 #: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
-msgstr ""
+msgstr "解决按键冲突，否者游戏过程中可能发生奇怪行为。"
 
 #: ../src/gui/setup_players.cpp:54
-#, fuzzy
 msgid "Name"
-msgstr "名称"
+msgstr "姓名"
 
 #: ../src/gui/setup_players.cpp:55
 msgid "Relation"
-msgstr ""
+msgstr "关系"
 
 #: ../src/gui/setup_players.cpp:59
 msgid "Neutral"
-msgstr ""
+msgstr "中立"
 
 #: ../src/gui/setup_players.cpp:60
 msgid "Friend"
-msgstr ""
+msgstr "好友"
 
 #: ../src/gui/setup_players.cpp:61
+#, fuzzy
 msgid "Disregarded"
-msgstr ""
+msgstr "无视"
 
 #: ../src/gui/setup_players.cpp:62
 msgid "Ignored"
-msgstr ""
+msgstr "忽略"
 
 #: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
 msgid "???"
@@ -920,19 +932,19 @@ msgstr ""
 
 #: ../src/gui/setup_players.cpp:216
 msgid "Save player list"
-msgstr ""
+msgstr "保存玩家列表"
 
 #: ../src/gui/setup_players.cpp:218
 msgid "Allow trading"
-msgstr ""
+msgstr "允许交易"
 
 #: ../src/gui/setup_players.cpp:220
 msgid "Allow whispers"
-msgstr ""
+msgstr "允许私语"
 
 #: ../src/gui/setup_players.cpp:247
 msgid "When ignoring:"
-msgstr ""
+msgstr "当忽略时："
 
 #: ../src/gui/setup_video.cpp:92
 msgid "No modes available"
@@ -952,11 +964,12 @@ msgstr "OpenGL"
 
 #: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
-msgstr "通常的光标"
+msgstr "自定义鼠标"
 
 #: ../src/gui/setup_video.cpp:120
+#, fuzzy
 msgid "Particle effects"
-msgstr ""
+msgstr "纹理细节"
 
 #: ../src/gui/setup_video.cpp:121
 msgid "Speech bubbles"
@@ -968,7 +981,7 @@ msgstr ""
 
 #: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
-msgstr "FPS限制"
+msgstr "FPS限制："
 
 #: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
@@ -976,23 +989,24 @@ msgstr "Gui 透明度"
 
 #: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
-msgstr "滚动半径"
+msgstr "滑动半径"
 
 #: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
-msgstr "拉动极限"
+msgstr "滑动延迟"
 
 #: ../src/gui/setup_video.cpp:148
+#, fuzzy
 msgid "Ambient FX"
-msgstr "环境音效"
+msgstr "雾化效果"
 
 #: ../src/gui/setup_video.cpp:149
 msgid "Particle Detail"
-msgstr ""
+msgstr "纹理细节"
 
 #: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
 msgid "off"
-msgstr "离线"
+msgstr "关闭"
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
 #: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
@@ -1006,11 +1020,11 @@ msgstr "高"
 
 #: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
 msgid "medium"
-msgstr ""
+msgstr "中"
 
 #: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
 msgid "max"
-msgstr ""
+msgstr "最大"
 
 #: ../src/gui/setup_video.cpp:303
 msgid "Failed to switch to "
@@ -1035,7 +1049,7 @@ msgstr "切换到全屏"
 
 #: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
-msgstr "只有改变生效后才能重启"
+msgstr "重启生效"
 
 #. OpenGL can currently only be changed by restarting, notify user.
 #: ../src/gui/setup_video.cpp:325
@@ -1062,7 +1076,7 @@ msgstr ""
 #: ../src/gui/setup_video.cpp:416
 #, fuzzy
 msgid "Restart your client for the change to take effect."
-msgstr "只有改变生效后才能重启"
+msgstr "重启生效"
 
 #: ../src/gui/setup_video.cpp:434
 msgid "Particle effect settings changed"
@@ -1071,7 +1085,7 @@ msgstr ""
 #: ../src/gui/setup_video.cpp:435
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
-msgstr "只有改变生效后才能重启"
+msgstr "重启生效"
 
 #: ../src/gui/skill.cpp:41
 #, fuzzy
@@ -1081,11 +1095,11 @@ msgstr "技能"
 #: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
 msgid "Skill points: %d"
-msgstr ""
+msgstr "技能点数：%d"
 
 #: ../src/gui/skill.cpp:140
 msgid "Up"
-msgstr ""
+msgstr "升级"
 
 #: ../src/gui/skill.cpp:140
 msgid "inc"
@@ -1106,108 +1120,99 @@ msgid "Speech"
 msgstr ""
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
-#, fuzzy, c-format
+#, c-format
 msgid "Job: %d"
-msgstr "等级：%d"
+msgstr "职业：%d"
 
 #: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
-#, fuzzy, c-format
+#, c-format
 msgid "Money: %d GP"
-msgstr "金钱：%d"
+msgstr "金钱：%d 金币"
 
 #. ----------------------
 #. Stats Part
 #. ----------------------
 #. Static Labels
 #: ../src/gui/status.cpp:125
-#, fuzzy
 msgid "Stats"
 msgstr "状态"
 
 #: ../src/gui/status.cpp:126
 msgid "Total"
-msgstr ""
+msgstr "总计"
 
 #: ../src/gui/status.cpp:127
 msgid "Cost"
-msgstr ""
+msgstr "花费"
 
 #. Derived Stats
 #: ../src/gui/status.cpp:130
-#, fuzzy
 msgid "Attack:"
-msgstr "攻击 %+d"
+msgstr "攻击:"
 
 #: ../src/gui/status.cpp:131
-#, fuzzy
 msgid "Defense:"
-msgstr "防护 %+d"
+msgstr "防御："
 
 #: ../src/gui/status.cpp:132
-#, fuzzy
 msgid "M.Attack:"
-msgstr "攻击 %+d"
+msgstr "魔攻："
 
 #: ../src/gui/status.cpp:133
-#, fuzzy
 msgid "M.Defense:"
-msgstr "防护 %+d"
+msgstr "魔防："
 
 #: ../src/gui/status.cpp:134
 #, c-format
 msgid "% Accuracy:"
-msgstr ""
+msgstr "% Ac精确度："
 
 #: ../src/gui/status.cpp:135
 #, c-format
 msgid "% Evade:"
-msgstr ""
+msgstr "% E回避率："
 
 #: ../src/gui/status.cpp:136
 msgid "% Reflex:"
-msgstr ""
+msgstr "% 伤害反射："
 
 #: ../src/gui/status.cpp:280
-#, fuzzy
 msgid "Strength"
 msgstr "力量"
 
 #: ../src/gui/status.cpp:281
-#, fuzzy
 msgid "Agility"
-msgstr "敏捷:"
+msgstr "敏捷"
 
 #: ../src/gui/status.cpp:282
-#, fuzzy
 msgid "Vitality"
-msgstr "体力:"
+msgstr "生命"
 
 #: ../src/gui/status.cpp:283
-#, fuzzy
 msgid "Intelligence"
-msgstr "智力:"
+msgstr "智慧"
 
 #: ../src/gui/status.cpp:284
-#, fuzzy
 msgid "Dexterity"
-msgstr "智慧:"
+msgstr "敏捷"
 
 #: ../src/gui/status.cpp:285
 msgid "Luck"
-msgstr ""
+msgstr "幸运"
 
 #: ../src/gui/status.cpp:303
 #, c-format
 msgid "Remaining Status Points: %d"
-msgstr ""
+msgstr "剩余状态点数：%d"
 
 #: ../src/gui/trade.cpp:51
+#, fuzzy
 msgid "Trade: You"
-msgstr ""
+msgstr "交易"
 
 #: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
 msgid "Trade"
-msgstr ""
+msgstr "交易"
 
 #: ../src/gui/trade.cpp:63
 msgid "Add"
@@ -1220,11 +1225,11 @@ msgstr "你得到%d GP."
 
 #: ../src/gui/trade.cpp:83
 msgid "You give:"
-msgstr "你得到："
+msgstr "你付出:"
 
 #: ../src/gui/trade.cpp:252
 msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
+msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
 #: ../src/gui/updatewindow.cpp:78
 #, c-format
@@ -1233,11 +1238,11 @@ msgstr ""
 
 #: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
-msgstr ""
+msgstr "更新..."
 
 #: ../src/gui/updatewindow.cpp:115
 msgid "Play"
-msgstr ""
+msgstr "开始"
 
 #: ../src/gui/updatewindow.cpp:196
 msgid "Couldn't load news"
@@ -1279,7 +1284,7 @@ msgstr ""
 
 #: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
-msgstr ""
+msgstr "已完成"
 
 #: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
 msgid "Message"
@@ -1299,8 +1304,9 @@ msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
 #: ../src/net/playerhandler.cpp:220
+#, fuzzy
 msgid "You are not that alive anymore."
-msgstr ""
+msgstr "你现在无法办到！"
 
 #: ../src/net/playerhandler.cpp:221
 msgid "The cold hands of the grim reaper are grabbing for your soul."
@@ -1362,13 +1368,15 @@ msgstr ""
 
 #. Monty Python reference from a couple of skits
 #: ../src/net/playerhandler.cpp:233
+#, fuzzy
 msgid "You are no more."
-msgstr ""
+msgstr "没有备忘录"
 
 #. Monty Python reference from the dead parrot sketch starting now
 #: ../src/net/playerhandler.cpp:234
+#, fuzzy
 msgid "You have ceased to be."
-msgstr ""
+msgstr "没有备忘录"
 
 #: ../src/net/playerhandler.cpp:235
 msgid "You've expired and gone to meet your maker."
@@ -1455,7 +1463,7 @@ msgstr ""
 #: ../src/net/tradehandler.cpp:127
 #, fuzzy
 msgid "Trade with "
-msgstr "@@交易|与%s交易@@"
+msgstr "交易"
 
 #: ../src/net/tradehandler.cpp:128
 #, fuzzy
@@ -1482,12 +1490,14 @@ msgid "Failed adding item for unknown reason."
 msgstr ""
 
 #: ../src/net/tradehandler.cpp:207
+#, fuzzy
 msgid "Trade canceled."
-msgstr ""
+msgstr "交易失败！"
 
 #: ../src/net/tradehandler.cpp:214
+#, fuzzy
 msgid "Trade completed."
-msgstr ""
+msgstr "已完成"
 
 #: ../src/resources/colordb.cpp:56
 #, c-format
@@ -1534,8 +1544,9 @@ msgid "Initializing item database..."
 msgstr ""
 
 #: ../src/resources/itemdb.cpp:56
+#, fuzzy
 msgid "Unknown item"
-msgstr ""
+msgstr "未知指令"
 
 #: ../src/resources/itemdb.cpp:61
 msgid "items.xml"
@@ -1556,7 +1567,7 @@ msgstr ""
 
 #: ../src/resources/itemdb.cpp:101
 msgid "Unnamed"
-msgstr ""
+msgstr "未知物品"
 
 #: ../src/resources/itemdb.cpp:146
 #, c-format
@@ -1578,8 +1589,9 @@ msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
 
 #: ../src/resources/monsterdb.cpp:44
+#, fuzzy
 msgid "unnamed"
-msgstr ""
+msgstr "未知物品"
 
 #: ../src/resources/monsterdb.cpp:46
 msgid "Initializing monster database..."
@@ -1631,8 +1643,9 @@ msgid "Screenshot saved to ~/"
 msgstr ""
 
 #: ../src/game.cpp:399
+#, fuzzy
 msgid "Saving screenshot failed!"
-msgstr ""
+msgstr "原地休息失败！"
 
 #: ../src/game.cpp:400
 msgid "Error: could not save screenshot."
@@ -1657,7 +1670,7 @@ msgstr ""
 #: ../src/game.cpp:641
 #, fuzzy
 msgid "Are you sure you want to quit?"
-msgstr "你确定想删除这个较色"
+msgstr "你确定想删除这个角色？"
 
 #: ../src/game.cpp:648
 msgid "no"
@@ -1757,8 +1770,9 @@ msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
 #: ../src/main.cpp:503
+#, fuzzy
 msgid "  -h --help       : Display this help"
-msgstr ""
+msgstr "/help: 显示帮助信息"
 
 #: ../src/main.cpp:504
 msgid "  -H --updatehost : Use this update host"
@@ -1795,7 +1809,7 @@ msgstr ""
 #: ../src/main.cpp:615
 #, fuzzy
 msgid "Trying to connect to account server..."
-msgstr "连接中..."
+msgstr "正在连接 帐号 服务器..."
 
 #: ../src/main.cpp:616
 #, c-format
@@ -1805,7 +1819,7 @@ msgstr ""
 #: ../src/main.cpp:670
 #, fuzzy
 msgid "Trying to connect to char server..."
-msgstr "连接中..."
+msgstr "正在连接 角色 服务器..."
 
 #: ../src/main.cpp:692
 #, c-format
@@ -1815,12 +1829,12 @@ msgstr ""
 #: ../src/main.cpp:698
 #, fuzzy
 msgid "Trying to connect to map server..."
-msgstr "连接中..."
+msgstr "正在连接 地图 服务器..."
 
 #: ../src/main.cpp:699
 #, fuzzy, c-format
 msgid "Map: %s"
-msgstr "名字：%s"
+msgstr "姓名：%s"
 
 #: ../src/main.cpp:829
 #, c-format
@@ -1829,20 +1843,19 @@ msgstr ""
 
 #: ../src/main.cpp:862
 msgid "Got disconnected from server!"
-msgstr ""
+msgstr "和服务器失去连接"
 
 #: ../src/main.cpp:1067
-#, fuzzy
 msgid "Connecting to map server..."
-msgstr "连接中..."
+msgstr "正在连接 地图 服务器..."
 
 #: ../src/main.cpp:1075
 msgid "Connecting to character server..."
-msgstr ""
+msgstr "正在连接 角色 服务器..."
 
 #: ../src/main.cpp:1083
 msgid "Connecting to account server..."
-msgstr ""
+msgstr "正在连接 帐号 服务器..."
 
 #: ../src/party.cpp:55
 msgid "Not yet implemented!"
@@ -1865,8 +1878,9 @@ msgid "Party successfully created."
 msgstr ""
 
 #: ../src/party.cpp:97
+#, fuzzy
 msgid "Could not create party."
-msgstr ""
+msgstr "不能加入工会！"
 
 #: ../src/party.cpp:106
 #, c-format
@@ -1890,7 +1904,7 @@ msgstr ""
 #: ../src/party.cpp:130
 #, fuzzy
 msgid "Invite to party"
-msgstr "清单"
+msgstr "物品栏"
 
 #: ../src/party.cpp:131
 #, c-format
@@ -1911,8 +1925,9 @@ msgid "/party <command> <params>: Party commands."
 msgstr ""
 
 #: ../src/party.cpp:178
+#, fuzzy
 msgid "Command: /party <command> <args>"
-msgstr ""
+msgstr "指令： /help <指令>"
 
 #: ../src/party.cpp:179
 msgid "where <command> can be one of:"
@@ -1936,16 +1951,18 @@ msgid "   /leave"
 msgstr ""
 
 #: ../src/party.cpp:184
+#, fuzzy
 msgid "This command implements the partying function."
-msgstr ""
+msgstr "该指令显现<指令>的帮助信息"
 
 #: ../src/party.cpp:186
 msgid "Type /help party <command> for further help."
 msgstr ""
 
 #: ../src/party.cpp:192
+#, fuzzy
 msgid "Command: /party new <party-name>"
-msgstr ""
+msgstr "指令： /announce <信息>"
 
 #: ../src/party.cpp:193
 msgid "Command: /party create <party-name>"
@@ -1960,8 +1977,9 @@ msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
 #: ../src/party.cpp:201
+#, fuzzy
 msgid "This command sets the party prefix character."
-msgstr ""
+msgstr "该指令可清除历史聊天记录。"
 
 #: ../src/party.cpp:203
 msgid ""
@@ -1970,52 +1988,43 @@ msgid ""
 msgstr ""
 
 #: ../src/party.cpp:205
+#, fuzzy
 msgid "Command: /party prefix"
-msgstr ""
+msgstr "指令： /clear"
 
 #: ../src/party.cpp:206
+#, fuzzy
 msgid "This command reports the current party prefix character."
-msgstr ""
+msgstr "该指令可清除历史聊天记录。"
 
 #: ../src/party.cpp:214
+#, fuzzy
 msgid "Command: /party leave"
-msgstr ""
+msgstr "指令： /clear"
 
 #: ../src/party.cpp:215
+#, fuzzy
 msgid "This command causes the player to leave the party."
-msgstr ""
+msgstr "该指令可清除历史聊天记录。"
 
 #: ../src/party.cpp:219
+#, fuzzy
 msgid "Unknown /party command."
-msgstr ""
+msgstr "未知命令"
 
 #: ../src/party.cpp:220
-msgid "Type /help party for a list of options."
-msgstr ""
-
 #, fuzzy
-#~ msgid "Color:"
-#~ msgstr "头发颜色"
-
-#, fuzzy
-#~ msgid "Description:"
-#~ msgstr "描述：%s"
-
-#, fuzzy
-#~ msgid "Effect:"
-#~ msgstr "影响: %s"
+msgid "Type /help party for a list of options."
+msgstr "输入 /help 获取指令列表。"
 
-#, fuzzy
-#~ msgid "Name: "
-#~ msgstr "名称"
+#~ msgid "Remember Username"
+#~ msgstr "保存用户名"
 
-#, fuzzy
-#~ msgid "Effect: "
-#~ msgstr "影响: %s"
+#~ msgid "Mystery Skill"
+#~ msgstr "神秘技能"
 
-#, fuzzy
-#~ msgid "Description: "
-#~ msgstr "描述：%s"
+#~ msgid "Change"
+#~ msgstr "改变"
 
 #~ msgid "Unregister"
 #~ msgstr "注销"
@@ -2065,9 +2074,6 @@ msgstr ""
 #~ msgid "Confirm trade"
 #~ msgstr "决定交易"
 
-#~ msgid "Change"
-#~ msgstr "改变"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
-- 
cgit v1.2.3-70-g09d2


From 3f6a5ed735d20977aed97b54c8472d3cd1f5c964 Mon Sep 17 00:00:00 2001
From: GonzoDark <Gonzo.Dark@gmail.com>
Date: Sun, 18 Jan 2009 22:32:27 +0100
Subject: Because of how I imported translations to reduce the complexity of
 merging, this commit adds back in a few of Ichigo's translations which were
 lost.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 po/da.po | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/po/da.po b/po/da.po
index f0be3f84..0debc786 100644
--- a/po/da.po
+++ b/po/da.po
@@ -122,8 +122,8 @@ msgstr "Slet"
 
 #: ../src/gui/char_select.cpp:97 ../src/gui/item_amount.cpp:59
 #: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
-msgid "Ok"
-msgstr ""
+msgid "OK"
+msgstr "OK"
 
 #: ../src/gui/char_select.cpp:176
 #, c-format
@@ -176,16 +176,16 @@ msgstr "Global meddelelse: "
 #: ../src/gui/chat.cpp:157
 #, fuzzy, c-format
 msgid "Global announcement from %s: "
-msgstr "Global meddelelse fra "
+msgstr "Global meddelelse fra %s: "
 
 #: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
 msgid "Server:"
 msgstr "Server:"
 
 #: ../src/gui/chat.cpp:327
-#, fuzzy, c-format
+#, c-format
 msgid "Whispering to %s: %s"
-msgstr "Hvisker til "
+msgstr "Hvisker til %s: %s"
 
 #: ../src/gui/chat.cpp:346
 msgid "Trying to send a blank party message."
@@ -211,12 +211,10 @@ msgstr "Besked lukker nu chat."
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
-"Mulighederne til /toggle er \"yes\", \"no\", \"true\", \"false\", \"1\", \"0"
-"\"."
+"Mulighederne til /toggle er \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: ../src/gui/chat.cpp:510
-#, fuzzy
-msgid "Unknown party command... Type \"/help\" party for more information."
+#: ../src/gui/chat.cpp:432
+msgid "Unknown party command... Type \"/help party\" party for more information."
 msgstr "Ukendt gruppe kommando... Skriv \"/help party\" for mere information."
 
 #: ../src/gui/chat.cpp:556
@@ -595,7 +593,7 @@ msgstr "Smid"
 #: ../src/gui/inventorywindow.cpp:72 ../src/gui/inventorywindow.cpp:114
 #, fuzzy, c-format
 msgid "Weight: %d  g / %d g"
-msgstr "Vægt: "
+msgstr "Vægt: %d  g / %d g"
 
 #: ../src/gui/inventorywindow.cpp:75 ../src/gui/inventorywindow.cpp:117
 #, c-format
@@ -1090,9 +1088,8 @@ msgid "Restart your client or change maps for the change to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten, eller skifter bane."
 
 #: ../src/gui/skill.cpp:41
-#, fuzzy
 msgid "skills.xml"
-msgstr "Færdigheder"
+msgstr ""
 
 #: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
 #, c-format
@@ -1120,7 +1117,7 @@ msgstr "Fejl under loading af færdigheds fil: %s"
 #: ../src/gui/speechbubble.cpp:38
 #, fuzzy
 msgid "Speech"
-msgstr "Snakke bobler"
+msgstr "Snakke"
 
 #: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
 #, fuzzy, c-format
@@ -1527,7 +1524,7 @@ msgstr "ColorDB: Fejlede"
 #: ../src/resources/colordb.cpp:83
 #, fuzzy, c-format
 msgid "ColorDB: Redefinition of dye ID %d"
-msgstr "ItemDB: Ny definition af genstand ID %d"
+msgstr "ColorDB: Ny definition af genstand ID %d"
 
 #: ../src/resources/colordb.cpp:98
 msgid "Unloading color database..."
@@ -1710,9 +1707,9 @@ msgid "Warning: no protocol was specified for the update host"
 msgstr "Advarsel: ingen protocol var aktiv som opdate host"
 
 #: ../src/main.cpp:245
-#, fuzzy, c-format
+#, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
-msgstr "Fejl: %s/%s kan ikke laves, men findes ikke!"
+msgstr "Fejl: %s kan ikke laves, men findes ikke!"
 
 #: ../src/main.cpp:247 ../src/main.cpp:253
 msgid "Error creating updates directory!"
@@ -1730,11 +1727,11 @@ msgstr " kan ikke laves, men det findes ikke! Lukker."
 #: ../src/main.cpp:291
 #, c-format
 msgid "Starting Aethyra Version %s"
-msgstr ""
+msgstr "Starter Aethyra Version %s"
 
 #: ../src/main.cpp:293
 msgid "Starting Aethyra - Version not defined"
-msgstr ""
+msgstr "Starter Aethyra - Version er ikke defineret"
 
 #. Initialize SDL
 #: ../src/main.cpp:297
@@ -1815,7 +1812,7 @@ msgstr "  -v --version    : Viser den nuværende version"
 
 #: ../src/main.cpp:515 ../src/main.cpp:518
 msgid "Aethyra version "
-msgstr ""
+msgstr "Aethyra version "
 
 #: ../src/main.cpp:519
 msgid "(local build?, PACKAGE_VERSION is not defined)"
@@ -2132,7 +2129,7 @@ msgstr "Skriv /help for at få en liste med kommandoer"
 #~ msgstr "E-mail:"
 
 #~ msgid "Choose your Mana World Server"
-#~ msgstr "Vælg din Mana World Server"
+#~ msgstr "Vælg din Aethyra Server"
 
 #~ msgid "Please type both the address and the port of a server."
 #~ msgstr "Skriv både adressen og porten på serveren."
-- 
cgit v1.2.3-70-g09d2


From f75f2025025cc651dabf25403111156b8b908ee4 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 26 Jan 2009 00:14:31 +0100
Subject: Tweaked the green color to be more readable

---
 src/gui/browserbox.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h
index 4290f0a2..4bdf224b 100644
--- a/src/gui/browserbox.h
+++ b/src/gui/browserbox.h
@@ -124,7 +124,7 @@ class BrowserBox : public gcn::Widget, public gcn::MouseListener
         enum {
             BLACK = 0x000000,       /**< Color 0 */
             RED = 0xff0000,         /**< Color 1 */
-            GREEN = 0x1fa052,       /**< Color 2 */
+            GREEN = 0x009000,       /**< Color 2 */
             BLUE = 0x0000ff,        /**< Color 3 */
             ORANGE = 0xe0980e,      /**< Color 4 */
             YELLOW = 0xf1dc27,      /**< Color 5 */
-- 
cgit v1.2.3-70-g09d2


From 0221a7bacfbf3246028a5d4f7ffd31ab968a22a1 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 25 Jan 2009 19:51:39 -0700
Subject: Fixed a few translatable strings.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/setup.cpp  | 8 ++++----
 src/gui/status.cpp | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index dd0f94e5..d18f365c 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -68,7 +68,7 @@ Setup::Setup():
         add(btn);
 
         // Disable this button when the windows aren't created yet
-        if (!strcmp(*curBtn, _("Reset Windows")))
+        if (!strcmp(*curBtn, "Reset Windows"))
             btn->setEnabled(statusWindow != NULL);
     }
 
@@ -113,17 +113,17 @@ Setup::~Setup()
 
 void Setup::action(const gcn::ActionEvent &event)
 {
-    if (event.getId() == _("Apply"))
+    if (event.getId() == "Apply")
     {
         setVisible(false);
         for_each(mTabs.begin(), mTabs.end(), std::mem_fun(&SetupTab::apply));
     }
-    else if (event.getId() == _("Cancel"))
+    else if (event.getId() == "Cancel")
     {
         setVisible(false);
         for_each(mTabs.begin(), mTabs.end(), std::mem_fun(&SetupTab::cancel));
     }
-    else if (event.getId() == _("Reset Windows"))
+    else if (event.getId() == "Reset Windows")
     {
         // Bail out if this action happens to be activated before the windows
         // are created (though it should be disabled then)
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 5cc0e80b..bd6048f3 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -50,19 +50,19 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     mGpLabel = new gcn::Label(strprintf(_("Job: %d"), 0));
     mJobLvlLabel = new gcn::Label(strprintf(_("Money: %d GP"), 0));
 
-    mHpLabel = new gcn::Label("HP:");
+    mHpLabel = new gcn::Label(_("HP:"));
     mHpBar = new ProgressBar(1.0f, 80, 15, 0, 171, 34);
     mHpValueLabel = new gcn::Label;
 
-    mXpLabel = new gcn::Label("Exp:");
+    mXpLabel = new gcn::Label(_("Exp:"));
     mXpBar = new ProgressBar(1.0f, 80, 15, 143, 192, 211);
     mXpValueLabel = new gcn::Label;
 
-    mMpLabel = new gcn::Label("MP:");
+    mMpLabel = new gcn::Label(_("MP:"));
     mMpBar = new ProgressBar(1.0f, 80, 15, 26, 102, 230);
     mMpValueLabel = new gcn::Label;
 
-    mJobXpLabel = new gcn::Label("Job:");
+    mJobXpLabel = new gcn::Label(_("Job:"));
     mJobXpBar = new ProgressBar(1.0f, 80, 15, 220, 135, 203);
     mJobValueLabel = new gcn::Label;
 
-- 
cgit v1.2.3-70-g09d2


From 2273323d978cd85fb22f4dd3dfe0d018f72241fb Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 25 Jan 2009 20:05:27 -0700
Subject: Goofed up the default inventory size that shows with inventory
 windows.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/inventorywindow.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 33b6ff52..a1f8b858 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -46,7 +46,7 @@ class InventoryWindow : public Window, gcn::ActionListener,
         /**
          * Constructor.
          */
-        InventoryWindow(int invSize = INVENTORY_SIZE);
+        InventoryWindow(int invSize = (INVENTORY_SIZE - 2));
 
         /**
          * Logic (updates buttons and weight information).
-- 
cgit v1.2.3-70-g09d2


From 1702c84521ab707326de720aea0a53136779300d Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 25 Jan 2009 20:43:59 -0700
Subject: Repaired item weight and slot reporting.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/inventorywindow.cpp | 27 ++++++++++++++-------------
 src/gui/inventorywindow.h   |  4 +++-
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 76f83996..52198180 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -47,7 +47,7 @@
 
 InventoryWindow::InventoryWindow(int invSize):
     Window(_("Inventory")),
-    mSize(invSize),
+    mMaxSlots(invSize),
     mItemDesc(false)
 {
     setWindowName(_("Inventory"));
@@ -68,15 +68,14 @@ InventoryWindow::InventoryWindow(int invSize):
 
     mTotalWeight = toString(player_node->mTotalWeight);
     mMaxWeight = toString(player_node->mMaxWeight);
+    mUsedSlots = toString(player_node->getInventory()->getNumberOfSlotsUsed());
 
     mWeight = strprintf(_("Weight: %d  g / %d g"),
-                              player_node->mTotalWeight,
-                              player_node->mMaxWeight) + " " +
-              strprintf(_("Slots used: %d / %d"),
-                              player_node->getInventory()->getNumberOfSlotsUsed(),
-                              mSize);
+                          atoi(mTotalWeight.c_str()), atoi(mMaxWeight.c_str()));
+    mSlots = strprintf(_("Slots used: %d / %d"),
+                         atoi(mUsedSlots.c_str()), mMaxSlots);
 
-    mWeightLabel = new gcn::Label(mWeight);
+    mWeightLabel = new gcn::Label(mWeight + "  " + mSlots);
 
     setMinHeight(130);
     setMinWidth(getFont()->getWidth(mWeight));
@@ -105,18 +104,20 @@ void InventoryWindow::logic()
     updateButtons();
 
     if ((mMaxWeight != toString(player_node->mMaxWeight)) ||
-         mTotalWeight != toString(player_node->mTotalWeight))
+         mTotalWeight != toString(player_node->mTotalWeight) ||
+         mUsedSlots != toString(player_node->getInventory()->getNumberOfSlotsUsed()))
     {
         mTotalWeight = toString(player_node->mTotalWeight);
         mMaxWeight = toString(player_node->mMaxWeight);
+        mUsedSlots = toString(player_node->getInventory()->getNumberOfSlotsUsed());
 
         // Adjust widgets
         mWeight = strprintf(_("Weight: %d  g / %d g"),
-                              player_node->mTotalWeight,
-                              player_node->mMaxWeight) + " " +
-                  strprintf(_("Slots used: %d / %d"),
-                              player_node->getInventory()->getNumberOfSlotsUsed(),
-                              mSize);
+                              atoi(mTotalWeight.c_str()), atoi(mMaxWeight.c_str()));
+        mSlots = strprintf(_("Slots used: %d / %d"),
+                             atoi(mUsedSlots.c_str()), mMaxSlots);
+
+        mWeightLabel->setCaption(mWeight + "  " + mSlots);
 
         setMinWidth(getFont()->getWidth(mWeight));
     }
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index a1f8b858..da7c1cee 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -71,13 +71,15 @@ class InventoryWindow : public Window, gcn::ActionListener,
         ItemContainer *mItems;
 
         std::string mWeight;
+        std::string mSlots;
+        std::string mUsedSlots;
         std::string mTotalWeight;
         std::string mMaxWeight;
         gcn::Button *mUseButton, *mDropButton;
         gcn::ScrollArea *mInvenScroll;
         gcn::Label *mWeightLabel;
 
-        int mSize;
+        int mMaxSlots;
 
         bool mItemDesc;
 };
-- 
cgit v1.2.3-70-g09d2


From c40a6d645c4721077313145cc5f692d19c99508a Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 25 Jan 2009 21:51:58 -0700
Subject: Fixed use button so that it starts out at the maximum width it will
 need. TODO: Modify layout rendering to be able to detect resizes.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/inventorywindow.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 52198180..32817479 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -57,7 +57,17 @@ InventoryWindow::InventoryWindow(int invSize):
     // If you adjust these defaults, don't forget to adjust the trade window's.
     setDefaultSize(115, 25, 322, 200);
 
-    mUseButton = new Button(_("Use"), "use", this);
+    std::string longestUseString = getFont()->getWidth(_("Equip")) > 
+                                   getFont()->getWidth(_("Use")) ?
+                                   _("Equip") : _("Use");
+
+    if (getFont()->getWidth(longestUseString) < 
+        getFont()->getWidth(_("Unequip")))
+    {
+        longestUseString = _("Unequip");
+    }
+
+    mUseButton = new Button(longestUseString, "use", this);
     mDropButton = new Button(_("Drop"), "drop", this);
 
     mItems = new ItemContainer(player_node->getInventory(), 2);
-- 
cgit v1.2.3-70-g09d2


From cd0bbf213902665f795d10a38c4f847f681c290c Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 25 Jan 2009 22:12:48 -0700
Subject: Changed it so that " :" messages are properly recognized as being
 from the server in the chat log.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/chat.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index d1069d13..1a3cb2a4 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -192,7 +192,13 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
             break;
     }
 
-    if (tmp.nick == ": " && tmp.text.substr(0, 17) == "Visible GM status")
+    if (tmp.nick == ": ")
+    {
+        tmp.nick = "";
+        lineColor = "##S";
+    }
+
+    if (tmp.nick == "" && tmp.text.substr(0, 17) == "Visible GM status")
     {
         player_node->setGM();
     }
-- 
cgit v1.2.3-70-g09d2


From 062f4065f5a2117fc5fd5f408e1f3163e2f63afc Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 26 Jan 2009 01:26:25 -0700
Subject: Fixed offset of right-click hitboxes and made NPCs without sprites
 clickable. Also set a minimum clickable area so that small mobs like maggots
 aren't too difficult to click.

Been wanting this patched for a while, but didn't know where to look
until Crush's patch for mainline click zones on TMW.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/being.cpp        | 14 ++++++++++----
 src/being.h          |  3 +++
 src/beingmanager.cpp | 10 +++++++---
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index 3fc679da..ad5f4204 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -571,11 +571,14 @@ int Being::getWidth() const
 {
     if (mSprites[BASE_SPRITE])
     {
-        return mSprites[BASE_SPRITE]->getWidth();
+        const int width = mSprites[BASE_SPRITE]->getWidth() > Being::DEFAULT_WIDTH ?
+                                   mSprites[BASE_SPRITE]->getWidth() : 
+                                   Being::DEFAULT_WIDTH;
+        return width;
     }
     else 
     {
-        return 0;
+        return Being::DEFAULT_WIDTH;
     }
 }
 
@@ -584,11 +587,14 @@ int Being::getHeight() const
 {
     if (mSprites[BASE_SPRITE])
     {
-        return mSprites[BASE_SPRITE]->getHeight();
+        const int height = mSprites[BASE_SPRITE]->getHeight() > Being::DEFAULT_HEIGHT ?
+                                   mSprites[BASE_SPRITE]->getHeight() : 
+                                   Being::DEFAULT_HEIGHT;
+        return height;
     }
     else 
     {
-        return 0;
+        return Being::DEFAULT_HEIGHT;
     }
 }
 
diff --git a/src/being.h b/src/being.h
index 80295db8..a43297ad 100644
--- a/src/being.h
+++ b/src/being.h
@@ -432,6 +432,9 @@ class Being : public Sprite
          */
         int getOffset(char pos, char neg) const;
 
+        static const int DEFAULT_WIDTH = 32;
+        static const int DEFAULT_HEIGHT = 32;
+
         // Speech Bubble components
         SpeechBubble *mSpeechBubble;
 
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index b2dc330b..6b71b3bf 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -129,12 +129,16 @@ Being* BeingManager::findBeingByPixel(Uint16 x, Uint16 y)
     for (; itr != itr_end; ++itr)
     {
         Being *being = (*itr);
+
+        int xtol = being->getWidth();
+        int uptol = being->getHeight();
+
         if ((being->mAction != Being::DEAD) &&
             (being != player_node) &&
             (being->getPixelX() <= x) &&
-            (being->getPixelX() + being->getWidth() >= x) &&
-            (being->getPixelY() <= y) &&
-            (being->getPixelY() + being->getHeight() >= y))
+            (being->getPixelX() + xtol >= x) &&
+            (being->getPixelY() - (uptol / 2) <= y) &&
+            (being->getPixelY() + (uptol / 2) >= y))
         {
             return being;
         }
-- 
cgit v1.2.3-70-g09d2


From 803e0dae01f09afbe529799cf89a8f57fe518ddb Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 26 Jan 2009 01:56:55 -0700
Subject: Bit of code cleanup for the last commit (moved default width and
 height out of being.h, so that they aren't included in any classes that don't
 need them and cut the number of divisions in half in the being manager)

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/being.cpp        | 15 +++++++++------
 src/being.h          |  3 ---
 src/beingmanager.cpp |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index ad5f4204..985be69c 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -56,6 +56,9 @@ std::vector<AnimatedSprite*> Being::emotionSet;
 static const int X_SPEECH_OFFSET = 18;
 static const int Y_SPEECH_OFFSET = 60;
 
+static const int DEFAULT_WIDTH = 32;
+static const int DEFAULT_HEIGHT = 32;
+
 Being::Being(int id, int job, Map *map):
     mJob(job),
     mX(0), mY(0),
@@ -571,14 +574,14 @@ int Being::getWidth() const
 {
     if (mSprites[BASE_SPRITE])
     {
-        const int width = mSprites[BASE_SPRITE]->getWidth() > Being::DEFAULT_WIDTH ?
+        const int width = mSprites[BASE_SPRITE]->getWidth() > DEFAULT_WIDTH ?
                                    mSprites[BASE_SPRITE]->getWidth() : 
-                                   Being::DEFAULT_WIDTH;
+                                   DEFAULT_WIDTH;
         return width;
     }
     else 
     {
-        return Being::DEFAULT_WIDTH;
+        return DEFAULT_WIDTH;
     }
 }
 
@@ -587,14 +590,14 @@ int Being::getHeight() const
 {
     if (mSprites[BASE_SPRITE])
     {
-        const int height = mSprites[BASE_SPRITE]->getHeight() > Being::DEFAULT_HEIGHT ?
+        const int height = mSprites[BASE_SPRITE]->getHeight() > DEFAULT_HEIGHT ?
                                    mSprites[BASE_SPRITE]->getHeight() : 
-                                   Being::DEFAULT_HEIGHT;
+                                   DEFAULT_HEIGHT;
         return height;
     }
     else 
     {
-        return Being::DEFAULT_HEIGHT;
+        return DEFAULT_HEIGHT;
     }
 }
 
diff --git a/src/being.h b/src/being.h
index a43297ad..80295db8 100644
--- a/src/being.h
+++ b/src/being.h
@@ -432,9 +432,6 @@ class Being : public Sprite
          */
         int getOffset(char pos, char neg) const;
 
-        static const int DEFAULT_WIDTH = 32;
-        static const int DEFAULT_HEIGHT = 32;
-
         // Speech Bubble components
         SpeechBubble *mSpeechBubble;
 
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index 6b71b3bf..9e620ca0 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -131,14 +131,14 @@ Being* BeingManager::findBeingByPixel(Uint16 x, Uint16 y)
         Being *being = (*itr);
 
         int xtol = being->getWidth();
-        int uptol = being->getHeight();
+        int uptol = being->getHeight() / 2;
 
         if ((being->mAction != Being::DEAD) &&
             (being != player_node) &&
             (being->getPixelX() <= x) &&
             (being->getPixelX() + xtol >= x) &&
-            (being->getPixelY() - (uptol / 2) <= y) &&
-            (being->getPixelY() + (uptol / 2) >= y))
+            (being->getPixelY() - uptol <= y) &&
+            (being->getPixelY() + uptol >= y))
         {
             return being;
         }
-- 
cgit v1.2.3-70-g09d2


From 7a618a7f4f7c2efe2a6973cc37bc8283025e4782 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 26 Jan 2009 11:05:46 -0700
Subject: Modified the inventory window so that weight and slots used are shown
 as progress bars. Suggestion made by Forge.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/inventorywindow.cpp | 55 ++++++++++++++++++++++++++++-----------------
 src/gui/inventorywindow.h   |  6 +++++
 2 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 32817479..fe3300dc 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -31,6 +31,7 @@
 #include "inventorywindow.h"
 #include "item_amount.h"
 #include "itemcontainer.h"
+#include "progressbar.h"
 #include "scrollarea.h"
 #include "viewport.h"
 
@@ -80,23 +81,22 @@ InventoryWindow::InventoryWindow(int invSize):
     mMaxWeight = toString(player_node->mMaxWeight);
     mUsedSlots = toString(player_node->getInventory()->getNumberOfSlotsUsed());
 
-    mWeight = strprintf(_("Weight: %d  g / %d g"),
-                          atoi(mTotalWeight.c_str()), atoi(mMaxWeight.c_str()));
-    mSlots = strprintf(_("Slots used: %d / %d"),
-                         atoi(mUsedSlots.c_str()), mMaxSlots);
+    mSlotsLabel = new gcn::Label(_("Slots: "));
+    mWeightLabel = new gcn::Label(_("Weight: "));
 
-    mWeightLabel = new gcn::Label(mWeight + "  " + mSlots);
+    mSlotsBar = new ProgressBar(1.0f, 100, 20, 225, 200, 25);
+    mWeightBar = new ProgressBar(1.0f, 100, 20, 0, 0, 255);
 
     setMinHeight(130);
-    setMinWidth(getFont()->getWidth(mWeight));
+    setMinWidth(mWeightLabel->getWidth() + mSlotsLabel->getWidth() + 310);
 
-    ContainerPlacer place;
-    place = getPlacer(0, 0);
-
-    place(0, 0, mInvenScroll, 5, 4);
-    place(0, 4, mWeightLabel, 5);
-    place(3, 5, mDropButton);
-    place(4, 5, mUseButton);
+    place(0, 0, mInvenScroll, 7, 4);
+    place(0, 4, mWeightLabel).setPadding(3);
+    place(1, 4, mWeightBar, 2);
+    place(3, 4, mSlotsLabel).setPadding(3);
+    place(4, 4, mSlotsBar, 2);
+    place(5, 5, mDropButton);
+    place(6, 5, mUseButton);
 
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
@@ -121,15 +121,30 @@ void InventoryWindow::logic()
         mMaxWeight = toString(player_node->mMaxWeight);
         mUsedSlots = toString(player_node->getInventory()->getNumberOfSlotsUsed());
 
-        // Adjust widgets
-        mWeight = strprintf(_("Weight: %d  g / %d g"),
-                              atoi(mTotalWeight.c_str()), atoi(mMaxWeight.c_str()));
-        mSlots = strprintf(_("Slots used: %d / %d"),
-                             atoi(mUsedSlots.c_str()), mMaxSlots);
+        // Weight Bar coloration
+        if (int(player_node->mTotalWeight) < int(player_node->mMaxWeight / 3))
+        {
+            mWeightBar->setColor(0, 0, 255); // Blue
+        }
+        else if (int(player_node->mTotalWeight) <
+                 int((player_node->mMaxWeight / 3) * 2))
+        {
+            mWeightBar->setColor(255, 255, 0); // Yellow
+        }
+        else
+        {
+            mWeightBar->setColor(255, 0, 0); // Red
+        }
 
-        mWeightLabel->setCaption(mWeight + "  " + mSlots);
+        // Adjust progress bars
+        mSlotsBar->setProgress((float)
+               player_node->getInventory()->getNumberOfSlotsUsed() / mMaxSlots);
+        mWeightBar->setProgress((float) player_node->mTotalWeight / 
+                                        player_node->mMaxWeight);
 
-        setMinWidth(getFont()->getWidth(mWeight));
+        mSlotsBar->setText(strprintf("%s/%d", mUsedSlots.c_str(), mMaxSlots));
+        mWeightBar->setText(strprintf("%sg/%sg", mTotalWeight.c_str(),
+                                                 mMaxWeight.c_str()));
     }
 }
 
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index da7c1cee..93b9c572 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -33,6 +33,7 @@
 
 class Item;
 class ItemContainer;
+class ProgressBar;
 
 /**
  * Inventory dialog.
@@ -77,7 +78,12 @@ class InventoryWindow : public Window, gcn::ActionListener,
         std::string mMaxWeight;
         gcn::Button *mUseButton, *mDropButton;
         gcn::ScrollArea *mInvenScroll;
+
         gcn::Label *mWeightLabel;
+        gcn::Label *mSlotsLabel;
+
+        ProgressBar *mWeightBar;
+        ProgressBar *mSlotsBar;
 
         int mMaxSlots;
 
-- 
cgit v1.2.3-70-g09d2


From a1d19e32e1206e406409ca68db6f344535e16519 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 26 Jan 2009 11:38:12 -0700
Subject: Modified item popups to show the weight of the item as well. TODO:
 modify itemdb to pull the item weight information from the server instead of
 the client, so as to always have the server and client in sync.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/itempopup.cpp    | 71 ++++++++++++++++++++++++++++++++++++++----------
 src/gui/itempopup.h      |  2 ++
 src/resources/itemdb.cpp |  6 ++--
 3 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index f9916a89..42ef88ae 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -20,6 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <guichan/font.hpp>
+
 #include <guichan/widgets/label.hpp>
 
 #include "gui.h"
@@ -34,6 +36,7 @@
 
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
+#include "../utils/tostring.h"
 
 ItemPopup::ItemPopup():
     Window()
@@ -52,37 +55,50 @@ ItemPopup::ItemPopup():
     mItemDesc = new TextBox();
     mItemDesc->setEditable(false);
     mItemDesc->setMinWidth(186);
+    mItemDesc->setTextWrapped("");
     mItemDescScroll = new ScrollArea(mItemDesc);
 
     mItemDescScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     mItemDescScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    mItemDescScroll->setDimension(gcn::Rectangle(0, 0, 196, 14));
+    mItemDescScroll->setDimension(gcn::Rectangle(0, 0, 196, getFont()->getHeight()));
     mItemDescScroll->setOpaque(false);
-    mItemDescScroll->setPosition(2, 15);
+    mItemDescScroll->setPosition(2, getFont()->getHeight());
 
     // Item Effect
     mItemEffect = new TextBox();
     mItemEffect->setEditable(false);
     mItemEffect->setMinWidth(186);
+    mItemEffect->setTextWrapped("");
     mItemEffectScroll = new ScrollArea(mItemEffect);
 
     mItemEffectScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
     mItemEffectScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    mItemEffectScroll->setDimension(gcn::Rectangle(0, 0, 196, 14));
+    mItemEffectScroll->setDimension(gcn::Rectangle(0, 0, 196, getFont()->getHeight()));
     mItemEffectScroll->setOpaque(false);
-    mItemEffectScroll->setPosition(2, 35);
+    mItemEffectScroll->setPosition(2, (2 * getFont()->getHeight()) + 5);
+
+    // Item Weight
+    mItemWeight = new TextBox();
+    mItemWeight->setEditable(false);
+    mItemWeight->setMinWidth(186);
+    mItemWeight->setTextWrapped("");
+    mItemWeightScroll = new ScrollArea(mItemWeight);
+
+    mItemWeightScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mItemWeightScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mItemWeightScroll->setDimension(gcn::Rectangle(0, 0, 196, getFont()->getHeight()));
+    mItemWeightScroll->setOpaque(false);
+    mItemWeightScroll->setPosition(2, (3 * getFont()->getHeight()) + 10);
 
     add(mItemName);
     add(mItemDescScroll);
     add(mItemEffectScroll);
+    add(mItemWeightScroll);
 
     setLocationRelativeTo(getParent());
 
     // LEEOR / TODO: This causes an exception error.
     //moveToBottom(getParent());
-
-    mItemDesc->setTextWrapped( "" );
-    mItemEffect->setTextWrapped( "" );
 }
 
 void ItemPopup::setItem(const ItemInfo &item)
@@ -92,30 +108,57 @@ void ItemPopup::setItem(const ItemInfo &item)
 
     mItemDesc->setMinWidth(width - 10);
     mItemEffect->setMinWidth(width - 10);
+    mItemWeight->setMinWidth(width - 10);
 
     mItemName->setCaption(item.getName());
     mItemDesc->setTextWrapped(item.getDescription());
     mItemEffect->setTextWrapped(item.getEffect());
+    mItemWeight->setTextWrapped(_("Weight: ") + toString(item.getWeight()) + 
+                                _(" grams"));
 
     int numRowsDesc = mItemDesc->getNumberOfRows();
     int numRowsEffect = mItemEffect->getNumberOfRows();
+    int numRowsWeight = mItemWeight->getNumberOfRows();
+
+    mItemDescScroll->setDimension(gcn::Rectangle(2, 0, 196,
+                                  numRowsDesc * getFont()->getHeight()));
+
+    mItemEffectScroll->setDimension(gcn::Rectangle(2, 0, 196,
+                                    numRowsEffect * getFont()->getHeight()));
+
+    mItemWeightScroll->setDimension(gcn::Rectangle(2, 0, 196,
+                                    numRowsWeight * getFont()->getHeight()));
 
     if(item.getEffect() == "")
-        setContentSize(200, (numRowsDesc * 14) + 30);
+    {
+        setContentSize(200, (numRowsDesc * getFont()->getHeight() + 
+                      (3 * getFont()->getHeight())));
+
+        mItemWeightScroll->setPosition(2, 
+                          (numRowsDesc * getFont()->getHeight()) +
+                          (2 * getFont()->getHeight()));
+    }
     else
-        setContentSize(200, (numRowsDesc * 14) + (numRowsEffect * 14) + 30);
-
-    mItemDescScroll->setDimension(gcn::Rectangle(2, 0, 196, numRowsDesc * 14));
+    {
+        setContentSize(200, (numRowsDesc * getFont()->getHeight()) + 
+                      (numRowsEffect * getFont()->getHeight()) +
+                      (3 * getFont()->getHeight()));
 
-    mItemEffectScroll->setDimension(gcn::Rectangle(2, 0, 196, numRowsEffect * 14));
+        mItemWeightScroll->setPosition(2, 
+                          (numRowsDesc * getFont()->getHeight()) +
+                          (numRowsEffect * getFont()->getHeight()) +
+                          (2 * getFont()->getHeight()));
+    }
 
     mItemDescScroll->setPosition(2, 20);
-    mItemEffectScroll->setPosition(2, (numRowsDesc * 15) + 25);
+    mItemEffectScroll->setPosition(2, (numRowsDesc * getFont()->getHeight()) +
+                      (2 * getFont()->getHeight()));
 }
 
 unsigned int ItemPopup::getNumRows()
 {
-    return mItemDesc->getNumberOfRows(), mItemEffect->getNumberOfRows();
+    return mItemDesc->getNumberOfRows() + mItemEffect->getNumberOfRows() +
+           mItemWeight->getNumberOfRows();
 }
 
 void ItemPopup::view(int x, int y)
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index 8ae2c98f..0c729231 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -42,8 +42,10 @@ class ItemPopup : public Window
         gcn::Label *mItemName;
         TextBox *mItemDesc;
         TextBox *mItemEffect;
+        TextBox *mItemWeight;
         ScrollArea *mItemDescScroll;
         ScrollArea *mItemEffectScroll;
+        ScrollArea *mItemWeightScroll;
 };
 
 #endif // ITEMPOPUP_H__
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index c32c3459..773febd7 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -84,7 +84,7 @@ void ItemDB::load()
         }
 
         int type = XML::getProperty(node, "type", 0);
-        //int weight = XML::getProperty(node, "weight", 0);
+        int weight = XML::getProperty(node, "weight", 0);
         int view = XML::getProperty(node, "view", 0);
 
         std::string name = XML::getProperty(node, "name", "");
@@ -103,7 +103,7 @@ void ItemDB::load()
             itemInfo->setEffect(effect);
             itemInfo->setType(type);
             itemInfo->setView(view);
-            //itemInfo->setWeight(weight);
+            itemInfo->setWeight(weight);
             itemInfo->setWeaponType(weaponType);
 
             for_each_xml_child_node(itemChild, node)
@@ -158,7 +158,7 @@ void ItemDB::load()
         CHECK_PARAM(description, "");
         // CHECK_PARAM(effect, "");
         // CHECK_PARAM(type, 0);
-        // CHECK_PARAM(weight, 0);
+        CHECK_PARAM(weight, 0);
         // CHECK_PARAM(slot, 0);
 
 #undef CHECK_PARAM
-- 
cgit v1.2.3-70-g09d2


From 63126a5dd5e6cf9acaf9b2114e8ac7213939d69f Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 26 Jan 2009 12:18:23 -0700
Subject: Made minimaps resizeable.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/minimap.cpp | 17 +++++++++++++----
 src/gui/window.h    | 20 ++++++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 9292ec05..e52a20ac 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -41,6 +41,7 @@ Minimap::Minimap():
     mProportion(0.5)
 {
     setWindowName(_("MiniMap"));
+    setResizable(true);
 }
 
 Minimap::~Minimap()
@@ -63,11 +64,19 @@ void Minimap::setMapImage(Image *img)
         const int titleWidth = getFont()->getWidth(getCaption()) + 15;
         const int mapWidth = mMapImage->getWidth() < 100 ? 
                              mMapImage->getWidth() + offsetX : 100;
+        const int mapHeight = mMapImage->getHeight() < 100 ? 
+                              mMapImage->getHeight() + offsetY : 100;
+
+        setMinWidth(mapWidth > titleWidth ? mapWidth : titleWidth);
+        setMinHeight(mapHeight);
+        setMaxWidth(mMapImage->getWidth() + offsetX);
+        setMaxHeight(mMapImage->getHeight() + offsetY);
+
         mMapImage->setAlpha(config.getValue("guialpha", 0.8));
-        setDefaultSize(offsetX, offsetY, 
-                       mapWidth > titleWidth ? mapWidth : titleWidth, 
-                       mMapImage->getHeight() < 100 ? 
-                           mMapImage->getHeight() + offsetY : 100);
+        setDefaultSize(offsetX, offsetY, getMinWidth() > getWidth() ? 
+                                              getMinWidth() : getWidth(),
+                                         getMaxHeight() < getHeight() ? 
+                                              getMaxHeight() : getHeight());
         loadWindowState();
         setVisible(mShow);
     }
diff --git a/src/gui/window.h b/src/gui/window.h
index 51b5186d..501ad160 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -129,6 +129,26 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         void setMaxHeight(unsigned int height);
 
+        /**
+         * Gets the minimum width of the window.
+         */
+        int getMinWidth() { return mMinWinWidth; }
+
+        /**
+         * Gets the minimum height of the window.
+         */
+        int getMinHeight() { return mMinWinHeight; }
+
+        /**
+         * Gets the maximum width of the window.
+         */
+        int getMaxWidth() { return mMaxWinWidth; }
+
+        /**
+         * Gets the minimum height of the window.
+         */
+        int getMaxHeight() { return mMaxWinHeight; }
+
         /**
          * Sets flag to show a title or not.
          */
-- 
cgit v1.2.3-70-g09d2


From 368a7d109248fe286aad278e744192746381df9c Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 26 Jan 2009 16:25:55 -0700
Subject: Created a new equipment screen, which is loosely related to the
 equipment screen on TMW's mainline client. Also fixed up the player box so
 that it can be used in game as well, which could potentially be useful in the
 future for making future equipment dialog changes.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/being.h                 |   3 +
 src/gui/equipmentwindow.cpp | 141 +++++++++++++++++++++++++++++++++++---------
 src/gui/equipmentwindow.h   |  59 ++++++++++++++----
 src/gui/playerbox.cpp       |   9 ++-
 4 files changed, 173 insertions(+), 39 deletions(-)

diff --git a/src/being.h b/src/being.h
index 80295db8..b4508661 100644
--- a/src/being.h
+++ b/src/being.h
@@ -370,6 +370,9 @@ class Being : public Sprite
 
         static std::string getHairColor(int index);
 
+        virtual AnimatedSprite* getSprite(int index) const
+            { return mSprites[index]; }
+
     protected:
         /**
          * Sets the new path for this being.
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index ff976b24..b532d621 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -19,16 +19,19 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define BOX_WIDTH 36
+#define BOX_HEIGHT 36
+
+#include <guichan/font.hpp>
+
+#include "button.h"
 #include "equipmentwindow.h"
+#include "playerbox.h"
 
-#include "../equipment.h"
-#include "../inventory.h"
-#include "../localplayer.h"
 #include "../graphics.h"
 #include "../inventory.h"
 #include "../item.h"
 #include "../localplayer.h"
-#include "../log.h"
 
 #include "../resources/iteminfo.h"
 #include "../resources/resourcemanager.h"
@@ -36,19 +39,57 @@
 #include "../utils/gettext.h"
 #include "../utils/tostring.h"
 
+// Positions of the boxes, 2nd dimension is X and Y respectively.
+static const int boxPosition[][2] = {
+    {50, 208},   // EQUIP_LEGS_SLOT
+    {8, 123},   // EQUIP_FIGHT1_SLOT
+    {8, 78},    // EQUIP_GLOVES_SLOT
+    {129, 168},  // EQUIP_RING2_SLOT
+    {8, 168},   // EQUIP_RING1_SLOT
+    {129, 123},  // EQUIP_FIGHT2_SLOT
+    {90, 208},  // EQUIP_FEET_SLOT
+    {50, 40},    // EQUIP_CAPE_SLOT
+    {70, 0},     // EQUIP_HEAD_SLOT
+    {90, 40},   // EQUIP_TORSO_SLOT
+    {129, 78}    // EQUIP_AMMO_SLOT
+};
+
 EquipmentWindow::EquipmentWindow(Equipment *equipment):
     Window(_("Equipment")),
-    mEquipment(equipment)
+    mEquipment(equipment),
+    mSelected(-1)
+
 {
+    // Control that shows the Player
+    mPlayerBox = new PlayerBox;
+    mPlayerBox->setDimension(gcn::Rectangle(50, 80, 74, 123));
+    mPlayerBox->setPlayer(player_node);
+
     setWindowName("Equipment");
     setCloseButton(true);
-    setDefaultSize(5, 230, 200, 140);
+    setDefaultSize(5, 195, 180, 300);
     loadWindowState();
+
+    mUnequip = new Button(_("Unequip"), "unequip", this);
+    gcn::Rectangle const &area = getChildrenArea();
+    mUnequip->setPosition(area.width  - mUnequip->getWidth() - 5,
+                          area.height - mUnequip->getHeight() - 5);
+
+    add(mPlayerBox);
+    add(mUnequip);
+
+    for (int i = EQUIP_LEGS_SLOT; i < EQUIP_VECTOREND; i++)
+    {
+        mEquipBox[i].posX = boxPosition[i][0] + getPadding();
+        mEquipBox[i].posY = boxPosition[i][1] + getTitleBarHeight();
+    }
+
     mInventory = player_node->getInventory();
 }
 
 EquipmentWindow::~EquipmentWindow()
 {
+    delete mUnequip;
 }
 
 void EquipmentWindow::draw(gcn::Graphics *graphics)
@@ -56,38 +97,84 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
     // Draw window graphics
     Window::draw(graphics);
 
-    Item *item;
-    Image *image;
+    Item* item;
 
-    // Rectangles around items are black
-    graphics->setColor(gcn::Color(0, 0, 0));
+    Graphics *g = static_cast<Graphics*>(graphics);
 
-    for (int i = 0; i < EQUIPMENT_SIZE; i++) {
-        graphics->drawRectangle(gcn::Rectangle(10 + 36 * (i % 4),
-                36 * (i / 4) + 25, 32, 32));
+    Window::drawChildren(graphics);
 
-        if (!(item = mInventory->getItem(mEquipment->getEquipment(i))))
-            continue;
+    for (int i = EQUIP_LEGS_SLOT; i < EQUIP_VECTOREND; i++)
+    {
+        item = (i != EQUIP_AMMO_SLOT) ?
+               mInventory->getItem(mEquipment->getEquipment(i)) :
+               mInventory->getItem(mEquipment->getArrows());
+        if (item)
+        {
+            // Draw Item.
+            Image* image = item->getImage();
+            g->drawImage(image, mEquipBox[i].posX, mEquipBox[i].posY);
+            if (i == EQUIP_AMMO_SLOT)
+            {
+                graphics->drawText(toString(item->getQuantity()),
+                                   mEquipBox[i].posX + (BOX_WIDTH / 2),
+                                   mEquipBox[i].posY - getFont()->getHeight(),
+                                   gcn::Graphics::CENTER); 
+            }
+        }
 
-        image = item->getImage();
-        if (image)
+        if (i == mSelected)
+        {
+            // Set color red.
+            g->setColor(gcn::Color(255, 0, 0));
+        }
+        else
         {
-            static_cast<Graphics*>(graphics)->drawImage(
-                    image, 36 * (i % 4) + 10, 36 * (i / 4) + 25);
+            // Set color black.
+            g->setColor(gcn::Color(0, 0, 0));
         }
+
+        // Draw box border.
+        g->drawRectangle(gcn::Rectangle(mEquipBox[i].posX, mEquipBox[i].posY,
+            BOX_WIDTH, BOX_HEIGHT));
+    }
+}
+
+void EquipmentWindow::action(const gcn::ActionEvent &event)
+{
+    if (event.getId() == "unequip" && mSelected > -1)
+    {
+        Item* item = (mSelected != EQUIP_AMMO_SLOT) ?
+                     mInventory->getItem(mEquipment->getEquipment(mSelected)) :
+                     mInventory->getItem(mEquipment->getArrows());
+        player_node->unequipItem(item);
+        mSelected = -1;
     }
+}
 
-    graphics->drawRectangle(gcn::Rectangle(160, 25, 32, 32));
+void EquipmentWindow::mousePressed(gcn::MouseEvent& mouseEvent)
+{
+    Window::mousePressed(mouseEvent);
 
-     if (!(item = mInventory->getItem(mEquipment->getArrows())))
-        return;
+    const int x = mouseEvent.getX();
+    const int y = mouseEvent.getY();
 
-    image = item->getImage();
+    Item* item;
 
-    if (image)
+    // Checks if any of the presses were in the equip boxes.
+    for (int i = EQUIP_LEGS_SLOT; i < EQUIP_VECTOREND; i++)
     {
-        static_cast<Graphics*>(graphics)->drawImage(image, 160, 25);
+        item = (i != EQUIP_AMMO_SLOT) ?
+               mInventory->getItem(mEquipment->getEquipment(i)) :
+               mInventory->getItem(mEquipment->getArrows());
+        gcn::Rectangle tRect(mEquipBox[i].posX, mEquipBox[i].posY,
+                             BOX_WIDTH, BOX_HEIGHT);
+        if (tRect.isPointInRect(x, y))
+        {
+            if (item)
+            {
+                mSelected = i;
+            }
+        }
     }
-    graphics->drawText(toString(item->getQuantity()), 170, 62,
-            gcn::Graphics::CENTER);   
 }
+
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 3a3f37f4..d8018644 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -1,41 +1,51 @@
 /*
  *  The Mana World
- *  Copyright (C) 2004  The Mana World Development Team
+ *  Copyright 2004 The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  The Mana World is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  The Mana World is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
+ *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef EQUIPMENTWINDOW_H
-#define EQUIPMENTWINDOW_H
+#ifndef EQUIPMENT_WINDOW_H
+#define EQUIPMENT_WINDOW_H
+
+#include <guichan/actionlistener.hpp>
 
 #include "window.h"
-#include "../inventory.h"
 
-#include "../guichanfwd.h"
-#include "../inventory.h"
+#include "../equipment.h"
+
+class Inventory;
+class PlayerBox;
 
-class Equipment;
+/**
+ * Equipment box.
+ */
+struct EquipBox
+{
+    int posX;
+    int posY;
+};
 
 /**
  * Equipment dialog.
  *
  * \ingroup Interface
  */
-class EquipmentWindow : public Window
+class EquipmentWindow : public Window, public gcn::ActionListener
 {
     public:
         /**
@@ -53,9 +63,36 @@ class EquipmentWindow : public Window
          */
         void draw(gcn::Graphics *graphics);
 
+        void action(const gcn::ActionEvent &event);
+
+        void mousePressed(gcn::MouseEvent& mouseEvent);
+
+        enum {
+            // Equipment rules:
+            EQUIP_LEGS_SLOT = 0,
+            EQUIP_FIGHT1_SLOT,
+            EQUIP_GLOVES_SLOT,
+            EQUIP_RING2_SLOT,
+            EQUIP_RING1_SLOT,
+            EQUIP_FIGHT2_SLOT,
+            EQUIP_FEET_SLOT,
+            EQUIP_CAPE_SLOT,
+            EQUIP_HEAD_SLOT,
+            EQUIP_TORSO_SLOT,
+            EQUIP_AMMO_SLOT,
+            EQUIP_VECTOREND
+        };
+
+
     private:
         Equipment *mEquipment;
         Inventory *mInventory;
+        gcn::Button *mUnequip;                  /**< Button for unequipping. */
+        EquipBox mEquipBox[EQUIP_VECTOREND];    /**< Equipment Boxes. */
+
+        PlayerBox *mPlayerBox;
+
+        int mSelected;                          /**< Index of selected item. */
 };
 
 extern EquipmentWindow *equipmentWindow;
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index e8c19ad4..c22d407c 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -23,6 +23,7 @@
 
 #include "playerbox.h"
 
+#include "../animatedsprite.h"
 #include "../configuration.h"
 #include "../graphics.h"
 #include "../player.h"
@@ -85,7 +86,13 @@ void PlayerBox::draw(gcn::Graphics *graphics)
         bs = getFrameSize();
         x = getWidth() / 2 - 16 + bs;
         y = getHeight() / 2 + bs;
-        mPlayer->draw(static_cast<Graphics*>(graphics), x, y);
+        for (int i = 0; i < Being::VECTOREND_SPRITE; i++)
+        {
+            if (mPlayer->getSprite(i) != NULL)
+            {
+                mPlayer->getSprite(i)->draw(static_cast<Graphics*>(graphics), x, y);
+            }
+        }
     }
 }
 
-- 
cgit v1.2.3-70-g09d2


From 6b658b783521d17dffaa7609491c627f1d9763db Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 26 Jan 2009 16:44:52 -0700
Subject: Merged new and delete buttons, since either one or the other is
 always enabled, and having both doesn't look as good.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/char_select.cpp | 41 +++++++++++++++++++++--------------------
 src/gui/char_select.h   |  3 +--
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index af030280..e556dfa0 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -21,6 +21,7 @@
 
 #include <string>
 
+#include <guichan/font.hpp>
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
@@ -90,10 +91,13 @@ CharSelectDialog::CharSelectDialog(Network *network,
     mJobLevelLabel = new gcn::Label(strprintf(_("Job Level: %d"), 0));
     mMoneyLabel = new gcn::Label(strprintf(_("Money: %d"), 0));
 
+    const std::string tempString = getFont()->getWidth(_("New")) < 
+                                   getFont()->getWidth(_("Delete")) ? 
+                                   _("Delete") : _("New");
+
     mPreviousButton = new Button(_("Previous"), "previous", this);
     mNextButton = new Button(_("Next"), "next", this);
-    mNewCharButton = new Button(_("New"), "new", this);
-    mDelCharButton = new Button(_("Delete"), "delete", this);
+    mNewDelCharButton = new Button(tempString, "newdel", this);
     mSelectButton = new Button(_("Ok"), "ok", this);
     mCancelButton = new Button(_("Cancel"), "cancel", this);
 
@@ -101,8 +105,7 @@ CharSelectDialog::CharSelectDialog(Network *network,
     place = getPlacer(0, 0);
 
     place(0, 0, mPlayerBox, 1, 6).setPadding(3);
-    place(1, 0, mNewCharButton);
-    place(2, 0, mDelCharButton);
+    place(1, 0, mNewDelCharButton);
     place(1, 1, mNameLabel, 5);
     place(1, 2, mLevelLabel, 5);
     place(1, 3, mJobLevelLabel, 5);
@@ -127,8 +130,7 @@ void CharSelectDialog::action(const gcn::ActionEvent &event)
     if (event.getId() == "ok" && n_character > 0)
     {
         // Start game
-        mNewCharButton->setEnabled(false);
-        mDelCharButton->setEnabled(false);
+        mNewDelCharButton->setEnabled(false);
         mSelectButton->setEnabled(false);
         mPreviousButton->setEnabled(false);
         mNextButton->setEnabled(false);
@@ -139,20 +141,21 @@ void CharSelectDialog::action(const gcn::ActionEvent &event)
     {
         state = EXIT_STATE;
     }
-    else if (event.getId() == "new" && n_character <= MAX_SLOT)
-    {
-        // Start new character dialog
-        CharCreateDialog *charCreateDialog =
-            new CharCreateDialog(this, mCharInfo->getPos(), mNetwork, mGender);
-        charServerHandler.setCharCreateDialog(charCreateDialog);
-    }
-    else if (event.getId() == "delete")
+    else if (event.getId() == "newdel")
     {
-        // Delete character
-        if (mCharInfo->getEntry())
+        // Check for a character
+        if (mCharInfo->getEntry() && n_character <= MAX_SLOT )
         {
             new CharDeleteConfirm(this);
         }
+        else
+        {
+            // Start new character dialog
+            CharCreateDialog *charCreateDialog =
+                new CharCreateDialog(this, mCharInfo->getPos(),
+                                     mNetwork, mGender);
+            charServerHandler.setCharCreateDialog(charCreateDialog);
+        }
     }
     else if (event.getId() == "previous")
     {
@@ -176,8 +179,7 @@ void CharSelectDialog::updatePlayerInfo()
         mMoneyLabel->setCaption(strprintf(_("Gold: %d"), pi->mGp));
         if (!mCharSelected)
         {
-            mNewCharButton->setEnabled(false);
-            mDelCharButton->setEnabled(true);
+            mNewDelCharButton->setCaption(_("Delete"));
             mSelectButton->setEnabled(true);
         }
     }
@@ -187,8 +189,7 @@ void CharSelectDialog::updatePlayerInfo()
         mLevelLabel->setCaption(strprintf(_("Level: %d"), 0));
         mJobLevelLabel->setCaption(strprintf(_("Job Level: %d"), 0));
         mMoneyLabel->setCaption(strprintf(_("Money: %d"), 0));
-        mNewCharButton->setEnabled(true);
-        mDelCharButton->setEnabled(false);
+        mNewDelCharButton->setCaption(_("New"));
         mSelectButton->setEnabled(false);
     }
 
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index 23f5499c..5d4ecfa8 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -65,8 +65,7 @@ class CharSelectDialog : public Window, public gcn::ActionListener
 
         gcn::Button *mSelectButton;
         gcn::Button *mCancelButton;
-        gcn::Button *mNewCharButton;
-        gcn::Button *mDelCharButton;
+        gcn::Button *mNewDelCharButton;
         gcn::Button *mPreviousButton;
         gcn::Button *mNextButton;
 
-- 
cgit v1.2.3-70-g09d2


From 306e345adab33a67e3fc12aad2f7ae7c6c86302c Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 26 Jan 2009 19:48:33 -0700
Subject: Slight bit of code cleanup, as well as minor fixes to logic. For some
 reason, the windows will gladly shrink when resizeable, but not grow. This
 will need to get resolved some time later.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/engine.cpp      | 31 ++++++++++++-------------------
 src/game.cpp        |  8 ++------
 src/gui/minimap.cpp | 28 +++++++++++++++++++---------
 3 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/src/engine.cpp b/src/engine.cpp
index ab13450e..29b8921a 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -81,16 +81,13 @@ void Engine::changeMap(const std::string &mapPath)
     map_path = "maps/" + mapPath.substr(0, mapPath.rfind(".")) + ".tmx";
     ResourceManager *resman = ResourceManager::getInstance();
     if (!resman->exists(map_path))
-    {
         map_path += ".gz";
-    }
 
     // Attempt to load the new map
     Map *newMap = MapReader::readMap(map_path);
 
-    if (!newMap) {
+    if (!newMap)
         logger->error("Could not find map file");
-    }
 
     // Notify the minimap and beingManager about the map change
     Image *mapImage = NULL;
@@ -100,28 +97,24 @@ void Engine::changeMap(const std::string &mapPath)
 
         // Set the title for the Minimap
         if (newMap->hasProperty("mapname"))
-        {
              minimap->setCaption(newMap->getProperty("mapname"));
-        }
         else if (newMap->hasProperty("name"))
-        {
             minimap->setCaption(newMap->getProperty("name"));
-        }
         else
         {
              minimap->setCaption("Unknown");
-             logger->log("WARNING: Map file '%s' defines a minimap image but does not define a 'mapname' property", map_path.c_str());
+             logger->log("WARNING: Map file '%s' defines a minimap image but "
+                         "does not define a 'mapname' property",
+                         map_path.c_str());
         }
-        // How many pixels equal one tile. .5 (which is the TMW default) is 2 tiles to a pixel, 
-        // while 1 is 1 tile to 1 pixel
+
+        // How many pixels equal one tile. .5 (which is the TMW default) is 
+        // 2 tiles to a pixel, while 1 is 1 tile to 1 pixel
         if (newMap->hasProperty("minimapproportion"))
-        {
-             minimap->setProportion(atof(newMap->getProperty("minimapproportion").c_str()));
-        }
+             minimap->setProportion(atof(
+                      newMap->getProperty("minimapproportion").c_str()));
         else
-        {
              minimap->setProportion(0.5);
-        }
     }
     minimap->setMapImage(mapImage);
     beingManager->setMap(newMap);
@@ -134,16 +127,16 @@ void Engine::changeMap(const std::string &mapPath)
     // Start playing new music file when necessary
     std::string oldMusic = "";
 
-    if (mCurrentMap) {
+    if (mCurrentMap)
+    {
         oldMusic = mCurrentMap->getProperty("music");
         delete mCurrentMap;
     }
 
     std::string newMusic = newMap->getProperty("music");
 
-    if (newMusic != oldMusic) {
+    if (newMusic != oldMusic)
         sound.playMusic(newMusic, -1);
-    }
 
     mCurrentMap = newMap;
     mMapName = mapPath;
diff --git a/src/game.cpp b/src/game.cpp
index 76cf792e..5b37d409 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -234,12 +234,8 @@ void createGuiWindows(Network *network)
         itemShortcutWindow->getWindowName() + "Visible", true));
     emoteShortcutWindow->setVisible((bool) config.getValue(
         emoteShortcutWindow->getWindowName() + "Visible", true));
-
-    if (!(bool) config.getValue("MinimapVisible", true))
-        minimap->toggle();
-
-    if (config.getValue("logToChat", 0))
-        logger->setChatWindow(chatWindow);
+    minimap->setVisible((bool) config.getValue(
+        minimap->getWindowName() + "Visible", true));
 }
 
 /**
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index e52a20ac..7802b583 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -33,14 +33,16 @@
 
 #include "../utils/gettext.h"
 
-bool Minimap::mShow = config.getValue("MinimapVisible", true);
+bool Minimap::mShow = true;
 
 Minimap::Minimap():
-    Window(_("Map")),
+    Window(_("MiniMap")),
     mMapImage(NULL),
     mProportion(0.5)
 {
     setWindowName(_("MiniMap"));
+    mShow = config.getValue(getWindowName() + "Visible", true);
+    setDefaultSize(5, 25, 100, 100);
     setResizable(true);
 }
 
@@ -59,8 +61,8 @@ void Minimap::setMapImage(Image *img)
 
     if (mMapImage)
     {
-        const int offsetX = getPadding() + 4;
-        const int offsetY = getTitleBarHeight() + 4;
+        const int offsetX = 2 * getPadding();
+        const int offsetY = getTitleBarHeight() + getPadding();
         const int titleWidth = getFont()->getWidth(getCaption()) + 15;
         const int mapWidth = mMapImage->getWidth() < 100 ? 
                              mMapImage->getWidth() + offsetX : 100;
@@ -73,10 +75,18 @@ void Minimap::setMapImage(Image *img)
         setMaxHeight(mMapImage->getHeight() + offsetY);
 
         mMapImage->setAlpha(config.getValue("guialpha", 0.8));
-        setDefaultSize(offsetX, offsetY, getMinWidth() > getWidth() ? 
-                                              getMinWidth() : getWidth(),
-                                         getMaxHeight() < getHeight() ? 
-                                              getMaxHeight() : getHeight());
+
+        // Set content size to be within the minimum and maximum boundaries
+        setWidth(getMinWidth() < getWidth() ? getWidth() : getMinWidth());
+        if (getMaxWidth() > getWidth())
+            setWidth(getMaxWidth());
+        setHeight(getMinHeight() < getHeight() ? getHeight() : getMinHeight());
+        if (getMaxHeight() > getHeight())
+            setHeight(getMaxHeight());
+
+        setDefaultSize(getX(), getY(), getWidth(), getHeight());
+        resetToDefaultSize();
+
         loadWindowState();
         setVisible(mShow);
     }
@@ -89,7 +99,7 @@ void Minimap::setMapImage(Image *img)
 void Minimap::toggle()
 {
     mShow = !mShow;
-    config.setValue("MinimapVisible", mShow);
+    config.setValue(getWindowName() + "Visible", mShow);
 }
 
 void Minimap::draw(gcn::Graphics *graphics)
-- 
cgit v1.2.3-70-g09d2


From ebc287a74689cfd283bd3a87d8969f3e689b6aa6 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 26 Jan 2009 20:37:01 -0700
Subject: Little bit of include cleanups.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/emoteshortcutcontainer.h  |  2 --
 src/gui/emotewindow.cpp           |  1 +
 src/gui/emotewindow.h             |  4 ++--
 src/gui/equipmentwindow.cpp       | 11 ++++++-----
 src/gui/equipmentwindow.h         |  3 +--
 src/gui/itemcontainer.cpp         |  1 +
 src/gui/itemcontainer.h           |  3 +--
 src/gui/itemshortcutcontainer.cpp |  1 +
 src/gui/itemshortcutcontainer.h   |  6 ++----
 src/gui/shortcutcontainer.h       |  4 ++--
 10 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/gui/emoteshortcutcontainer.h b/src/gui/emoteshortcutcontainer.h
index 71485259..cffaee6f 100644
--- a/src/gui/emoteshortcutcontainer.h
+++ b/src/gui/emoteshortcutcontainer.h
@@ -25,8 +25,6 @@
 #include <vector>
 
 #include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
 
 #include "shortcutcontainer.h"
 
diff --git a/src/gui/emotewindow.cpp b/src/gui/emotewindow.cpp
index 3653cb68..b4e9c735 100644
--- a/src/gui/emotewindow.cpp
+++ b/src/gui/emotewindow.cpp
@@ -28,6 +28,7 @@
 #include "emotewindow.h"
 #include "emotecontainer.h"
 #include "scrollarea.h"
+#include "textbox.h"
 
 #include "widgets/layout.h"
 
diff --git a/src/gui/emotewindow.h b/src/gui/emotewindow.h
index eaea1f7c..8e36e5ce 100644
--- a/src/gui/emotewindow.h
+++ b/src/gui/emotewindow.h
@@ -25,12 +25,12 @@
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
 
-#include "textbox.h"
 #include "window.h"
 
 #include "../guichanfwd.h"
 
 class EmoteContainer;
+class TextBox;
 
 /**
  * Emote dialog.
@@ -38,7 +38,7 @@ class EmoteContainer;
  * \ingroup Interface
  */
 class EmoteWindow : public Window, gcn::ActionListener,
-    gcn::SelectionListener
+                                   gcn::SelectionListener
 {
     public:
         /**
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index b532d621..b37dfc3a 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -28,6 +28,7 @@
 #include "equipmentwindow.h"
 #include "playerbox.h"
 
+#include "../equipment.h"
 #include "../graphics.h"
 #include "../inventory.h"
 #include "../item.h"
@@ -42,15 +43,15 @@
 // Positions of the boxes, 2nd dimension is X and Y respectively.
 static const int boxPosition[][2] = {
     {50, 208},   // EQUIP_LEGS_SLOT
-    {8, 123},   // EQUIP_FIGHT1_SLOT
-    {8, 78},    // EQUIP_GLOVES_SLOT
+    {8, 123},    // EQUIP_FIGHT1_SLOT
+    {8, 78},     // EQUIP_GLOVES_SLOT
     {129, 168},  // EQUIP_RING2_SLOT
-    {8, 168},   // EQUIP_RING1_SLOT
+    {8, 168},    // EQUIP_RING1_SLOT
     {129, 123},  // EQUIP_FIGHT2_SLOT
-    {90, 208},  // EQUIP_FEET_SLOT
+    {90, 208},   // EQUIP_FEET_SLOT
     {50, 40},    // EQUIP_CAPE_SLOT
     {70, 0},     // EQUIP_HEAD_SLOT
-    {90, 40},   // EQUIP_TORSO_SLOT
+    {90, 40},    // EQUIP_TORSO_SLOT
     {129, 78}    // EQUIP_AMMO_SLOT
 };
 
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index d8018644..8e9b22eb 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -26,8 +26,7 @@
 
 #include "window.h"
 
-#include "../equipment.h"
-
+class Equipment;
 class Inventory;
 class PlayerBox;
 
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index e07a997c..ab3da9f6 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -25,6 +25,7 @@
 #include <guichan/selectionlistener.hpp>
 
 #include "itemcontainer.h"
+#include "itempopup.h"
 
 #include "../graphics.h"
 #include "../inventory.h"
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index aac06bae..5513faa7 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -28,13 +28,12 @@
 #include <guichan/widget.hpp>
 #include <guichan/widgetlistener.hpp>
 
-#include "itempopup.h"
-
 #include "../guichanfwd.h"
 
 class Image;
 class Inventory;
 class Item;
+class ItemPopup;
 
 namespace gcn {
     class SelectionListener;
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index 5179ceb8..8803ab15 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -21,6 +21,7 @@
 #include <SDL_mouse.h>
 
 #include "itemshortcutcontainer.h"
+#include "itempopup.h"
 
 #include "../configuration.h"
 #include "../graphics.h"
diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h
index 9b61ca86..d6a04d7b 100644
--- a/src/gui/itemshortcutcontainer.h
+++ b/src/gui/itemshortcutcontainer.h
@@ -23,16 +23,14 @@
 #define ITEMSHORTCUTCONTAINER_H
 
 #include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
 
-#include "../guichanfwd.h"
 #include "shortcutcontainer.h"
 
-#include "itempopup.h"
+#include "../guichanfwd.h"
 
 class Image;
 class Item;
+class ItemPopup;
 
 /**
  * An item shortcut container. Used to quickly use items.
diff --git a/src/gui/shortcutcontainer.h b/src/gui/shortcutcontainer.h
index d841f4d8..66aca6c3 100644
--- a/src/gui/shortcutcontainer.h
+++ b/src/gui/shortcutcontainer.h
@@ -36,8 +36,8 @@ class Image;
  * \ingroup GUI
  */
 class ShortcutContainer : public gcn::Widget,
-                              public gcn::WidgetListener,
-                              public gcn::MouseListener
+                          public gcn::WidgetListener,
+                          public gcn::MouseListener
 {
     public:
         /**
-- 
cgit v1.2.3-70-g09d2


From 354ca55186072cd152f3b13d58985b87e55d8e42 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 26 Jan 2009 20:57:29 -0700
Subject: Cleaned up inventory includes, as well as adding right click popup
 menus to the item shortcut container.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/inventorywindow.cpp       |  1 +
 src/gui/inventorywindow.h         |  4 ++--
 src/gui/itemshortcutcontainer.cpp | 33 +++++++++++++++++++++++++++------
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index fe3300dc..e0e496f7 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -33,6 +33,7 @@
 #include "itemcontainer.h"
 #include "progressbar.h"
 #include "scrollarea.h"
+#include "textbox.h"
 #include "viewport.h"
 
 #include "widgets/layout.h"
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 93b9c572..2c19ce26 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -25,7 +25,6 @@
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
 
-#include "textbox.h"
 #include "window.h"
 
 #include "../guichanfwd.h"
@@ -34,6 +33,7 @@
 class Item;
 class ItemContainer;
 class ProgressBar;
+class TextBox;
 
 /**
  * Inventory dialog.
@@ -41,7 +41,7 @@ class ProgressBar;
  * \ingroup Interface
  */
 class InventoryWindow : public Window, gcn::ActionListener,
-    gcn::SelectionListener
+                                       gcn::SelectionListener
 {
     public:
         /**
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index 8803ab15..83d8c9fb 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -20,8 +20,10 @@
  */
 #include <SDL_mouse.h>
 
+#include "gui.h"
 #include "itemshortcutcontainer.h"
 #include "itempopup.h"
+#include "viewport.h"
 
 #include "../configuration.h"
 #include "../graphics.h"
@@ -172,14 +174,33 @@ void ItemShortcutContainer::mousePressed(gcn::MouseEvent &event)
     if (index == -1)
         return;
 
-    // Stores the selected item if theirs one.
-    if (itemShortcut->isItemSelected())
+    if (event.getButton() == gcn::MouseEvent::LEFT)
     {
-        itemShortcut->setItem(index);
-        itemShortcut->setItemSelected(-1);
+
+        // Stores the selected item if theirs one.
+        if (itemShortcut->isItemSelected())
+        {
+            itemShortcut->setItem(index);
+            itemShortcut->setItemSelected(-1);
+        }
+        else if (itemShortcut->getItem(index))
+            mItemClicked = true;
+    }
+    else if (event.getButton() == gcn::MouseEvent::RIGHT)
+    {
+        Item *item = player_node->getInventory()->
+                     findItem(itemShortcut->getItem(index));
+
+        if (!item)
+            return;
+
+        /* Convert relative to the window coordinates to absolute screen
+         * coordinates.
+         */
+        int mx, my;
+        SDL_GetMouseState(&mx, &my);
+        viewport->showPopup(mx, my, item);
     }
-    else if (itemShortcut->getItem(index))
-        mItemClicked = true;
 }
 
 void ItemShortcutContainer::mouseReleased(gcn::MouseEvent &event)
-- 
cgit v1.2.3-70-g09d2


From 65e552d0bd3dee1f1962fc7e9adac4126ab603a4 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 26 Jan 2009 21:21:43 -0700
Subject: Adjusted selection colors so that it blends better with the Aethyra
 theme.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/listbox.cpp     | 2 +-
 src/gui/shoplistbox.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp
index 21b59a07..990a0ade 100644
--- a/src/gui/listbox.cpp
+++ b/src/gui/listbox.cpp
@@ -36,7 +36,7 @@ void ListBox::draw(gcn::Graphics *graphics)
     if (!mListModel)
         return;
 
-    graphics->setColor(gcn::Color(110, 160, 255));
+    graphics->setColor(gcn::Color(235, 200, 115));
     graphics->setFont(getFont());
 
     int fontHeight = getFont()->getHeight();
diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp
index b6a12658..765b9f08 100644
--- a/src/gui/shoplistbox.cpp
+++ b/src/gui/shoplistbox.cpp
@@ -72,7 +72,7 @@ void ShopListBox::draw(gcn::Graphics *gcnGraphics)
 
         if (i == mSelected)
         {
-            backgroundColor = gcn::Color(110, 160, 255);
+            backgroundColor = gcn::Color(235, 200, 115);
         }
         else if (mShopItems &&
                 mPlayerMoney < mShopItems->at(i)->getPrice() && mPriceCheck)
-- 
cgit v1.2.3-70-g09d2


From d49a39e76f5e086f443fe24e89ab5445682b3c31 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 26 Jan 2009 21:35:48 -0700
Subject: Fixed a few default window sizes so that they look better for first
 time client loaders.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/inventorywindow.cpp | 2 +-
 src/gui/npc_text.cpp        | 2 +-
 src/gui/npclistdialog.cpp   | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index e0e496f7..58c13910 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -57,7 +57,7 @@ InventoryWindow::InventoryWindow(int invSize):
     setCloseButton(true);
 
     // If you adjust these defaults, don't forget to adjust the trade window's.
-    setDefaultSize(115, 25, 322, 200);
+    setDefaultSize(115, 25, 375, 300);
 
     std::string longestUseString = getFont()->getWidth(_("Equip")) > 
                                    getFont()->getWidth(_("Use")) ?
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 3a0a86a6..a2e043d1 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -40,7 +40,7 @@ NpcTextDialog::NpcTextDialog():
     setMinWidth(200);
     setMinHeight(150);
 
-    setDefaultSize(0, 0, 260, 175);
+    setDefaultSize(0, 0, 260, 200);
 
     mBrowserBox = new BrowserBox(BrowserBox::AUTO_WRAP);
     mBrowserBox->setOpaque(false);
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 9f41be67..bb815680 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -38,6 +38,8 @@ NpcListDialog::NpcListDialog():
     setMinWidth(200);
     setMinHeight(150);
 
+    setDefaultSize(0, 0, 260, 200);
+
     mItemList = new ListBox(this);
     scrollArea = new ScrollArea(mItemList);
     okButton = new Button(_("OK"), "ok", this);
-- 
cgit v1.2.3-70-g09d2


From cbb9ceaac89f7a29ff36445f2405c1a24b7a0da8 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 26 Jan 2009 21:35:48 -0700
Subject: Fixed a few default window sizes so that they look better for first
 time client loaders.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/inventorywindow.cpp | 2 +-
 src/gui/npc_text.cpp        | 2 +-
 src/gui/npclistdialog.cpp   | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index e0e496f7..58c13910 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -57,7 +57,7 @@ InventoryWindow::InventoryWindow(int invSize):
     setCloseButton(true);
 
     // If you adjust these defaults, don't forget to adjust the trade window's.
-    setDefaultSize(115, 25, 322, 200);
+    setDefaultSize(115, 25, 375, 300);
 
     std::string longestUseString = getFont()->getWidth(_("Equip")) > 
                                    getFont()->getWidth(_("Use")) ?
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 3a0a86a6..a2e043d1 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -40,7 +40,7 @@ NpcTextDialog::NpcTextDialog():
     setMinWidth(200);
     setMinHeight(150);
 
-    setDefaultSize(0, 0, 260, 175);
+    setDefaultSize(0, 0, 260, 200);
 
     mBrowserBox = new BrowserBox(BrowserBox::AUTO_WRAP);
     mBrowserBox->setOpaque(false);
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 9f41be67..bb815680 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -38,6 +38,8 @@ NpcListDialog::NpcListDialog():
     setMinWidth(200);
     setMinHeight(150);
 
+    setDefaultSize(0, 0, 260, 200);
+
     mItemList = new ListBox(this);
     scrollArea = new ScrollArea(mItemList);
     okButton = new Button(_("OK"), "ok", this);
-- 
cgit v1.2.3-70-g09d2


From 127be512d44927cec17d29778265ab65c427ac33 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 26 Jan 2009 21:50:02 -0700
Subject: Removed the description option from right click menus on items. With
 item popups, this is no longer useful, as well as it never doing anything to
 begin with.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/popupmenu.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 88fd273e..bf7c803a 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -258,12 +258,6 @@ void PopupMenu::handleLink(const std::string& link)
     {
 	new ItemAmountWindow(AMOUNT_ITEM_DROP, inventoryWindow, mItem);
     }
-
-    else if (link == "description")
-    {
-	// do nothing for now, I need to write
-	// a window for the description first
-    }
     else if (link == "party-invite" &&
 	     mBeing != NULL &&
 	     mBeing->getType() == Being::PLAYER)
@@ -304,7 +298,6 @@ void PopupMenu::showPopup(int x, int y, Item *item)
 
     mBrowserBox->addRow(_("@@drop|Drop@@"));
     mBrowserBox->addRow(_("@@chat|Add to Chat@@"));
-    mBrowserBox->addRow(_("@@description|Description@@"));
     mBrowserBox->addRow("##3---");
     mBrowserBox->addRow(_("@@cancel|Cancel@@"));
 
-- 
cgit v1.2.3-70-g09d2


From ef4fc442bdbf575846936596eb642a2b52a8b237 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 26 Jan 2009 22:15:29 -0700
Subject: Fixed the number of arrows from drawing in red when the shirt is
 selected in the equipment window.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/equipmentwindow.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index b37dfc3a..1fb2b601 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -116,6 +116,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
             g->drawImage(image, mEquipBox[i].posX, mEquipBox[i].posY);
             if (i == EQUIP_AMMO_SLOT)
             {
+                g->setColor(gcn::Color(0, 0, 0));
                 graphics->drawText(toString(item->getQuantity()),
                                    mEquipBox[i].posX + (BOX_WIDTH / 2),
                                    mEquipBox[i].posY - getFont()->getHeight(),
-- 
cgit v1.2.3-70-g09d2


From 9a1111ee3b13ab9cb4a20d0236022f3c744686c3 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Mon, 26 Jan 2009 22:19:09 -0700
Subject: Bolded item names in the item popup. TODO: Modify this later to also
 color the item name based on general function, like speech bubbles do for
 being names.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/itempopup.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index 42ef88ae..8235d640 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -50,6 +50,7 @@ ItemPopup::ItemPopup():
     mItemName->setFont(gui->getFont());
     mItemName->setPosition(2, 2);
     mItemName->setWidth(getWidth() - 4);
+    mItemName->setFont(boldFont);
 
     // Item Description
     mItemDesc = new TextBox();
-- 
cgit v1.2.3-70-g09d2


From 27bcefc3d3730199f01e9a7972326ca0f62d33af Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 27 Jan 2009 10:02:51 +0100
Subject: Made font size configurable in config file

Just change the value of 'fontSize'. This should be made configurable in
the GUI though, and the GUI should then automatically adapt to the new
font size.
---
 src/gui/gui.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index dda171e0..ac9b10bf 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -108,7 +108,8 @@ Gui::Gui(Graphics *graphics):
     // Set global font
     std::string path = resman->getPath("fonts/dejavusans.ttf");
     try {
-        mGuiFont = new TrueTypeFont(path, 11);
+        const int fontSize = config.getValue("fontSize", 11);
+        mGuiFont = new TrueTypeFont(path, fontSize);
     }
     catch (gcn::Exception e)
     {
-- 
cgit v1.2.3-70-g09d2


From 9eb97160a7ea052054cbaa5fdf98352453a51c02 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 27 Jan 2009 08:19:58 -0700
Subject: Added font size config for the bold font as well.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/gui.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index ac9b10bf..642e916b 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -120,7 +120,8 @@ Gui::Gui(Graphics *graphics):
     // Set bold font
     path = resman->getPath("fonts/dejavusans-bold.ttf");
     try {
-        boldFont = new TrueTypeFont(path, 11);
+        const int fontSize = config.getValue("fontSize", 11);
+        boldFont = new TrueTypeFont(path, fontSize);
     }
     catch (gcn::Exception e)
     {
-- 
cgit v1.2.3-70-g09d2


From 955a7613d1fe116fe5e1da07a222b6849b3c885c Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 27 Jan 2009 08:17:31 +0000
Subject: Restore punching animation after weapon removal

---
 src/player.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/player.cpp b/src/player.cpp
index ad5b568b..ca8c9f14 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -161,6 +161,11 @@ void Player::setSprite(int slot, int id, std::string color)
     {
         delete mSprites[slot];
         mSprites[slot] = NULL;
+
+        if (slot == WEAPON_SPRITE)
+        {
+            mEquippedWeapon = NULL;
+        }
     }
     else
     {
-- 
cgit v1.2.3-70-g09d2