Merge branch '0.0.28'

Conflicts: po/POTFILES.in src/main.cpp src/main.h tmw.cbp
author: Bjørn Lindeijer <bjorn@lindeijer.nl> 2009-02-15 16:40:52 +0100
committer: Bjørn Lindeijer <bjorn@lindeijer.nl> 2009-02-15 16:40:52 +0100
commit: d6d906e2ad7b459882d628dfb07ed30ee36ed26b (patch)
tree: adcdd0ef5bfbff1a8df77b1420bf2c877cd00c82
parent: 1a5af5210f640d900efac540d781a80c90959c22 (diff)
parent: 4624f64d9bd89cd80030b2c0f143cfe4d2197229 (diff)
download: mana-client-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.tar.gz
mana-client-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.tar.bz2
mana-client-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.tar.xz
mana-client-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.zip
36 files changed, 2121 insertions, 1380 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ce5d305..b45c5376 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 PROJECT(TMW)
 
-SET(VERSION 0.0.28)
+SET(VERSION 0.0.28.1)
 
 # where to look for cmake modules
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)
diff --git a/NEWS b/NEWS
index 649771dc..a1733536 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+0.0.28.1 (12 February 2009)
+- Enabled translations on Windows
+- Added command line option to set home directory path
+- Tweaked green chat color to be a bit more readable
+- Made font size configurable in the config file
+- Fixed restoring of punching animation after weapon removal
+- Fixed inability to chat while talking to NPCs
+- Updated Swedish translation
+
 0.0.28 (25 January 2009)
 - Added support for animated map tiles
 - Added support for internationalization, plus many translations
diff --git a/README b/README
index e4272c12..1c5d5187 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA WORLD
 ==============
 
- Version: 0.0.28    Date: 25/1/2009
+ Version: 0.0.28.1    Date: 12/2/2009
 
  Development team:
   - See AUTHORS file for a list
diff --git a/configure.ac b/configure.ac
index 6162dca7..9e05f76f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([The Mana World], [0.0.28], [themanaworld-devel@lists.sourceforge.net], [tmw])
+AC_INIT([The Mana World], [0.0.28.1], [themanaworld-devel@lists.sourceforge.net], [tmw])
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h:config.h.in])
 AC_LANG_CPLUSPLUS
diff --git a/data/help/changes.txt b/data/help/changes.txt
index 62eed904..50242b50 100644
--- a/data/help/changes.txt
+++ b/data/help/changes.txt
@@ -3,6 +3,15 @@
  
 ##3                         === RECENT CHANGES ===
  
+ 0.0.28.1 (12 February 2009)
+ - Enabled translations on Windows
+ - Added command line option to set home directory path
+ - Tweaked green chat color to be a bit more readable
+ - Made font size configurable in the config file
+ - Fixed restoring of punching animation after weapon removal
+ - Fixed inability to chat while talking to NPCs
+ - Updated Swedish translation
+ 
  0.0.28 (25 January 2009)
  - Added support for animated map tiles
  - Added support for internationalization, plus many translations
@@ -64,18 +73,3 @@
  - 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
- 
diff --git a/data/help/header.txt b/data/help/header.txt
index 151eb262..661ec1e7 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -2,7 +2,7 @@
 ##1               T  H  E      M  A  N  A      W  O  R  L  D
 ##1               ==========================================
  
-           ##2Version:##6 0.0.28              ##2Date:##3 25 January 2009
+           ##2Version:##6 0.0.28.1            ##2Date:##3 12 February 2009
  
 ##2                    Website: http://themanaworld.org
  
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index e1c1e390..fd2f324b 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 "The Mana World"
-!define PRODUCT_VERSION "0.0.28"
+!define PRODUCT_VERSION "0.0.28.1"
 !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"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1b3dea84..034b0a79 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,18 +19,18 @@ src/gui/itempopup.cpp
 src/gui/login.cpp
 src/gui/menuwindow.cpp
 src/gui/minimap.cpp
+src/gui/npc_text.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
 src/gui/recorder.cpp
 src/gui/recorder.h
 src/gui/register.cpp
 src/gui/sell.cpp
-src/gui/setup_audio.cpp
 src/gui/setup.cpp
+src/gui/setup_audio.cpp
 src/gui/setup_colors.cpp
 src/gui/setup_joystick.cpp
 src/gui/setup_keyboard.cpp
diff --git a/po/ar.po b/po/ar.po
index b63517ec..61e64b40 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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+0100\n"
 "PO-Revision-Date: 2008-07-16 18:28+0000\n"
 "Last-Translator: صقر بن عبدالله <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -58,7 +58,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "إلغاء"
@@ -104,7 +105,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr "المستوى: %d"
@@ -150,8 +151,9 @@ msgstr "إنشاء"
 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:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr ""
 
@@ -465,7 +467,7 @@ msgstr "مهارات"
 msgid "Shortcut"
 msgstr "اختصار"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "تثبيت"
 
@@ -473,10 +475,23 @@ msgstr "تثبيت"
 msgid "MiniMap"
 msgstr "خارطة صغيرة"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr "NPC"
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "تسجيل"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -558,22 +573,10 @@ msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محار�
 msgid "Passwords do not match."
 msgstr "كلمات السرّ غير متطابقة."
 
-#: src/gui/register.cpp:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "خطأ"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "صوت"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "حجم صوت المؤثرّات"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "حجم صوت الموسيقا"
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr "تطبيق"
@@ -602,6 +605,18 @@ msgstr ""
 msgid "Players"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "صوت"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr "حجم صوت المؤثرّات"
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "حجم صوت الموسيقا"
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "إضغط على الزرّ لبدأ المعايرة"
@@ -767,16 +782,33 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "المستوى: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "النقود: %d"
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+#, fuzzy
+msgid "Job:"
+msgstr "المستوى: %d"
+
 #: src/gui/status.cpp:127
 #, fuzzy
 msgid "Stats"
@@ -810,50 +842,51 @@ msgstr "مهاجمة %+d"
 msgid "M.Defense:"
 msgstr "دفاع %+d"
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 #, fuzzy
 msgid "Strength"
 msgstr "القوّة:"
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 #, fuzzy
 msgid "Agility"
 msgstr "خفّة الحركة:"
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 #, fuzzy
 msgid "Vitality"
 msgstr "نشاط:"
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 #, fuzzy
 msgid "Intelligence"
 msgstr "ذكاء:"
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 #, fuzzy
 msgid "Dexterity"
 msgstr "المهارة:"
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -891,27 +924,27 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "جارِ الاتّصال..."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr ""
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
 #~ msgid "Unregister"
 #~ msgstr "إلغاء التسجيل"
 
diff --git a/po/ca.po b/po/ca.po
index 19d7b9c1..d3e34db3 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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+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"
@@ -57,7 +57,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr ""
@@ -103,7 +104,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr ""
@@ -148,8 +149,9 @@ msgstr ""
 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:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr ""
 
@@ -463,7 +465,7 @@ msgstr ""
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr ""
 
@@ -471,10 +473,22 @@ msgstr ""
 msgid "MiniMap"
 msgstr ""
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr ""
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+msgid "Reset"
+msgstr ""
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -555,22 +569,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr ""
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr ""
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr ""
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr ""
@@ -599,6 +601,18 @@ msgstr ""
 msgid "Players"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr ""
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr ""
@@ -763,16 +777,32 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, c-format
 msgid "Money: %d GP"
 msgstr ""
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+msgid "Job:"
+msgstr ""
+
 #: src/gui/status.cpp:127
 msgid "Stats"
 msgstr ""
@@ -801,45 +831,46 @@ msgstr ""
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 msgid "Strength"
 msgstr ""
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 msgid "Agility"
 msgstr ""
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 msgid "Vitality"
 msgstr ""
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 msgid "Intelligence"
 msgstr ""
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 msgid "Dexterity"
 msgstr ""
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -877,25 +908,25 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr ""
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
 #~ msgid "Change"
 #~ msgstr "canvi"
diff --git a/po/cs.po b/po/cs.po
index b17073e5..05b68d37 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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+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"
@@ -57,7 +57,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "Zrušit"
@@ -104,7 +105,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr "Úroveň: %d"
@@ -150,8 +151,9 @@ msgstr "Vytvořit"
 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:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr ""
 
@@ -465,7 +467,7 @@ msgstr "Dovednosti"
 msgid "Shortcut"
 msgstr "Zkratka"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "Nastavení"
 
@@ -473,10 +475,23 @@ msgstr "Nastavení"
 msgid "MiniMap"
 msgstr "MiniMapa"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr ""
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Registrace"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -557,22 +572,10 @@ msgstr "Heslo musí být kratší než %d znaků."
 msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
-#: src/gui/register.cpp:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "Chyba"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Zvuk"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr ""
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr ""
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr ""
@@ -601,6 +604,18 @@ msgstr "Klávesnice"
 msgid "Players"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Zvuk"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr ""
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr ""
@@ -766,16 +781,33 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Peníze: %d"
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+#, fuzzy
+msgid "Job:"
+msgstr "Úroveň: %d"
+
 #: src/gui/status.cpp:127
 #, fuzzy
 msgid "Stats"
@@ -809,49 +841,50 @@ msgstr "Útok %+d"
 msgid "M.Defense:"
 msgstr "Obrana %+d"
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 #, fuzzy
 msgid "Strength"
 msgstr "Síla:"
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 #, fuzzy
 msgid "Agility"
 msgstr "Vitalita:"
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalita:"
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligence:"
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 msgid "Dexterity"
 msgstr ""
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -889,27 +922,27 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Připojuji se..."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr ""
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Správa účtu a postavy"
 
diff --git a/po/da.po b/po/da.po
index d131c8b0..6e46e07a 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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+0100\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"
@@ -58,7 +58,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "Fortryd"
@@ -104,7 +105,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau: %d"
@@ -150,8 +151,9 @@ msgstr "Opret"
 msgid "Select Server"
 msgstr "Vælg Server"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: src/gui/char_server.cpp:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr "OK"
 
@@ -468,7 +470,7 @@ msgstr "Færdigheder"
 msgid "Shortcut"
 msgstr "Genvej"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "Opsætning"
 
@@ -476,10 +478,23 @@ msgstr "Opsætning"
 msgid "MiniMap"
 msgstr "MiniKort"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr "NPC"
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Nuværende:"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, fuzzy, c-format
 msgid "@@trade|Trade With %s@@"
@@ -561,22 +576,10 @@ msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
 msgid "Passwords do not match."
 msgstr "De indtastede adgangskoder stemmer ikke overens."
 
-#: src/gui/register.cpp:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "Fejl"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Lyd"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "Lydstyrke på effekter"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "Lydstyrke på musik"
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr "Anvend"
@@ -605,6 +608,18 @@ msgstr "Tastatur"
 msgid "Players"
 msgstr "Brugere"
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Lyd"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr "Lydstyrke på effekter"
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "Lydstyrke på musik"
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Tryk på knappen for at starte justeringen."
@@ -770,16 +785,33 @@ msgstr "Færdigheds points: %d"
 msgid "Up"
 msgstr "Op"
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Karriere: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Penge: %d GP"
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+#, fuzzy
+msgid "Job:"
+msgstr "Karriere: %d"
+
 #: src/gui/status.cpp:127
 #, fuzzy
 msgid "Stats"
@@ -813,50 +845,51 @@ msgstr "M.Angrib:"
 msgid "M.Defense:"
 msgstr "M.Forsvar:"
 
-#: src/gui/status.cpp:136
-#, fuzzy, c-format
+#: src/gui/status.cpp:137
+#, fuzzy, no-c-format
 msgid "% Accuracy:"
 msgstr "% Nøjagtighed:"
 
-#: src/gui/status.cpp:137
-#, fuzzy, c-format
+#: src/gui/status.cpp:139
+#, fuzzy, no-c-format
 msgid "% Evade:"
 msgstr "% Undvig:"
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr "% Refleks:"
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 #, fuzzy
 msgid "Strength"
 msgstr "Styrke"
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 #, fuzzy
 msgid "Agility"
 msgstr "Adræthed"
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 #, fuzzy
 msgid "Vitality"
 msgstr "Helbred"
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligens"
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 #, fuzzy
 msgid "Dexterity"
 msgstr "Behændighed"
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr "Held"
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr "Tilgode Status Points: %d"
@@ -896,27 +929,27 @@ msgstr "Spil"
 msgid "Completed"
 msgstr "Udført"
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr "Unavngivet"
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr "Blev smidt af serveren!"
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Opretter forbindelse til bane serveren..."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr "Opretter forbindelse til karakter serveren..."
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr "Opretter forbindelse til bruger serveren..."
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr "Unavngivet"
+
 #, fuzzy
 #~ msgid "Chat"
 #~ msgstr "Chat"
@@ -1063,9 +1096,6 @@ msgstr "Opretter forbindelse til bruger serveren..."
 #~ msgid "Port:"
 #~ msgstr "Port:"
 
-#~ msgid "Recent:"
-#~ msgstr "Nuværende:"
-
 #~ msgid "Keep"
 #~ msgstr "Behold"
 
diff --git a/po/de.po b/po/de.po
index 259325ca..4a03a9dc 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: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-25 22:01+0100\n"
-"PO-Revision-Date: 2009-01-19 20:15+0000\n"
-"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
+"POT-Creation-Date: 2009-02-12 20:22+0100\n"
+"PO-Revision-Date: 2009-01-28 16:16+0000\n"
+"Last-Translator: Philipp Sehmisch <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-25 22:24+0000\n"
+"X-Launchpad-Export-Date: 2009-02-12 19:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
@@ -57,7 +57,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -103,7 +104,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
@@ -148,19 +149,20 @@ msgstr "Erstellen"
 msgid "Select Server"
 msgstr "Server auswählen"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: src/gui/char_server.cpp:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr "Ok"
 
 #: src/gui/chat.cpp:115
 msgid "Global announcement:"
-msgstr ""
+msgstr "Globale Ansage:"
 
 #: src/gui/chat.cpp:118
 #, c-format
 msgid "Global announcement from %s:"
-msgstr ""
+msgstr "Globale Ansage von %s:"
 
 #: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82
 msgid "Server:"
@@ -206,15 +208,15 @@ msgstr ""
 
 #: src/gui/chat.cpp:382
 msgid "You have not yet reached a high enough lvl!"
-msgstr ""
+msgstr "Dein Level ist noch nicht hoch genug!"
 
 #: src/gui/chat.cpp:385
 msgid "Insufficient HP!"
-msgstr ""
+msgstr "Nicht genug HP!"
 
 #: src/gui/chat.cpp:388
 msgid "Insufficient SP!"
-msgstr ""
+msgstr "NIcht genug SP!"
 
 #: src/gui/chat.cpp:391
 msgid "You have no memos!"
@@ -463,7 +465,7 @@ msgstr "Fertigkeiten"
 msgid "Shortcut"
 msgstr "Tastenkürzel"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "Einstellungen"
 
@@ -471,10 +473,23 @@ msgstr "Einstellungen"
 msgid "MiniMap"
 msgstr "Übersichtskarte"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr "NPC"
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Registrieren"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -555,22 +570,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:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "Fehler"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Ton"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "Lautstärke der Klangeffekte"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "Latustärke der Musik"
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr "Anwenden"
@@ -599,6 +602,18 @@ msgstr "Tastatur"
 msgid "Players"
 msgstr "Spieler"
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Ton"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr "Lautstärke der Klangeffekte"
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "Latustärke der Musik"
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Knopf drücken um die Kalibrierung zu starten"
@@ -629,11 +644,11 @@ msgstr "Standard"
 
 #: src/gui/setup_keyboard.cpp:121
 msgid "Key Conflict(s) Detected."
-msgstr ""
+msgstr "Tastenkonflikte entdeckt."
 
 #: src/gui/setup_keyboard.cpp:122
 msgid "Resolve them, or gameplay may result in strange behaviour."
-msgstr ""
+msgstr "Bitte beheben, oder es wird zu merkwürdigem Verhalten im Spiel kommen."
 
 #: src/gui/setup_players.cpp:55
 msgid "Name"
@@ -709,7 +724,7 @@ msgstr "Hintergrundeffekte"
 
 #: src/gui/setup_video.cpp:144
 msgid "Particle Detail"
-msgstr ""
+msgstr "Partikeldetail"
 
 #: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398
 msgid "off"
@@ -758,22 +773,38 @@ msgstr ""
 #: src/gui/skill.cpp:132 src/gui/skill.cpp:188
 #, c-format
 msgid "Skill points: %d"
-msgstr ""
+msgstr "Fähigkeitspunkte: %d"
 
 #: src/gui/skill.cpp:133
 msgid "Up"
 msgstr "Erhöhen"
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, c-format
 msgid "Money: %d GP"
 msgstr "Geld: %d GP"
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+msgid "Job:"
+msgstr ""
+
 #: src/gui/status.cpp:127
 msgid "Stats"
 msgstr "Statistiken"
@@ -802,48 +833,49 @@ msgstr "M.Angriff:"
 msgid "M.Defense:"
 msgstr "M.Verteidigung:"
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr "% Genauigkeit"
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr "% Ausweichen:"
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr "% Reaktion:"
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 msgid "Strength"
 msgstr "Stärke"
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 msgid "Agility"
 msgstr "Beweglichkeit"
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 msgid "Vitality"
 msgstr "Gesundheit"
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 msgid "Intelligence"
 msgstr "Intelligenz"
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 msgid "Dexterity"
 msgstr "Ausdauer"
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr "Glück"
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
-msgstr ""
+msgstr "Verbleibende Statuspunkte: %d"
 
 #: src/gui/trade.cpp:61
 msgid "Add"
@@ -878,26 +910,26 @@ msgstr "Los!"
 msgid "Completed"
 msgstr "Fertig"
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr "Unbenannt"
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
-msgstr ""
+msgstr "Verbindung zum Server unterbrochen!"
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 msgid "Connecting to map server..."
 msgstr "Verbinde zu [map server]..."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr "Verbinde zu [character server]..."
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr "Verbinde zu [account server]..."
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr "Unbenannt"
+
 #~ msgid "Change"
 #~ msgstr "Ändern"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index f5cbb8ba..c38967e9 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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+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"
@@ -58,7 +58,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "Cancel"
@@ -104,7 +105,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
@@ -150,8 +151,9 @@ msgstr "Create"
 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:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr ""
 
@@ -465,7 +467,7 @@ msgstr "Skills"
 msgid "Shortcut"
 msgstr "Shortcut"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "Setup"
 
@@ -473,10 +475,23 @@ msgstr "Setup"
 msgid "MiniMap"
 msgstr "MiniMap"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr "NPC"
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Register"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -558,22 +573,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:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "Error"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Sound"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "Sfx volume"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "Music volume"
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr "Apply"
@@ -602,6 +605,18 @@ msgstr ""
 msgid "Players"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Sound"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr "Sfx volume"
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "Music volume"
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Press the button to start calibration"
@@ -767,16 +782,33 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Level: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Money: %d"
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+#, fuzzy
+msgid "Job:"
+msgstr "Level: %d"
+
 #: src/gui/status.cpp:127
 #, fuzzy
 msgid "Stats"
@@ -810,50 +842,51 @@ msgstr "Attack %+d"
 msgid "M.Defense:"
 msgstr "Defense %+d"
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 #, fuzzy
 msgid "Strength"
 msgstr "Strength:"
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 #, fuzzy
 msgid "Agility"
 msgstr "Agility:"
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitality:"
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligence:"
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 #, fuzzy
 msgid "Dexterity"
 msgstr "Dexterity:"
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -891,27 +924,27 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Connecting..."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr ""
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
 #~ msgid "Unregister"
 #~ msgstr "Unregister"
 
diff --git a/po/eo.po b/po/eo.po
index b4afff42..535ba851 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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+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"
@@ -57,7 +57,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr ""
@@ -103,7 +104,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr ""
@@ -148,8 +149,9 @@ msgstr ""
 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:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr ""
 
@@ -463,7 +465,7 @@ msgstr ""
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr ""
 
@@ -471,10 +473,22 @@ msgstr ""
 msgid "MiniMap"
 msgstr ""
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr ""
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+msgid "Reset"
+msgstr ""
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -555,22 +569,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr ""
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr ""
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr ""
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr ""
@@ -599,6 +601,18 @@ msgstr ""
 msgid "Players"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr ""
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr ""
@@ -762,16 +776,32 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, c-format
 msgid "Money: %d GP"
 msgstr ""
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+msgid "Job:"
+msgstr ""
+
 #: src/gui/status.cpp:127
 msgid "Stats"
 msgstr ""
@@ -800,45 +830,46 @@ msgstr ""
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 msgid "Strength"
 msgstr ""
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 msgid "Agility"
 msgstr ""
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 msgid "Vitality"
 msgstr ""
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 msgid "Intelligence"
 msgstr ""
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 msgid "Dexterity"
 msgstr ""
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -876,22 +907,22 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr ""
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
diff --git a/po/es.po b/po/es.po
index 74226821..ec2eaa95 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-25 22:01+0100\n"
-"PO-Revision-Date: 2008-10-15 01:37+0000\n"
-"Last-Translator: catalania <Unknown>\n"
+"POT-Creation-Date: 2009-02-12 20:22+0100\n"
+"PO-Revision-Date: 2009-01-27 13:52+0000\n"
+"Last-Translator: Habari <thomas.becerril@gmail.com>\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-Launchpad-Export-Date: 2009-02-12 19:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
@@ -47,9 +47,8 @@ msgid "Effect: %s"
 msgstr "Efecto: %s"
 
 #: src/gui/buysell.cpp:31
-#, fuzzy
 msgid "Shop"
-msgstr "Detener"
+msgstr "tienda"
 
 #: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
 msgid "Sell"
@@ -58,14 +57,15 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 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 ""
+msgstr "confirmar borrado de personaje"
 
 #: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
@@ -104,16 +104,16 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, 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
-#, fuzzy, c-format
+#, c-format
 msgid "Job Level: %d"
-msgstr "Nivel: %d"
+msgstr "nivel de trabajo %d"
 
 #: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
@@ -123,7 +123,7 @@ msgstr "Dinero: %d"
 #: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
-msgstr ""
+msgstr "oro: %d"
 
 #: src/gui/char_select.cpp:243
 msgid "Create Character"
@@ -146,23 +146,23 @@ msgid "Create"
 msgstr "Crear"
 
 #: src/gui/char_server.cpp:52
-#, fuzzy
 msgid "Select Server"
-msgstr "Seleccionar personaje"
+msgstr "Seleccionar servidor"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: src/gui/char_server.cpp:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
-msgstr ""
+msgstr "Aceptar"
 
 #: src/gui/chat.cpp:115
 msgid "Global announcement:"
-msgstr ""
+msgstr "Anuncio Global"
 
 #: src/gui/chat.cpp:118
 #, c-format
 msgid "Global announcement from %s:"
-msgstr ""
+msgstr "Anuncio global de %s"
 
 #: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82
 msgid "Server:"
@@ -171,208 +171,209 @@ msgstr "Servidor:"
 #: src/gui/chat.cpp:139
 #, c-format
 msgid "%s whispers:"
-msgstr ""
+msgstr "%s susurra"
 
 #: src/gui/chat.cpp:276
 #, c-format
 msgid "Whispering to %s: %s"
-msgstr ""
+msgstr "susurrando a %s: %s"
 
 #: src/gui/chat.cpp:349
 msgid "Unknown command"
-msgstr ""
+msgstr "Comando desconocido"
 
 #: src/gui/chat.cpp:359
 msgid "Trade failed!"
-msgstr ""
+msgstr "comercio fallido"
 
 #: src/gui/chat.cpp:362
 msgid "Emote failed!"
-msgstr ""
+msgstr "emcion fallida"
 
 #: src/gui/chat.cpp:365
 msgid "Sit failed!"
-msgstr ""
+msgstr "sentarse fallido"
 
 #: src/gui/chat.cpp:368
 msgid "Chat creating failed!"
-msgstr ""
+msgstr "creacion de chat fallida"
 
 #: src/gui/chat.cpp:371
 msgid "Could not join party!"
-msgstr ""
+msgstr "no pudiste unirte al grupo"
 
 #: src/gui/chat.cpp:374
 msgid "Cannot shout!"
-msgstr ""
+msgstr "no puedes gritar"
 
 #: src/gui/chat.cpp:382
 msgid "You have not yet reached a high enough lvl!"
-msgstr ""
+msgstr "no has alcanzado un nivel suficientemente alto"
 
 #: src/gui/chat.cpp:385
 msgid "Insufficient HP!"
-msgstr ""
+msgstr "puntos de vida insuficientes"
 
 #: src/gui/chat.cpp:388
 msgid "Insufficient SP!"
-msgstr ""
+msgstr "SP insuficientes"
 
 #: src/gui/chat.cpp:391
 msgid "You have no memos!"
-msgstr ""
+msgstr "No tienes ningun memo"
 
 #: src/gui/chat.cpp:394
 msgid "You cannot do that right now!"
-msgstr ""
+msgstr "no puedes hacer eso ahora mismo"
 
 #: src/gui/chat.cpp:397
 msgid "Seems you need more Zeny... ;-)"
-msgstr ""
+msgstr "parece ser que necesitas mas zeny"
 
 #: src/gui/chat.cpp:400
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr ""
+msgstr "no puedes usar esa habilidad con este tipo de arma"
 
 #: src/gui/chat.cpp:403
 msgid "You need another red gem!"
-msgstr ""
+msgstr "necesitas otra gmea roja"
 
 #: src/gui/chat.cpp:406
 msgid "You need another blue gem!"
-msgstr ""
+msgstr "necesitas otra gema azul"
 
 #: src/gui/chat.cpp:409
 msgid "You're carrying to much to do this!"
-msgstr ""
+msgstr "estas cargando demasiado de esto"
 
 #: src/gui/chat.cpp:412
 msgid "Huh? What's that?"
-msgstr ""
+msgstr "¿eh? que es eso?"
 
 #: src/gui/chat.cpp:418
 msgid "Warp failed..."
-msgstr ""
+msgstr "teletransporte fallido"
 
 #: src/gui/chat.cpp:421
 msgid "Could not steal anything..."
-msgstr ""
+msgstr "No pudiste robar nada"
 
 #: src/gui/chat.cpp:424
 msgid "Poison had no effect..."
-msgstr ""
+msgstr "el veneno no tuvo efecto"
 
 #: src/gui/chat.cpp:489
 msgid "-- Help --"
-msgstr ""
+msgstr "ayuda"
 
 #: src/gui/chat.cpp:492
 msgid "/announce: Global announcement (GM only)"
-msgstr ""
+msgstr "/announce ; anuncio global (GM solo)"
 
 #: src/gui/chat.cpp:493
 msgid "/clear: Clears this window"
-msgstr ""
+msgstr "/clear : limpia esta ventana"
 
 #: src/gui/chat.cpp:494
 msgid "/help: Display this help"
-msgstr ""
+msgstr "/help : muestra esta ayuda"
 
 #: src/gui/chat.cpp:495
 msgid "/where: Display map name"
-msgstr ""
+msgstr "/where : muestra nombre del mapa"
 
 #: src/gui/chat.cpp:496
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
-msgstr ""
+msgstr "/whisper <nick> <mensaje> : manda un <mensaje> privado para <nick>"
 
 #: src/gui/chat.cpp:498
 msgid "/w <nick> <message>: Short form for /whisper"
-msgstr ""
+msgstr "/w <nicl> <mensaje> abreviatura de /whisper"
 
 #: src/gui/chat.cpp:499
 msgid "/who: Display number of online users"
-msgstr ""
+msgstr "/who muestra el numero de jugadores online"
 
 #: src/gui/chat.cpp:500
 msgid "For more information, type /help <command>"
-msgstr ""
+msgstr "Par mas ayuda teclea el comando /help"
 
 #: src/gui/chat.cpp:505
 msgid "Command: /announce <msg>"
-msgstr ""
+msgstr "comando : /announce <mensaje>"
 
 #: src/gui/chat.cpp:506
 msgid "*** only available to a GM ***"
-msgstr ""
+msgstr "solo disponible para GM"
 
 #: src/gui/chat.cpp:507
 msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
+msgstr "este comando manda un mensaje a todos los jugadores que esten online"
 
 #: src/gui/chat.cpp:513
 msgid "Command: /clear"
-msgstr ""
+msgstr "comando: /clear"
 
 #: src/gui/chat.cpp:514
 msgid "This command clears the chat log of previous chat."
-msgstr ""
+msgstr "este comando borra"
 
 #: src/gui/chat.cpp:520
 msgid "Command: /help"
-msgstr ""
+msgstr "comando: /help"
 
 #: src/gui/chat.cpp:521
 msgid "This command displays a list of all commands available."
-msgstr ""
+msgstr "este comando da una lista de todos los comandos que hay"
 
 #: src/gui/chat.cpp:523
 msgid "Command: /help <command>"
-msgstr ""
+msgstr "comando: /help <comando>"
 
 #: src/gui/chat.cpp:524
 msgid "This command displays help on <command>."
-msgstr ""
+msgstr "este comando muestra ayuda sobre <otro comando>"
 
 #: src/gui/chat.cpp:529
 msgid "Command: /where"
-msgstr ""
+msgstr "comando: /where"
 
 #: src/gui/chat.cpp:530
 msgid "This command displays the name of the current map."
-msgstr ""
+msgstr "este comando muestra el nombre del mapa actual"
 
 #: src/gui/chat.cpp:536
 msgid "Command: /whisper <nick> <msg>"
-msgstr ""
+msgstr "comando: /whisper <mote> <mensaje>"
 
 #: src/gui/chat.cpp:537
 msgid "Command: /w <nick> <msg>"
-msgstr ""
+msgstr "comando: /w <mote> <mensaje>"
 
 #: src/gui/chat.cpp:538
 msgid "This command sends the message <msg> to <nick>."
-msgstr ""
+msgstr "este comando manda un mensaje <mensaje> a <mote>"
 
 #: src/gui/chat.cpp:540
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
+msgstr "si el <mote> incluye espacios , escribelo entre comillas (\"\")"
 
 #: src/gui/chat.cpp:546
 msgid "Command: /who"
-msgstr ""
+msgstr "comando: /who"
 
 #: src/gui/chat.cpp:547
 msgid "This command displays the number of players currently online."
 msgstr ""
+"este comando muestra el numero de jugadores que actualmente estan conectados"
 
 #: src/gui/chat.cpp:551
 msgid "Unknown command."
-msgstr ""
+msgstr "Orden desconocida."
 
 #: src/gui/chat.cpp:552
 msgid "Type /help for a list of commands."
-msgstr ""
+msgstr "teclea /help para una lista de comandos"
 
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
@@ -392,11 +393,11 @@ msgstr "Equipo"
 
 #: src/gui/help.cpp:33
 msgid "Help"
-msgstr ""
+msgstr "Ayuda"
 
 #: src/gui/help.cpp:41
 msgid "Close"
-msgstr ""
+msgstr "Cerrar"
 
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
@@ -414,12 +415,12 @@ msgstr "tirar"
 #: src/gui/inventorywindow.cpp:99
 #, c-format
 msgid "Weight: %d / %d"
-msgstr ""
+msgstr "peso: %d / %d"
 
 #: src/gui/inventorywindow.cpp:104
 #, c-format
 msgid "Slots used: %d / %d"
-msgstr ""
+msgstr "ranuras usadas : %d / %d"
 
 #: src/gui/inventorywindow.cpp:225
 msgid "Unequip"
@@ -447,7 +448,7 @@ msgstr "Contraseña:"
 
 #: src/gui/login.cpp:50
 msgid "Remember Username"
-msgstr ""
+msgstr "recordar nombre de usuario"
 
 #: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89
 msgid "Register"
@@ -465,7 +466,7 @@ msgstr "Habilidades"
 msgid "Shortcut"
 msgstr "Atajos"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "Configuración"
 
@@ -473,10 +474,23 @@ msgstr "Configuración"
 msgid "MiniMap"
 msgstr "Minimapa"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr "NPC"
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Registrar"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -502,9 +516,8 @@ msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Recoger %s@@"
 
 #: src/gui/popupmenu.cpp:283
-#, fuzzy
 msgid "@@use|Unequip@@"
-msgstr "@@use|Equipar@@"
+msgstr "@@usar|quitarselo@@"
 
 #: src/gui/popupmenu.cpp:285
 msgid "@@use|Equip@@"
@@ -528,11 +541,11 @@ msgstr "Confirmar:"
 
 #: src/gui/register.cpp:87
 msgid "Male"
-msgstr ""
+msgstr "Hombre"
 
 #: src/gui/register.cpp:88
 msgid "Female"
-msgstr ""
+msgstr "Mujer"
 
 #: src/gui/register.cpp:159
 #, c-format
@@ -558,22 +571,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:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "Error"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Sonido"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "Volumen efectos"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "Volumen musica"
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr "Aplicar"
@@ -600,7 +601,19 @@ msgstr "Teclado"
 
 #: src/gui/setup.cpp:94
 msgid "Players"
-msgstr ""
+msgstr "Jugadores"
+
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Sonido"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr "Volumen efectos"
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "Volumen musica"
 
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
@@ -624,61 +637,59 @@ msgstr "Gire el stick"
 
 #: src/gui/setup_keyboard.cpp:88
 msgid "Assign"
-msgstr ""
+msgstr "Asignar"
 
 #: src/gui/setup_keyboard.cpp:92
-#, fuzzy
 msgid "Default"
-msgstr "Eliminar"
+msgstr "Predeterminado"
 
 #: src/gui/setup_keyboard.cpp:121
 msgid "Key Conflict(s) Detected."
-msgstr ""
+msgstr "conflictos entre teclas detectados"
 
 #: src/gui/setup_keyboard.cpp:122
 msgid "Resolve them, or gameplay may result in strange behaviour."
-msgstr ""
+msgstr "resuelvelo , o el juego puede comportarse de manera extraña"
 
 #: src/gui/setup_players.cpp:55
-#, fuzzy
 msgid "Name"
 msgstr "Nombre:"
 
 #: src/gui/setup_players.cpp:56
 msgid "Relation"
-msgstr ""
+msgstr "Relacion"
 
 #: src/gui/setup_players.cpp:60
 msgid "Neutral"
-msgstr ""
+msgstr "Neutral"
 
 #: src/gui/setup_players.cpp:61
 msgid "Friend"
-msgstr ""
+msgstr "Amigo"
 
 #: src/gui/setup_players.cpp:62
 msgid "Disregarded"
-msgstr ""
+msgstr "desestimado"
 
 #: src/gui/setup_players.cpp:63
 msgid "Ignored"
-msgstr ""
+msgstr "Ingnorado"
 
 #: src/gui/setup_players.cpp:217
 msgid "Save player list"
-msgstr ""
+msgstr "guardar lista de jugdores"
 
 #: src/gui/setup_players.cpp:219
 msgid "Allow trading"
-msgstr ""
+msgstr "permitir comercio"
 
 #: src/gui/setup_players.cpp:221
 msgid "Allow whispers"
-msgstr ""
+msgstr "permitir susurros"
 
 #: src/gui/setup_players.cpp:248
 msgid "When ignoring:"
-msgstr ""
+msgstr "cuando ignorando"
 
 #: src/gui/setup_video.cpp:114
 msgid "Full screen"
@@ -714,7 +725,7 @@ msgstr "Efectos ambientales"
 
 #: src/gui/setup_video.cpp:144
 msgid "Particle Detail"
-msgstr ""
+msgstr "detalle particulas"
 
 #: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398
 msgid "off"
@@ -732,11 +743,11 @@ msgstr "alto"
 
 #: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418
 msgid "medium"
-msgstr ""
+msgstr "Medio"
 
 #: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424
 msgid "max"
-msgstr ""
+msgstr "max"
 
 #: src/gui/setup_video.cpp:296
 msgid "Switching to full screen"
@@ -756,107 +767,115 @@ msgstr "Se necesita reiniciar para aplicar los cambios hechos a OpenGL."
 
 #: src/gui/skill.cpp:79
 msgid "Mystery Skill"
-msgstr ""
+msgstr "habilidad mis"
 
 #: src/gui/skill.cpp:132 src/gui/skill.cpp:188
 #, c-format
 msgid "Skill points: %d"
-msgstr ""
+msgstr "puntos de habilidad: %d"
 
 #: src/gui/skill.cpp:133
 msgid "Up"
-msgstr ""
+msgstr "Arriba"
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
-#, fuzzy, c-format
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
+#, c-format
 msgid "Job: %d"
-msgstr "Nivel: %d"
+msgstr "trabajo : %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
-#, fuzzy, c-format
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
+#, c-format
 msgid "Money: %d GP"
-msgstr "Dinero: %d"
+msgstr "dinero: %d GP"
 
-#: src/gui/status.cpp:127
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
 #, fuzzy
+msgid "Job:"
+msgstr "trabajo : %d"
+
+#: src/gui/status.cpp:127
 msgid "Stats"
-msgstr "Estado"
+msgstr "Estadísticas"
 
 #: src/gui/status.cpp:128
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #: src/gui/status.cpp:129
 msgid "Cost"
-msgstr ""
+msgstr "Coste"
 
 #: src/gui/status.cpp:132
-#, fuzzy
 msgid "Attack:"
-msgstr "Ataque %+d"
+msgstr "Ataque:"
 
 #: src/gui/status.cpp:133
-#, fuzzy
 msgid "Defense:"
-msgstr "Defensa %+d"
+msgstr "defensa"
 
 #: src/gui/status.cpp:134
-#, fuzzy
 msgid "M.Attack:"
-msgstr "Ataque %+d"
+msgstr "ataque magico"
 
 #: src/gui/status.cpp:135
-#, fuzzy
 msgid "M.Defense:"
-msgstr "Defensa %+d"
+msgstr "defensa magica"
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
-msgstr ""
+msgstr "% AcPunteria"
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
-msgstr ""
+msgstr "% agilidad"
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
-msgstr ""
+msgstr "% reflejos"
 
-#: src/gui/status.cpp:282
-#, fuzzy
+#: src/gui/status.cpp:285
 msgid "Strength"
-msgstr "Fuerza:"
+msgstr "Fuerza"
 
-#: src/gui/status.cpp:283
-#, fuzzy
+#: src/gui/status.cpp:286
 msgid "Agility"
-msgstr "Agilidad:"
+msgstr "agilidad2"
 
-#: src/gui/status.cpp:284
-#, fuzzy
+#: src/gui/status.cpp:287
 msgid "Vitality"
-msgstr "Vitalidad:"
+msgstr "vitalidad"
 
-#: src/gui/status.cpp:285
-#, fuzzy
+#: src/gui/status.cpp:288
 msgid "Intelligence"
-msgstr "Inteligencia:"
+msgstr "inteligencia"
 
-#: src/gui/status.cpp:286
-#, fuzzy
+#: src/gui/status.cpp:289
 msgid "Dexterity"
-msgstr "Destreza:"
+msgstr "Destreza"
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
-msgstr ""
+msgstr "Suerte"
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
-msgstr ""
+msgstr "puntos de estatus que te quedan: %d"
 
 #: src/gui/trade.cpp:61
 msgid "Add"
@@ -864,7 +883,7 @@ msgstr "Añadir"
 
 #: src/gui/trade.cpp:64
 msgid "Trade"
-msgstr ""
+msgstr "Comercio"
 
 #: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209
 #, c-format
@@ -878,39 +897,43 @@ msgstr "Tu das:"
 #: src/gui/trade.cpp:290
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
+"no se pudo añadir objeto: No puedes sobreponer un tipo de objeto en la "
+"ventana"
 
 #: src/gui/updatewindow.cpp:93
 msgid "Updating..."
-msgstr ""
+msgstr "Actualizando ..."
 
 #: src/gui/updatewindow.cpp:119
 msgid "Play"
-msgstr ""
+msgstr "Jugar"
 
 #: src/gui/updatewindow.cpp:526
 msgid "Completed"
-msgstr ""
-
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
+msgstr "Terminado"
 
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
-msgstr ""
+msgstr "fuiste desconectado del servidor!!"
 
-#: src/main.cpp:956
-#, fuzzy
+#: src/main.cpp:965
 msgid "Connecting to map server..."
-msgstr "Conectando…"
+msgstr "conectando al servidor de mapas...."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
-msgstr ""
+msgstr "conectando al servidor de personajes..."
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
-msgstr ""
+msgstr "conectando al servidor de cuentas de usuario..."
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr "sin nombre"
+
+#~ msgid "Change"
+#~ msgstr "Modificar"
 
 #~ msgid "Unregister"
 #~ msgstr "Cancelar Cuenta"
@@ -963,9 +986,6 @@ msgstr ""
 #~ msgid "Confirm trade"
 #~ msgstr "Confirmar"
 
-#~ msgid "Change"
-#~ msgstr "Modificar"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/fi.po b/po/fi.po
index bcd5c901..25ea6067 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-25 22:01+0100\n"
-"PO-Revision-Date: 2008-12-30 10:23+0000\n"
+"POT-Creation-Date: 2009-02-12 20:22+0100\n"
+"PO-Revision-Date: 2009-02-02 12:09+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-Launchpad-Export-Date: 2009-02-12 19:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
@@ -47,9 +47,8 @@ msgid "Effect: %s"
 msgstr "Vaikutus: %s"
 
 #: src/gui/buysell.cpp:31
-#, fuzzy
 msgid "Shop"
-msgstr "Lopeta"
+msgstr "Kauppa"
 
 #: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
 msgid "Sell"
@@ -58,7 +57,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "Peru"
@@ -72,9 +72,8 @@ 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
-#, fuzzy
 msgid "Select Character"
-msgstr "Luo hahmo"
+msgstr "Valitse 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
@@ -105,16 +104,16 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, 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
-#, fuzzy, c-format
+#, c-format
 msgid "Job Level: %d"
-msgstr "Taso: %d"
+msgstr ""
 
 #: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
@@ -124,7 +123,7 @@ msgstr "Rahatilanne: %d"
 #: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
-msgstr ""
+msgstr "Raha: %d"
 
 #: src/gui/char_select.cpp:243
 msgid "Create Character"
@@ -147,14 +146,14 @@ msgid "Create"
 msgstr "Luo"
 
 #: src/gui/char_server.cpp:52
-#, fuzzy
 msgid "Select Server"
-msgstr "Vaihda palvelinta"
+msgstr "Valitse palvelin"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: src/gui/char_server.cpp:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
-msgstr ""
+msgstr "Ok"
 
 #: src/gui/chat.cpp:115
 msgid "Global announcement:"
@@ -466,7 +465,7 @@ msgstr "Taidot"
 msgid "Shortcut"
 msgstr "Pikavalinnat"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "Asetukset"
 
@@ -474,10 +473,23 @@ msgstr "Asetukset"
 msgid "MiniMap"
 msgstr "Apukartta"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr "Epäpelattava hahmo"
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Rekisteröidy"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -503,9 +515,8 @@ 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@@"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:285
 msgid "@@use|Equip@@"
@@ -559,22 +570,10 @@ msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: src/gui/register.cpp:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "Virhe"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Ääni"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "Äänitehosteiden voimakkuus"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "Musiikin voimakkuus"
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr "Käytä"
@@ -603,6 +602,18 @@ msgstr "Näppäimistö"
 msgid "Players"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Ääni"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr "Äänitehosteiden voimakkuus"
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "Musiikin voimakkuus"
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
@@ -628,9 +639,8 @@ msgid "Assign"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:92
-#, fuzzy
 msgid "Default"
-msgstr "Poista"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:121
 msgid "Key Conflict(s) Detected."
@@ -641,9 +651,8 @@ msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
 #: src/gui/setup_players.cpp:55
-#, fuzzy
 msgid "Name"
-msgstr "Nimi:"
+msgstr ""
 
 #: src/gui/setup_players.cpp:56
 msgid "Relation"
@@ -768,20 +777,35 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
-#, fuzzy, c-format
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
+#, c-format
 msgid "Job: %d"
-msgstr "Taso: %d"
+msgstr ""
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
-#, fuzzy, c-format
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
+#, c-format
 msgid "Money: %d GP"
-msgstr "Rahatilanne: %d"
+msgstr ""
+
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+msgid "Job:"
+msgstr ""
 
 #: src/gui/status.cpp:127
-#, fuzzy
 msgid "Stats"
-msgstr "Hahmon tiedot"
+msgstr ""
 
 #: src/gui/status.cpp:128
 msgid "Total"
@@ -792,69 +816,61 @@ msgid "Cost"
 msgstr ""
 
 #: src/gui/status.cpp:132
-#, fuzzy
 msgid "Attack:"
-msgstr "Hyökkäys %+d"
+msgstr ""
 
 #: src/gui/status.cpp:133
-#, fuzzy
 msgid "Defense:"
-msgstr "Puolustus %+d"
+msgstr ""
 
 #: src/gui/status.cpp:134
-#, fuzzy
 msgid "M.Attack:"
-msgstr "Hyökkäys %+d"
+msgstr ""
 
 #: src/gui/status.cpp:135
-#, fuzzy
 msgid "M.Defense:"
-msgstr "Puolustus %+d"
+msgstr ""
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
-#, fuzzy
+#: src/gui/status.cpp:285
 msgid "Strength"
-msgstr "Voima:"
+msgstr ""
 
-#: src/gui/status.cpp:283
-#, fuzzy
+#: src/gui/status.cpp:286
 msgid "Agility"
-msgstr "Ketteryys:"
+msgstr ""
 
-#: src/gui/status.cpp:284
-#, fuzzy
+#: src/gui/status.cpp:287
 msgid "Vitality"
-msgstr "Elinvoima:"
+msgstr ""
 
-#: src/gui/status.cpp:285
-#, fuzzy
+#: src/gui/status.cpp:288
 msgid "Intelligence"
-msgstr "Älykkyys:"
+msgstr ""
 
-#: src/gui/status.cpp:286
-#, fuzzy
+#: src/gui/status.cpp:289
 msgid "Dexterity"
-msgstr "Näppäryys:"
+msgstr ""
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -892,42 +908,32 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
-#, fuzzy
+#: src/main.cpp:965
 msgid "Connecting to map server..."
-msgstr "Yhdistetään..."
+msgstr ""
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr ""
 
-#~ msgid "Account and Character Management"
-#~ msgstr "Tilin ja hahmojen hallinta"
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
+#~ msgid "Change"
+#~ msgstr "Muuta"
 
 #~ 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 "Willpower:"
 #~ msgstr "Tahdonvoima:"
 
@@ -949,15 +955,6 @@ msgstr ""
 #~ 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@@"
 
@@ -976,20 +973,38 @@ msgstr ""
 #~ 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 "HP %+d"
 #~ msgstr "Iskupisteet %+d"
 
 #~ msgid "MP %+d"
 #~ msgstr "Taikapisteet %+d"
+
+#~ msgid "Account and Character Management"
+#~ msgstr "Tilin ja hahmojen hallinta"
+
+#~ msgid "Change Password"
+#~ msgstr "Vaihda salasana"
+
+#~ msgid "Change Email Address"
+#~ msgstr "Vaihda sähköpostiosoite"
+
+#~ msgid "Account: %s"
+#~ msgstr "Tili: %s"
+
+#~ 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 "Visible names"
+#~ msgstr "Näytä nimet"
diff --git a/po/fr.po b/po/fr.po
index d2a26c42..d96f38f9 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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+0100\n"
 "PO-Revision-Date: 2008-12-26 10:43+0000\n"
 "Last-Translator: Johan Serre <Unknown>\n"
 "Language-Team: French\n"
@@ -59,7 +59,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "Annuler"
@@ -105,7 +106,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
@@ -151,8 +152,9 @@ msgstr "Créer"
 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:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr ""
 
@@ -466,7 +468,7 @@ msgstr "Compétences"
 msgid "Shortcut"
 msgstr "Raccourci"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "Configuration"
 
@@ -474,10 +476,23 @@ msgstr "Configuration"
 msgid "MiniMap"
 msgstr "Plan"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr "PNJ"
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "S'inscrire"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -559,22 +574,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:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "Erreur"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Son"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "Volume des effets sonores"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "Volume de la musique"
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr "Appliquer"
@@ -603,6 +606,18 @@ msgstr "Clavier"
 msgid "Players"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Son"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr "Volume des effets sonores"
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "Volume de la musique"
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Presser le bouton pour démarrer la calibration"
@@ -770,16 +785,33 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Argent : %d"
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+#, fuzzy
+msgid "Job:"
+msgstr "Niveau : %d"
+
 #: src/gui/status.cpp:127
 #, fuzzy
 msgid "Stats"
@@ -813,50 +845,51 @@ msgstr "Attaque %+d"
 msgid "M.Defense:"
 msgstr "Défense %+d"
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 #, fuzzy
 msgid "Strength"
 msgstr "Force :"
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 #, fuzzy
 msgid "Agility"
 msgstr "Agilité :"
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalité :"
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligence :"
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 #, fuzzy
 msgid "Dexterity"
 msgstr "Dextérité :"
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -894,27 +927,27 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Connexion..."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr ""
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Gestion du compte et du personnage"
 
diff --git a/po/he.po b/po/he.po
index 364cb270..3db833e3 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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+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"
@@ -58,7 +58,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "ביטול"
@@ -105,7 +106,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr "רמה: %d"
@@ -151,8 +152,9 @@ msgstr "צור"
 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:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr ""
 
@@ -466,7 +468,7 @@ msgstr "כישורים"
 msgid "Shortcut"
 msgstr "קיצור-דרך"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "הגדרות"
 
@@ -474,10 +476,23 @@ msgstr "הגדרות"
 msgid "MiniMap"
 msgstr "מיני-מפה"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr "NPC"
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "הרשם"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -559,22 +574,10 @@ msgstr "הסיסמה חייבת להכיל פחות מ-%d תוים."
 msgid "Passwords do not match."
 msgstr "הסיסמאות אינן תואמות."
 
-#: src/gui/register.cpp:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "שגיאה"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "צליל"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "עוצמת SFX"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "עוצמת מוזיקה"
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr "אשר"
@@ -603,6 +606,18 @@ msgstr "מקלדת"
 msgid "Players"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "צליל"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr "עוצמת SFX"
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "עוצמת מוזיקה"
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "לחץ על הכפתור בכדי להתחיל בכיול"
@@ -768,16 +783,33 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "רמה: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "זהב: %d"
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+#, fuzzy
+msgid "Job:"
+msgstr "רמה: %d"
+
 #: src/gui/status.cpp:127
 #, fuzzy
 msgid "Stats"
@@ -811,50 +843,51 @@ msgstr "התקפה %+d"
 msgid "M.Defense:"
 msgstr "הגנה %+d"
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 #, fuzzy
 msgid "Strength"
 msgstr "עוצמה:"
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 #, fuzzy
 msgid "Agility"
 msgstr "זריזות:"
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 #, fuzzy
 msgid "Vitality"
 msgstr "חיוניות:"
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 #, fuzzy
 msgid "Intelligence"
 msgstr "תבונה:"
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 #, fuzzy
 msgid "Dexterity"
 msgstr "מיומנות:"
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -892,27 +925,27 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "מתחבר..."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr ""
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "ניהול משתמש ושחקן"
 
diff --git a/po/hr.po b/po/hr.po
index a0ab9b02..53123bf1 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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+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"
@@ -57,7 +57,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "Poništi"
@@ -104,7 +105,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr "Nivo: %d"
@@ -149,8 +150,9 @@ msgstr "Stvori"
 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:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr ""
 
@@ -464,7 +466,7 @@ msgstr "Vještine"
 msgid "Shortcut"
 msgstr "Kratica"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "Podešavanje"
 
@@ -472,10 +474,23 @@ msgstr "Podešavanje"
 msgid "MiniMap"
 msgstr "Karta"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr ""
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Registriraj se"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -557,22 +572,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "Greška"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr ""
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr ""
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr ""
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr ""
@@ -601,6 +604,18 @@ msgstr ""
 msgid "Players"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr ""
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr ""
@@ -766,16 +781,33 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Novac: %d"
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+#, fuzzy
+msgid "Job:"
+msgstr "Nivo: %d"
+
 #: src/gui/status.cpp:127
 #, fuzzy
 msgid "Stats"
@@ -805,50 +837,51 @@ msgstr ""
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 #, fuzzy
 msgid "Strength"
 msgstr "Snaga:"
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 #, fuzzy
 msgid "Agility"
 msgstr "Okretnost:"
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalnost:"
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligencija:"
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 #, fuzzy
 msgid "Dexterity"
 msgstr "Spretnost:"
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -886,27 +919,27 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Spajanje..."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr ""
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Upravljanje Računom i Likovima"
 
diff --git a/po/id.po b/po/id.po
index d83a3b83..7deaff55 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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+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"
@@ -58,7 +58,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "Batal"
@@ -104,7 +105,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
@@ -150,8 +151,9 @@ msgstr "Buat"
 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:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr ""
 
@@ -465,7 +467,7 @@ msgstr "Keahlian"
 msgid "Shortcut"
 msgstr "Tombol Singkat"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "Atur"
 
@@ -473,10 +475,23 @@ msgstr "Atur"
 msgid "MiniMap"
 msgstr "MiniMap"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr "NPC"
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Mendaftar"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -558,22 +573,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr "Kata sandi tidak sama."
 
-#: src/gui/register.cpp:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Suara"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "Volume sfx"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "Volume Musik"
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr "Terapkan"
@@ -602,6 +605,18 @@ msgstr ""
 msgid "Players"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Suara"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr "Volume sfx"
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "Volume Musik"
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Tekan tombol untuk memulai kalibrasi"
@@ -767,16 +782,33 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Uang: %d"
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+#, fuzzy
+msgid "Job:"
+msgstr "Tingkatan: %d"
+
 #: src/gui/status.cpp:127
 #, fuzzy
 msgid "Stats"
@@ -810,50 +842,51 @@ msgstr "Serangan %+d"
 msgid "M.Defense:"
 msgstr "Pertahanan %+d"
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 #, fuzzy
 msgid "Strength"
 msgstr "Kekuatan"
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 #, fuzzy
 msgid "Agility"
 msgstr "Daya/Tenaga Hidup"
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 #, fuzzy
 msgid "Vitality"
 msgstr "Daya/Tenaga Hidup"
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 #, fuzzy
 msgid "Intelligence"
 msgstr "Kecerdasan"
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 #, fuzzy
 msgid "Dexterity"
 msgstr "Ketangkasan"
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -891,27 +924,27 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Menyambung..."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr ""
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
 #~ msgid "Unregister"
 #~ msgstr "Tidak terdaftar"
 
diff --git a/po/it.po b/po/it.po
index d8126916..4b7548e9 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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+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"
@@ -60,7 +60,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "Cancella"
@@ -106,7 +107,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr "Livello: %d"
@@ -152,8 +153,9 @@ msgstr "Create"
 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:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr ""
 
@@ -467,7 +469,7 @@ msgstr "Abilità"
 msgid "Shortcut"
 msgstr "Scorciatoia"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "Impostazioni"
 
@@ -475,10 +477,23 @@ msgstr "Impostazioni"
 msgid "MiniMap"
 msgstr "Mini mappa"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr "NPC"
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Registra"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -560,22 +575,10 @@ msgstr "La password deve contenere meno di %d caratteri."
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
-#: src/gui/register.cpp:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "Errore"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Suono"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "Volume effetti sonori"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "Volume musica"
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr "Applica"
@@ -604,6 +607,18 @@ msgstr ""
 msgid "Players"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Suono"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr "Volume effetti sonori"
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "Volume musica"
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Premi il pulsante per cominciare la calibrazione"
@@ -769,16 +784,33 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Livello: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Monete: %d"
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+#, fuzzy
+msgid "Job:"
+msgstr "Livello: %d"
+
 #: src/gui/status.cpp:127
 #, fuzzy
 msgid "Stats"
@@ -812,50 +844,51 @@ msgstr "Attacco %+d"
 msgid "M.Defense:"
 msgstr "Difesa %+d"
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 #, fuzzy
 msgid "Strength"
 msgstr "Forza:"
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 #, fuzzy
 msgid "Agility"
 msgstr "Agilità:"
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalità:"
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligenza:"
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 #, fuzzy
 msgid "Dexterity"
 msgstr "Destrezza:"
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -893,27 +926,27 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Connessione..."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr ""
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
 #~ msgid "Unregister"
 #~ msgstr "Cancella registrazione"
 
diff --git a/po/ja.po b/po/ja.po
index 061d207c..6678deb6 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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+0100\n"
 "PO-Revision-Date: 2008-06-28 16:27+0000\n"
 "Last-Translator: fate <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -57,7 +57,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "取消"
@@ -103,7 +104,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
@@ -149,8 +150,9 @@ msgstr "作成"
 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:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr ""
 
@@ -464,7 +466,7 @@ msgstr ""
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "セットアップ"
 
@@ -472,10 +474,22 @@ msgstr "セットアップ"
 msgid "MiniMap"
 msgstr ""
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr ""
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+msgid "Reset"
+msgstr ""
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -557,22 +571,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr "パスワードが一致していません。"
 
-#: src/gui/register.cpp:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "エラー"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr ""
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr ""
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr ""
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr ""
@@ -601,6 +603,18 @@ msgstr ""
 msgid "Players"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr ""
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr ""
@@ -766,16 +780,33 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "レベル: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "GP: %d"
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+#, fuzzy
+msgid "Job:"
+msgstr "レベル: %d"
+
 #: src/gui/status.cpp:127
 #, fuzzy
 msgid "Stats"
@@ -805,50 +836,51 @@ msgstr ""
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 #, fuzzy
 msgid "Strength"
 msgstr "筋力:"
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 #, fuzzy
 msgid "Agility"
 msgstr "素早さ:"
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 #, fuzzy
 msgid "Vitality"
 msgstr "体力:"
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 #, fuzzy
 msgid "Intelligence"
 msgstr "知性:"
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 #, fuzzy
 msgid "Dexterity"
 msgstr "敏捷:"
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -886,27 +918,27 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "接続しています..."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr ""
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
 #~ msgid "Unregister"
 #~ msgstr "登録削除"
 
diff --git a/po/nl.po b/po/nl.po
index 09369f42..6c7881b4 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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+0100\n"
 "PO-Revision-Date: 2009-01-18 16:53+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Dutch\n"
@@ -57,7 +57,8 @@ msgstr "Verkopen"
 #: 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "Annuleren"
@@ -103,7 +104,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
@@ -148,8 +149,9 @@ msgstr "Aanmaken"
 msgid "Select Server"
 msgstr "Server Selecteren"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: src/gui/char_server.cpp:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr "OK"
 
@@ -463,7 +465,7 @@ msgstr "Vaardigheden"
 msgid "Shortcut"
 msgstr "Sneltoets"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "Configureren"
 
@@ -471,10 +473,23 @@ msgstr "Configureren"
 msgid "MiniMap"
 msgstr "Kaartje"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr "NPC"
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Aanmelden"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -555,22 +570,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:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "Fout"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Geluid"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "Volume van geluiden"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "Muziek volume"
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr "Toepassen"
@@ -599,6 +602,18 @@ msgstr "Toetsenbord"
 msgid "Players"
 msgstr "Spelers"
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Geluid"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr "Volume van geluiden"
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "Muziek volume"
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Druk op de knop om het kalibreren te starten"
@@ -762,16 +777,32 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, c-format
 msgid "Money: %d GP"
 msgstr "Geld: %d GP"
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+msgid "Job:"
+msgstr ""
+
 #: src/gui/status.cpp:127
 msgid "Stats"
 msgstr ""
@@ -800,45 +831,46 @@ msgstr ""
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 msgid "Strength"
 msgstr ""
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 msgid "Agility"
 msgstr ""
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 msgid "Vitality"
 msgstr ""
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 msgid "Intelligence"
 msgstr ""
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 msgid "Dexterity"
 msgstr ""
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -876,26 +908,26 @@ msgstr "Spelen"
 msgid "Completed"
 msgstr "Voltooid"
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr "Naamloos"
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 msgid "Connecting to map server..."
 msgstr "Verbinden met de map server..."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr "Verbinden met de karakter server..."
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr "Verbinden met de account server..."
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr "Naamloos"
+
 #~ msgid "Unregister"
 #~ msgstr "Registreren"
 
diff --git a/po/pl.po b/po/pl.po
index 61d0b510..ac0a28ff 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,14 +9,14 @@ 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-25 22:01+0100\n"
-"PO-Revision-Date: 2008-10-10 05:26+0000\n"
-"Last-Translator: Michał Trzebiatowski <Unknown>\n"
+"POT-Creation-Date: 2009-02-12 20:22+0100\n"
+"PO-Revision-Date: 2009-01-27 17:06+0000\n"
+"Last-Translator: Krzysztof Daszuta <irukard@gmail.com>\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-Launchpad-Export-Date: 2009-02-12 19:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
@@ -49,9 +49,8 @@ msgid "Effect: %s"
 msgstr "Efekt: %s"
 
 #: src/gui/buysell.cpp:31
-#, fuzzy
 msgid "Shop"
-msgstr "Zatrzymaj"
+msgstr "Sklep"
 
 #: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
 msgid "Sell"
@@ -60,14 +59,15 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 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 ""
+msgstr "Potwierdź usunięcie postaci"
 
 #: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
@@ -106,16 +106,16 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, 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
-#, fuzzy, c-format
+#, c-format
 msgid "Job Level: %d"
-msgstr "Poziom: %d"
+msgstr ""
 
 #: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
@@ -125,7 +125,7 @@ msgstr "Pieniądze: %d"
 #: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
-msgstr ""
+msgstr "Złoto: %d"
 
 #: src/gui/char_select.cpp:243
 msgid "Create Character"
@@ -148,23 +148,23 @@ msgid "Create"
 msgstr "Stwórz"
 
 #: src/gui/char_server.cpp:52
-#, fuzzy
 msgid "Select Server"
-msgstr "Wybierz postać"
+msgstr "Wybierz serwer"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: src/gui/char_server.cpp:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
-msgstr ""
+msgstr "Ok"
 
 #: src/gui/chat.cpp:115
 msgid "Global announcement:"
-msgstr ""
+msgstr "Ogłoszenie ogólne:"
 
 #: src/gui/chat.cpp:118
 #, c-format
 msgid "Global announcement from %s:"
-msgstr ""
+msgstr "Ogłoszenie ogólne od %s:"
 
 #: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82
 msgid "Server:"
@@ -173,20 +173,20 @@ msgstr "Serwer:"
 #: src/gui/chat.cpp:139
 #, c-format
 msgid "%s whispers:"
-msgstr ""
+msgstr "%s szepcze:"
 
 #: src/gui/chat.cpp:276
 #, c-format
 msgid "Whispering to %s: %s"
-msgstr ""
+msgstr "Szepczesz do %s: %s"
 
 #: src/gui/chat.cpp:349
 msgid "Unknown command"
-msgstr ""
+msgstr "Nieznane polecenie"
 
 #: src/gui/chat.cpp:359
 msgid "Trade failed!"
-msgstr ""
+msgstr "Handel zakończony niepowodzeniem!"
 
 #: src/gui/chat.cpp:362
 msgid "Emote failed!"
@@ -210,11 +210,11 @@ msgstr ""
 
 #: src/gui/chat.cpp:382
 msgid "You have not yet reached a high enough lvl!"
-msgstr ""
+msgstr "Masz za niski poziom!"
 
 #: src/gui/chat.cpp:385
 msgid "Insufficient HP!"
-msgstr ""
+msgstr "Niewystarczające PŻ!"
 
 #: src/gui/chat.cpp:388
 msgid "Insufficient SP!"
@@ -226,15 +226,15 @@ msgstr ""
 
 #: src/gui/chat.cpp:394
 msgid "You cannot do that right now!"
-msgstr ""
+msgstr "Nie możesz teraz tego zrobić!"
 
 #: src/gui/chat.cpp:397
 msgid "Seems you need more Zeny... ;-)"
-msgstr ""
+msgstr "Chyba potrzebujesz więcej pieniędzy... ;-)"
 
 #: src/gui/chat.cpp:400
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr ""
+msgstr "Nie można użyć tej umiejętności z taką bronią!"
 
 #: src/gui/chat.cpp:403
 msgid "You need another red gem!"
@@ -246,11 +246,11 @@ msgstr ""
 
 #: src/gui/chat.cpp:409
 msgid "You're carrying to much to do this!"
-msgstr ""
+msgstr "Jesteś zbyt obciążony aby to zrobić!"
 
 #: src/gui/chat.cpp:412
 msgid "Huh? What's that?"
-msgstr ""
+msgstr "O! Co to?"
 
 #: src/gui/chat.cpp:418
 msgid "Warp failed..."
@@ -258,123 +258,124 @@ msgstr ""
 
 #: src/gui/chat.cpp:421
 msgid "Could not steal anything..."
-msgstr ""
+msgstr "Nie mogę nic ukraść..."
 
 #: src/gui/chat.cpp:424
 msgid "Poison had no effect..."
-msgstr ""
+msgstr "Trucizna nie zadziałała..."
 
 #: src/gui/chat.cpp:489
 msgid "-- Help --"
-msgstr ""
+msgstr "-- Pomoc --"
 
 #: src/gui/chat.cpp:492
 msgid "/announce: Global announcement (GM only)"
-msgstr ""
+msgstr "/announce: Ogłoszenie ogólne (tylko GM)"
 
 #: src/gui/chat.cpp:493
 msgid "/clear: Clears this window"
-msgstr ""
+msgstr "/clear: Czyści okno"
 
 #: src/gui/chat.cpp:494
 msgid "/help: Display this help"
-msgstr ""
+msgstr "/help: Wyświetla pomoc"
 
 #: src/gui/chat.cpp:495
 msgid "/where: Display map name"
-msgstr ""
+msgstr "/where: Wyświetla nazwę mapy"
 
 #: src/gui/chat.cpp:496
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
-msgstr ""
+msgstr "/whisper <postać> <wiadomość>: Wysyła prywatną <wiadomość> do <postać>"
 
 #: src/gui/chat.cpp:498
 msgid "/w <nick> <message>: Short form for /whisper"
-msgstr ""
+msgstr "/w <postać> <wiadomość>: Krótka forma komendy /whisper"
 
 #: src/gui/chat.cpp:499
 msgid "/who: Display number of online users"
-msgstr ""
+msgstr "/who: Wyświetla liczbę połączonych graczy"
 
 #: src/gui/chat.cpp:500
 msgid "For more information, type /help <command>"
-msgstr ""
+msgstr "Aby uzyskać więcej informacji wpisz /help <komenda>"
 
 #: src/gui/chat.cpp:505
 msgid "Command: /announce <msg>"
-msgstr ""
+msgstr "Komenda: /announce <wiadomość>"
 
 #: src/gui/chat.cpp:506
 msgid "*** only available to a GM ***"
-msgstr ""
+msgstr "*** dostępne tylko dla GM ***"
 
 #: src/gui/chat.cpp:507
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
+"Ta komenda wysyła wiadomość <wiadomość> to wszystkich połączonych graczy."
 
 #: src/gui/chat.cpp:513
 msgid "Command: /clear"
-msgstr ""
+msgstr "Komenda: /clear"
 
 #: src/gui/chat.cpp:514
 msgid "This command clears the chat log of previous chat."
-msgstr ""
+msgstr "Ta komenda czyści zawartość okna."
 
 #: src/gui/chat.cpp:520
 msgid "Command: /help"
-msgstr ""
+msgstr "Komenda: /help"
 
 #: src/gui/chat.cpp:521
 msgid "This command displays a list of all commands available."
-msgstr ""
+msgstr "Ta komenda wyświetla listę dostępnych komend."
 
 #: src/gui/chat.cpp:523
 msgid "Command: /help <command>"
-msgstr ""
+msgstr "Komenda: /help <komenda>"
 
 #: src/gui/chat.cpp:524
 msgid "This command displays help on <command>."
-msgstr ""
+msgstr "Ta komenda wyświetla pomoc dotyczącą <komenda>"
 
 #: src/gui/chat.cpp:529
 msgid "Command: /where"
-msgstr ""
+msgstr "Komenda: /where"
 
 #: src/gui/chat.cpp:530
 msgid "This command displays the name of the current map."
-msgstr ""
+msgstr "Ta komenda wyświetla nazwę aktualnej mapy."
 
 #: src/gui/chat.cpp:536
 msgid "Command: /whisper <nick> <msg>"
-msgstr ""
+msgstr "Komenda: /whisper <postać> <wiadomość>"
 
 #: src/gui/chat.cpp:537
 msgid "Command: /w <nick> <msg>"
-msgstr ""
+msgstr "Komenda: /w <postać> <wiadomość>"
 
 #: src/gui/chat.cpp:538
 msgid "This command sends the message <msg> to <nick>."
-msgstr ""
+msgstr "Ta komenda wysyła wiadomość <wiadomość> do <postać>"
 
 #: src/gui/chat.cpp:540
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
+msgstr "Jeżeli <postać> ma spacje należy ją zapisać w cudzysłowie (\")"
 
 #: src/gui/chat.cpp:546
 msgid "Command: /who"
-msgstr ""
+msgstr "Komenda: /who"
 
 #: src/gui/chat.cpp:547
 msgid "This command displays the number of players currently online."
-msgstr ""
+msgstr "Ta komenda wyświetla liczbę połączonych graczy."
 
 #: src/gui/chat.cpp:551
 msgid "Unknown command."
-msgstr ""
+msgstr "Nieznane polecenie."
 
 #: src/gui/chat.cpp:552
 msgid "Type /help for a list of commands."
-msgstr ""
+msgstr "Wpisz /help aby usyskać listę komend."
 
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
@@ -394,11 +395,11 @@ msgstr "Ekwipunek"
 
 #: src/gui/help.cpp:33
 msgid "Help"
-msgstr ""
+msgstr "Pomoc"
 
 #: src/gui/help.cpp:41
 msgid "Close"
-msgstr ""
+msgstr "Zamknij"
 
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
@@ -416,7 +417,7 @@ msgstr "Upuść"
 #: src/gui/inventorywindow.cpp:99
 #, c-format
 msgid "Weight: %d / %d"
-msgstr ""
+msgstr "Ciężar: %d / %d"
 
 #: src/gui/inventorywindow.cpp:104
 #, c-format
@@ -449,7 +450,7 @@ msgstr "Hasło:"
 
 #: src/gui/login.cpp:50
 msgid "Remember Username"
-msgstr ""
+msgstr "Zapamiętaj użytkownika"
 
 #: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89
 msgid "Register"
@@ -467,7 +468,7 @@ msgstr "Zdolności"
 msgid "Shortcut"
 msgstr "Skrót"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "Konfiguracja"
 
@@ -475,10 +476,23 @@ msgstr "Konfiguracja"
 msgid "MiniMap"
 msgstr "MiniMapa"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr "NPC"
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Rejestruj"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -504,9 +518,8 @@ msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Podnieś %s@@"
 
 #: src/gui/popupmenu.cpp:283
-#, fuzzy
 msgid "@@use|Unequip@@"
-msgstr "@@use|Załóż@@"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:285
 msgid "@@use|Equip@@"
@@ -560,22 +573,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:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "Błąd"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Dźwięk"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "Głośność efektów dźwiękowych"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "Głośność muzyki"
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr "Zastosuj"
@@ -598,11 +599,23 @@ msgstr "Joystick"
 
 #: src/gui/setup.cpp:90
 msgid "Keyboard"
-msgstr ""
+msgstr "Klawiatura"
 
 #: src/gui/setup.cpp:94
 msgid "Players"
-msgstr ""
+msgstr "Gracze"
+
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Dźwięk"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr "Głośność efektów dźwiękowych"
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "Głośność muzyki"
 
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
@@ -626,29 +639,27 @@ msgstr "Obróć drążek"
 
 #: src/gui/setup_keyboard.cpp:88
 msgid "Assign"
-msgstr ""
+msgstr "Przypisz"
 
 #: src/gui/setup_keyboard.cpp:92
-#, fuzzy
 msgid "Default"
-msgstr "Usuń"
+msgstr "Domyślny"
 
 #: src/gui/setup_keyboard.cpp:121
 msgid "Key Conflict(s) Detected."
-msgstr ""
+msgstr "Wykryto konflikt klawiszy."
 
 #: src/gui/setup_keyboard.cpp:122
 msgid "Resolve them, or gameplay may result in strange behaviour."
-msgstr ""
+msgstr "Rozwiąż go albo granie może być utrudnione."
 
 #: src/gui/setup_players.cpp:55
-#, fuzzy
 msgid "Name"
-msgstr "Imię:"
+msgstr "Nazwa"
 
 #: src/gui/setup_players.cpp:56
 msgid "Relation"
-msgstr ""
+msgstr "Relacja"
 
 #: src/gui/setup_players.cpp:60
 msgid "Neutral"
@@ -656,7 +667,7 @@ msgstr ""
 
 #: src/gui/setup_players.cpp:61
 msgid "Friend"
-msgstr ""
+msgstr "Przyjaciel"
 
 #: src/gui/setup_players.cpp:62
 msgid "Disregarded"
@@ -664,23 +675,23 @@ msgstr ""
 
 #: src/gui/setup_players.cpp:63
 msgid "Ignored"
-msgstr ""
+msgstr "Ignorowany"
 
 #: src/gui/setup_players.cpp:217
 msgid "Save player list"
-msgstr ""
+msgstr "Zapisz listę graczy"
 
 #: src/gui/setup_players.cpp:219
 msgid "Allow trading"
-msgstr ""
+msgstr "Zezwól na handel"
 
 #: src/gui/setup_players.cpp:221
 msgid "Allow whispers"
-msgstr ""
+msgstr "Zezwój na szepty"
 
 #: src/gui/setup_players.cpp:248
 msgid "When ignoring:"
-msgstr ""
+msgstr "Gdy ignorowany:"
 
 #: src/gui/setup_video.cpp:114
 msgid "Full screen"
@@ -716,7 +727,7 @@ msgstr "Dźwięki otoczenia"
 
 #: src/gui/setup_video.cpp:144
 msgid "Particle Detail"
-msgstr ""
+msgstr "Detale cząsteczek"
 
 #: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398
 msgid "off"
@@ -734,11 +745,11 @@ msgstr "wysokie"
 
 #: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418
 msgid "medium"
-msgstr ""
+msgstr "średni"
 
 #: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424
 msgid "max"
-msgstr ""
+msgstr "max"
 
 #: src/gui/setup_video.cpp:296
 msgid "Switching to full screen"
@@ -768,95 +779,102 @@ msgstr ""
 
 #: src/gui/skill.cpp:133
 msgid "Up"
-msgstr ""
+msgstr "Góra"
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
-#, fuzzy, c-format
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
+#, c-format
 msgid "Job: %d"
-msgstr "Poziom: %d"
+msgstr ""
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
-#, fuzzy, c-format
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
+#, c-format
 msgid "Money: %d GP"
-msgstr "Pieniądze: %d"
+msgstr "Pieniądze: %d GP"
+
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+msgid "Job:"
+msgstr ""
 
 #: src/gui/status.cpp:127
-#, fuzzy
 msgid "Stats"
-msgstr "Stan"
+msgstr "Statystyki"
 
 #: src/gui/status.cpp:128
 msgid "Total"
-msgstr ""
+msgstr "Razem"
 
 #: src/gui/status.cpp:129
 msgid "Cost"
-msgstr ""
+msgstr "Koszt"
 
 #: src/gui/status.cpp:132
-#, fuzzy
 msgid "Attack:"
-msgstr "Atak %+d"
+msgstr "Atak:"
 
 #: src/gui/status.cpp:133
-#, fuzzy
 msgid "Defense:"
-msgstr "Obrona %+d"
+msgstr "Obrona:"
 
 #: src/gui/status.cpp:134
-#, fuzzy
 msgid "M.Attack:"
-msgstr "Atak %+d"
+msgstr "Atak M.:"
 
 #: src/gui/status.cpp:135
-#, fuzzy
 msgid "M.Defense:"
-msgstr "Obrona %+d"
+msgstr "Obrona M.:"
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
-#, fuzzy
+#: src/gui/status.cpp:285
 msgid "Strength"
-msgstr "Siła:"
+msgstr "Siła"
 
-#: src/gui/status.cpp:283
-#, fuzzy
+#: src/gui/status.cpp:286
 msgid "Agility"
-msgstr "Zwinność:"
+msgstr ""
 
-#: src/gui/status.cpp:284
-#, fuzzy
+#: src/gui/status.cpp:287
 msgid "Vitality"
-msgstr "Witalność:"
+msgstr "Witalność"
 
-#: src/gui/status.cpp:285
-#, fuzzy
+#: src/gui/status.cpp:288
 msgid "Intelligence"
-msgstr "Inteligencja:"
+msgstr "Inteligencja"
 
-#: src/gui/status.cpp:286
-#, fuzzy
+#: src/gui/status.cpp:289
 msgid "Dexterity"
-msgstr "Zręczność:"
+msgstr "Celność"
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
-msgstr ""
+msgstr "Szczęście"
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -867,7 +885,7 @@ msgstr "Dodaj"
 
 #: src/gui/trade.cpp:64
 msgid "Trade"
-msgstr ""
+msgstr "Handel"
 
 #: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209
 #, c-format
@@ -884,43 +902,42 @@ msgstr ""
 
 #: src/gui/updatewindow.cpp:93
 msgid "Updating..."
-msgstr ""
+msgstr "Aktualizacja..."
 
 #: src/gui/updatewindow.cpp:119
 msgid "Play"
-msgstr ""
+msgstr "Graj"
 
 #: src/gui/updatewindow.cpp:526
 msgid "Completed"
-msgstr ""
-
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
+msgstr "Zakończono"
 
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
-msgstr ""
+msgstr "Rozłączono z serwerem!"
 
-#: src/main.cpp:956
-#, fuzzy
+#: src/main.cpp:965
 msgid "Connecting to map server..."
-msgstr "Łączenie..."
+msgstr "Łączenie z serwerem map..."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
-msgstr ""
+msgstr "Łączenie z serwerem postaci..."
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
-msgstr ""
+msgstr "Łączenie z serwerem kont..."
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr "Nienazwany"
+
+#~ msgid "Change"
+#~ msgstr "Zmień"
 
 #~ msgid "Unregister"
 #~ msgstr "Wyrejestruj"
 
-#~ msgid "Change Password"
-#~ msgstr "Zmień hasło"
-
 #~ msgid "Willpower:"
 #~ msgstr "Siła woli:"
 
@@ -969,9 +986,6 @@ msgstr ""
 #~ msgid "Confirm trade"
 #~ msgstr "Potwierdź handel"
 
-#~ msgid "Change"
-#~ msgstr "Zmień"
-
 #~ msgid "HP %+d"
 #~ msgstr "PŻ %+d"
 
@@ -989,3 +1003,6 @@ msgstr ""
 
 #~ msgid "Keep"
 #~ msgstr "Zachowaj"
+
+#~ msgid "Change Password"
+#~ msgstr "Zmień hasło"
diff --git a/po/pt.po b/po/pt.po
index 7115afdd..ea2d30fe 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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+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"
@@ -58,7 +58,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "Cancelar"
@@ -104,7 +105,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
@@ -150,8 +151,9 @@ msgstr "Criar"
 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:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr ""
 
@@ -465,7 +467,7 @@ msgstr "Competências"
 msgid "Shortcut"
 msgstr "Atalho"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "Configuração"
 
@@ -473,10 +475,23 @@ msgstr "Configuração"
 msgid "MiniMap"
 msgstr "MiniMapa"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr "NPC"
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Registo"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -558,22 +573,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:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "Erro"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Som"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "Volume dos Efeitos"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "Volume da Música"
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr "Aplicar"
@@ -602,6 +605,18 @@ msgstr ""
 msgid "Players"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Som"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr "Volume dos Efeitos"
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "Volume da Música"
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Pressione o botão para começar a calibragem"
@@ -767,16 +782,33 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Nível: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Dinheiro: %d"
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+#, fuzzy
+msgid "Job:"
+msgstr "Nível: %d"
+
 #: src/gui/status.cpp:127
 #, fuzzy
 msgid "Stats"
@@ -818,50 +850,51 @@ msgstr ""
 "Copy text   \t\r\n"
 "Defesa %+d"
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 #, fuzzy
 msgid "Strength"
 msgstr "Força:"
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 #, fuzzy
 msgid "Agility"
 msgstr "Agilidade:"
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalidade:"
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligência:"
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 #, fuzzy
 msgid "Dexterity"
 msgstr "Destreza:"
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -899,27 +932,27 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Conectando..."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr ""
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
 #~ msgid "Unregister"
 #~ msgstr "Remover o Registo"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4f3948fd..3a0ab6fb 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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+0100\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"
@@ -57,7 +57,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "Cancelar"
@@ -103,7 +104,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
@@ -148,8 +149,9 @@ msgstr "Criar"
 msgid "Select Server"
 msgstr "Selecionar Servidor"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: src/gui/char_server.cpp:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr "OK"
 
@@ -463,7 +465,7 @@ msgstr "Habilidades"
 msgid "Shortcut"
 msgstr "Atalho"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "Configurar"
 
@@ -471,10 +473,23 @@ msgstr "Configurar"
 msgid "MiniMap"
 msgstr "MiniMapa"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr "NPC"
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Registrar"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -555,22 +570,10 @@ msgstr "A senha deve ser menor que %d caracteres."
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: src/gui/register.cpp:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "Erro"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Som"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "Volume Sfx"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "Volume da Música"
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr "Aplicar"
@@ -599,6 +602,18 @@ msgstr "Teclado"
 msgid "Players"
 msgstr "Jogadores"
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Som"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr "Volume Sfx"
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "Volume da Música"
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Aperto o botão para começar a calibração"
@@ -762,16 +777,33 @@ msgstr "Pontos de habilidade: %d"
 msgid "Up"
 msgstr "Acima"
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, c-format
 msgid "Job: %d"
 msgstr "Trabalho: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, c-format
 msgid "Money: %d GP"
 msgstr "Dinheiro: %d GP"
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+#, fuzzy
+msgid "Job:"
+msgstr "Trabalho: %d"
+
 #: src/gui/status.cpp:127
 msgid "Stats"
 msgstr "Status"
@@ -800,45 +832,46 @@ msgstr "M. Ataque:"
 msgid "M.Defense:"
 msgstr "M. Defesa:"
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr "% Acuracidade:"
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr "% Evasão:"
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr "% Reflexo:"
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 msgid "Strength"
 msgstr "Força"
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 msgid "Agility"
 msgstr "Agilidade"
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 msgid "Vitality"
 msgstr "Vitalidade"
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 msgid "Intelligence"
 msgstr "Inteligência"
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 msgid "Dexterity"
 msgstr "Destreza"
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr "Sorte"
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr "Pontos de Status Restantes: %d"
@@ -877,26 +910,26 @@ msgstr "Jogar"
 msgid "Completed"
 msgstr "Concluído"
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr "Sem nome"
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado do servidor!"
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 msgid "Connecting to map server..."
 msgstr "Conectando ao servidor de mapas..."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr "Conectando ao servidor de personagens..."
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr "Conectando ao servidor de contas..."
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr "Sem nome"
+
 #~ msgid "Change"
 #~ msgstr "Mudar"
 
diff --git a/po/ru.po b/po/ru.po
index 8ee9bcdb..6d5a2803 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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+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"
@@ -58,7 +58,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "Отмена"
@@ -104,7 +105,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
@@ -150,8 +151,9 @@ msgstr "Создать"
 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:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr ""
 
@@ -465,7 +467,7 @@ msgstr "Умения"
 msgid "Shortcut"
 msgstr "Клавиша"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "Настройка"
 
@@ -473,10 +475,23 @@ msgstr "Настройка"
 msgid "MiniMap"
 msgstr "МиниКарта"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr "NPC"
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Зарегистрироваться"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -558,22 +573,10 @@ msgstr "Пароль не должен содержать более %d симв
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: src/gui/register.cpp:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Звук"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "Громкость эффектов"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "Громкость музыки"
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr "Применить"
@@ -602,6 +605,18 @@ msgstr ""
 msgid "Players"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Звук"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr "Громкость эффектов"
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "Громкость музыки"
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Нажмите кнопку, чтобы начать калибровку"
@@ -767,16 +782,33 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Деньги: %d"
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+#, fuzzy
+msgid "Job:"
+msgstr "Уровень: %d"
+
 #: src/gui/status.cpp:127
 #, fuzzy
 msgid "Stats"
@@ -810,50 +842,51 @@ msgstr "Атака %+d"
 msgid "M.Defense:"
 msgstr "Защита %+d"
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 #, fuzzy
 msgid "Strength"
 msgstr "Сила:"
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 #, fuzzy
 msgid "Agility"
 msgstr "Выносливость:"
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 #, fuzzy
 msgid "Vitality"
 msgstr "Живучесть:"
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 #, fuzzy
 msgid "Intelligence"
 msgstr "Интеллект:"
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 #, fuzzy
 msgid "Dexterity"
 msgstr "Ловкость:"
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -891,27 +924,27 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Соединение..."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr ""
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
 #~ msgid "Unregister"
 #~ msgstr "Удалить регистрацию"
 
diff --git a/po/sk.po b/po/sk.po
index 7cf27c06..536e1e54 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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+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"
@@ -57,7 +57,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "Zrušiť"
@@ -104,7 +105,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
@@ -149,8 +150,9 @@ msgstr "Vytvoriť"
 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:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr ""
 
@@ -464,7 +466,7 @@ msgstr ""
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr ""
 
@@ -472,10 +474,22 @@ msgstr ""
 msgid "MiniMap"
 msgstr ""
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr ""
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+msgid "Reset"
+msgstr ""
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -556,22 +570,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr ""
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr ""
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr ""
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr ""
@@ -600,6 +602,18 @@ msgstr ""
 msgid "Players"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr ""
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr ""
@@ -765,16 +779,33 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Level: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Peniaze: %d"
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+#, fuzzy
+msgid "Job:"
+msgstr "Level: %d"
+
 #: src/gui/status.cpp:127
 msgid "Stats"
 msgstr ""
@@ -803,47 +834,48 @@ msgstr ""
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 #, fuzzy
 msgid "Strength"
 msgstr "Sila:"
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 msgid "Agility"
 msgstr ""
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 msgid "Vitality"
 msgstr ""
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligencia:"
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 msgid "Dexterity"
 msgstr ""
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -881,26 +913,26 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr ""
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Účet a správa postáv"
 
diff --git a/po/sv.po b/po/sv.po
index ab0b6f54..51dee596 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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+0100\n"
 "PO-Revision-Date: 2009-01-29 01:20+0100\n"
 "Last-Translator: Kess Vargavind <vargavind@gmail.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -57,7 +57,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "Avbryt"
@@ -103,7 +104,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
@@ -148,8 +149,9 @@ msgstr "Skapa"
 msgid "Select Server"
 msgstr "Välj server"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: src/gui/char_server.cpp:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr "Ok"
 
@@ -465,7 +467,7 @@ msgstr "Färdigheter"
 msgid "Shortcut"
 msgstr "Genvägar"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "Inställningar"
 
@@ -473,10 +475,23 @@ msgstr "Inställningar"
 msgid "MiniMap"
 msgstr "Minikarta"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr "NPC"
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Registrera"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -557,22 +572,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:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "Fel"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Ljud"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "Volym för ljudeffekter"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "Musikvolym"
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr "Verkställ"
@@ -601,6 +604,18 @@ msgstr "Tangentbord"
 msgid "Players"
 msgstr "Spelare"
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Ljud"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr "Volym för ljudeffekter"
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "Musikvolym"
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Klicka på knappen för att starta kalibreringen"
@@ -764,16 +779,33 @@ msgstr "Färdighetspoäng: %d"
 msgid "Up"
 msgstr "Upp"
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, c-format
 msgid "Job: %d"
 msgstr "Jobb: %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, c-format
 msgid "Money: %d GP"
 msgstr "Pengar: %d GP"
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+#, fuzzy
+msgid "Job:"
+msgstr "Jobb: %d"
+
 #: src/gui/status.cpp:127
 msgid "Stats"
 msgstr "Statistik"
@@ -802,45 +834,46 @@ msgstr "M. attack:"
 msgid "M.Defense:"
 msgstr "M. försvar:"
 
-#: src/gui/status.cpp:136
+#: src/gui/status.cpp:137
 #, fuzzy, no-c-format
 msgid "% Accuracy:"
 msgstr "% Precision:"
 
-#: src/gui/status.cpp:137
+#: src/gui/status.cpp:139
 #, fuzzy, no-c-format
 msgid "% Evade:"
 msgstr "% Undvikan:"
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr "% Reflexer:"
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 msgid "Strength"
 msgstr "Styrka"
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 msgid "Agility"
 msgstr "Smidighet"
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 msgid "Vitality"
 msgstr "Hälsa"
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 msgid "Intelligence"
 msgstr "Intelligens"
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 msgid "Dexterity"
 msgstr "Skicklighet"
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr "Tur"
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr "Återstående statuspoäng: %d"
@@ -880,26 +913,26 @@ msgstr "Spela"
 msgid "Completed"
 msgstr "Färdig"
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr "Namnlös"
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr "Kopplades från servern!"
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 msgid "Connecting to map server..."
 msgstr "Ansluter till kartservern..."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr "Ansluter till karaktärsservern..."
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr "Ansluter till kontoservern..."
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr "Namnlös"
+
 #~ msgid "Unregister"
 #~ msgstr "Avregistrera"
 
diff --git a/po/th.po b/po/th.po
index 4f7efb8d..d4437442 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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+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"
@@ -57,7 +57,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "ยกเลิก"
@@ -104,7 +105,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr ""
@@ -149,8 +150,9 @@ msgstr "สร้าง"
 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:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr ""
 
@@ -464,7 +466,7 @@ msgstr ""
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "ตั้งค่า"
 
@@ -472,10 +474,23 @@ msgstr "ตั้งค่า"
 msgid "MiniMap"
 msgstr ""
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr "NPC"
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "สมัครสมาชิก"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -556,22 +571,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "ผิดพลาด"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr ""
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr ""
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr ""
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr ""
@@ -600,6 +603,18 @@ msgstr ""
 msgid "Players"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr ""
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr ""
@@ -765,16 +780,32 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, c-format
 msgid "Money: %d GP"
 msgstr ""
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+msgid "Job:"
+msgstr ""
+
 #: src/gui/status.cpp:127
 #, fuzzy
 msgid "Stats"
@@ -804,50 +835,51 @@ msgstr ""
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 #, fuzzy
 msgid "Strength"
 msgstr "Strength:"
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 #, fuzzy
 msgid "Agility"
 msgstr "Agility:"
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitality:"
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligence:"
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 #, fuzzy
 msgid "Dexterity"
 msgstr "Dexterity:"
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -885,27 +917,27 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr ""
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
 #~ msgid "Change Password"
 #~ msgstr "เปลี่ยนรหัสผ่าน"
 
diff --git a/po/tmw.pot b/po/tmw.pot
index a418576f..0044315b 100644
--- a/po/tmw.pot
+++ b/po/tmw.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-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+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"
@@ -56,7 +56,8 @@ 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:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr ""
@@ -102,7 +103,7 @@ 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
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr ""
@@ -147,8 +148,9 @@ msgstr ""
 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:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr ""
 
@@ -462,7 +464,7 @@ msgstr ""
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr ""
 
@@ -470,10 +472,22 @@ msgstr ""
 msgid "MiniMap"
 msgstr ""
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr ""
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+msgid "Reset"
+msgstr ""
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -554,22 +568,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr ""
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr ""
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr ""
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr ""
@@ -598,6 +600,18 @@ msgstr ""
 msgid "Players"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr ""
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr ""
@@ -761,16 +775,32 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, c-format
 msgid "Money: %d GP"
 msgstr ""
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+msgid "Job:"
+msgstr ""
+
 #: src/gui/status.cpp:127
 msgid "Stats"
 msgstr ""
@@ -799,45 +829,46 @@ msgstr ""
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 msgid "Strength"
 msgstr ""
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 msgid "Agility"
 msgstr ""
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 msgid "Vitality"
 msgstr ""
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 msgid "Intelligence"
 msgstr ""
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 msgid "Dexterity"
 msgstr ""
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -875,22 +906,22 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr ""
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
diff --git a/src/main.cpp b/src/main.cpp
index aa8e2805..54320433 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -259,7 +259,8 @@ void setUpdatesDir()
  */
 void init_engine(const Options &options)
 {
-    homeDir = std::string(PHYSFS_getUserDir()) + "/.tmw";
+    if (homeDir.empty())
+        homeDir = std::string(PHYSFS_getUserDir()) + "/.tmw";
 #if defined WIN32
     if (!CreateDirectory(homeDir.c_str(), 0) &&
             GetLastError() != ERROR_ALREADY_EXISTS)
@@ -498,6 +499,7 @@ void printHelp()
         << _("  -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
+        << _("  -S --homedir    : Directory to use as home directory") << 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
@@ -518,7 +520,7 @@ void printVersion()
 
 void parseOptions(int argc, char *argv[], Options &options)
 {
-    const char *optstring = "hvud:U:P:Dp:C:H:";
+    const char *optstring = "hvud:U:P:Dp:C:H:S:";
 
     const struct option long_options[] = {
         { "configfile", required_argument, 0, 'C' },
@@ -527,6 +529,7 @@ void parseOptions(int argc, char *argv[], Options &options)
         { "playername", required_argument, 0, 'p' },
         { "password",   required_argument, 0, 'P' },
         { "help",       no_argument,       0, 'h' },
+        { "homedir",    required_argument, 0, 'S' },
         { "updatehost", required_argument, 0, 'H' },
         { "skipupdate", no_argument,       0, 'u' },
         { "username",   required_argument, 0, 'U' },
@@ -573,6 +576,9 @@ void parseOptions(int argc, char *argv[], Options &options)
             case 'v':
                 options.printVersion = true;
                 break;
+            case 'S':
+                homeDir = optarg;
+                break;
         }
     }
 }
diff --git a/src/main.h b/src/main.h
index 1e02cf2a..42696568 100644
--- a/src/main.h
+++ b/src/main.h
@@ -29,7 +29,7 @@
 #elif defined WIN32
 #include "winver.h"
 #elif defined __APPLE__
-#define PACKAGE_VERSION "0.0.28"
+#define PACKAGE_VERSION "0.0.28.1"
 #endif
 
 #ifndef PKG_DATADIR
diff --git a/src/winver.h b/src/winver.h
index 45043409..5f0e1fb2 100644
--- a/src/winver.h
+++ b/src/winver.h
@@ -2,5 +2,5 @@
 #define VER_MAJOR 0
 #define VER_MINOR 0
 #define VER_RELEASE 28
-#define VER_BUILD 0
-#define PACKAGE_VERSION "0.0.28"
+#define VER_BUILD 1
+#define PACKAGE_VERSION "0.0.28.1"
diff --git a/tmw.cbp b/tmw.cbp
index 7fcfdd92..b559b03c 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -13,6 +13,7 @@
 				<Option parameters='-u -d &quot;D:/tmw/data&quot;' />
 				<Option projectResourceIncludeDirsRelation="0" />
 				<Compiler>
+					<Add option="-O3" />
 					<Add option="-Wall" />
 					<Add option="-DUSE_OPENGL" />
 					<Add option="-DNOGDI" />
author	Bjørn Lindeijer <bjorn@lindeijer.nl>	2009-02-15 16:40:52 +0100
committer	Bjørn Lindeijer <bjorn@lindeijer.nl>	2009-02-15 16:40:52 +0100
commit	d6d906e2ad7b459882d628dfb07ed30ee36ed26b (patch)
tree	adcdd0ef5bfbff1a8df77b1420bf2c877cd00c82
parent	1a5af5210f640d900efac540d781a80c90959c22 (diff)
parent	4624f64d9bd89cd80030b2c0f143cfe4d2197229 (diff)
download	mana-client-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.tar.gz mana-client-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.tar.bz2 mana-client-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.tar.xz mana-client-d6d906e2ad7b459882d628dfb07ed30ee36ed26b.zip