Updated all translation files and fixed name of Chinese translation

18 files changed, 2903 insertions, 2081 deletions

diff --git a/po/ar.po b/po/ar.po
index 91f073f0..256e46fa 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2007-10-28 18:59+0100\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-09 22:58+0200\n"
 "PO-Revision-Date: 2008-07-16 18:28+0000\n"
 "Last-Translator: صقر بن عبدالله <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -17,169 +17,185 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-09 20:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
 msgid "Buy"
 msgstr "شراء"
 
-#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
 #: src/gui/sell.cpp:241
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "السعر: %d GP / الإجمالي: %d GP"
 
-#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
 msgid "Quit"
 msgstr "مغادرة"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
-#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
-#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:202 src/gui/buy.cpp:220
+#: src/gui/sell.cpp:65 src/gui/sell.cpp:212 src/gui/sell.cpp:226
 #: src/gui/trade.cpp:84 src/gui/trade.cpp:171
 #, c-format
 msgid "Description: %s"
 msgstr "الوصف: %s"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
-#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:204 src/gui/buy.cpp:221
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:214 src/gui/sell.cpp:227
 #, c-format
 msgid "Effect: %s"
 msgstr "التأثير: %s"
 
-#: src/gui/char_select.cpp:71
-msgid "Confirm"
-msgstr "تأكيد"
+#: src/gui/char_select.cpp:74
+#, fuzzy
+msgid "Confirm Character Delete"
+msgstr "إنشاء شخصيّة"
 
-#: src/gui/char_select.cpp:72
+#: src/gui/char_select.cpp:75
 msgid "Are you sure you want to delete this character?"
 msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
 
-#: src/gui/char_select.cpp:88
-msgid "Select Character"
-msgstr "إنتقاء الشخصيّة"
+#: src/gui/char_select.cpp:91
+msgid "Account and Character Management"
+msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/char_select.cpp:95 src/gui/item_amount.cpp:66 src/gui/login.cpp:50
 #: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
 #: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
 #: src/gui/serverdialog.cpp:110
 msgid "Ok"
 msgstr "موافق"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
-#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:283
+#: src/gui/connection.cpp:41 src/gui/item_amount.cpp:67 src/gui/login.cpp:51
 #: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:57
 #: src/gui/trade.cpp:62
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
 msgid "New"
 msgstr "جديد"
 
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
 msgid "Delete"
 msgstr "حذف"
 
-#: src/gui/char_select.cpp:96
+#: src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "السّابق"
 
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "التّالي"
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:101
 msgid "Unregister"
 msgstr "إلغاء التسجيل"
 
-#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
-#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
+#: src/gui/char_select.cpp:102
+#, fuzzy
+msgid "Change Password"
+msgstr "كلمة السرّ:"
+
+#: src/gui/char_select.cpp:103
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/char_select.cpp:105
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:106 src/gui/char_select.cpp:211
+#: src/gui/char_select.cpp:222 src/gui/trade.cpp:82 src/gui/trade.cpp:169
 #, c-format
 msgid "Name: %s"
 msgstr "الاسم: %s"
 
-#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
-#: src/gui/char_select.cpp:201
+#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
+#: src/gui/char_select.cpp:223
 #, c-format
 msgid "Level: %d"
 msgstr "المستوى: %d"
 
-#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
-#: src/gui/char_select.cpp:202
+#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
+#: src/gui/char_select.cpp:224
 #, c-format
 msgid "Money: %d"
 msgstr "النقود: %d"
 
-#: src/gui/char_select.cpp:245
+#: src/gui/char_select.cpp:268
 msgid "Create Character"
 msgstr "إنشاء شخصيّة"
 
-#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
 msgid "Name:"
 msgstr "الاسم:"
 
-#: src/gui/char_select.cpp:255
+#: src/gui/char_select.cpp:278
 msgid "Hair Color:"
 msgstr "لون الشعر:"
 
-#: src/gui/char_select.cpp:258
+#: src/gui/char_select.cpp:281
 msgid "Hair Style:"
 msgstr "قصّة الشعر:"
 
-#: src/gui/char_select.cpp:259
+#: src/gui/char_select.cpp:282
 msgid "Create"
 msgstr "إنشاء"
 
-#: src/gui/char_select.cpp:262
+#: src/gui/char_select.cpp:285
+msgid "Male"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Female"
+msgstr ""
+
+#: src/gui/char_select.cpp:290
 msgid "Strength:"
 msgstr "القوّة:"
 
-#: src/gui/char_select.cpp:263
+#: src/gui/char_select.cpp:291
 msgid "Agility:"
 msgstr "خفّة الحركة:"
 
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:292
 msgid "Dexterity:"
 msgstr "المهارة:"
 
-#: src/gui/char_select.cpp:265
+#: src/gui/char_select.cpp:293
 msgid "Vitality:"
 msgstr "نشاط:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:294
 msgid "Intelligence:"
 msgstr "ذكاء:"
 
-#: src/gui/char_select.cpp:267
+#: src/gui/char_select.cpp:295
 msgid "Willpower:"
 msgstr "قوّة الذات:"
 
-#: src/gui/char_select.cpp:268
-msgid "Charisma:"
-msgstr "جاذبيّة:"
-
-#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
+#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "رجاء أن توزّع %d نقطة"
 
-#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
 #: src/gui/serverdialog.cpp:171
 msgid "Error"
 msgstr "خطأ"
 
-#: src/gui/char_select.cpp:369
+#: src/gui/char_select.cpp:417
 msgid "Your name needs to be at least 4 characters."
 msgstr "يجب أن يكون طول اسمك على الأقل 4 محارف."
 
-#: src/gui/char_select.cpp:416
+#: src/gui/char_select.cpp:469
 msgid "Character stats OK"
 msgstr "إحصائيات الشخصيّة جيّدة"
 
-#: src/gui/char_select.cpp:428
+#: src/gui/char_select.cpp:481
 #, c-format
 msgid "Please remove %d points"
 msgstr "رجاء حذف %d نقطة"
@@ -192,11 +208,11 @@ msgstr "نعم"
 msgid "No"
 msgstr "لا"
 
-#: src/gui/connection.cpp:42
+#: src/gui/connection.cpp:43
 msgid "Connecting..."
 msgstr "جارِ الاتّصال..."
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
 msgid "Equipment"
 msgstr "العتاد"
 
@@ -204,28 +220,23 @@ msgstr "العتاد"
 msgid "Unequip"
 msgstr "تجريد من العتاد"
 
-#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
+#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
 msgid "Inventory"
 msgstr "الجردة"
 
-#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
 msgid "Use"
 msgstr "استخدام"
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:69
 msgid "Drop"
 msgstr "إسقاط"
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:70
 msgid "Split"
 msgstr "قسم"
 
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
-#, c-format
-msgid "Total Weight: %d - Maximum Weight: %d"
-msgstr "الوزن الإجماليّ: %d - وزن الحدّ الأقصى: %d"
-
-#: src/gui/inventorywindow.cpp:194
+#: src/gui/inventorywindow.cpp:178
 msgid "Equip"
 msgstr "استعمال العتاد"
 
@@ -241,35 +252,39 @@ msgstr "انتقاء كمّيّة من المواد لإسقاطها."
 msgid "Select amount of items to split."
 msgstr "انتقاء كمّيّة من المواد لقسمها."
 
-#: src/gui/login.cpp:44
+#: src/gui/login.cpp:43
 msgid "Login"
 msgstr "ولوج"
 
-#: src/gui/login.cpp:47 src/gui/register.cpp:68
+#: src/gui/login.cpp:46 src/gui/register.cpp:68
 msgid "Password:"
 msgstr "كلمة السرّ:"
 
-#: src/gui/login.cpp:50
-msgid "Keep"
-msgstr "ترك"
+#: src/gui/login.cpp:49
+msgid "Remember Username"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
 msgid "Register"
 msgstr "تسجيل"
 
-#: src/gui/menuwindow.cpp:62
+#: src/gui/menuwindow.cpp:63
 msgid "Status"
 msgstr "الحالة"
 
-#: src/gui/menuwindow.cpp:65
+#: src/gui/menuwindow.cpp:66
 msgid "Skills"
 msgstr "مهارات"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:67
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:68
 msgid "Shortcut"
 msgstr "اختصار"
 
-#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
+#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
 msgid "Setup"
 msgstr "تثبيت"
 
@@ -291,37 +306,47 @@ msgstr "@@تجارة|متاجرة مع %s@@"
 msgid "@@attack|Attack %s@@"
 msgstr "@@مهاجمة|هاجم %s@@"
 
-#: src/gui/popupmenu.cpp:90
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "@@guild|Invite %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:85
+#, c-format
+msgid "@@party|Invite %s to join your party@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:92
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@محادثة|تحدّث مع NPC@@"
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:240
 msgid "@@cancel|Cancel@@"
 msgstr "@@إلغاء|إلغاء@@"
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@اقتطاف|اقتطاف %s@@"
 
-#: src/gui/popupmenu.cpp:216
+#: src/gui/popupmenu.cpp:231
 msgid "@@use|Equip@@"
 msgstr "@@استخدام|استخدام العتاد@@"
 
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:234
 msgid "@@use|Use@@"
 msgstr "@@استخدم|استخدم@@"
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:235
 msgid "@@drop|Drop@@"
 msgstr "@@إسقاط|إسقاط@@"
 
-#: src/gui/popupmenu.cpp:221
+#: src/gui/popupmenu.cpp:236
 msgid "@@description|Description@@"
 msgstr "@@الوصف|الوصف@@"
 
-#: src/gui/popupmenu.cpp:223
+#: src/gui/popupmenu.cpp:238
 msgid "@@split|Split@@"
 msgstr "@@قسم|قسم@@"
 
@@ -365,7 +390,7 @@ msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محار�
 msgid "Passwords do not match."
 msgstr "كلمات السرّ غير متطابقة."
 
-#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
 msgid "Sell"
 msgstr "بيع"
 
@@ -389,39 +414,43 @@ msgstr "رجاء طباعة عنوان ومنفذ الخادوم."
 msgid "Sound"
 msgstr "صوت"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:49
 msgid "Sfx volume"
 msgstr "حجم صوت المؤثرّات"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:50
 msgid "Music volume"
 msgstr "حجم صوت الموسيقا"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "تطبيق"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "تصفير النوافذ"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Video"
 msgstr "مرئية"
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:77
 msgid "Audio"
 msgstr "سمعيّ"
 
-#: src/gui/setup.cpp:80
+#: src/gui/setup.cpp:81
 msgid "Joystick"
 msgstr "عصا الألعاب"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+#: src/gui/setup.cpp:85
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Press the button to start calibration"
 msgstr "إضغط على الزرّ لبدأ المعايرة"
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
 msgid "Calibrate"
 msgstr "معايرة"
 
@@ -429,71 +458,75 @@ msgstr "معايرة"
 msgid "Enable joystick"
 msgstr "تفعيل عصا الألعاب"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:77
 msgid "Stop"
 msgstr "إيقاف"
 
-#: src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:78
 msgid "Rotate the stick"
 msgstr "تدوير العصا"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr "ملء الشاشة"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
 msgstr "مؤشّر مخصّص"
 
 #: src/gui/setup_video.cpp:117
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:119
 msgid "FPS Limit:"
 msgstr "حدّ FPS:"
 
-#: src/gui/setup_video.cpp:133
+#: src/gui/setup_video.cpp:136
 msgid "Gui opacity"
 msgstr "عتمة واجهة المستخدم"
 
-#: src/gui/setup_video.cpp:186
+#: src/gui/setup_video.cpp:192
 msgid "Scroll radius"
 msgstr "نصف قطر اللفّ"
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:200
 msgid "Scroll laziness"
 msgstr "كسل اللفّ"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:208
 msgid "Ambient FX"
 msgstr "مؤثّرات محيطة"
 
-#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
 msgid "off"
 msgstr "واقف"
 
-#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
 msgid "low"
 msgstr "منخفض"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
 msgid "high"
 msgstr "مرتفع"
 
-#: src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:275
 msgid "Switching to full screen"
 msgstr "جارِ ملء الشاشة"
 
-#: src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:276
 msgid "Restart needed for changes to take effect."
 msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:287
 msgid "Changing OpenGL"
 msgstr "تغيير OpenGL"
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:288
 msgid "Applying change to OpenGL requires restart."
 msgstr "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
 
@@ -522,22 +555,37 @@ msgstr "أنت تقدّم:"
 msgid "Change"
 msgstr "تغيير"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr "مهاجمة %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr "دفاع %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "تأكيد"
+
+#~ msgid "Select Character"
+#~ msgstr "إنتقاء الشخصيّة"
+
+#~ msgid "Charisma:"
+#~ msgstr "جاذبيّة:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "الوزن الإجماليّ: %d - وزن الحدّ الأقصى: %d"
+
+#~ msgid "Keep"
+#~ msgstr "ترك"
diff --git a/po/ca.po b/po/ca.po
index 29063a3b..44254c8b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2007-10-28 18:59+0100\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-09 22:58+0200\n"
 "PO-Revision-Date: 2008-07-03 17:21+0000\n"
 "Last-Translator: Habari <thomas.becerril@gmail.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -17,169 +17,183 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-09 20:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
 #: src/gui/sell.cpp:241
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "preu %d GP / total %d GP"
 
-#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
 msgid "Quit"
 msgstr "sortir"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
-#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
-#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:202 src/gui/buy.cpp:220
+#: src/gui/sell.cpp:65 src/gui/sell.cpp:212 src/gui/sell.cpp:226
 #: src/gui/trade.cpp:84 src/gui/trade.cpp:171
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
-#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:204 src/gui/buy.cpp:221
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:214 src/gui/sell.cpp:227
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:71
-msgid "Confirm"
+#: src/gui/char_select.cpp:74
+msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:72
+#: src/gui/char_select.cpp:75
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/char_select.cpp:88
-msgid "Select Character"
+#: src/gui/char_select.cpp:91
+msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/char_select.cpp:95 src/gui/item_amount.cpp:66 src/gui/login.cpp:50
 #: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
 #: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
 #: src/gui/serverdialog.cpp:110
 msgid "Ok"
 msgstr "ok"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
-#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:283
+#: src/gui/connection.cpp:41 src/gui/item_amount.cpp:67 src/gui/login.cpp:51
 #: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:57
 #: src/gui/trade.cpp:62
 msgid "Cancel"
 msgstr ""
 
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
 msgid "New"
 msgstr ""
 
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
 msgid "Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:96
+#: src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr ""
 
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:100
 msgid "Next"
 msgstr ""
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:101
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
-#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
+#: src/gui/char_select.cpp:102
+msgid "Change Password"
+msgstr ""
+
+#: src/gui/char_select.cpp:103
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/char_select.cpp:105
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:106 src/gui/char_select.cpp:211
+#: src/gui/char_select.cpp:222 src/gui/trade.cpp:82 src/gui/trade.cpp:169
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
-#: src/gui/char_select.cpp:201
+#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
+#: src/gui/char_select.cpp:223
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
-#: src/gui/char_select.cpp:202
+#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
+#: src/gui/char_select.cpp:224
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:245
+#: src/gui/char_select.cpp:268
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
 msgid "Name:"
 msgstr "nom"
 
-#: src/gui/char_select.cpp:255
+#: src/gui/char_select.cpp:278
 msgid "Hair Color:"
 msgstr ""
 
-#: src/gui/char_select.cpp:258
+#: src/gui/char_select.cpp:281
 msgid "Hair Style:"
 msgstr ""
 
-#: src/gui/char_select.cpp:259
+#: src/gui/char_select.cpp:282
 msgid "Create"
 msgstr ""
 
-#: src/gui/char_select.cpp:262
+#: src/gui/char_select.cpp:285
+msgid "Male"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Female"
+msgstr ""
+
+#: src/gui/char_select.cpp:290
 msgid "Strength:"
 msgstr ""
 
-#: src/gui/char_select.cpp:263
+#: src/gui/char_select.cpp:291
 msgid "Agility:"
 msgstr ""
 
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:292
 msgid "Dexterity:"
 msgstr ""
 
-#: src/gui/char_select.cpp:265
+#: src/gui/char_select.cpp:293
 msgid "Vitality:"
 msgstr ""
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:294
 msgid "Intelligence:"
 msgstr ""
 
-#: src/gui/char_select.cpp:267
+#: src/gui/char_select.cpp:295
 msgid "Willpower:"
 msgstr ""
 
-#: src/gui/char_select.cpp:268
-msgid "Charisma:"
-msgstr ""
-
-#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
+#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
 #: src/gui/serverdialog.cpp:171
 msgid "Error"
 msgstr ""
 
-#: src/gui/char_select.cpp:369
+#: src/gui/char_select.cpp:417
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/char_select.cpp:416
+#: src/gui/char_select.cpp:469
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/char_select.cpp:428
+#: src/gui/char_select.cpp:481
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -192,11 +206,11 @@ msgstr "si"
 msgid "No"
 msgstr "no"
 
-#: src/gui/connection.cpp:42
+#: src/gui/connection.cpp:43
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
 msgid "Equipment"
 msgstr ""
 
@@ -204,28 +218,23 @@ msgstr ""
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
+#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:69
 msgid "Drop"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:70
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
-#, c-format
-msgid "Total Weight: %d - Maximum Weight: %d"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:194
+#: src/gui/inventorywindow.cpp:178
 msgid "Equip"
 msgstr ""
 
@@ -241,35 +250,39 @@ msgstr ""
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/login.cpp:44
+#: src/gui/login.cpp:43
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:47 src/gui/register.cpp:68
+#: src/gui/login.cpp:46 src/gui/register.cpp:68
 msgid "Password:"
 msgstr ""
 
-#: src/gui/login.cpp:50
-msgid "Keep"
+#: src/gui/login.cpp:49
+msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
 msgid "Register"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:62
+#: src/gui/menuwindow.cpp:63
 msgid "Status"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:65
+#: src/gui/menuwindow.cpp:66
 msgid "Skills"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:67
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:68
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
+#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
 msgid "Setup"
 msgstr ""
 
@@ -291,37 +304,47 @@ msgstr ""
 msgid "@@attack|Attack %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:90
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "@@guild|Invite %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:85
+#, c-format
+msgid "@@party|Invite %s to join your party@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:92
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:240
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:216
+#: src/gui/popupmenu.cpp:231
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:234
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:235
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:221
+#: src/gui/popupmenu.cpp:236
 msgid "@@description|Description@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:223
+#: src/gui/popupmenu.cpp:238
 msgid "@@split|Split@@"
 msgstr ""
 
@@ -365,7 +388,7 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
 msgid "Sell"
 msgstr ""
 
@@ -389,39 +412,43 @@ msgstr ""
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:49
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:50
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:77
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup.cpp:80
+#: src/gui/setup.cpp:81
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+#: src/gui/setup.cpp:85
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
 msgid "Calibrate"
 msgstr ""
 
@@ -429,71 +456,75 @@ msgstr ""
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:77
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:78
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
 msgstr ""
 
 #: src/gui/setup_video.cpp:117
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:119
 msgid "FPS Limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:133
+#: src/gui/setup_video.cpp:136
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:186
+#: src/gui/setup_video.cpp:192
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:200
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:208
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:275
 msgid "Switching to full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:276
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:287
 msgid "Changing OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:288
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
@@ -522,22 +553,22 @@ msgstr ""
 msgid "Change"
 msgstr "canvi"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index 34d21df4..23aae36b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2007-10-28 18:59+0100\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-09 22:58+0200\n"
 "PO-Revision-Date: 2008-03-02 15:29+0000\n"
 "Last-Translator: GonzoDark <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -17,169 +17,185 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-09 20:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
 msgid "Buy"
 msgstr "Køb"
 
-#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
 #: src/gui/sell.cpp:241
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Pris: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
-#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
-#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:202 src/gui/buy.cpp:220
+#: src/gui/sell.cpp:65 src/gui/sell.cpp:212 src/gui/sell.cpp:226
 #: src/gui/trade.cpp:84 src/gui/trade.cpp:171
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
-#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:204 src/gui/buy.cpp:221
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:214 src/gui/sell.cpp:227
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/char_select.cpp:71
-msgid "Confirm"
-msgstr "Bekræft"
+#: src/gui/char_select.cpp:74
+#, fuzzy
+msgid "Confirm Character Delete"
+msgstr "Lav Bruger"
 
-#: src/gui/char_select.cpp:72
+#: src/gui/char_select.cpp:75
 msgid "Are you sure you want to delete this character?"
 msgstr "Er du sikker på du vil slette denne bruger?"
 
-#: src/gui/char_select.cpp:88
-msgid "Select Character"
-msgstr "Vælg Bruger"
+#: src/gui/char_select.cpp:91
+msgid "Account and Character Management"
+msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/char_select.cpp:95 src/gui/item_amount.cpp:66 src/gui/login.cpp:50
 #: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
 #: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
 #: src/gui/serverdialog.cpp:110
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
-#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:283
+#: src/gui/connection.cpp:41 src/gui/item_amount.cpp:67 src/gui/login.cpp:51
 #: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:57
 #: src/gui/trade.cpp:62
 msgid "Cancel"
 msgstr "Annuller"
 
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
 msgid "New"
 msgstr "Nyt"
 
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
 msgid "Delete"
 msgstr "Slet"
 
-#: src/gui/char_select.cpp:96
+#: src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Forrige"
 
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Næste"
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:101
 msgid "Unregister"
 msgstr "Frameld"
 
-#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
-#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
+#: src/gui/char_select.cpp:102
+#, fuzzy
+msgid "Change Password"
+msgstr "Adgangskode:"
+
+#: src/gui/char_select.cpp:103
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/char_select.cpp:105
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:106 src/gui/char_select.cpp:211
+#: src/gui/char_select.cpp:222 src/gui/trade.cpp:82 src/gui/trade.cpp:169
 #, c-format
 msgid "Name: %s"
 msgstr "Navn:%s"
 
-#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
-#: src/gui/char_select.cpp:201
+#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
+#: src/gui/char_select.cpp:223
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau: %d"
 
-#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
-#: src/gui/char_select.cpp:202
+#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
+#: src/gui/char_select.cpp:224
 #, c-format
 msgid "Money: %d"
 msgstr "Penge: %d"
 
-#: src/gui/char_select.cpp:245
+#: src/gui/char_select.cpp:268
 msgid "Create Character"
 msgstr "Lav Bruger"
 
-#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Navn:"
 
-#: src/gui/char_select.cpp:255
+#: src/gui/char_select.cpp:278
 msgid "Hair Color:"
 msgstr "Hår Farve"
 
-#: src/gui/char_select.cpp:258
+#: src/gui/char_select.cpp:281
 msgid "Hair Style:"
 msgstr "Hår Stil"
 
-#: src/gui/char_select.cpp:259
+#: src/gui/char_select.cpp:282
 msgid "Create"
 msgstr "Opret"
 
-#: src/gui/char_select.cpp:262
+#: src/gui/char_select.cpp:285
+msgid "Male"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Female"
+msgstr ""
+
+#: src/gui/char_select.cpp:290
 msgid "Strength:"
 msgstr "Styrke"
 
-#: src/gui/char_select.cpp:263
+#: src/gui/char_select.cpp:291
 msgid "Agility:"
 msgstr "Adræthed"
 
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:292
 msgid "Dexterity:"
 msgstr "Opfattelsesevne"
 
-#: src/gui/char_select.cpp:265
+#: src/gui/char_select.cpp:293
 msgid "Vitality:"
 msgstr "Livskraft"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:294
 msgid "Intelligence:"
 msgstr "Intelligens"
 
-#: src/gui/char_select.cpp:267
+#: src/gui/char_select.cpp:295
 msgid "Willpower:"
 msgstr "Viljestyrke"
 
-#: src/gui/char_select.cpp:268
-msgid "Charisma:"
-msgstr "Udstråling"
-
-#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
+#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Fordel dine %d points"
 
-#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
 #: src/gui/serverdialog.cpp:171
 msgid "Error"
 msgstr "Fejl"
 
-#: src/gui/char_select.cpp:369
+#: src/gui/char_select.cpp:417
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dit navn skal være mindst 4 bogstaver langt."
 
-#: src/gui/char_select.cpp:416
+#: src/gui/char_select.cpp:469
 msgid "Character stats OK"
 msgstr "Brugerens stats OK"
 
-#: src/gui/char_select.cpp:428
+#: src/gui/char_select.cpp:481
 #, c-format
 msgid "Please remove %d points"
 msgstr "Fjern dine %d points"
@@ -192,11 +208,11 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
-#: src/gui/connection.cpp:42
+#: src/gui/connection.cpp:43
 msgid "Connecting..."
 msgstr "Tilslutter..."
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
 msgid "Equipment"
 msgstr "Udstyr"
 
@@ -204,28 +220,23 @@ msgstr "Udstyr"
 msgid "Unequip"
 msgstr "Tag af"
 
-#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
+#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
 msgid "Inventory"
 msgstr "Inventarieliste"
 
-#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
 msgid "Use"
 msgstr "Brug"
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:69
 msgid "Drop"
 msgstr "Smid"
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:70
 msgid "Split"
 msgstr "Opdel"
 
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
-#, c-format
-msgid "Total Weight: %d - Maximum Weight: %d"
-msgstr "Total Vægt: %d - Maximum Vægt: %d"
-
-#: src/gui/inventorywindow.cpp:194
+#: src/gui/inventorywindow.cpp:178
 msgid "Equip"
 msgstr "Tag på"
 
@@ -241,35 +252,39 @@ msgstr "Vælg antal af ting du vil smide."
 msgid "Select amount of items to split."
 msgstr "Vælg antal af ting du vil opdele."
 
-#: src/gui/login.cpp:44
+#: src/gui/login.cpp:43
 msgid "Login"
 msgstr "Log Ind"
 
-#: src/gui/login.cpp:47 src/gui/register.cpp:68
+#: src/gui/login.cpp:46 src/gui/register.cpp:68
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: src/gui/login.cpp:50
-msgid "Keep"
-msgstr "Behold"
+#: src/gui/login.cpp:49
+msgid "Remember Username"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Register"
 
-#: src/gui/menuwindow.cpp:62
+#: src/gui/menuwindow.cpp:63
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:65
+#: src/gui/menuwindow.cpp:66
 msgid "Skills"
 msgstr "Færdigheder"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:67
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:68
 msgid "Shortcut"
 msgstr "Genvej"
 
-#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
+#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
 msgid "Setup"
 msgstr "Opsætning"
 
@@ -291,37 +306,47 @@ msgstr "@@trade|Byt Med %s@@"
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Angrib %s@@"
 
-#: src/gui/popupmenu.cpp:90
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "@@guild|Invite %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:85
+#, c-format
+msgid "@@party|Invite %s to join your party@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:92
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Snak til IMS@@"
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:240
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuller@@"
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Samle Op %s@@"
 
-#: src/gui/popupmenu.cpp:216
+#: src/gui/popupmenu.cpp:231
 msgid "@@use|Equip@@"
 msgstr "@@use|Tag på@@"
 
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:234
 msgid "@@use|Use@@"
 msgstr "@@use|Brug@@"
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:235
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Smid@@"
 
-#: src/gui/popupmenu.cpp:221
+#: src/gui/popupmenu.cpp:236
 msgid "@@description|Description@@"
 msgstr "@@description|Beskrivelse@@"
 
-#: src/gui/popupmenu.cpp:223
+#: src/gui/popupmenu.cpp:238
 msgid "@@split|Split@@"
 msgstr "@@split|Opdel@@"
 
@@ -365,7 +390,7 @@ msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
 msgid "Passwords do not match."
 msgstr "Adgangskoden stemmer ikke."
 
-#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
 msgid "Sell"
 msgstr "Sælg"
 
@@ -389,39 +414,43 @@ msgstr "Skriv både adressen og porten på serveren."
 msgid "Sound"
 msgstr "Lyd"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:49
 msgid "Sfx volume"
 msgstr "Sfx styrke"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:50
 msgid "Music volume"
 msgstr "Lyd styrke"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Anvend"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Nulstiller Vinduer"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:77
 msgid "Audio"
 msgstr "Lyd"
 
-#: src/gui/setup.cpp:80
+#: src/gui/setup.cpp:81
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+#: src/gui/setup.cpp:85
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Press the button to start calibration"
 msgstr "Tryk på knappen for at starte justeringen."
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
 msgid "Calibrate"
 msgstr "Justering"
 
@@ -429,71 +458,75 @@ msgstr "Justering"
 msgid "Enable joystick"
 msgstr "Aktiver joystick"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:77
 msgid "Stop"
 msgstr "Stop"
 
-#: src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:78
 msgid "Rotate the stick"
 msgstr "Roter styrepinden"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr "Fuld Skærm"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
 msgstr "Brugerdefineret Musepil"
 
 #: src/gui/setup_video.cpp:117
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:119
 msgid "FPS Limit:"
 msgstr "FPS grænse"
 
-#: src/gui/setup_video.cpp:133
+#: src/gui/setup_video.cpp:136
 msgid "Gui opacity"
 msgstr "Gennemsigtighed"
 
-#: src/gui/setup_video.cpp:186
+#: src/gui/setup_video.cpp:192
 msgid "Scroll radius"
 msgstr "Opfattelses radius"
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:200
 msgid "Scroll laziness"
 msgstr "Opfattelses dovenskab"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:208
 msgid "Ambient FX"
 msgstr "Omgivende FX"
 
-#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
 msgid "off"
 msgstr "fra"
 
-#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
 msgid "low"
 msgstr "lav"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
 msgid "high"
 msgstr "høj"
 
-#: src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:275
 msgid "Switching to full screen"
 msgstr "Skifter til fuld skærm"
 
-#: src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:276
 msgid "Restart needed for changes to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:287
 msgid "Changing OpenGL"
 msgstr "Skrifter til OpenGL"
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:288
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
 
@@ -522,22 +555,37 @@ msgstr "Du giver:"
 msgid "Change"
 msgstr "Ændre"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr "Angrib %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr "Forsvar %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Bekræft"
+
+#~ msgid "Select Character"
+#~ msgstr "Vælg Bruger"
+
+#~ msgid "Charisma:"
+#~ msgstr "Udstråling"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Total Vægt: %d - Maximum Vægt: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Behold"
diff --git a/po/de.po b/po/de.po
index c623b94b..618c1fe7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-10-28 18:59+0100\n"
+"POT-Creation-Date: 2008-10-09 22:58+0200\n"
 "PO-Revision-Date: 2008-05-01 09:56+0000\n"
 "Last-Translator: fate <Unknown>\n"
 "Language-Team: German\n"
@@ -17,169 +17,185 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-09 20:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
 msgid "Buy"
 msgstr "Kaufen"
 
-#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
 #: src/gui/sell.cpp:241
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preis: %d GP / Summe: %d GP"
 
-#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
-#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
-#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:202 src/gui/buy.cpp:220
+#: src/gui/sell.cpp:65 src/gui/sell.cpp:212 src/gui/sell.cpp:226
 #: src/gui/trade.cpp:84 src/gui/trade.cpp:171
 #, c-format
 msgid "Description: %s"
 msgstr "Beschreibung : %s"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
-#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:204 src/gui/buy.cpp:221
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:214 src/gui/sell.cpp:227
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt : %s"
 
-#: src/gui/char_select.cpp:71
-msgid "Confirm"
-msgstr "Bestätigen"
+#: src/gui/char_select.cpp:74
+#, fuzzy
+msgid "Confirm Character Delete"
+msgstr "Spielfigur erstellen"
 
-#: src/gui/char_select.cpp:72
+#: src/gui/char_select.cpp:75
 msgid "Are you sure you want to delete this character?"
 msgstr "Bist Du sicher, daß Du diese Spielfigur löschen möchtest?"
 
-#: src/gui/char_select.cpp:88
-msgid "Select Character"
-msgstr "Spielfigur auswählen"
+#: src/gui/char_select.cpp:91
+msgid "Account and Character Management"
+msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/char_select.cpp:95 src/gui/item_amount.cpp:66 src/gui/login.cpp:50
 #: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
 #: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
 #: src/gui/serverdialog.cpp:110
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
-#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:283
+#: src/gui/connection.cpp:41 src/gui/item_amount.cpp:67 src/gui/login.cpp:51
 #: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:57
 #: src/gui/trade.cpp:62
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
 msgid "New"
 msgstr "Neu"
 
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/gui/char_select.cpp:96
+#: src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Zurück"
 
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Weiter"
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:101
 msgid "Unregister"
 msgstr "Abmelden"
 
-#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
-#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
+#: src/gui/char_select.cpp:102
+#, fuzzy
+msgid "Change Password"
+msgstr "Passwort:"
+
+#: src/gui/char_select.cpp:103
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/char_select.cpp:105
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:106 src/gui/char_select.cpp:211
+#: src/gui/char_select.cpp:222 src/gui/trade.cpp:82 src/gui/trade.cpp:169
 #, c-format
 msgid "Name: %s"
 msgstr "Name : %s"
 
-#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
-#: src/gui/char_select.cpp:201
+#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
+#: src/gui/char_select.cpp:223
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
-#: src/gui/char_select.cpp:202
+#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
+#: src/gui/char_select.cpp:224
 #, c-format
 msgid "Money: %d"
 msgstr "Geld: %d"
 
-#: src/gui/char_select.cpp:245
+#: src/gui/char_select.cpp:268
 msgid "Create Character"
 msgstr "Spielfigur erstellen"
 
-#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Name :"
 
-#: src/gui/char_select.cpp:255
+#: src/gui/char_select.cpp:278
 msgid "Hair Color:"
 msgstr "Haarfarbe"
 
-#: src/gui/char_select.cpp:258
+#: src/gui/char_select.cpp:281
 msgid "Hair Style:"
 msgstr "Frisur"
 
-#: src/gui/char_select.cpp:259
+#: src/gui/char_select.cpp:282
 msgid "Create"
 msgstr "Erstellen"
 
-#: src/gui/char_select.cpp:262
+#: src/gui/char_select.cpp:285
+msgid "Male"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Female"
+msgstr ""
+
+#: src/gui/char_select.cpp:290
 msgid "Strength:"
 msgstr "Stärke:"
 
-#: src/gui/char_select.cpp:263
+#: src/gui/char_select.cpp:291
 msgid "Agility:"
 msgstr "Agilität:"
 
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:292
 msgid "Dexterity:"
 msgstr "Geschicklichkeit:"
 
-#: src/gui/char_select.cpp:265
+#: src/gui/char_select.cpp:293
 msgid "Vitality:"
 msgstr "Vitalität:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:294
 msgid "Intelligence:"
 msgstr "Intelligenz:"
 
-#: src/gui/char_select.cpp:267
+#: src/gui/char_select.cpp:295
 msgid "Willpower:"
 msgstr "Willenskraft:"
 
-#: src/gui/char_select.cpp:268
-msgid "Charisma:"
-msgstr "Charisma:"
-
-#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
+#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Bitte verteile %d Punkte"
 
-#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
 #: src/gui/serverdialog.cpp:171
 msgid "Error"
 msgstr "Fehler"
 
-#: src/gui/char_select.cpp:369
+#: src/gui/char_select.cpp:417
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
 
-#: src/gui/char_select.cpp:416
+#: src/gui/char_select.cpp:469
 msgid "Character stats OK"
 msgstr "Spielfigurattribute OK"
 
-#: src/gui/char_select.cpp:428
+#: src/gui/char_select.cpp:481
 #, c-format
 msgid "Please remove %d points"
 msgstr "Bitte entferne %d Punkte"
@@ -192,11 +208,11 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-#: src/gui/connection.cpp:42
+#: src/gui/connection.cpp:43
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
 msgid "Equipment"
 msgstr "Ausrüstung"
 
@@ -204,28 +220,23 @@ msgstr "Ausrüstung"
 msgid "Unequip"
 msgstr "Ablegen"
 
-#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
+#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
 msgid "Inventory"
 msgstr "Inventar"
 
-#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
 msgid "Use"
 msgstr "Benutzen"
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:69
 msgid "Drop"
 msgstr "Wegwerfen"
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:70
 msgid "Split"
 msgstr "Aufteilen"
 
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
-#, c-format
-msgid "Total Weight: %d - Maximum Weight: %d"
-msgstr "Gesamtgewicht : %d - Maximales Gewicht : %d"
-
-#: src/gui/inventorywindow.cpp:194
+#: src/gui/inventorywindow.cpp:178
 msgid "Equip"
 msgstr "Ausrüsten"
 
@@ -241,35 +252,39 @@ msgstr "Wähle aus, wieviele Gegenstände Du wegwerfen möchtest."
 msgid "Select amount of items to split."
 msgstr "Wähle aus, wieviel Gegenstände Du aufteilen möchtest."
 
-#: src/gui/login.cpp:44
+#: src/gui/login.cpp:43
 msgid "Login"
 msgstr "Anmelden"
 
-#: src/gui/login.cpp:47 src/gui/register.cpp:68
+#: src/gui/login.cpp:46 src/gui/register.cpp:68
 msgid "Password:"
 msgstr "Passwort:"
 
-#: src/gui/login.cpp:50
-msgid "Keep"
-msgstr "Erinnern"
+#: src/gui/login.cpp:49
+msgid "Remember Username"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registrieren"
 
-#: src/gui/menuwindow.cpp:62
+#: src/gui/menuwindow.cpp:63
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:65
+#: src/gui/menuwindow.cpp:66
 msgid "Skills"
 msgstr "Fertigkeiten"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:67
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:68
 msgid "Shortcut"
 msgstr "Tastenkürzel"
 
-#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
+#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
 msgid "Setup"
 msgstr "Einstellungen"
 
@@ -291,37 +306,47 @@ msgstr "@@trade|Mit %s handeln@@"
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|%s angreifen@@"
 
-#: src/gui/popupmenu.cpp:90
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "@@guild|Invite %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:85
+#, c-format
+msgid "@@party|Invite %s to join your party@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:92
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Mit NSC reden@@"
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:240
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Abbrechen@@"
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|%s aufheben@@"
 
-#: src/gui/popupmenu.cpp:216
+#: src/gui/popupmenu.cpp:231
 msgid "@@use|Equip@@"
 msgstr "@@use|Ausrüsten@@"
 
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:234
 msgid "@@use|Use@@"
 msgstr "@@use|Nutzen@@"
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:235
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Fallen lassen@@"
 
-#: src/gui/popupmenu.cpp:221
+#: src/gui/popupmenu.cpp:236
 msgid "@@description|Description@@"
 msgstr "@@description|Beschreibung@@"
 
-#: src/gui/popupmenu.cpp:223
+#: src/gui/popupmenu.cpp:238
 msgid "@@split|Split@@"
 msgstr "@@split|Aufteilen@@"
 
@@ -365,7 +390,7 @@ msgstr "Der Nutzername muss kürzer als %d sein."
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
 msgid "Sell"
 msgstr "Verkaufen"
 
@@ -389,39 +414,43 @@ msgstr "Bitte die Adresse und den Port eines Servers eingeben"
 msgid "Sound"
 msgstr "Ton"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:49
 msgid "Sfx volume"
 msgstr "Lautstärke der Klangeffekte"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:50
 msgid "Music volume"
 msgstr "Latustärke der Musik"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Anwenden"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:77
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:80
+#: src/gui/setup.cpp:81
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+#: src/gui/setup.cpp:85
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Press the button to start calibration"
 msgstr "Knopf drücken um die Kalibrierung zu starten"
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
 msgid "Calibrate"
 msgstr "Kalibrieren"
 
@@ -429,71 +458,75 @@ msgstr "Kalibrieren"
 msgid "Enable joystick"
 msgstr "Joystick aktivieren"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:77
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:78
 msgid "Rotate the stick"
 msgstr "Kreise den Steuerknüppel"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr "Vollbild"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
 msgstr "Benutzerdefinierten Zeiger"
 
 #: src/gui/setup_video.cpp:117
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:119
 msgid "FPS Limit:"
 msgstr "FPS-Limit:"
 
-#: src/gui/setup_video.cpp:133
+#: src/gui/setup_video.cpp:136
 msgid "Gui opacity"
 msgstr "GUI Transparenz"
 
-#: src/gui/setup_video.cpp:186
+#: src/gui/setup_video.cpp:192
 msgid "Scroll radius"
 msgstr "Scroll-Radius"
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:200
 msgid "Scroll laziness"
 msgstr "Scroll-Trägheit"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:208
 msgid "Ambient FX"
 msgstr "Hintergrundeffekte"
 
-#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
 msgid "off"
 msgstr "Aus"
 
-#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
 msgid "low"
 msgstr "Niedrig"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
 msgid "high"
 msgstr "Hoch"
 
-#: src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:275
 msgid "Switching to full screen"
 msgstr "Wechsle zum Vollbildmodus"
 
-#: src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:276
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:287
 msgid "Changing OpenGL"
 msgstr "Ändere OpenGL"
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:288
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
@@ -524,22 +557,37 @@ msgstr "Du gibst:"
 msgid "Change"
 msgstr "Ändern"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr "Angriff %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr "Verteidigung %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Bestätigen"
+
+#~ msgid "Select Character"
+#~ msgstr "Spielfigur auswählen"
+
+#~ msgid "Charisma:"
+#~ msgstr "Charisma:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Gesamtgewicht : %d - Maximales Gewicht : %d"
+
+#~ msgid "Keep"
+#~ msgstr "Erinnern"
diff --git a/po/en_GB.po b/po/en_GB.po
index 71e4b946..035a2654 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2007-10-28 18:59+0100\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-09 22:58+0200\n"
 "PO-Revision-Date: 2008-05-10 16:51+0000\n"
 "Last-Translator: Me <Glich.Glich@googlemail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -17,169 +17,185 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-09 20:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
 msgid "Buy"
 msgstr "Buy"
 
-#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
 #: src/gui/sell.cpp:241
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Price: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
 msgid "Quit"
 msgstr "Exit"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
-#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
-#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:202 src/gui/buy.cpp:220
+#: src/gui/sell.cpp:65 src/gui/sell.cpp:212 src/gui/sell.cpp:226
 #: src/gui/trade.cpp:84 src/gui/trade.cpp:171
 #, c-format
 msgid "Description: %s"
 msgstr "Description: %s"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
-#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:204 src/gui/buy.cpp:221
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:214 src/gui/sell.cpp:227
 #, c-format
 msgid "Effect: %s"
 msgstr "Effect: %s"
 
-#: src/gui/char_select.cpp:71
-msgid "Confirm"
-msgstr "Confirm"
+#: src/gui/char_select.cpp:74
+#, fuzzy
+msgid "Confirm Character Delete"
+msgstr "Create Character"
 
-#: src/gui/char_select.cpp:72
+#: src/gui/char_select.cpp:75
 msgid "Are you sure you want to delete this character?"
 msgstr "Are you sure you want to delete this character?"
 
-#: src/gui/char_select.cpp:88
-msgid "Select Character"
-msgstr "Select Character"
+#: src/gui/char_select.cpp:91
+msgid "Account and Character Management"
+msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/char_select.cpp:95 src/gui/item_amount.cpp:66 src/gui/login.cpp:50
 #: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
 #: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
 #: src/gui/serverdialog.cpp:110
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
-#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:283
+#: src/gui/connection.cpp:41 src/gui/item_amount.cpp:67 src/gui/login.cpp:51
 #: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:57
 #: src/gui/trade.cpp:62
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
 msgid "New"
 msgstr "New"
 
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gui/char_select.cpp:96
+#: src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Previous"
 
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Next"
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:101
 msgid "Unregister"
 msgstr "Unregister"
 
-#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
-#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
+#: src/gui/char_select.cpp:102
+#, fuzzy
+msgid "Change Password"
+msgstr "Password:"
+
+#: src/gui/char_select.cpp:103
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/char_select.cpp:105
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:106 src/gui/char_select.cpp:211
+#: src/gui/char_select.cpp:222 src/gui/trade.cpp:82 src/gui/trade.cpp:169
 #, c-format
 msgid "Name: %s"
 msgstr "Name: %s"
 
-#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
-#: src/gui/char_select.cpp:201
+#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
+#: src/gui/char_select.cpp:223
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
-#: src/gui/char_select.cpp:202
+#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
+#: src/gui/char_select.cpp:224
 #, c-format
 msgid "Money: %d"
 msgstr "Money: %d"
 
-#: src/gui/char_select.cpp:245
+#: src/gui/char_select.cpp:268
 msgid "Create Character"
 msgstr "Create Character"
 
-#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Name:"
 
-#: src/gui/char_select.cpp:255
+#: src/gui/char_select.cpp:278
 msgid "Hair Color:"
 msgstr "Hair Colour:"
 
-#: src/gui/char_select.cpp:258
+#: src/gui/char_select.cpp:281
 msgid "Hair Style:"
 msgstr "Hair Style:"
 
-#: src/gui/char_select.cpp:259
+#: src/gui/char_select.cpp:282
 msgid "Create"
 msgstr "Create"
 
-#: src/gui/char_select.cpp:262
+#: src/gui/char_select.cpp:285
+msgid "Male"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Female"
+msgstr ""
+
+#: src/gui/char_select.cpp:290
 msgid "Strength:"
 msgstr "Strength:"
 
-#: src/gui/char_select.cpp:263
+#: src/gui/char_select.cpp:291
 msgid "Agility:"
 msgstr "Agility:"
 
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:292
 msgid "Dexterity:"
 msgstr "Dexterity:"
 
-#: src/gui/char_select.cpp:265
+#: src/gui/char_select.cpp:293
 msgid "Vitality:"
 msgstr "Vitality:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:294
 msgid "Intelligence:"
 msgstr "Intelligence:"
 
-#: src/gui/char_select.cpp:267
+#: src/gui/char_select.cpp:295
 msgid "Willpower:"
 msgstr "Willpower:"
 
-#: src/gui/char_select.cpp:268
-msgid "Charisma:"
-msgstr "Charisma:"
-
-#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
+#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Please distribute %d points"
 
-#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
 #: src/gui/serverdialog.cpp:171
 msgid "Error"
 msgstr "Error"
 
-#: src/gui/char_select.cpp:369
+#: src/gui/char_select.cpp:417
 msgid "Your name needs to be at least 4 characters."
 msgstr "Your name needs to be at least 4 characters."
 
-#: src/gui/char_select.cpp:416
+#: src/gui/char_select.cpp:469
 msgid "Character stats OK"
 msgstr "Character stats OK"
 
-#: src/gui/char_select.cpp:428
+#: src/gui/char_select.cpp:481
 #, c-format
 msgid "Please remove %d points"
 msgstr "Please remove %d points"
@@ -192,11 +208,11 @@ msgstr "Yes"
 msgid "No"
 msgstr "No"
 
-#: src/gui/connection.cpp:42
+#: src/gui/connection.cpp:43
 msgid "Connecting..."
 msgstr "Connecting..."
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
 msgid "Equipment"
 msgstr "Equipment"
 
@@ -204,28 +220,23 @@ msgstr "Equipment"
 msgid "Unequip"
 msgstr "Unequip"
 
-#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
+#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
 msgid "Inventory"
 msgstr "Inventory"
 
-#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
 msgid "Use"
 msgstr "Use"
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:69
 msgid "Drop"
 msgstr "Drop"
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:70
 msgid "Split"
 msgstr "Split"
 
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
-#, c-format
-msgid "Total Weight: %d - Maximum Weight: %d"
-msgstr "Total Weight: %d - Maximum Weight: %d"
-
-#: src/gui/inventorywindow.cpp:194
+#: src/gui/inventorywindow.cpp:178
 msgid "Equip"
 msgstr "Equip"
 
@@ -241,35 +252,39 @@ msgstr "Select amount of items to drop."
 msgid "Select amount of items to split."
 msgstr "Select amount of items to split."
 
-#: src/gui/login.cpp:44
+#: src/gui/login.cpp:43
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:47 src/gui/register.cpp:68
+#: src/gui/login.cpp:46 src/gui/register.cpp:68
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gui/login.cpp:50
-msgid "Keep"
-msgstr "Keep"
+#: src/gui/login.cpp:49
+msgid "Remember Username"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Register"
 
-#: src/gui/menuwindow.cpp:62
+#: src/gui/menuwindow.cpp:63
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:65
+#: src/gui/menuwindow.cpp:66
 msgid "Skills"
 msgstr "Skills"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:67
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:68
 msgid "Shortcut"
 msgstr "Shortcut"
 
-#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
+#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
 msgid "Setup"
 msgstr "Setup"
 
@@ -291,37 +306,47 @@ msgstr "@@trade|Trade With %s@@"
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Attack %s@@"
 
-#: src/gui/popupmenu.cpp:90
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "@@guild|Invite %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:85
+#, c-format
+msgid "@@party|Invite %s to join your party@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:92
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Talk To NPC@@"
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:240
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancel@@"
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Pick Up %s@@"
 
-#: src/gui/popupmenu.cpp:216
+#: src/gui/popupmenu.cpp:231
 msgid "@@use|Equip@@"
 msgstr "@@use|Equip@@"
 
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:234
 msgid "@@use|Use@@"
 msgstr "@@use|Use@@"
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:235
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Drop@@"
 
-#: src/gui/popupmenu.cpp:221
+#: src/gui/popupmenu.cpp:236
 msgid "@@description|Description@@"
 msgstr "@@description|Description@@"
 
-#: src/gui/popupmenu.cpp:223
+#: src/gui/popupmenu.cpp:238
 msgid "@@split|Split@@"
 msgstr "@@split|Split@@"
 
@@ -365,7 +390,7 @@ msgstr "The password needs to be less than %d characters long."
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
 msgid "Sell"
 msgstr "Sell"
 
@@ -389,39 +414,43 @@ msgstr "Please type both the address and the port of a server."
 msgid "Sound"
 msgstr "Sound"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:49
 msgid "Sfx volume"
 msgstr "Sfx volume"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:50
 msgid "Music volume"
 msgstr "Music volume"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Reset Windows"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:77
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:80
+#: src/gui/setup.cpp:81
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+#: src/gui/setup.cpp:85
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Press the button to start calibration"
 msgstr "Press the button to start calibration"
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
 msgid "Calibrate"
 msgstr "Calibrate"
 
@@ -429,71 +458,75 @@ msgstr "Calibrate"
 msgid "Enable joystick"
 msgstr "Enable joystick"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:77
 msgid "Stop"
 msgstr "Stop"
 
-#: src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:78
 msgid "Rotate the stick"
 msgstr "Rotate the stick"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr "Full screen"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
 msgstr "Custom cursor"
 
 #: src/gui/setup_video.cpp:117
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:119
 msgid "FPS Limit:"
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:133
+#: src/gui/setup_video.cpp:136
 msgid "Gui opacity"
 msgstr "Gui opacity"
 
-#: src/gui/setup_video.cpp:186
+#: src/gui/setup_video.cpp:192
 msgid "Scroll radius"
 msgstr "Scroll radius"
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:200
 msgid "Scroll laziness"
 msgstr "Scroll laziness"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:208
 msgid "Ambient FX"
 msgstr "Ambient FX"
 
-#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
 msgid "off"
 msgstr "off"
 
-#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
 msgid "low"
 msgstr "low"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
 msgid "high"
 msgstr "high"
 
-#: src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:275
 msgid "Switching to full screen"
 msgstr "Switching to full screen"
 
-#: src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:276
 msgid "Restart needed for changes to take effect."
 msgstr "Restart needed for changes to take effect."
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:287
 msgid "Changing OpenGL"
 msgstr "Changing OpenGL"
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:288
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applying change to OpenGL requires restart."
 
@@ -522,22 +555,37 @@ msgstr "You give:"
 msgid "Change"
 msgstr "Change"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr "Attack %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr "Defense %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Confirm"
+
+#~ msgid "Select Character"
+#~ msgstr "Select Character"
+
+#~ msgid "Charisma:"
+#~ msgstr "Charisma:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Total Weight: %d - Maximum Weight: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Keep"
diff --git a/po/es.po b/po/es.po
index 0e2c5031..27f67523 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2007-10-28 18:59+0100\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-09 22:58+0200\n"
 "PO-Revision-Date: 2008-07-10 21:39+0000\n"
 "Last-Translator: catalania <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -17,169 +17,185 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-09 20:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
 #: src/gui/sell.cpp:241
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Precio: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
 msgid "Quit"
 msgstr "Salir"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
-#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
-#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:202 src/gui/buy.cpp:220
+#: src/gui/sell.cpp:65 src/gui/sell.cpp:212 src/gui/sell.cpp:226
 #: src/gui/trade.cpp:84 src/gui/trade.cpp:171
 #, c-format
 msgid "Description: %s"
 msgstr "Descripción: %s"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
-#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:204 src/gui/buy.cpp:221
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:214 src/gui/sell.cpp:227
 #, c-format
 msgid "Effect: %s"
 msgstr "Efecto: %s"
 
-#: src/gui/char_select.cpp:71
-msgid "Confirm"
-msgstr "Confirmar"
+#: src/gui/char_select.cpp:74
+#, fuzzy
+msgid "Confirm Character Delete"
+msgstr "Crear Personaje"
 
-#: src/gui/char_select.cpp:72
+#: src/gui/char_select.cpp:75
 msgid "Are you sure you want to delete this character?"
 msgstr "¿Seguro que quieres borrar este personaje?"
 
-#: src/gui/char_select.cpp:88
-msgid "Select Character"
-msgstr "Seleccionar personaje"
+#: src/gui/char_select.cpp:91
+msgid "Account and Character Management"
+msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/char_select.cpp:95 src/gui/item_amount.cpp:66 src/gui/login.cpp:50
 #: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
 #: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
 #: src/gui/serverdialog.cpp:110
 msgid "Ok"
 msgstr "Aceptar"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
-#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:283
+#: src/gui/connection.cpp:41 src/gui/item_amount.cpp:67 src/gui/login.cpp:51
 #: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:57
 #: src/gui/trade.cpp:62
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
 msgid "New"
 msgstr "Nuevo"
 
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/gui/char_select.cpp:96
+#: src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:101
 msgid "Unregister"
 msgstr "Cancelar Cuenta"
 
-#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
-#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
+#: src/gui/char_select.cpp:102
+#, fuzzy
+msgid "Change Password"
+msgstr "Contraseña:"
+
+#: src/gui/char_select.cpp:103
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/char_select.cpp:105
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:106 src/gui/char_select.cpp:211
+#: src/gui/char_select.cpp:222 src/gui/trade.cpp:82 src/gui/trade.cpp:169
 #, c-format
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
-#: src/gui/char_select.cpp:201
+#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
+#: src/gui/char_select.cpp:223
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
-#: src/gui/char_select.cpp:202
+#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
+#: src/gui/char_select.cpp:224
 #, c-format
 msgid "Money: %d"
 msgstr "Dinero: %d"
 
-#: src/gui/char_select.cpp:245
+#: src/gui/char_select.cpp:268
 msgid "Create Character"
 msgstr "Crear Personaje"
 
-#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/gui/char_select.cpp:255
+#: src/gui/char_select.cpp:278
 msgid "Hair Color:"
 msgstr "Color de pelo:"
 
-#: src/gui/char_select.cpp:258
+#: src/gui/char_select.cpp:281
 msgid "Hair Style:"
 msgstr "corte de pelo"
 
-#: src/gui/char_select.cpp:259
+#: src/gui/char_select.cpp:282
 msgid "Create"
 msgstr "Crear"
 
-#: src/gui/char_select.cpp:262
+#: src/gui/char_select.cpp:285
+msgid "Male"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Female"
+msgstr ""
+
+#: src/gui/char_select.cpp:290
 msgid "Strength:"
 msgstr "Fuerza:"
 
-#: src/gui/char_select.cpp:263
+#: src/gui/char_select.cpp:291
 msgid "Agility:"
 msgstr "Agilidad:"
 
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:292
 msgid "Dexterity:"
 msgstr "Destreza:"
 
-#: src/gui/char_select.cpp:265
+#: src/gui/char_select.cpp:293
 msgid "Vitality:"
 msgstr "Vitalidad:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:294
 msgid "Intelligence:"
 msgstr "Inteligencia:"
 
-#: src/gui/char_select.cpp:267
+#: src/gui/char_select.cpp:295
 msgid "Willpower:"
 msgstr "Fuerza de voluntad:"
 
-#: src/gui/char_select.cpp:268
-msgid "Charisma:"
-msgstr "Carisma:"
-
-#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
+#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribuya %d puntos"
 
-#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
 #: src/gui/serverdialog.cpp:171
 msgid "Error"
 msgstr "Error"
 
-#: src/gui/char_select.cpp:369
+#: src/gui/char_select.cpp:417
 msgid "Your name needs to be at least 4 characters."
 msgstr "El nombre debe tener al menos 4 caracteres."
 
-#: src/gui/char_select.cpp:416
+#: src/gui/char_select.cpp:469
 msgid "Character stats OK"
 msgstr "Estatus personaje OK"
 
-#: src/gui/char_select.cpp:428
+#: src/gui/char_select.cpp:481
 #, c-format
 msgid "Please remove %d points"
 msgstr "por favor quita %d puntos"
@@ -192,11 +208,11 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
-#: src/gui/connection.cpp:42
+#: src/gui/connection.cpp:43
 msgid "Connecting..."
 msgstr "Conectando…"
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
 msgid "Equipment"
 msgstr "Equipo"
 
@@ -204,28 +220,23 @@ msgstr "Equipo"
 msgid "Unequip"
 msgstr "quitarselo"
 
-#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
+#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
 msgid "Inventory"
 msgstr "Inventario"
 
-#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:69
 msgid "Drop"
 msgstr "tirar"
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:70
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
-#, c-format
-msgid "Total Weight: %d - Maximum Weight: %d"
-msgstr "Peso Total: %d - Peso Máximo: %d"
-
-#: src/gui/inventorywindow.cpp:194
+#: src/gui/inventorywindow.cpp:178
 msgid "Equip"
 msgstr "Equipar"
 
@@ -241,35 +252,39 @@ msgstr "Seleccione objetos para soltar."
 msgid "Select amount of items to split."
 msgstr "Seleccione objetos para dividir."
 
-#: src/gui/login.cpp:44
+#: src/gui/login.cpp:43
 msgid "Login"
 msgstr "conectarse"
 
-#: src/gui/login.cpp:47 src/gui/register.cpp:68
+#: src/gui/login.cpp:46 src/gui/register.cpp:68
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/gui/login.cpp:50
-msgid "Keep"
-msgstr "Mantener"
+#: src/gui/login.cpp:49
+msgid "Remember Username"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/menuwindow.cpp:62
+#: src/gui/menuwindow.cpp:63
 msgid "Status"
 msgstr "Estado"
 
-#: src/gui/menuwindow.cpp:65
+#: src/gui/menuwindow.cpp:66
 msgid "Skills"
 msgstr "Habilidades"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:67
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:68
 msgid "Shortcut"
 msgstr "Atajos"
 
-#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
+#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
 msgid "Setup"
 msgstr "Configuración"
 
@@ -291,37 +306,47 @@ msgstr "@@trade|Comerciar con %s@@"
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Atacar a %s@@"
 
-#: src/gui/popupmenu.cpp:90
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "@@guild|Invite %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:85
+#, c-format
+msgid "@@party|Invite %s to join your party@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:92
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Hablar al NPC@@"
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:240
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Recoger %s@@"
 
-#: src/gui/popupmenu.cpp:216
+#: src/gui/popupmenu.cpp:231
 msgid "@@use|Equip@@"
 msgstr "@@use|Equipar@@"
 
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:234
 msgid "@@use|Use@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:235
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Tirar@@"
 
-#: src/gui/popupmenu.cpp:221
+#: src/gui/popupmenu.cpp:236
 msgid "@@description|Description@@"
 msgstr "@@description|Descripción@@"
 
-#: src/gui/popupmenu.cpp:223
+#: src/gui/popupmenu.cpp:238
 msgid "@@split|Split@@"
 msgstr "@@split|Dividir@@"
 
@@ -365,7 +390,7 @@ msgstr "La contraseña puede tener como máximo %d caracteres."
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
 msgid "Sell"
 msgstr "Vender"
 
@@ -389,39 +414,43 @@ msgstr "Escriba la dirección y el puerto de un servidor."
 msgid "Sound"
 msgstr "Sonido"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:49
 msgid "Sfx volume"
 msgstr "Volumen efectos"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:50
 msgid "Music volume"
 msgstr "Volumen musica"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Reiniciar ventanas"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:77
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:80
+#: src/gui/setup.cpp:81
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+#: src/gui/setup.cpp:85
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Press the button to start calibration"
 msgstr "Presione el botón para comenzar a calibrar"
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
 msgid "Calibrate"
 msgstr "Calibrar"
 
@@ -429,71 +458,75 @@ msgstr "Calibrar"
 msgid "Enable joystick"
 msgstr "Activar joystick"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:77
 msgid "Stop"
 msgstr "Detener"
 
-#: src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:78
 msgid "Rotate the stick"
 msgstr "Gire el stick"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
 msgstr "Cursor propio"
 
 #: src/gui/setup_video.cpp:117
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:119
 msgid "FPS Limit:"
 msgstr "Límite de FPS:"
 
-#: src/gui/setup_video.cpp:133
+#: src/gui/setup_video.cpp:136
 msgid "Gui opacity"
 msgstr "Transparencia menus"
 
-#: src/gui/setup_video.cpp:186
+#: src/gui/setup_video.cpp:192
 msgid "Scroll radius"
 msgstr "Ratio de scroll"
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:200
 msgid "Scroll laziness"
 msgstr "Velocidad de scroll"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:208
 msgid "Ambient FX"
 msgstr "Efectos ambientales"
 
-#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
 msgid "off"
 msgstr "desactivado"
 
-#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
 msgid "low"
 msgstr "bajo"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
 msgid "high"
 msgstr "alto"
 
-#: src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:275
 msgid "Switching to full screen"
 msgstr "Cambiar a pantalla completa"
 
-#: src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:276
 msgid "Restart needed for changes to take effect."
 msgstr "Se necesita reiniciar para aplicar los cambios."
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:287
 msgid "Changing OpenGL"
 msgstr "Cambiar a OpenGL"
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:288
 msgid "Applying change to OpenGL requires restart."
 msgstr "Se necesita reiniciar para aplicar los cambios hechos a OpenGL."
 
@@ -522,22 +555,37 @@ msgstr "Tu das:"
 msgid "Change"
 msgstr "Modificar"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr "Ataque %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr "Defensa %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Confirmar"
+
+#~ msgid "Select Character"
+#~ msgstr "Seleccionar personaje"
+
+#~ msgid "Charisma:"
+#~ msgstr "Carisma:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Peso Total: %d - Peso Máximo: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Mantener"
diff --git a/po/fr.po b/po/fr.po
index df471424..b9fa2e5e 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: 2007-10-28 18:59+0100\n"
+"POT-Creation-Date: 2008-10-09 22:58+0200\n"
 "PO-Revision-Date: 2007-12-03 01:45+0000\n"
 "Last-Translator: Guillaume Melquiond <Unknown>\n"
 "Language-Team: French\n"
@@ -18,169 +18,185 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-09 20:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
 msgid "Buy"
 msgstr "Acheter"
 
-#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
 #: src/gui/sell.cpp:241
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Prix : %d PO / Total : %d PO"
 
-#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
-#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
-#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:202 src/gui/buy.cpp:220
+#: src/gui/sell.cpp:65 src/gui/sell.cpp:212 src/gui/sell.cpp:226
 #: src/gui/trade.cpp:84 src/gui/trade.cpp:171
 #, c-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
-#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:204 src/gui/buy.cpp:221
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:214 src/gui/sell.cpp:227
 #, c-format
 msgid "Effect: %s"
 msgstr "Effet : %s"
 
-#: src/gui/char_select.cpp:71
-msgid "Confirm"
-msgstr "Confirmer"
+#: src/gui/char_select.cpp:74
+#, fuzzy
+msgid "Confirm Character Delete"
+msgstr "Création du personnage"
 
-#: src/gui/char_select.cpp:72
+#: src/gui/char_select.cpp:75
 msgid "Are you sure you want to delete this character?"
 msgstr "Voulez-vous vraiment supprimer ce personnage ?"
 
-#: src/gui/char_select.cpp:88
-msgid "Select Character"
-msgstr "Choix du personnage"
+#: src/gui/char_select.cpp:91
+msgid "Account and Character Management"
+msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/char_select.cpp:95 src/gui/item_amount.cpp:66 src/gui/login.cpp:50
 #: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
 #: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
 #: src/gui/serverdialog.cpp:110
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
-#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:283
+#: src/gui/connection.cpp:41 src/gui/item_amount.cpp:67 src/gui/login.cpp:51
 #: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:57
 #: src/gui/trade.cpp:62
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
 msgid "New"
 msgstr "Nouveau"
 
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/gui/char_select.cpp:96
+#: src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Précédent"
 
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Suivant"
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:101
 msgid "Unregister"
 msgstr "Se désinscrire"
 
-#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
-#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
+#: src/gui/char_select.cpp:102
+#, fuzzy
+msgid "Change Password"
+msgstr "Mot de passe :"
+
+#: src/gui/char_select.cpp:103
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/char_select.cpp:105
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:106 src/gui/char_select.cpp:211
+#: src/gui/char_select.cpp:222 src/gui/trade.cpp:82 src/gui/trade.cpp:169
 #, c-format
 msgid "Name: %s"
 msgstr "Nom : %s"
 
-#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
-#: src/gui/char_select.cpp:201
+#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
+#: src/gui/char_select.cpp:223
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
-#: src/gui/char_select.cpp:202
+#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
+#: src/gui/char_select.cpp:224
 #, c-format
 msgid "Money: %d"
 msgstr "Argent : %d"
 
-#: src/gui/char_select.cpp:245
+#: src/gui/char_select.cpp:268
 msgid "Create Character"
 msgstr "Création du personnage"
 
-#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nom :"
 
-#: src/gui/char_select.cpp:255
+#: src/gui/char_select.cpp:278
 msgid "Hair Color:"
 msgstr "Teinte :"
 
-#: src/gui/char_select.cpp:258
+#: src/gui/char_select.cpp:281
 msgid "Hair Style:"
 msgstr "Coiffure :"
 
-#: src/gui/char_select.cpp:259
+#: src/gui/char_select.cpp:282
 msgid "Create"
 msgstr "Créer"
 
-#: src/gui/char_select.cpp:262
+#: src/gui/char_select.cpp:285
+msgid "Male"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Female"
+msgstr ""
+
+#: src/gui/char_select.cpp:290
 msgid "Strength:"
 msgstr "Force :"
 
-#: src/gui/char_select.cpp:263
+#: src/gui/char_select.cpp:291
 msgid "Agility:"
 msgstr "Agilité :"
 
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:292
 msgid "Dexterity:"
 msgstr "Dextérité :"
 
-#: src/gui/char_select.cpp:265
+#: src/gui/char_select.cpp:293
 msgid "Vitality:"
 msgstr "Vitalité :"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:294
 msgid "Intelligence:"
 msgstr "Intelligence :"
 
-#: src/gui/char_select.cpp:267
+#: src/gui/char_select.cpp:295
 msgid "Willpower:"
 msgstr "Volonté :"
 
-#: src/gui/char_select.cpp:268
-msgid "Charisma:"
-msgstr "Charisme :"
-
-#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
+#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Veuillez distribuer %d points"
 
-#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
 #: src/gui/serverdialog.cpp:171
 msgid "Error"
 msgstr "Erreur"
 
-#: src/gui/char_select.cpp:369
+#: src/gui/char_select.cpp:417
 msgid "Your name needs to be at least 4 characters."
 msgstr "Votre nom doit faire 4 caractères au moins."
 
-#: src/gui/char_select.cpp:416
+#: src/gui/char_select.cpp:469
 msgid "Character stats OK"
 msgstr "Caractéristiques Ok"
 
-#: src/gui/char_select.cpp:428
+#: src/gui/char_select.cpp:481
 #, c-format
 msgid "Please remove %d points"
 msgstr "Veuillez retirer %d points"
@@ -193,11 +209,11 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
-#: src/gui/connection.cpp:42
+#: src/gui/connection.cpp:43
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
 msgid "Equipment"
 msgstr "Équipement"
 
@@ -205,28 +221,23 @@ msgstr "Équipement"
 msgid "Unequip"
 msgstr "Retirer"
 
-#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
+#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
 msgid "Inventory"
 msgstr "Inventaire"
 
-#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
 msgid "Use"
 msgstr "Utiliser"
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:69
 msgid "Drop"
 msgstr "Lâcher"
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:70
 msgid "Split"
 msgstr "Partager"
 
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
-#, c-format
-msgid "Total Weight: %d - Maximum Weight: %d"
-msgstr "Poids total : %d - Poids maximal : %d"
-
-#: src/gui/inventorywindow.cpp:194
+#: src/gui/inventorywindow.cpp:178
 msgid "Equip"
 msgstr "Équiper"
 
@@ -242,35 +253,39 @@ msgstr "Choisissez le nombre d'objets à lâcher."
 msgid "Select amount of items to split."
 msgstr "Choisissez le nombre d'objets à déplacer."
 
-#: src/gui/login.cpp:44
+#: src/gui/login.cpp:43
 msgid "Login"
 msgstr "Connexion"
 
-#: src/gui/login.cpp:47 src/gui/register.cpp:68
+#: src/gui/login.cpp:46 src/gui/register.cpp:68
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: src/gui/login.cpp:50
-msgid "Keep"
-msgstr "Conserver"
+#: src/gui/login.cpp:49
+msgid "Remember Username"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
 msgid "Register"
 msgstr "S'inscrire"
 
-#: src/gui/menuwindow.cpp:62
+#: src/gui/menuwindow.cpp:63
 msgid "Status"
 msgstr "Statut"
 
-#: src/gui/menuwindow.cpp:65
+#: src/gui/menuwindow.cpp:66
 msgid "Skills"
 msgstr "Compétences"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:67
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:68
 msgid "Shortcut"
 msgstr "Raccourci"
 
-#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
+#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
 msgid "Setup"
 msgstr "Configuration"
 
@@ -292,37 +307,47 @@ msgstr "@@trade|Troquer avec %s@@"
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Attaquer %s@@"
 
-#: src/gui/popupmenu.cpp:90
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "@@guild|Invite %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:85
+#, c-format
+msgid "@@party|Invite %s to join your party@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:92
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Parler au PNJ@@"
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:240
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuler@@"
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Ramasser %s@@"
 
-#: src/gui/popupmenu.cpp:216
+#: src/gui/popupmenu.cpp:231
 msgid "@@use|Equip@@"
 msgstr "@@use|Équiper@@"
 
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:234
 msgid "@@use|Use@@"
 msgstr "@@use|Utiliser@@"
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:235
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Lâcher@@"
 
-#: src/gui/popupmenu.cpp:221
+#: src/gui/popupmenu.cpp:236
 msgid "@@description|Description@@"
 msgstr "@@description|Description@@"
 
-#: src/gui/popupmenu.cpp:223
+#: src/gui/popupmenu.cpp:238
 msgid "@@split|Split@@"
 msgstr "@@split|Partager@@"
 
@@ -366,7 +391,7 @@ msgstr "Le mot de passe doit faire moins de %d caractères."
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe ne correspondent pas."
 
-#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
 msgid "Sell"
 msgstr "Vendre"
 
@@ -390,39 +415,43 @@ msgstr "Veuillez entrer l'adresse et le port du serveur."
 msgid "Sound"
 msgstr "Son"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:49
 msgid "Sfx volume"
 msgstr "Volume des effets sonores"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:50
 msgid "Music volume"
 msgstr "Volume de la musique"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Appliquer"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:77
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:80
+#: src/gui/setup.cpp:81
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+#: src/gui/setup.cpp:85
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Press the button to start calibration"
 msgstr "Presser le bouton pour démarrer la calibration"
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
 msgid "Calibrate"
 msgstr "Calibrer"
 
@@ -430,72 +459,76 @@ msgstr "Calibrer"
 msgid "Enable joystick"
 msgstr "Activer le joystick"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:77
 msgid "Stop"
 msgstr "Stop"
 
-#: src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:78
 msgid "Rotate the stick"
 msgstr "Tourner le joystick"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr "Plein écran"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
 msgstr "Curseur personnalisé"
 
 #: src/gui/setup_video.cpp:117
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:119
 msgid "FPS Limit:"
 msgstr "Limite FPS :"
 
-#: src/gui/setup_video.cpp:133
+#: src/gui/setup_video.cpp:136
 msgid "Gui opacity"
 msgstr "Opacité de l'interface"
 
-#: src/gui/setup_video.cpp:186
+#: src/gui/setup_video.cpp:192
 msgid "Scroll radius"
 msgstr "Rayon du scrolling"
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:200
 msgid "Scroll laziness"
 msgstr "Paresse du scrolling"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:208
 msgid "Ambient FX"
 msgstr "Effets ambiants"
 
-#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
 msgid "off"
 msgstr "aucun"
 
-#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
 msgid "low"
 msgstr "léger"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
 msgid "high"
 msgstr "complet"
 
-#: src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:275
 msgid "Switching to full screen"
 msgstr "Passage en plein écran"
 
-#: src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:276
 msgid "Restart needed for changes to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:287
 msgid "Changing OpenGL"
 msgstr "Changement OpenGL"
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:288
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
@@ -525,22 +558,37 @@ msgstr "Vous donnez :"
 msgid "Change"
 msgstr "Changer"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr "Attaque %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr "Défense %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr "PV %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr "PM %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Confirmer"
+
+#~ msgid "Select Character"
+#~ msgstr "Choix du personnage"
+
+#~ msgid "Charisma:"
+#~ msgstr "Charisme :"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Poids total : %d - Poids maximal : %d"
+
+#~ msgid "Keep"
+#~ msgstr "Conserver"
diff --git a/po/id.po b/po/id.po
index 21e9e3ea..b6ca6362 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2007-10-28 18:59+0100\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-09 22:58+0200\n"
 "PO-Revision-Date: 2008-03-26 09:11+0000\n"
 "Last-Translator: ActiveFile <activefile@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -17,169 +17,185 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-09 20:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
 msgid "Buy"
 msgstr "Beli"
 
-#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
 #: src/gui/sell.cpp:241
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Harga: %d GP / Jumlah: %d GP"
 
-#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
 msgid "Quit"
 msgstr "Keluar"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
-#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
-#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:202 src/gui/buy.cpp:220
+#: src/gui/sell.cpp:65 src/gui/sell.cpp:212 src/gui/sell.cpp:226
 #: src/gui/trade.cpp:84 src/gui/trade.cpp:171
 #, c-format
 msgid "Description: %s"
 msgstr "Deskripsi: %s"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
-#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:204 src/gui/buy.cpp:221
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:214 src/gui/sell.cpp:227
 #, c-format
 msgid "Effect: %s"
 msgstr "Efek: %s"
 
-#: src/gui/char_select.cpp:71
-msgid "Confirm"
-msgstr "Konfirmasi"
+#: src/gui/char_select.cpp:74
+#, fuzzy
+msgid "Confirm Character Delete"
+msgstr "Buat Karakter"
 
-#: src/gui/char_select.cpp:72
+#: src/gui/char_select.cpp:75
 msgid "Are you sure you want to delete this character?"
 msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 
-#: src/gui/char_select.cpp:88
-msgid "Select Character"
-msgstr "Pilih Karakter"
+#: src/gui/char_select.cpp:91
+msgid "Account and Character Management"
+msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/char_select.cpp:95 src/gui/item_amount.cpp:66 src/gui/login.cpp:50
 #: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
 #: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
 #: src/gui/serverdialog.cpp:110
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
-#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:283
+#: src/gui/connection.cpp:41 src/gui/item_amount.cpp:67 src/gui/login.cpp:51
 #: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:57
 #: src/gui/trade.cpp:62
 msgid "Cancel"
 msgstr "Batal"
 
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
 msgid "New"
 msgstr "Buat baru"
 
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/gui/char_select.cpp:96
+#: src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Berikutnya"
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:101
 msgid "Unregister"
 msgstr "Tidak terdaftar"
 
-#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
-#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
+#: src/gui/char_select.cpp:102
+#, fuzzy
+msgid "Change Password"
+msgstr "Kata Sandi:"
+
+#: src/gui/char_select.cpp:103
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/char_select.cpp:105
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:106 src/gui/char_select.cpp:211
+#: src/gui/char_select.cpp:222 src/gui/trade.cpp:82 src/gui/trade.cpp:169
 #, c-format
 msgid "Name: %s"
 msgstr "Nama: %s"
 
-#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
-#: src/gui/char_select.cpp:201
+#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
+#: src/gui/char_select.cpp:223
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
-#: src/gui/char_select.cpp:202
+#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
+#: src/gui/char_select.cpp:224
 #, c-format
 msgid "Money: %d"
 msgstr "Uang: %d"
 
-#: src/gui/char_select.cpp:245
+#: src/gui/char_select.cpp:268
 msgid "Create Character"
 msgstr "Buat Karakter"
 
-#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nama:"
 
-#: src/gui/char_select.cpp:255
+#: src/gui/char_select.cpp:278
 msgid "Hair Color:"
 msgstr "Warna Rambut:"
 
-#: src/gui/char_select.cpp:258
+#: src/gui/char_select.cpp:281
 msgid "Hair Style:"
 msgstr "Gaya Rambut:"
 
-#: src/gui/char_select.cpp:259
+#: src/gui/char_select.cpp:282
 msgid "Create"
 msgstr "Buat"
 
-#: src/gui/char_select.cpp:262
+#: src/gui/char_select.cpp:285
+msgid "Male"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Female"
+msgstr ""
+
+#: src/gui/char_select.cpp:290
 msgid "Strength:"
 msgstr "Kekuatan"
 
-#: src/gui/char_select.cpp:263
+#: src/gui/char_select.cpp:291
 msgid "Agility:"
 msgstr ""
 
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:292
 msgid "Dexterity:"
 msgstr "Ketangkasan"
 
-#: src/gui/char_select.cpp:265
+#: src/gui/char_select.cpp:293
 msgid "Vitality:"
 msgstr "Daya/Tenaga Hidup"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:294
 msgid "Intelligence:"
 msgstr "Kecerdasan"
 
-#: src/gui/char_select.cpp:267
+#: src/gui/char_select.cpp:295
 msgid "Willpower:"
 msgstr "Ketekunan"
 
-#: src/gui/char_select.cpp:268
-msgid "Charisma:"
-msgstr "Karisma"
-
-#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
+#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Tolong distribusikan %d point"
 
-#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
 #: src/gui/serverdialog.cpp:171
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/gui/char_select.cpp:369
+#: src/gui/char_select.cpp:417
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nama anda sekurang-kurangnya harus 4 karakter"
 
-#: src/gui/char_select.cpp:416
+#: src/gui/char_select.cpp:469
 msgid "Character stats OK"
 msgstr "Stats Karakter OK"
 
-#: src/gui/char_select.cpp:428
+#: src/gui/char_select.cpp:481
 #, c-format
 msgid "Please remove %d points"
 msgstr "Tolong hilangkan %d point"
@@ -192,11 +208,11 @@ msgstr "Ya"
 msgid "No"
 msgstr "Tidak"
 
-#: src/gui/connection.cpp:42
+#: src/gui/connection.cpp:43
 msgid "Connecting..."
 msgstr "Menyambung..."
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
 msgid "Equipment"
 msgstr "Perlengkapan"
 
@@ -204,28 +220,23 @@ msgstr "Perlengkapan"
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
+#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
 msgid "Use"
 msgstr "Gunakan"
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:69
 msgid "Drop"
 msgstr "Jatuh"
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:70
 msgid "Split"
 msgstr "Pecah"
 
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
-#, c-format
-msgid "Total Weight: %d - Maximum Weight: %d"
-msgstr "Jumlah Berat: %d - Berat Maksimum: %d"
-
-#: src/gui/inventorywindow.cpp:194
+#: src/gui/inventorywindow.cpp:178
 msgid "Equip"
 msgstr ""
 
@@ -241,35 +252,39 @@ msgstr "Pilih jumlah item yang mau di buang"
 msgid "Select amount of items to split."
 msgstr "Pilih jumlah item yang mau di pisahkan"
 
-#: src/gui/login.cpp:44
+#: src/gui/login.cpp:43
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:47 src/gui/register.cpp:68
+#: src/gui/login.cpp:46 src/gui/register.cpp:68
 msgid "Password:"
 msgstr "Kata Sandi:"
 
-#: src/gui/login.cpp:50
-msgid "Keep"
-msgstr "Pertahankan"
+#: src/gui/login.cpp:49
+msgid "Remember Username"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Mendaftar"
 
-#: src/gui/menuwindow.cpp:62
+#: src/gui/menuwindow.cpp:63
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:65
+#: src/gui/menuwindow.cpp:66
 msgid "Skills"
 msgstr "Keahlian"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:67
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:68
 msgid "Shortcut"
 msgstr "Tombol Singkat"
 
-#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
+#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
 msgid "Setup"
 msgstr "Atur"
 
@@ -291,37 +306,47 @@ msgstr "@@trade|Dagang Dengan %s@@"
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Serang%s@@"
 
-#: src/gui/popupmenu.cpp:90
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "@@guild|Invite %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:85
+#, c-format
+msgid "@@party|Invite %s to join your party@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:92
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Bicara dengan NPC@@"
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:240
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Batal@@"
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Ambil %s@@"
 
-#: src/gui/popupmenu.cpp:216
+#: src/gui/popupmenu.cpp:231
 msgid "@@use|Equip@@"
 msgstr "@@use|Melengkapi@@"
 
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:234
 msgid "@@use|Use@@"
 msgstr "@@use|Gunakan@@"
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:235
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Buang@@"
 
-#: src/gui/popupmenu.cpp:221
+#: src/gui/popupmenu.cpp:236
 msgid "@@description|Description@@"
 msgstr "@@description|Deskripsi@@"
 
-#: src/gui/popupmenu.cpp:223
+#: src/gui/popupmenu.cpp:238
 msgid "@@split|Split@@"
 msgstr "@@split|Pisah@@"
 
@@ -365,7 +390,7 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr "Kata sandi tidak sama."
 
-#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
 msgid "Sell"
 msgstr "Jual"
 
@@ -389,39 +414,43 @@ msgstr "Tolong tulis address dan port dari server"
 msgid "Sound"
 msgstr "Suara"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:49
 msgid "Sfx volume"
 msgstr "Volume sfx"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:50
 msgid "Music volume"
 msgstr "Volume Musik"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Terapkan"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:77
 msgid "Audio"
 msgstr "Suara"
 
-#: src/gui/setup.cpp:80
+#: src/gui/setup.cpp:81
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+#: src/gui/setup.cpp:85
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Press the button to start calibration"
 msgstr "Tekan tombol untuk memulai kalibrasi"
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
 msgid "Calibrate"
 msgstr "Kalibrasi"
 
@@ -429,71 +458,75 @@ msgstr "Kalibrasi"
 msgid "Enable joystick"
 msgstr "Membolehkan joistik"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:77
 msgid "Stop"
 msgstr "Berhenti"
 
-#: src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:78
 msgid "Rotate the stick"
 msgstr "Memutar tongkat"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr "Layar penuh"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
 msgstr ""
 
 #: src/gui/setup_video.cpp:117
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:119
 msgid "FPS Limit:"
 msgstr "Batas FPS"
 
-#: src/gui/setup_video.cpp:133
+#: src/gui/setup_video.cpp:136
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:186
+#: src/gui/setup_video.cpp:192
 msgid "Scroll radius"
 msgstr "Radius gulungan"
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:200
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:208
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
 msgid "off"
 msgstr "mati"
 
-#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
 msgid "low"
 msgstr "rendah"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
 msgid "high"
 msgstr "tinggi"
 
-#: src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:275
 msgid "Switching to full screen"
 msgstr "Mengganti ke layar penuh"
 
-#: src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:276
 msgid "Restart needed for changes to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:287
 msgid "Changing OpenGL"
 msgstr "Mengubah OpenGL"
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:288
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
 
@@ -522,22 +555,37 @@ msgstr "Anda memberikan:"
 msgid "Change"
 msgstr "Ubah"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr "Serangan %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr "Pertahanan %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Konfirmasi"
+
+#~ msgid "Select Character"
+#~ msgstr "Pilih Karakter"
+
+#~ msgid "Charisma:"
+#~ msgstr "Karisma"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Jumlah Berat: %d - Berat Maksimum: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Pertahankan"
diff --git a/po/it.po b/po/it.po
index a2024c29..96ab0831 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: 2007-10-28 18:59+0100\n"
+"POT-Creation-Date: 2008-10-09 22:58+0200\n"
 "PO-Revision-Date: 2007-12-03 01:45+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Italian\n"
@@ -19,169 +19,185 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-09 20:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
 msgid "Buy"
 msgstr "Compra"
 
-#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
 #: src/gui/sell.cpp:241
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Prezzo: %d GP / Totale: %d GP"
 
-#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
 msgid "Quit"
 msgstr "Esci"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
-#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
-#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:202 src/gui/buy.cpp:220
+#: src/gui/sell.cpp:65 src/gui/sell.cpp:212 src/gui/sell.cpp:226
 #: src/gui/trade.cpp:84 src/gui/trade.cpp:171
 #, c-format
 msgid "Description: %s"
 msgstr "Descrizione : %s"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
-#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:204 src/gui/buy.cpp:221
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:214 src/gui/sell.cpp:227
 #, c-format
 msgid "Effect: %s"
 msgstr "Effetto : %s"
 
-#: src/gui/char_select.cpp:71
-msgid "Confirm"
-msgstr "Conferma"
+#: src/gui/char_select.cpp:74
+#, fuzzy
+msgid "Confirm Character Delete"
+msgstr "Crea Personaggio"
 
-#: src/gui/char_select.cpp:72
+#: src/gui/char_select.cpp:75
 msgid "Are you sure you want to delete this character?"
 msgstr "Sei sicuro di voler cancellare questo personaggio?"
 
-#: src/gui/char_select.cpp:88
-msgid "Select Character"
-msgstr "Scelta Personaggio"
+#: src/gui/char_select.cpp:91
+msgid "Account and Character Management"
+msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/char_select.cpp:95 src/gui/item_amount.cpp:66 src/gui/login.cpp:50
 #: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
 #: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
 #: src/gui/serverdialog.cpp:110
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
-#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:283
+#: src/gui/connection.cpp:41 src/gui/item_amount.cpp:67 src/gui/login.cpp:51
 #: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:57
 #: src/gui/trade.cpp:62
 msgid "Cancel"
 msgstr "Cancella"
 
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
 msgid "New"
 msgstr "Nuovo"
 
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/gui/char_select.cpp:96
+#: src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Precedente"
 
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Prossimo"
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:101
 msgid "Unregister"
 msgstr "Cancella registrazione"
 
-#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
-#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
+#: src/gui/char_select.cpp:102
+#, fuzzy
+msgid "Change Password"
+msgstr "Password:"
+
+#: src/gui/char_select.cpp:103
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/char_select.cpp:105
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:106 src/gui/char_select.cpp:211
+#: src/gui/char_select.cpp:222 src/gui/trade.cpp:82 src/gui/trade.cpp:169
 #, c-format
 msgid "Name: %s"
 msgstr "Nome : %s"
 
-#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
-#: src/gui/char_select.cpp:201
+#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
+#: src/gui/char_select.cpp:223
 #, c-format
 msgid "Level: %d"
 msgstr "Livello: %d"
 
-#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
-#: src/gui/char_select.cpp:202
+#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
+#: src/gui/char_select.cpp:224
 #, c-format
 msgid "Money: %d"
 msgstr "Monete: %d"
 
-#: src/gui/char_select.cpp:245
+#: src/gui/char_select.cpp:268
 msgid "Create Character"
 msgstr "Crea Personaggio"
 
-#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nome :"
 
-#: src/gui/char_select.cpp:255
+#: src/gui/char_select.cpp:278
 msgid "Hair Color:"
 msgstr "Colore Capelli"
 
-#: src/gui/char_select.cpp:258
+#: src/gui/char_select.cpp:281
 msgid "Hair Style:"
 msgstr "Stile Capelli:"
 
-#: src/gui/char_select.cpp:259
+#: src/gui/char_select.cpp:282
 msgid "Create"
 msgstr "Create"
 
-#: src/gui/char_select.cpp:262
+#: src/gui/char_select.cpp:285
+msgid "Male"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Female"
+msgstr ""
+
+#: src/gui/char_select.cpp:290
 msgid "Strength:"
 msgstr "Forza:"
 
-#: src/gui/char_select.cpp:263
+#: src/gui/char_select.cpp:291
 msgid "Agility:"
 msgstr "Agilità:"
 
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:292
 msgid "Dexterity:"
 msgstr "Destrezza:"
 
-#: src/gui/char_select.cpp:265
+#: src/gui/char_select.cpp:293
 msgid "Vitality:"
 msgstr "Vitalità:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:294
 msgid "Intelligence:"
 msgstr "Intelligenza:"
 
-#: src/gui/char_select.cpp:267
+#: src/gui/char_select.cpp:295
 msgid "Willpower:"
 msgstr "Volontà:"
 
-#: src/gui/char_select.cpp:268
-msgid "Charisma:"
-msgstr "Carisma:"
-
-#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
+#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Prego distribuisci %d points"
 
-#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
 #: src/gui/serverdialog.cpp:171
 msgid "Error"
 msgstr "Errore"
 
-#: src/gui/char_select.cpp:369
+#: src/gui/char_select.cpp:417
 msgid "Your name needs to be at least 4 characters."
 msgstr "Il tuo nome deve contenere almeno 4 caratteri."
 
-#: src/gui/char_select.cpp:416
+#: src/gui/char_select.cpp:469
 msgid "Character stats OK"
 msgstr "Statistiche personaggio OK"
 
-#: src/gui/char_select.cpp:428
+#: src/gui/char_select.cpp:481
 #, c-format
 msgid "Please remove %d points"
 msgstr "Prego rimuovi %d punti"
@@ -194,11 +210,11 @@ msgstr "Si"
 msgid "No"
 msgstr "No"
 
-#: src/gui/connection.cpp:42
+#: src/gui/connection.cpp:43
 msgid "Connecting..."
 msgstr "Connessione..."
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
@@ -206,28 +222,23 @@ msgstr "Equipaggiamento"
 msgid "Unequip"
 msgstr "Rimuovi"
 
-#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
+#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
 msgid "Inventory"
 msgstr "Inventario"
 
-#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
 msgid "Use"
 msgstr "Usa"
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:69
 msgid "Drop"
 msgstr "Lascia"
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:70
 msgid "Split"
 msgstr "Lascia"
 
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
-#, c-format
-msgid "Total Weight: %d - Maximum Weight: %d"
-msgstr "Peso totale : %d - Peso massimo : %d"
-
-#: src/gui/inventorywindow.cpp:194
+#: src/gui/inventorywindow.cpp:178
 msgid "Equip"
 msgstr "Equipaggia"
 
@@ -243,35 +254,39 @@ msgstr "Seleziona la quantità di oggetti da lasciare."
 msgid "Select amount of items to split."
 msgstr "Seleziona la quantità di oggetti da lasciare."
 
-#: src/gui/login.cpp:44
+#: src/gui/login.cpp:43
 msgid "Login"
 msgstr "Autenticazione"
 
-#: src/gui/login.cpp:47 src/gui/register.cpp:68
+#: src/gui/login.cpp:46 src/gui/register.cpp:68
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gui/login.cpp:50
-msgid "Keep"
-msgstr "Mantieni"
+#: src/gui/login.cpp:49
+msgid "Remember Username"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registra"
 
-#: src/gui/menuwindow.cpp:62
+#: src/gui/menuwindow.cpp:63
 msgid "Status"
 msgstr "Stato"
 
-#: src/gui/menuwindow.cpp:65
+#: src/gui/menuwindow.cpp:66
 msgid "Skills"
 msgstr "Abilità"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:67
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:68
 msgid "Shortcut"
 msgstr "Scorciatoia"
 
-#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
+#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
 msgid "Setup"
 msgstr "Impostazioni"
 
@@ -293,37 +308,47 @@ msgstr "@@trade|Scambia Con %s@@"
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Attacca %s@@"
 
-#: src/gui/popupmenu.cpp:90
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "@@guild|Invite %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:85
+#, c-format
+msgid "@@party|Invite %s to join your party@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:92
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Parla con NPC@@"
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:240
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancella@@"
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Raccogli %s@@"
 
-#: src/gui/popupmenu.cpp:216
+#: src/gui/popupmenu.cpp:231
 msgid "@@use|Equip@@"
 msgstr "@@use|Equipaggia@@"
 
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:234
 msgid "@@use|Use@@"
 msgstr "@@usa|Usa@@"
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:235
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Lascia@@"
 
-#: src/gui/popupmenu.cpp:221
+#: src/gui/popupmenu.cpp:236
 msgid "@@description|Description@@"
 msgstr "@@description|Descrizione@@"
 
-#: src/gui/popupmenu.cpp:223
+#: src/gui/popupmenu.cpp:238
 msgid "@@split|Split@@"
 msgstr "@@split|Lascia@@"
 
@@ -367,7 +392,7 @@ msgstr "La password deve contenere meno di %d caratteri."
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
-#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
 msgid "Sell"
 msgstr "Vendi"
 
@@ -391,39 +416,43 @@ msgstr "Per favore inserisci l'indirizzo e la porta del server."
 msgid "Sound"
 msgstr "Suono"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:49
 msgid "Sfx volume"
 msgstr "Volume effetti sonori"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:50
 msgid "Music volume"
 msgstr "Volume musica"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Applica"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Resetta finestre"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:77
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:80
+#: src/gui/setup.cpp:81
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+#: src/gui/setup.cpp:85
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Press the button to start calibration"
 msgstr "Premi il pulsante per cominciare la calibrazione"
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
 msgid "Calibrate"
 msgstr "Calibra"
 
@@ -431,71 +460,75 @@ msgstr "Calibra"
 msgid "Enable joystick"
 msgstr "Abilita joystick"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:77
 msgid "Stop"
 msgstr "Ferma"
 
-#: src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:78
 msgid "Rotate the stick"
 msgstr "Ruota la manopola"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr "Schermo intero"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
 msgstr "Cursore personalizzato"
 
 #: src/gui/setup_video.cpp:117
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:119
 msgid "FPS Limit:"
 msgstr "Limita FPS:"
 
-#: src/gui/setup_video.cpp:133
+#: src/gui/setup_video.cpp:136
 msgid "Gui opacity"
 msgstr "Opacità IU"
 
-#: src/gui/setup_video.cpp:186
+#: src/gui/setup_video.cpp:192
 msgid "Scroll radius"
 msgstr "Raggio dello scroll"
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:200
 msgid "Scroll laziness"
 msgstr "Lentezza dello scroll"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:208
 msgid "Ambient FX"
 msgstr "Suoni ambientali"
 
-#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
 msgid "off"
 msgstr "Spento"
 
-#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
 msgid "low"
 msgstr "Basso"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
 msgid "high"
 msgstr "Alto"
 
-#: src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:275
 msgid "Switching to full screen"
 msgstr "Modalità a schermo intero"
 
-#: src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:276
 msgid "Restart needed for changes to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:287
 msgid "Changing OpenGL"
 msgstr "Modifica OpenGL"
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:288
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
 
@@ -524,22 +557,37 @@ msgstr "Dai:"
 msgid "Change"
 msgstr "Cambia"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr "Attacco %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr "Difesa %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr "PF %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr "PM %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Conferma"
+
+#~ msgid "Select Character"
+#~ msgstr "Scelta Personaggio"
+
+#~ msgid "Charisma:"
+#~ msgstr "Carisma:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Peso totale : %d - Peso massimo : %d"
+
+#~ msgid "Keep"
+#~ msgstr "Mantieni"
diff --git a/po/ja.po b/po/ja.po
index ca19ee82..d9fc5681 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2007-10-28 18:59+0100\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-09 22:58+0200\n"
 "PO-Revision-Date: 2008-06-28 16:27+0000\n"
 "Last-Translator: fate <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -17,169 +17,185 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-09 20:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
 msgid "Buy"
 msgstr "買う"
 
-#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
 #: src/gui/sell.cpp:241
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "価格: %d GP / 合計: %d GP"
 
-#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
 msgid "Quit"
 msgstr "終了"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
-#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
-#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:202 src/gui/buy.cpp:220
+#: src/gui/sell.cpp:65 src/gui/sell.cpp:212 src/gui/sell.cpp:226
 #: src/gui/trade.cpp:84 src/gui/trade.cpp:171
 #, c-format
 msgid "Description: %s"
 msgstr "名状: %s"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
-#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:204 src/gui/buy.cpp:221
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:214 src/gui/sell.cpp:227
 #, c-format
 msgid "Effect: %s"
 msgstr "効用: %s"
 
-#: src/gui/char_select.cpp:71
-msgid "Confirm"
-msgstr "確認"
+#: src/gui/char_select.cpp:74
+#, fuzzy
+msgid "Confirm Character Delete"
+msgstr "キャラを作成"
 
-#: src/gui/char_select.cpp:72
+#: src/gui/char_select.cpp:75
 msgid "Are you sure you want to delete this character?"
 msgstr "このキャラは消してもいいですか?"
 
-#: src/gui/char_select.cpp:88
-msgid "Select Character"
-msgstr "キャラを選択"
+#: src/gui/char_select.cpp:91
+msgid "Account and Character Management"
+msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/char_select.cpp:95 src/gui/item_amount.cpp:66 src/gui/login.cpp:50
 #: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
 #: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
 #: src/gui/serverdialog.cpp:110
 msgid "Ok"
 msgstr "了解"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
-#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:283
+#: src/gui/connection.cpp:41 src/gui/item_amount.cpp:67 src/gui/login.cpp:51
 #: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:57
 #: src/gui/trade.cpp:62
 msgid "Cancel"
 msgstr "取消"
 
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
 msgid "New"
 msgstr "新規"
 
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
 msgid "Delete"
 msgstr "削除"
 
-#: src/gui/char_select.cpp:96
+#: src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "前へ"
 
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "次へ"
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:101
 msgid "Unregister"
 msgstr "登録削除"
 
-#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
-#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
+#: src/gui/char_select.cpp:102
+#, fuzzy
+msgid "Change Password"
+msgstr "パスワード:"
+
+#: src/gui/char_select.cpp:103
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/char_select.cpp:105
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:106 src/gui/char_select.cpp:211
+#: src/gui/char_select.cpp:222 src/gui/trade.cpp:82 src/gui/trade.cpp:169
 #, c-format
 msgid "Name: %s"
 msgstr "名前: %s"
 
-#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
-#: src/gui/char_select.cpp:201
+#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
+#: src/gui/char_select.cpp:223
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
 
-#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
-#: src/gui/char_select.cpp:202
+#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
+#: src/gui/char_select.cpp:224
 #, c-format
 msgid "Money: %d"
 msgstr "GP: %d"
 
-#: src/gui/char_select.cpp:245
+#: src/gui/char_select.cpp:268
 msgid "Create Character"
 msgstr "キャラを作成"
 
-#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
 msgid "Name:"
 msgstr "名前:"
 
-#: src/gui/char_select.cpp:255
+#: src/gui/char_select.cpp:278
 msgid "Hair Color:"
 msgstr "髪の色："
 
-#: src/gui/char_select.cpp:258
+#: src/gui/char_select.cpp:281
 msgid "Hair Style:"
 msgstr "髪型："
 
-#: src/gui/char_select.cpp:259
+#: src/gui/char_select.cpp:282
 msgid "Create"
 msgstr "作成"
 
-#: src/gui/char_select.cpp:262
+#: src/gui/char_select.cpp:285
+msgid "Male"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Female"
+msgstr ""
+
+#: src/gui/char_select.cpp:290
 msgid "Strength:"
 msgstr "筋力:"
 
-#: src/gui/char_select.cpp:263
+#: src/gui/char_select.cpp:291
 msgid "Agility:"
 msgstr "素早さ:"
 
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:292
 msgid "Dexterity:"
 msgstr "敏捷:"
 
-#: src/gui/char_select.cpp:265
+#: src/gui/char_select.cpp:293
 msgid "Vitality:"
 msgstr "体力:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:294
 msgid "Intelligence:"
 msgstr "知性:"
 
-#: src/gui/char_select.cpp:267
+#: src/gui/char_select.cpp:295
 msgid "Willpower:"
 msgstr "精神:"
 
-#: src/gui/char_select.cpp:268
-msgid "Charisma:"
-msgstr "魅力:"
-
-#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
+#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "%d ポイントを取り分けください"
 
-#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
 #: src/gui/serverdialog.cpp:171
 msgid "Error"
 msgstr "エラー"
 
-#: src/gui/char_select.cpp:369
+#: src/gui/char_select.cpp:417
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/char_select.cpp:416
+#: src/gui/char_select.cpp:469
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/char_select.cpp:428
+#: src/gui/char_select.cpp:481
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -192,11 +208,11 @@ msgstr "はい"
 msgid "No"
 msgstr "いいえ"
 
-#: src/gui/connection.cpp:42
+#: src/gui/connection.cpp:43
 msgid "Connecting..."
 msgstr "接続しています..."
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
 msgid "Equipment"
 msgstr ""
 
@@ -204,28 +220,23 @@ msgstr ""
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
+#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
 msgid "Use"
 msgstr "使う"
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:69
 msgid "Drop"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:70
 msgid "Split"
 msgstr "分割"
 
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
-#, c-format
-msgid "Total Weight: %d - Maximum Weight: %d"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:194
+#: src/gui/inventorywindow.cpp:178
 msgid "Equip"
 msgstr ""
 
@@ -241,35 +252,39 @@ msgstr ""
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/login.cpp:44
+#: src/gui/login.cpp:43
 msgid "Login"
 msgstr "ログイン"
 
-#: src/gui/login.cpp:47 src/gui/register.cpp:68
+#: src/gui/login.cpp:46 src/gui/register.cpp:68
 msgid "Password:"
 msgstr "パスワード:"
 
-#: src/gui/login.cpp:50
-msgid "Keep"
+#: src/gui/login.cpp:49
+msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
 msgid "Register"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:62
+#: src/gui/menuwindow.cpp:63
 msgid "Status"
 msgstr "状態"
 
-#: src/gui/menuwindow.cpp:65
+#: src/gui/menuwindow.cpp:66
 msgid "Skills"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:67
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:68
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
+#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
 msgid "Setup"
 msgstr "セットアップ"
 
@@ -291,37 +306,47 @@ msgstr ""
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|%sを攻撃する@@"
 
-#: src/gui/popupmenu.cpp:90
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "@@guild|Invite %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:85
+#, c-format
+msgid "@@party|Invite %s to join your party@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:92
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|NPCを喋る@@"
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:240
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:216
+#: src/gui/popupmenu.cpp:231
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:234
 msgid "@@use|Use@@"
 msgstr "@@use|使う@@"
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:235
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:221
+#: src/gui/popupmenu.cpp:236
 msgid "@@description|Description@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:223
+#: src/gui/popupmenu.cpp:238
 msgid "@@split|Split@@"
 msgstr ""
 
@@ -365,7 +390,7 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr "パスワードが一致していません。"
 
-#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
 msgid "Sell"
 msgstr ""
 
@@ -389,39 +414,43 @@ msgstr ""
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:49
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:50
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:77
 msgid "Audio"
 msgstr "音声"
 
-#: src/gui/setup.cpp:80
+#: src/gui/setup.cpp:81
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+#: src/gui/setup.cpp:85
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
 msgid "Calibrate"
 msgstr ""
 
@@ -429,71 +458,75 @@ msgstr ""
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:77
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:78
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
 msgstr ""
 
 #: src/gui/setup_video.cpp:117
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:119
 msgid "FPS Limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:133
+#: src/gui/setup_video.cpp:136
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:186
+#: src/gui/setup_video.cpp:192
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:200
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:208
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:275
 msgid "Switching to full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:276
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:287
 msgid "Changing OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:288
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
@@ -522,22 +555,31 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr ""
+
+#~ msgid "Confirm"
+#~ msgstr "確認"
+
+#~ msgid "Select Character"
+#~ msgstr "キャラを選択"
+
+#~ msgid "Charisma:"
+#~ msgstr "魅力:"
diff --git a/po/nl.po b/po/nl.po
index abcd0cb4..2ce89f26 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: 2007-10-28 18:59+0100\n"
+"POT-Creation-Date: 2008-10-09 22:58+0200\n"
 "PO-Revision-Date: 2007-12-03 11:01+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Dutch\n"
@@ -17,169 +17,185 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-09 20:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
 msgid "Buy"
 msgstr "Kopen"
 
-#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
 #: src/gui/sell.cpp:241
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
-#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
-#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:202 src/gui/buy.cpp:220
+#: src/gui/sell.cpp:65 src/gui/sell.cpp:212 src/gui/sell.cpp:226
 #: src/gui/trade.cpp:84 src/gui/trade.cpp:171
 #, c-format
 msgid "Description: %s"
 msgstr "Beschrijving: %s"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
-#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:204 src/gui/buy.cpp:221
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:214 src/gui/sell.cpp:227
 #, c-format
 msgid "Effect: %s"
 msgstr "Effect: %s"
 
-#: src/gui/char_select.cpp:71
-msgid "Confirm"
-msgstr "Bevestigen"
+#: src/gui/char_select.cpp:74
+#, fuzzy
+msgid "Confirm Character Delete"
+msgstr "Personage Aanmaken"
 
-#: src/gui/char_select.cpp:72
+#: src/gui/char_select.cpp:75
 msgid "Are you sure you want to delete this character?"
 msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 
-#: src/gui/char_select.cpp:88
-msgid "Select Character"
-msgstr "Kies Personage"
+#: src/gui/char_select.cpp:91
+msgid "Account and Character Management"
+msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/char_select.cpp:95 src/gui/item_amount.cpp:66 src/gui/login.cpp:50
 #: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
 #: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
 #: src/gui/serverdialog.cpp:110
 msgid "Ok"
 msgstr "Oké"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
-#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:283
+#: src/gui/connection.cpp:41 src/gui/item_amount.cpp:67 src/gui/login.cpp:51
 #: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:57
 #: src/gui/trade.cpp:62
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
 msgid "New"
 msgstr "Nieuw"
 
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/gui/char_select.cpp:96
+#: src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Vorige"
 
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Volgende"
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:101
 msgid "Unregister"
 msgstr "Registreren"
 
-#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
-#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
+#: src/gui/char_select.cpp:102
+#, fuzzy
+msgid "Change Password"
+msgstr "Wachtword:"
+
+#: src/gui/char_select.cpp:103
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/char_select.cpp:105
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:106 src/gui/char_select.cpp:211
+#: src/gui/char_select.cpp:222 src/gui/trade.cpp:82 src/gui/trade.cpp:169
 #, c-format
 msgid "Name: %s"
 msgstr "Naam: %s"
 
-#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
-#: src/gui/char_select.cpp:201
+#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
+#: src/gui/char_select.cpp:223
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
-#: src/gui/char_select.cpp:202
+#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
+#: src/gui/char_select.cpp:224
 #, c-format
 msgid "Money: %d"
 msgstr "Geld: %d"
 
-#: src/gui/char_select.cpp:245
+#: src/gui/char_select.cpp:268
 msgid "Create Character"
 msgstr "Personage Aanmaken"
 
-#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/gui/char_select.cpp:255
+#: src/gui/char_select.cpp:278
 msgid "Hair Color:"
 msgstr "Haarkleur:"
 
-#: src/gui/char_select.cpp:258
+#: src/gui/char_select.cpp:281
 msgid "Hair Style:"
 msgstr "Haarstijl:"
 
-#: src/gui/char_select.cpp:259
+#: src/gui/char_select.cpp:282
 msgid "Create"
 msgstr "Aanmaken"
 
-#: src/gui/char_select.cpp:262
+#: src/gui/char_select.cpp:285
+msgid "Male"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Female"
+msgstr ""
+
+#: src/gui/char_select.cpp:290
 msgid "Strength:"
 msgstr "Sterkte:"
 
-#: src/gui/char_select.cpp:263
+#: src/gui/char_select.cpp:291
 msgid "Agility:"
 msgstr "Agiliteit:"
 
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:292
 msgid "Dexterity:"
 msgstr "Dexteriteit:"
 
-#: src/gui/char_select.cpp:265
+#: src/gui/char_select.cpp:293
 msgid "Vitality:"
 msgstr "Vitaliteit:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:294
 msgid "Intelligence:"
 msgstr "Intelligentie:"
 
-#: src/gui/char_select.cpp:267
+#: src/gui/char_select.cpp:295
 msgid "Willpower:"
 msgstr "Wilskracht:"
 
-#: src/gui/char_select.cpp:268
-msgid "Charisma:"
-msgstr "Charisma:"
-
-#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
+#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
 
-#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
 #: src/gui/serverdialog.cpp:171
 msgid "Error"
 msgstr "Fout"
 
-#: src/gui/char_select.cpp:369
+#: src/gui/char_select.cpp:417
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan"
 
-#: src/gui/char_select.cpp:416
+#: src/gui/char_select.cpp:469
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
-#: src/gui/char_select.cpp:428
+#: src/gui/char_select.cpp:481
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
@@ -192,11 +208,11 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nee"
 
-#: src/gui/connection.cpp:42
+#: src/gui/connection.cpp:43
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
 msgid "Equipment"
 msgstr "Uitrusting"
 
@@ -204,28 +220,23 @@ msgstr "Uitrusting"
 msgid "Unequip"
 msgstr "Afdoen"
 
-#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
+#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
 msgid "Use"
 msgstr "Gebruiken"
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:69
 msgid "Drop"
 msgstr "Neerleggen"
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:70
 msgid "Split"
 msgstr "Splitsen"
 
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
-#, c-format
-msgid "Total Weight: %d - Maximum Weight: %d"
-msgstr "Totaal gewicht: %d - Maximum gewicht: %d"
-
-#: src/gui/inventorywindow.cpp:194
+#: src/gui/inventorywindow.cpp:178
 msgid "Equip"
 msgstr "Uitrusten"
 
@@ -241,35 +252,39 @@ msgstr "Selecteer het aantal exemplaren om neer te leggen"
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/login.cpp:44
+#: src/gui/login.cpp:43
 msgid "Login"
 msgstr "Inloggen"
 
-#: src/gui/login.cpp:47 src/gui/register.cpp:68
+#: src/gui/login.cpp:46 src/gui/register.cpp:68
 msgid "Password:"
 msgstr "Wachtword:"
 
-#: src/gui/login.cpp:50
-msgid "Keep"
-msgstr "Behouden"
+#: src/gui/login.cpp:49
+msgid "Remember Username"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Aanmelden"
 
-#: src/gui/menuwindow.cpp:62
+#: src/gui/menuwindow.cpp:63
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:65
+#: src/gui/menuwindow.cpp:66
 msgid "Skills"
 msgstr "Vaardigheden"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:67
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:68
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
+#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
 msgid "Setup"
 msgstr "Configureren"
 
@@ -291,37 +306,47 @@ msgstr "@@trade|Handelen met %s@@"
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|%s aanvallen@@"
 
-#: src/gui/popupmenu.cpp:90
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "@@guild|Invite %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:85
+#, c-format
+msgid "@@party|Invite %s to join your party@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:92
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Praat met NPC@@"
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:240
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuleren@@"
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|%s oppakken@@"
 
-#: src/gui/popupmenu.cpp:216
+#: src/gui/popupmenu.cpp:231
 msgid "@@use|Equip@@"
 msgstr "@@use|Uitrusten@@"
 
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:234
 msgid "@@use|Use@@"
 msgstr "@@use|Gebruiken@@"
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:235
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Neerleggen@@"
 
-#: src/gui/popupmenu.cpp:221
+#: src/gui/popupmenu.cpp:236
 msgid "@@description|Description@@"
 msgstr "@@description|Beschrijving@@"
 
-#: src/gui/popupmenu.cpp:223
+#: src/gui/popupmenu.cpp:238
 msgid "@@split|Split@@"
 msgstr ""
 
@@ -365,7 +390,7 @@ msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
 msgid "Sell"
 msgstr ""
 
@@ -389,39 +414,43 @@ msgstr ""
 msgid "Sound"
 msgstr "Geluid"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:49
 msgid "Sfx volume"
 msgstr "Volume van geluiden"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:50
 msgid "Music volume"
 msgstr "Muziek volume"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Toepassen"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:77
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup.cpp:80
+#: src/gui/setup.cpp:81
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+#: src/gui/setup.cpp:85
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Press the button to start calibration"
 msgstr "Druk op de knop om het kalibreren te starten"
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
 msgid "Calibrate"
 msgstr "Kalibreren"
 
@@ -429,74 +458,77 @@ msgstr "Kalibreren"
 msgid "Enable joystick"
 msgstr "Joystick activeren"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:77
 msgid "Stop"
 msgstr "Stoppen"
 
-#: src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:78
 msgid "Rotate the stick"
 msgstr "Maak rondjes met de stick"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr "Volledig scherm"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
 #: src/gui/setup_video.cpp:117
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:119
 msgid "FPS Limit:"
 msgstr "FPS limiet:"
 
-#: src/gui/setup_video.cpp:133
+#: src/gui/setup_video.cpp:136
 msgid "Gui opacity"
 msgstr "Dekking van de GUI"
 
-#: src/gui/setup_video.cpp:186
+#: src/gui/setup_video.cpp:192
 msgid "Scroll radius"
 msgstr "Scroll radius"
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:200
 msgid "Scroll laziness"
 msgstr "Scroll vertraging"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:208
 msgid "Ambient FX"
 msgstr "Omgevingseffecten"
 
-#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
 msgid "off"
 msgstr "uit"
 
-#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
 msgid "low"
 msgstr "laag"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
 msgid "high"
 msgstr "hoog"
 
-#: src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:275
 msgid "Switching to full screen"
 msgstr "Overgaan naar volledig scherm"
 
-#: src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:276
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:287
 msgid "Changing OpenGL"
 msgstr "Veranderen van OpenGL"
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:288
 msgid "Applying change to OpenGL requires restart."
-msgstr ""
-"Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
+msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
 
 #: src/gui/trade.cpp:61
 msgid "Add"
@@ -523,22 +555,37 @@ msgstr "Je geeft:"
 msgid "Change"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr ""
+
+#~ msgid "Confirm"
+#~ msgstr "Bevestigen"
+
+#~ msgid "Select Character"
+#~ msgstr "Kies Personage"
+
+#~ msgid "Charisma:"
+#~ msgstr "Charisma:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Totaal gewicht: %d - Maximum gewicht: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Behouden"
diff --git a/po/pl.po b/po/pl.po
index edff512a..f887a84b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-10-28 18:59+0100\n"
+"POT-Creation-Date: 2008-10-09 22:58+0200\n"
 "PO-Revision-Date: 2008-10-07 06:42+0000\n"
 "Last-Translator: Krzysztof Daszuta <irukard@gmail.com>\n"
 "Language-Team: <pl@li.org>\n"
@@ -19,169 +19,185 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-09 20:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
 msgid "Buy"
 msgstr "Kup"
 
-#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
 #: src/gui/sell.cpp:241
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cena: %d GP / Razem: %d GP"
 
-#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
 msgid "Quit"
 msgstr "Wyjdź"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
-#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
-#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:202 src/gui/buy.cpp:220
+#: src/gui/sell.cpp:65 src/gui/sell.cpp:212 src/gui/sell.cpp:226
 #: src/gui/trade.cpp:84 src/gui/trade.cpp:171
 #, c-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
-#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:204 src/gui/buy.cpp:221
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:214 src/gui/sell.cpp:227
 #, c-format
 msgid "Effect: %s"
 msgstr "Efekt: %s"
 
-#: src/gui/char_select.cpp:71
-msgid "Confirm"
-msgstr "Potwierdź"
+#: src/gui/char_select.cpp:74
+#, fuzzy
+msgid "Confirm Character Delete"
+msgstr "Stwórz postać"
 
-#: src/gui/char_select.cpp:72
+#: src/gui/char_select.cpp:75
 msgid "Are you sure you want to delete this character?"
 msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
 
-#: src/gui/char_select.cpp:88
-msgid "Select Character"
-msgstr "Wybierz postać"
+#: src/gui/char_select.cpp:91
+msgid "Account and Character Management"
+msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/char_select.cpp:95 src/gui/item_amount.cpp:66 src/gui/login.cpp:50
 #: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
 #: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
 #: src/gui/serverdialog.cpp:110
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
-#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:283
+#: src/gui/connection.cpp:41 src/gui/item_amount.cpp:67 src/gui/login.cpp:51
 #: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:57
 #: src/gui/trade.cpp:62
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
 msgid "New"
 msgstr "Nowa"
 
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/gui/char_select.cpp:96
+#: src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Następny"
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:101
 msgid "Unregister"
 msgstr "Wyrejestruj"
 
-#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
-#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
+#: src/gui/char_select.cpp:102
+#, fuzzy
+msgid "Change Password"
+msgstr "Hasło:"
+
+#: src/gui/char_select.cpp:103
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/char_select.cpp:105
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:106 src/gui/char_select.cpp:211
+#: src/gui/char_select.cpp:222 src/gui/trade.cpp:82 src/gui/trade.cpp:169
 #, c-format
 msgid "Name: %s"
 msgstr "Imię: %s"
 
-#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
-#: src/gui/char_select.cpp:201
+#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
+#: src/gui/char_select.cpp:223
 #, c-format
 msgid "Level: %d"
 msgstr "Poziom: %d"
 
-#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
-#: src/gui/char_select.cpp:202
+#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
+#: src/gui/char_select.cpp:224
 #, c-format
 msgid "Money: %d"
 msgstr "Pieniądze: %d"
 
-#: src/gui/char_select.cpp:245
+#: src/gui/char_select.cpp:268
 msgid "Create Character"
 msgstr "Stwórz postać"
 
-#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Imię:"
 
-#: src/gui/char_select.cpp:255
+#: src/gui/char_select.cpp:278
 msgid "Hair Color:"
 msgstr "Kolor włosów:"
 
-#: src/gui/char_select.cpp:258
+#: src/gui/char_select.cpp:281
 msgid "Hair Style:"
 msgstr "Fryzura:"
 
-#: src/gui/char_select.cpp:259
+#: src/gui/char_select.cpp:282
 msgid "Create"
 msgstr "Stwórz"
 
-#: src/gui/char_select.cpp:262
+#: src/gui/char_select.cpp:285
+msgid "Male"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Female"
+msgstr ""
+
+#: src/gui/char_select.cpp:290
 msgid "Strength:"
 msgstr "Siła:"
 
-#: src/gui/char_select.cpp:263
+#: src/gui/char_select.cpp:291
 msgid "Agility:"
 msgstr "Zwinność:"
 
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:292
 msgid "Dexterity:"
 msgstr "Zręczność:"
 
-#: src/gui/char_select.cpp:265
+#: src/gui/char_select.cpp:293
 msgid "Vitality:"
 msgstr "Witalność:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:294
 msgid "Intelligence:"
 msgstr "Inteligencja:"
 
-#: src/gui/char_select.cpp:267
+#: src/gui/char_select.cpp:295
 msgid "Willpower:"
 msgstr "Siła woli:"
 
-#: src/gui/char_select.cpp:268
-msgid "Charisma:"
-msgstr "Charyzma:"
-
-#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
+#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Proszę wykorzystać %d punktów"
 
-#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
 #: src/gui/serverdialog.cpp:171
 msgid "Error"
 msgstr "Błąd"
 
-#: src/gui/char_select.cpp:369
+#: src/gui/char_select.cpp:417
 msgid "Your name needs to be at least 4 characters."
 msgstr "Twoje imię musi mieć conajmniej 4 znaki."
 
-#: src/gui/char_select.cpp:416
+#: src/gui/char_select.cpp:469
 msgid "Character stats OK"
 msgstr "Statystyki postaci w porządku."
 
-#: src/gui/char_select.cpp:428
+#: src/gui/char_select.cpp:481
 #, c-format
 msgid "Please remove %d points"
 msgstr "Proszę usunąć %d punktów"
@@ -194,11 +210,11 @@ msgstr "Tak"
 msgid "No"
 msgstr "Nie"
 
-#: src/gui/connection.cpp:42
+#: src/gui/connection.cpp:43
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
 msgid "Equipment"
 msgstr "Ekwipunek"
 
@@ -206,28 +222,23 @@ msgstr "Ekwipunek"
 msgid "Unequip"
 msgstr "Zdejmij"
 
-#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
+#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
 msgid "Inventory"
 msgstr "Inwentarz"
 
-#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
 msgid "Use"
 msgstr "Użyj"
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:69
 msgid "Drop"
 msgstr "Upuść"
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:70
 msgid "Split"
 msgstr "Podziel"
 
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
-#, c-format
-msgid "Total Weight: %d - Maximum Weight: %d"
-msgstr "Całkowita waga: %d - Maksymalna waga: %d"
-
-#: src/gui/inventorywindow.cpp:194
+#: src/gui/inventorywindow.cpp:178
 msgid "Equip"
 msgstr "Załóż"
 
@@ -243,35 +254,39 @@ msgstr "Wybierz ilość przedmiotów do upuszczenia."
 msgid "Select amount of items to split."
 msgstr "Wybierz ilość przedmiotów do podziału."
 
-#: src/gui/login.cpp:44
+#: src/gui/login.cpp:43
 msgid "Login"
 msgstr "Użytkownik"
 
-#: src/gui/login.cpp:47 src/gui/register.cpp:68
+#: src/gui/login.cpp:46 src/gui/register.cpp:68
 msgid "Password:"
 msgstr "Hasło:"
 
-#: src/gui/login.cpp:50
-msgid "Keep"
-msgstr "Zachowaj"
+#: src/gui/login.cpp:49
+msgid "Remember Username"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Rejestruj"
 
-#: src/gui/menuwindow.cpp:62
+#: src/gui/menuwindow.cpp:63
 msgid "Status"
 msgstr "Stan"
 
-#: src/gui/menuwindow.cpp:65
+#: src/gui/menuwindow.cpp:66
 msgid "Skills"
 msgstr "Zdolności"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:67
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:68
 msgid "Shortcut"
 msgstr "Skrót"
 
-#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
+#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
 msgid "Setup"
 msgstr "Konfiguracja"
 
@@ -293,37 +308,47 @@ msgstr "@@trade|Targ z %s@@"
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Atakuj %s@@"
 
-#: src/gui/popupmenu.cpp:90
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "@@guild|Invite %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:85
+#, c-format
+msgid "@@party|Invite %s to join your party@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:92
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Rozmawiaj z NPC@@"
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:240
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Anuluj@@"
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Podnieś %s@@"
 
-#: src/gui/popupmenu.cpp:216
+#: src/gui/popupmenu.cpp:231
 msgid "@@use|Equip@@"
 msgstr "@@use|Załóż@@"
 
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:234
 msgid "@@use|Use@@"
 msgstr "@@use|Użyj@@"
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:235
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Upuść@@"
 
-#: src/gui/popupmenu.cpp:221
+#: src/gui/popupmenu.cpp:236
 msgid "@@description|Description@@"
 msgstr "@@description|Opis@@"
 
-#: src/gui/popupmenu.cpp:223
+#: src/gui/popupmenu.cpp:238
 msgid "@@split|Split@@"
 msgstr "@@split|Rozdziel@@"
 
@@ -367,7 +392,7 @@ msgstr "Hasło nie może mieć więcej jak %d znaków."
 msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
-#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
 msgid "Sell"
 msgstr "Sprzedaj"
 
@@ -391,39 +416,43 @@ msgstr "Proszę wpisać adres i port serwera"
 msgid "Sound"
 msgstr "Dźwięk"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:49
 msgid "Sfx volume"
 msgstr "Głośność efektów dźwiękowych"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:50
 msgid "Music volume"
 msgstr "Głośność muzyki"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Zresetuj okna"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Video"
 msgstr "Obraz"
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:77
 msgid "Audio"
 msgstr "Dźwięk"
 
-#: src/gui/setup.cpp:80
+#: src/gui/setup.cpp:81
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+#: src/gui/setup.cpp:85
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Press the button to start calibration"
 msgstr "Wciśnij przycisk aby rozpocząć kalibrację"
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
 msgid "Calibrate"
 msgstr "Kalibruj"
 
@@ -431,71 +460,75 @@ msgstr "Kalibruj"
 msgid "Enable joystick"
 msgstr "Włącz joystick"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:77
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:78
 msgid "Rotate the stick"
 msgstr "Obróć drążek"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr "Pełen ekran"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
 msgstr "Własny kursor"
 
 #: src/gui/setup_video.cpp:117
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:119
 msgid "FPS Limit:"
 msgstr "Limit FPS:"
 
-#: src/gui/setup_video.cpp:133
+#: src/gui/setup_video.cpp:136
 msgid "Gui opacity"
 msgstr "Przezroczystość GUI"
 
-#: src/gui/setup_video.cpp:186
+#: src/gui/setup_video.cpp:192
 msgid "Scroll radius"
 msgstr "Skok przy przewijaniu ekranu"
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:200
 msgid "Scroll laziness"
 msgstr "Opóźnienie przy przewijaniu ekranu"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:208
 msgid "Ambient FX"
 msgstr "Dźwięki otoczenia"
 
-#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
 msgid "off"
 msgstr "wyłączone"
 
-#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
 msgid "low"
 msgstr "niskie"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
 msgid "high"
 msgstr "wysokie"
 
-#: src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:275
 msgid "Switching to full screen"
 msgstr "Przełączanie na pełen ekran"
 
-#: src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:276
 msgid "Restart needed for changes to take effect."
 msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:287
 msgid "Changing OpenGL"
 msgstr "Zmień ustawienia OpenGL"
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:288
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Zastosowywanie zmian w konfiguracji OpenGL wymaga ponownego uruchomienia."
@@ -525,22 +558,37 @@ msgstr "Dajesz:"
 msgid "Change"
 msgstr "Zmień"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr "Atak %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr "Obrona %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr "PŻ %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr "PM %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Potwierdź"
+
+#~ msgid "Select Character"
+#~ msgstr "Wybierz postać"
+
+#~ msgid "Charisma:"
+#~ msgstr "Charyzma:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Całkowita waga: %d - Maksymalna waga: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Zachowaj"
diff --git a/po/pt.po b/po/pt.po
index 64df5a4d..fcdbd7f7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2007-10-28 18:59+0100\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-09 22:58+0200\n"
 "PO-Revision-Date: 2008-02-03 10:14+0000\n"
 "Last-Translator: Tiago Silva <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -17,169 +17,185 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-02-26 10:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
 #: src/gui/sell.cpp:241
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preço: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
-#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
-#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:202 src/gui/buy.cpp:220
+#: src/gui/sell.cpp:65 src/gui/sell.cpp:212 src/gui/sell.cpp:226
 #: src/gui/trade.cpp:84 src/gui/trade.cpp:171
 #, c-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
-#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:204 src/gui/buy.cpp:221
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:214 src/gui/sell.cpp:227
 #, c-format
 msgid "Effect: %s"
 msgstr "Efeito: %s"
 
-#: src/gui/char_select.cpp:71
-msgid "Confirm"
-msgstr "Confirmar"
+#: src/gui/char_select.cpp:74
+#, fuzzy
+msgid "Confirm Character Delete"
+msgstr "Criar Personagem"
 
-#: src/gui/char_select.cpp:72
+#: src/gui/char_select.cpp:75
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem a certeza que quer apagar este personagem"
 
-#: src/gui/char_select.cpp:88
-msgid "Select Character"
-msgstr "Seleccione um Personagem"
+#: src/gui/char_select.cpp:91
+msgid "Account and Character Management"
+msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/char_select.cpp:95 src/gui/item_amount.cpp:66 src/gui/login.cpp:50
 #: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
 #: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
 #: src/gui/serverdialog.cpp:110
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
-#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:283
+#: src/gui/connection.cpp:41 src/gui/item_amount.cpp:67 src/gui/login.cpp:51
 #: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:57
 #: src/gui/trade.cpp:62
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
 msgid "New"
 msgstr "Novo"
 
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/gui/char_select.cpp:96
+#: src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Seguinte"
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:101
 msgid "Unregister"
 msgstr "Remover o Registo"
 
-#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
-#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
+#: src/gui/char_select.cpp:102
+#, fuzzy
+msgid "Change Password"
+msgstr "Senha:"
+
+#: src/gui/char_select.cpp:103
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/char_select.cpp:105
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:106 src/gui/char_select.cpp:211
+#: src/gui/char_select.cpp:222 src/gui/trade.cpp:82 src/gui/trade.cpp:169
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
-#: src/gui/char_select.cpp:201
+#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
+#: src/gui/char_select.cpp:223
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
-#: src/gui/char_select.cpp:202
+#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
+#: src/gui/char_select.cpp:224
 #, c-format
 msgid "Money: %d"
 msgstr "Dinheiro: %d"
 
-#: src/gui/char_select.cpp:245
+#: src/gui/char_select.cpp:268
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/gui/char_select.cpp:255
+#: src/gui/char_select.cpp:278
 msgid "Hair Color:"
 msgstr "Cor de Cabelo:"
 
-#: src/gui/char_select.cpp:258
+#: src/gui/char_select.cpp:281
 msgid "Hair Style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/char_select.cpp:259
+#: src/gui/char_select.cpp:282
 msgid "Create"
 msgstr "Criar"
 
-#: src/gui/char_select.cpp:262
+#: src/gui/char_select.cpp:285
+msgid "Male"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Female"
+msgstr ""
+
+#: src/gui/char_select.cpp:290
 msgid "Strength:"
 msgstr "Força:"
 
-#: src/gui/char_select.cpp:263
+#: src/gui/char_select.cpp:291
 msgid "Agility:"
 msgstr "Agilidade:"
 
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:292
 msgid "Dexterity:"
 msgstr "Destreza:"
 
-#: src/gui/char_select.cpp:265
+#: src/gui/char_select.cpp:293
 msgid "Vitality:"
 msgstr "Vitalidade:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:294
 msgid "Intelligence:"
 msgstr "Inteligência:"
 
-#: src/gui/char_select.cpp:267
+#: src/gui/char_select.cpp:295
 msgid "Willpower:"
 msgstr "Força de Vontade:"
 
-#: src/gui/char_select.cpp:268
-msgid "Charisma:"
-msgstr "Carisma:"
-
-#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
+#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d potos"
 
-#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
 #: src/gui/serverdialog.cpp:171
 msgid "Error"
 msgstr "Erro"
 
-#: src/gui/char_select.cpp:369
+#: src/gui/char_select.cpp:417
 msgid "Your name needs to be at least 4 characters."
 msgstr "O seu nome necessita de pelo menos 4 caracteres"
 
-#: src/gui/char_select.cpp:416
+#: src/gui/char_select.cpp:469
 msgid "Character stats OK"
 msgstr "Estatisticas da personagem OK"
 
-#: src/gui/char_select.cpp:428
+#: src/gui/char_select.cpp:481
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -192,11 +208,11 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: src/gui/connection.cpp:42
+#: src/gui/connection.cpp:43
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
 msgid "Equipment"
 msgstr "Equipamento"
 
@@ -204,28 +220,23 @@ msgstr "Equipamento"
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
+#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
 msgid "Inventory"
 msgstr "Inventário"
 
-#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:69
 msgid "Drop"
 msgstr "Largar"
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:70
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
-#, c-format
-msgid "Total Weight: %d - Maximum Weight: %d"
-msgstr "Peso Total: %d - Peso Máximo: %d"
-
-#: src/gui/inventorywindow.cpp:194
+#: src/gui/inventorywindow.cpp:178
 msgid "Equip"
 msgstr "Equipar"
 
@@ -241,35 +252,39 @@ msgstr "Seleccionar a quantidade de itens a largar."
 msgid "Select amount of items to split."
 msgstr "Seleccionar a quantidade de itens a dividir."
 
-#: src/gui/login.cpp:44
+#: src/gui/login.cpp:43
 msgid "Login"
 msgstr "Autenticar"
 
-#: src/gui/login.cpp:47 src/gui/register.cpp:68
+#: src/gui/login.cpp:46 src/gui/register.cpp:68
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/gui/login.cpp:50
-msgid "Keep"
-msgstr "Manter"
+#: src/gui/login.cpp:49
+msgid "Remember Username"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registo"
 
-#: src/gui/menuwindow.cpp:62
+#: src/gui/menuwindow.cpp:63
 msgid "Status"
 msgstr "Estado"
 
-#: src/gui/menuwindow.cpp:65
+#: src/gui/menuwindow.cpp:66
 msgid "Skills"
 msgstr "Competências"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:67
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:68
 msgid "Shortcut"
 msgstr "Atalho"
 
-#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
+#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
 msgid "Setup"
 msgstr "Configuração"
 
@@ -291,37 +306,47 @@ msgstr "@@trade|Negociar com %s@@"
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Atacar %s@@"
 
-#: src/gui/popupmenu.cpp:90
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "@@guild|Invite %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:85
+#, c-format
+msgid "@@party|Invite %s to join your party@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:92
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Falar com o NPC@@"
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:240
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Apanhar %s@@"
 
-#: src/gui/popupmenu.cpp:216
+#: src/gui/popupmenu.cpp:231
 msgid "@@use|Equip@@"
 msgstr "@@use|Equipar@@"
 
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:234
 msgid "@@use|Use@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:235
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Largar@@"
 
-#: src/gui/popupmenu.cpp:221
+#: src/gui/popupmenu.cpp:236
 msgid "@@description|Description@@"
 msgstr "@@descrição|Descrição@@"
 
-#: src/gui/popupmenu.cpp:223
+#: src/gui/popupmenu.cpp:238
 msgid "@@split|Split@@"
 msgstr "@@split|Dividir@@"
 
@@ -365,7 +390,7 @@ msgstr "A password só pode ter até %d caracteres."
 msgid "Passwords do not match."
 msgstr "As senhas não coincidem."
 
-#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
 msgid "Sell"
 msgstr "Vender"
 
@@ -389,39 +414,43 @@ msgstr "Por favor escreva o endereço e a porta do servidor."
 msgid "Sound"
 msgstr "Som"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:49
 msgid "Sfx volume"
 msgstr "Volume dos Efeitos"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:50
 msgid "Music volume"
 msgstr "Volume da Música"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Reiniciar Janelas"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:77
 msgid "Audio"
 msgstr "Áudio"
 
-#: src/gui/setup.cpp:80
+#: src/gui/setup.cpp:81
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+#: src/gui/setup.cpp:85
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Press the button to start calibration"
 msgstr "Pressione o botão para começar a calibragem"
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
 msgid "Calibrate"
 msgstr "Calibrar"
 
@@ -429,73 +458,77 @@ msgstr "Calibrar"
 msgid "Enable joystick"
 msgstr "Habilitar Joystick"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:77
 msgid "Stop"
 msgstr "Parar"
 
-#: src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:78
 msgid "Rotate the stick"
 msgstr "Rode o manipulo"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr "Ecrã completo"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
 msgstr "Cursor personalizado"
 
 #: src/gui/setup_video.cpp:117
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:119
 msgid "FPS Limit:"
 msgstr "Limite de FPS:"
 
-#: src/gui/setup_video.cpp:133
+#: src/gui/setup_video.cpp:136
 msgid "Gui opacity"
 msgstr "Opacidade do Interface"
 
-#: src/gui/setup_video.cpp:186
+#: src/gui/setup_video.cpp:192
 #, fuzzy
 msgid "Scroll radius"
 msgstr "Raio do Rolamento"
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:200
 #, fuzzy
 msgid "Scroll laziness"
 msgstr "Velocidade do Rolamento"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:208
 msgid "Ambient FX"
 msgstr "Efeitos Ambientais"
 
-#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
 msgid "off"
 msgstr "desligado"
 
-#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
 msgid "low"
 msgstr "baixo"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
 msgid "high"
 msgstr "elevado"
 
-#: src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:275
 msgid "Switching to full screen"
 msgstr "Mudar para ecrã completo"
 
-#: src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:276
 msgid "Restart needed for changes to take effect."
 msgstr "É necessário reiniciar para as alterações terem efeito."
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:287
 msgid "Changing OpenGL"
 msgstr "Mudando OpenGL"
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:288
 msgid "Applying change to OpenGL requires restart."
 msgstr "É necessário reiniciar para as alterações ao OpenGl terem efeito."
 
@@ -524,26 +557,41 @@ msgstr "Dá:"
 msgid "Change"
 msgstr "Modificar"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr ""
-"Copy text   \t
\n"
+"Copy text   \t\r\n"
 "Ataque %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr ""
-"Copy text   \t
\n"
+"Copy text   \t\r\n"
 "Defesa %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Confirmar"
+
+#~ msgid "Select Character"
+#~ msgstr "Seleccione um Personagem"
+
+#~ msgid "Charisma:"
+#~ msgstr "Carisma:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Peso Total: %d - Peso Máximo: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Manter"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c905adf9..b2304bdb 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2007-10-28 18:59+0100\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-09 22:58+0200\n"
 "PO-Revision-Date: 2008-03-22 15:39+0000\n"
 "Last-Translator: Blamoo <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -17,169 +17,185 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-09 20:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
 #: src/gui/sell.cpp:241
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preço: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
-#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
-#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:202 src/gui/buy.cpp:220
+#: src/gui/sell.cpp:65 src/gui/sell.cpp:212 src/gui/sell.cpp:226
 #: src/gui/trade.cpp:84 src/gui/trade.cpp:171
 #, c-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
-#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:204 src/gui/buy.cpp:221
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:214 src/gui/sell.cpp:227
 #, c-format
 msgid "Effect: %s"
 msgstr "Efeito: %s"
 
-#: src/gui/char_select.cpp:71
-msgid "Confirm"
-msgstr "Confirmar"
+#: src/gui/char_select.cpp:74
+#, fuzzy
+msgid "Confirm Character Delete"
+msgstr "Criar Personagem"
 
-#: src/gui/char_select.cpp:72
+#: src/gui/char_select.cpp:75
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem certeza que deseja excluir este personagem?"
 
-#: src/gui/char_select.cpp:88
-msgid "Select Character"
-msgstr "Selecionar personagem"
+#: src/gui/char_select.cpp:91
+msgid "Account and Character Management"
+msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/char_select.cpp:95 src/gui/item_amount.cpp:66 src/gui/login.cpp:50
 #: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
 #: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
 #: src/gui/serverdialog.cpp:110
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
-#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:283
+#: src/gui/connection.cpp:41 src/gui/item_amount.cpp:67 src/gui/login.cpp:51
 #: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:57
 #: src/gui/trade.cpp:62
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
 msgid "New"
 msgstr "Novo"
 
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/gui/char_select.cpp:96
+#: src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Próximo"
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:101
 msgid "Unregister"
 msgstr "Cancelar Registro"
 
-#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
-#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
+#: src/gui/char_select.cpp:102
+#, fuzzy
+msgid "Change Password"
+msgstr "Senha:"
+
+#: src/gui/char_select.cpp:103
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/char_select.cpp:105
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:106 src/gui/char_select.cpp:211
+#: src/gui/char_select.cpp:222 src/gui/trade.cpp:82 src/gui/trade.cpp:169
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
-#: src/gui/char_select.cpp:201
+#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
+#: src/gui/char_select.cpp:223
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
-#: src/gui/char_select.cpp:202
+#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
+#: src/gui/char_select.cpp:224
 #, c-format
 msgid "Money: %d"
 msgstr "Dinheiro: %d"
 
-#: src/gui/char_select.cpp:245
+#: src/gui/char_select.cpp:268
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/gui/char_select.cpp:255
+#: src/gui/char_select.cpp:278
 msgid "Hair Color:"
 msgstr "Cor do Cabelo:"
 
-#: src/gui/char_select.cpp:258
+#: src/gui/char_select.cpp:281
 msgid "Hair Style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/char_select.cpp:259
+#: src/gui/char_select.cpp:282
 msgid "Create"
 msgstr "Criar"
 
-#: src/gui/char_select.cpp:262
+#: src/gui/char_select.cpp:285
+msgid "Male"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Female"
+msgstr ""
+
+#: src/gui/char_select.cpp:290
 msgid "Strength:"
 msgstr "Força:"
 
-#: src/gui/char_select.cpp:263
+#: src/gui/char_select.cpp:291
 msgid "Agility:"
 msgstr "Agilidade:"
 
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:292
 msgid "Dexterity:"
 msgstr "Destreza:"
 
-#: src/gui/char_select.cpp:265
+#: src/gui/char_select.cpp:293
 msgid "Vitality:"
 msgstr "Vitalidade:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:294
 msgid "Intelligence:"
 msgstr "Inteligência:"
 
-#: src/gui/char_select.cpp:267
+#: src/gui/char_select.cpp:295
 msgid "Willpower:"
 msgstr "Força de Vontade:"
 
-#: src/gui/char_select.cpp:268
-msgid "Charisma:"
-msgstr "Carisma:"
-
-#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
+#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
 
-#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
 #: src/gui/serverdialog.cpp:171
 msgid "Error"
 msgstr "Erro"
 
-#: src/gui/char_select.cpp:369
+#: src/gui/char_select.cpp:417
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome precisa ter no mínimo 4 caracteres."
 
-#: src/gui/char_select.cpp:416
+#: src/gui/char_select.cpp:469
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/char_select.cpp:428
+#: src/gui/char_select.cpp:481
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -192,11 +208,11 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: src/gui/connection.cpp:42
+#: src/gui/connection.cpp:43
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
 msgid "Equipment"
 msgstr "Equipamento"
 
@@ -204,28 +220,23 @@ msgstr "Equipamento"
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
+#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
 msgid "Inventory"
 msgstr "Inventório"
 
-#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:69
 msgid "Drop"
 msgstr "Descartar"
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:70
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
-#, c-format
-msgid "Total Weight: %d - Maximum Weight: %d"
-msgstr "Peso Total: %d - Peso Máximo: %d"
-
-#: src/gui/inventorywindow.cpp:194
+#: src/gui/inventorywindow.cpp:178
 msgid "Equip"
 msgstr "Equipar"
 
@@ -241,35 +252,39 @@ msgstr "Selecionar montante de itens para descartar."
 msgid "Select amount of items to split."
 msgstr "Selecionar montante de itens para dividir."
 
-#: src/gui/login.cpp:44
+#: src/gui/login.cpp:43
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:47 src/gui/register.cpp:68
+#: src/gui/login.cpp:46 src/gui/register.cpp:68
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/gui/login.cpp:50
-msgid "Keep"
-msgstr "Manter"
+#: src/gui/login.cpp:49
+msgid "Remember Username"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/menuwindow.cpp:62
+#: src/gui/menuwindow.cpp:63
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:65
+#: src/gui/menuwindow.cpp:66
 msgid "Skills"
 msgstr "Habilidades"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:67
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:68
 msgid "Shortcut"
 msgstr "Atalho"
 
-#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
+#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
 msgid "Setup"
 msgstr "Configurar"
 
@@ -291,37 +306,47 @@ msgstr "@@Negociar|Negociar com %s@@"
 msgid "@@attack|Attack %s@@"
 msgstr "@@atacar|Atacar %s@@"
 
-#: src/gui/popupmenu.cpp:90
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "@@guild|Invite %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:85
+#, c-format
+msgid "@@party|Invite %s to join your party@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:92
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@falar|Falar com NPC@@"
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:240
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancelar|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pegar|Pegar %s@@"
 
-#: src/gui/popupmenu.cpp:216
+#: src/gui/popupmenu.cpp:231
 msgid "@@use|Equip@@"
 msgstr "@@usar|Equipar@@"
 
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:234
 msgid "@@use|Use@@"
 msgstr "@@usar|Usar@@"
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:235
 msgid "@@drop|Drop@@"
 msgstr "@@descartar|Descartar@@"
 
-#: src/gui/popupmenu.cpp:221
+#: src/gui/popupmenu.cpp:236
 msgid "@@description|Description@@"
 msgstr "@@descrição|Descrição@@"
 
-#: src/gui/popupmenu.cpp:223
+#: src/gui/popupmenu.cpp:238
 msgid "@@split|Split@@"
 msgstr "@@dividir|Dividir@@"
 
@@ -365,7 +390,7 @@ msgstr "A senha deve ser menor que %d caracteres."
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
 msgid "Sell"
 msgstr "Vender"
 
@@ -389,39 +414,43 @@ msgstr "Por favor especifique ambos os Endereços e a Porta do servidor"
 msgid "Sound"
 msgstr "Som"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:49
 msgid "Sfx volume"
 msgstr "Volume Sfx"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:50
 msgid "Music volume"
 msgstr "Volume da Música"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:77
 msgid "Audio"
 msgstr "Áudio"
 
-#: src/gui/setup.cpp:80
+#: src/gui/setup.cpp:81
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+#: src/gui/setup.cpp:85
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Press the button to start calibration"
 msgstr "Aperto o botão para começar a calibração"
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
 msgid "Calibrate"
 msgstr "Calibrar"
 
@@ -429,71 +458,75 @@ msgstr "Calibrar"
 msgid "Enable joystick"
 msgstr "Habilitar joystick"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:77
 msgid "Stop"
 msgstr "Parar"
 
-#: src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:78
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
 #: src/gui/setup_video.cpp:117
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:119
 msgid "FPS Limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:133
+#: src/gui/setup_video.cpp:136
 msgid "Gui opacity"
 msgstr "Opacidade da GUI"
 
-#: src/gui/setup_video.cpp:186
+#: src/gui/setup_video.cpp:192
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:200
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:208
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
 msgid "low"
 msgstr "baixo"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
 msgid "high"
 msgstr "alto"
 
-#: src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:275
 msgid "Switching to full screen"
 msgstr "Mudando para Tela cheia"
 
-#: src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:276
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:287
 msgid "Changing OpenGL"
 msgstr "Trocando OpenGL"
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:288
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicando mudança a OpenGL requer reiniciar o jogo."
 
@@ -522,22 +555,37 @@ msgstr "Você dá:"
 msgid "Change"
 msgstr "Mudar"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr "Ataque %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr "Defesa %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Confirmar"
+
+#~ msgid "Select Character"
+#~ msgstr "Selecionar personagem"
+
+#~ msgid "Charisma:"
+#~ msgstr "Carisma:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Peso Total: %d - Peso Máximo: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Manter"
diff --git a/po/ru.po b/po/ru.po
index b3e3ec0c..3b1d5a3d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2007-10-28 18:59+0100\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-09 22:58+0200\n"
 "PO-Revision-Date: 2008-01-08 11:50+0000\n"
 "Last-Translator: idle sign <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -17,169 +17,185 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-09 20:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
 msgid "Buy"
 msgstr "Купить"
 
-#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
 #: src/gui/sell.cpp:241
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Стоимость: %d GP / Всегоl: %d GP"
 
-#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
 msgid "Quit"
 msgstr "Выход"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
-#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
-#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:202 src/gui/buy.cpp:220
+#: src/gui/sell.cpp:65 src/gui/sell.cpp:212 src/gui/sell.cpp:226
 #: src/gui/trade.cpp:84 src/gui/trade.cpp:171
 #, c-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
-#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:204 src/gui/buy.cpp:221
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:214 src/gui/sell.cpp:227
 #, c-format
 msgid "Effect: %s"
 msgstr "Эффект: %s"
 
-#: src/gui/char_select.cpp:71
-msgid "Confirm"
-msgstr "Подтвердить"
+#: src/gui/char_select.cpp:74
+#, fuzzy
+msgid "Confirm Character Delete"
+msgstr "Создать персонажа"
 
-#: src/gui/char_select.cpp:72
+#: src/gui/char_select.cpp:75
 msgid "Are you sure you want to delete this character?"
 msgstr "Вы уверены, что хотите удалить этого персонажа?"
 
-#: src/gui/char_select.cpp:88
-msgid "Select Character"
-msgstr "Выбор персонажа"
+#: src/gui/char_select.cpp:91
+msgid "Account and Character Management"
+msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/char_select.cpp:95 src/gui/item_amount.cpp:66 src/gui/login.cpp:50
 #: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
 #: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
 #: src/gui/serverdialog.cpp:110
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
-#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:283
+#: src/gui/connection.cpp:41 src/gui/item_amount.cpp:67 src/gui/login.cpp:51
 #: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:57
 #: src/gui/trade.cpp:62
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
 msgid "New"
 msgstr "Новый"
 
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/gui/char_select.cpp:96
+#: src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Следующий"
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:101
 msgid "Unregister"
 msgstr "Удалить регистрацию"
 
-#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
-#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
+#: src/gui/char_select.cpp:102
+#, fuzzy
+msgid "Change Password"
+msgstr "Пароль:"
+
+#: src/gui/char_select.cpp:103
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/char_select.cpp:105
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:106 src/gui/char_select.cpp:211
+#: src/gui/char_select.cpp:222 src/gui/trade.cpp:82 src/gui/trade.cpp:169
 #, c-format
 msgid "Name: %s"
 msgstr "Имя: %s"
 
-#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
-#: src/gui/char_select.cpp:201
+#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
+#: src/gui/char_select.cpp:223
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
-#: src/gui/char_select.cpp:202
+#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
+#: src/gui/char_select.cpp:224
 #, c-format
 msgid "Money: %d"
 msgstr "Деньги: %d"
 
-#: src/gui/char_select.cpp:245
+#: src/gui/char_select.cpp:268
 msgid "Create Character"
 msgstr "Создать персонажа"
 
-#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Имя:"
 
-#: src/gui/char_select.cpp:255
+#: src/gui/char_select.cpp:278
 msgid "Hair Color:"
 msgstr "Цвет волос:"
 
-#: src/gui/char_select.cpp:258
+#: src/gui/char_select.cpp:281
 msgid "Hair Style:"
 msgstr "Стрижка:"
 
-#: src/gui/char_select.cpp:259
+#: src/gui/char_select.cpp:282
 msgid "Create"
 msgstr "Создать"
 
-#: src/gui/char_select.cpp:262
+#: src/gui/char_select.cpp:285
+msgid "Male"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Female"
+msgstr ""
+
+#: src/gui/char_select.cpp:290
 msgid "Strength:"
 msgstr "Сила:"
 
-#: src/gui/char_select.cpp:263
+#: src/gui/char_select.cpp:291
 msgid "Agility:"
 msgstr "Выносливость:"
 
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:292
 msgid "Dexterity:"
 msgstr "Ловкость:"
 
-#: src/gui/char_select.cpp:265
+#: src/gui/char_select.cpp:293
 msgid "Vitality:"
 msgstr "Живучесть:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:294
 msgid "Intelligence:"
 msgstr "Интеллект:"
 
-#: src/gui/char_select.cpp:267
+#: src/gui/char_select.cpp:295
 msgid "Willpower:"
 msgstr "Сила волиr:"
 
-#: src/gui/char_select.cpp:268
-msgid "Charisma:"
-msgstr "Харизма:"
-
-#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
+#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Распределите очки (%d)"
 
-#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
 #: src/gui/serverdialog.cpp:171
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/gui/char_select.cpp:369
+#: src/gui/char_select.cpp:417
 msgid "Your name needs to be at least 4 characters."
 msgstr "Имя должно содержать не менее четырех символов."
 
-#: src/gui/char_select.cpp:416
+#: src/gui/char_select.cpp:469
 msgid "Character stats OK"
 msgstr "Данные персонажа в порядке"
 
-#: src/gui/char_select.cpp:428
+#: src/gui/char_select.cpp:481
 #, c-format
 msgid "Please remove %d points"
 msgstr "Снимите очки (%d)"
@@ -192,11 +208,11 @@ msgstr "Да"
 msgid "No"
 msgstr "Нет"
 
-#: src/gui/connection.cpp:42
+#: src/gui/connection.cpp:43
 msgid "Connecting..."
 msgstr "Соединение..."
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
 msgid "Equipment"
 msgstr "Снаряжение"
 
@@ -204,28 +220,23 @@ msgstr "Снаряжение"
 msgid "Unequip"
 msgstr "Снять"
 
-#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
+#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
 msgid "Inventory"
 msgstr "Инвентарь"
 
-#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
 msgid "Use"
 msgstr "Использовать"
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:69
 msgid "Drop"
 msgstr "Сбросить"
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:70
 msgid "Split"
 msgstr "Разделить"
 
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
-#, c-format
-msgid "Total Weight: %d - Maximum Weight: %d"
-msgstr "Суммарный вес: %d - Макс. вес: %d"
-
-#: src/gui/inventorywindow.cpp:194
+#: src/gui/inventorywindow.cpp:178
 msgid "Equip"
 msgstr "Надеть"
 
@@ -241,35 +252,39 @@ msgstr "Сколько предметов сбросить."
 msgid "Select amount of items to split."
 msgstr "Сколько предметов разделить."
 
-#: src/gui/login.cpp:44
+#: src/gui/login.cpp:43
 msgid "Login"
 msgstr "Вход"
 
-#: src/gui/login.cpp:47 src/gui/register.cpp:68
+#: src/gui/login.cpp:46 src/gui/register.cpp:68
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/gui/login.cpp:50
-msgid "Keep"
-msgstr "Оставить"
+#: src/gui/login.cpp:49
+msgid "Remember Username"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: src/gui/menuwindow.cpp:62
+#: src/gui/menuwindow.cpp:63
 msgid "Status"
 msgstr "Состояние"
 
-#: src/gui/menuwindow.cpp:65
+#: src/gui/menuwindow.cpp:66
 msgid "Skills"
 msgstr "Умения"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:67
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:68
 msgid "Shortcut"
 msgstr "Клавиша"
 
-#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
+#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
 msgid "Setup"
 msgstr "Настройка"
 
@@ -291,37 +306,47 @@ msgstr "@@trade|Торговать с %s@@"
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Атаковать %s@@"
 
-#: src/gui/popupmenu.cpp:90
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "@@guild|Invite %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:85
+#, c-format
+msgid "@@party|Invite %s to join your party@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:92
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Говорить с NPC@@"
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:240
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancelОтмена@@"
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Подобрать %s@@"
 
-#: src/gui/popupmenu.cpp:216
+#: src/gui/popupmenu.cpp:231
 msgid "@@use|Equip@@"
 msgstr "@@use|Надеть@@"
 
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:234
 msgid "@@use|Use@@"
 msgstr "@@use|Использовать@@"
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:235
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Сбросить@@"
 
-#: src/gui/popupmenu.cpp:221
+#: src/gui/popupmenu.cpp:236
 msgid "@@description|Description@@"
 msgstr "@@description|Описание@@"
 
-#: src/gui/popupmenu.cpp:223
+#: src/gui/popupmenu.cpp:238
 msgid "@@split|Split@@"
 msgstr "@@split|Разделить@@"
 
@@ -365,7 +390,7 @@ msgstr "Пароль не должен содержать более %d симв
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
 msgid "Sell"
 msgstr "Продать"
 
@@ -389,39 +414,43 @@ msgstr "Следует указать адрес и порт сервера."
 msgid "Sound"
 msgstr "Звук"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:49
 msgid "Sfx volume"
 msgstr "Громкость эффектов"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:50
 msgid "Music volume"
 msgstr "Громкость музыки"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Применить"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Восстановить расположение окон"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Video"
 msgstr "Видео"
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:77
 msgid "Audio"
 msgstr "Аудио"
 
-#: src/gui/setup.cpp:80
+#: src/gui/setup.cpp:81
 msgid "Joystick"
 msgstr "Джойстик"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+#: src/gui/setup.cpp:85
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Press the button to start calibration"
 msgstr "Нажмите кнопку, чтобы начать калибровку"
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
 msgid "Calibrate"
 msgstr "Калибровать"
 
@@ -429,72 +458,75 @@ msgstr "Калибровать"
 msgid "Enable joystick"
 msgstr "Использовать джойстик"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:77
 msgid "Stop"
 msgstr "Стоп"
 
-#: src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:78
 msgid "Rotate the stick"
 msgstr "Вращайте рукоять"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr "На полный экран"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
 msgstr "Выборочный курсор"
 
 #: src/gui/setup_video.cpp:117
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:119
 msgid "FPS Limit:"
 msgstr "Ограничение кадр/с:"
 
-#: src/gui/setup_video.cpp:133
+#: src/gui/setup_video.cpp:136
 msgid "Gui opacity"
 msgstr "Прозрачность интерфейса"
 
-#: src/gui/setup_video.cpp:186
+#: src/gui/setup_video.cpp:192
 msgid "Scroll radius"
 msgstr "Радиус прокрутки"
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:200
 msgid "Scroll laziness"
 msgstr "Заторможенность прокрутки"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:208
 msgid "Ambient FX"
 msgstr "Эффекты окружающей среды"
 
-#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
 msgid "off"
 msgstr "выкл"
 
-#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
 msgid "low"
 msgstr "низ."
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
 msgid "high"
 msgstr "выс."
 
-#: src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:275
 msgid "Switching to full screen"
 msgstr "Переключение в полноэкранный режим"
 
-#: src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:276
 msgid "Restart needed for changes to take effect."
-msgstr ""
-"Для вступления в силу выбранных настроек требуется перезагрузка игры."
+msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:287
 msgid "Changing OpenGL"
 msgstr "Переключение на OpenGL"
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:288
 msgid "Applying change to OpenGL requires restart."
 msgstr "Переход к OpenGL требует перезагрузки игры."
 
@@ -523,22 +555,37 @@ msgstr "Вы отдаете:"
 msgid "Change"
 msgstr "Сменить"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr "Атака %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr "Защита %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr "Мана %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Подтвердить"
+
+#~ msgid "Select Character"
+#~ msgstr "Выбор персонажа"
+
+#~ msgid "Charisma:"
+#~ msgstr "Харизма:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Суммарный вес: %d - Макс. вес: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Оставить"
diff --git a/po/sv.po b/po/sv.po
index d8bee477..01853882 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2007-10-28 18:59+0100\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-09 22:58+0200\n"
 "PO-Revision-Date: 2008-05-07 19:04+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -17,169 +17,185 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-09 20:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
 msgid "Buy"
 msgstr "Köp"
 
-#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
 #: src/gui/sell.cpp:241
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Pris: %d GP / Totalt: %d GP"
 
-#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
-#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
-#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:202 src/gui/buy.cpp:220
+#: src/gui/sell.cpp:65 src/gui/sell.cpp:212 src/gui/sell.cpp:226
 #: src/gui/trade.cpp:84 src/gui/trade.cpp:171
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
-#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:204 src/gui/buy.cpp:221
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:214 src/gui/sell.cpp:227
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/char_select.cpp:71
-msgid "Confirm"
-msgstr "Bekräfta"
+#: src/gui/char_select.cpp:74
+#, fuzzy
+msgid "Confirm Character Delete"
+msgstr "Skapa karaktär"
 
-#: src/gui/char_select.cpp:72
+#: src/gui/char_select.cpp:75
 msgid "Are you sure you want to delete this character?"
 msgstr "Är du säker på att du vill ta bort den här karaktären?"
 
-#: src/gui/char_select.cpp:88
-msgid "Select Character"
-msgstr "Välj karaktär"
+#: src/gui/char_select.cpp:91
+msgid "Account and Character Management"
+msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/char_select.cpp:95 src/gui/item_amount.cpp:66 src/gui/login.cpp:50
 #: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
 #: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
 #: src/gui/serverdialog.cpp:110
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
-#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:283
+#: src/gui/connection.cpp:41 src/gui/item_amount.cpp:67 src/gui/login.cpp:51
 #: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:57
 #: src/gui/trade.cpp:62
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
 msgid "New"
 msgstr "Ny"
 
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/gui/char_select.cpp:96
+#: src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Föregående"
 
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Nästa"
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:101
 msgid "Unregister"
 msgstr "Avregistrera"
 
-#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
-#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
+#: src/gui/char_select.cpp:102
+#, fuzzy
+msgid "Change Password"
+msgstr "Lösenord:"
+
+#: src/gui/char_select.cpp:103
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/char_select.cpp:105
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:106 src/gui/char_select.cpp:211
+#: src/gui/char_select.cpp:222 src/gui/trade.cpp:82 src/gui/trade.cpp:169
 #, c-format
 msgid "Name: %s"
 msgstr "Namn: %s"
 
-#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
-#: src/gui/char_select.cpp:201
+#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
+#: src/gui/char_select.cpp:223
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
-#: src/gui/char_select.cpp:202
+#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
+#: src/gui/char_select.cpp:224
 #, c-format
 msgid "Money: %d"
 msgstr "Pengar: %d"
 
-#: src/gui/char_select.cpp:245
+#: src/gui/char_select.cpp:268
 msgid "Create Character"
 msgstr "Skapa karaktär"
 
-#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Namn:"
 
-#: src/gui/char_select.cpp:255
+#: src/gui/char_select.cpp:278
 msgid "Hair Color:"
 msgstr "Hårfärg:"
 
-#: src/gui/char_select.cpp:258
+#: src/gui/char_select.cpp:281
 msgid "Hair Style:"
 msgstr "Frisyr:"
 
-#: src/gui/char_select.cpp:259
+#: src/gui/char_select.cpp:282
 msgid "Create"
 msgstr "Skapa"
 
-#: src/gui/char_select.cpp:262
+#: src/gui/char_select.cpp:285
+msgid "Male"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Female"
+msgstr ""
+
+#: src/gui/char_select.cpp:290
 msgid "Strength:"
 msgstr "Styrka:"
 
-#: src/gui/char_select.cpp:263
+#: src/gui/char_select.cpp:291
 msgid "Agility:"
 msgstr "Smidighet:"
 
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:292
 msgid "Dexterity:"
 msgstr "Skicklighet:"
 
-#: src/gui/char_select.cpp:265
+#: src/gui/char_select.cpp:293
 msgid "Vitality:"
 msgstr "Hälsa:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:294
 msgid "Intelligence:"
 msgstr "Intelligens:"
 
-#: src/gui/char_select.cpp:267
+#: src/gui/char_select.cpp:295
 msgid "Willpower:"
 msgstr "Viljestyrka:"
 
-#: src/gui/char_select.cpp:268
-msgid "Charisma:"
-msgstr "Karisma:"
-
-#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
+#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Var vänlig fördela %d poäng"
 
-#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
 #: src/gui/serverdialog.cpp:171
 msgid "Error"
 msgstr "Fel"
 
-#: src/gui/char_select.cpp:369
+#: src/gui/char_select.cpp:417
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ditt namn måste vara minst 4 tecken långt."
 
-#: src/gui/char_select.cpp:416
+#: src/gui/char_select.cpp:469
 msgid "Character stats OK"
 msgstr "Karaktärens värden OK"
 
-#: src/gui/char_select.cpp:428
+#: src/gui/char_select.cpp:481
 #, c-format
 msgid "Please remove %d points"
 msgstr "Var vänlig ta bort %d poäng"
@@ -192,11 +208,11 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
-#: src/gui/connection.cpp:42
+#: src/gui/connection.cpp:43
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
 msgid "Equipment"
 msgstr "Utrustning"
 
@@ -204,28 +220,23 @@ msgstr "Utrustning"
 msgid "Unequip"
 msgstr "Avrusta"
 
-#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
+#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
 msgid "Inventory"
 msgstr "Inventarium"
 
-#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
 msgid "Use"
 msgstr "Använd"
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:69
 msgid "Drop"
 msgstr "Släpp"
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:70
 msgid "Split"
 msgstr "Dela"
 
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
-#, c-format
-msgid "Total Weight: %d - Maximum Weight: %d"
-msgstr "Nuvarande vikt: %d - Maxvikt: %d"
-
-#: src/gui/inventorywindow.cpp:194
+#: src/gui/inventorywindow.cpp:178
 msgid "Equip"
 msgstr "Utrusta"
 
@@ -241,35 +252,39 @@ msgstr "Välj antal föremål att släppa."
 msgid "Select amount of items to split."
 msgstr "Välj antal föremål att dela."
 
-#: src/gui/login.cpp:44
+#: src/gui/login.cpp:43
 msgid "Login"
 msgstr "Användarnamn"
 
-#: src/gui/login.cpp:47 src/gui/register.cpp:68
+#: src/gui/login.cpp:46 src/gui/register.cpp:68
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: src/gui/login.cpp:50
-msgid "Keep"
-msgstr "Behåll"
+#: src/gui/login.cpp:49
+msgid "Remember Username"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registrera"
 
-#: src/gui/menuwindow.cpp:62
+#: src/gui/menuwindow.cpp:63
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:65
+#: src/gui/menuwindow.cpp:66
 msgid "Skills"
 msgstr "Färdigheter"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:67
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:68
 msgid "Shortcut"
 msgstr "Genväg"
 
-#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
+#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
 msgid "Setup"
 msgstr "Inställningar"
 
@@ -291,37 +306,47 @@ msgstr "@@trade|Handla med %s@@"
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Attackera %s@@"
 
-#: src/gui/popupmenu.cpp:90
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "@@guild|Invite %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:85
+#, c-format
+msgid "@@party|Invite %s to join your party@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:92
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Prata med NPC@@"
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:240
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Avbryt@@"
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Plocka upp %s@@"
 
-#: src/gui/popupmenu.cpp:216
+#: src/gui/popupmenu.cpp:231
 msgid "@@use|Equip@@"
 msgstr "@@use|Utrusta@@"
 
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:234
 msgid "@@use|Use@@"
 msgstr "@@use|Använd@@"
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:235
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Släpp@@"
 
-#: src/gui/popupmenu.cpp:221
+#: src/gui/popupmenu.cpp:236
 msgid "@@description|Description@@"
 msgstr "@@description|Beskrivning@@"
 
-#: src/gui/popupmenu.cpp:223
+#: src/gui/popupmenu.cpp:238
 msgid "@@split|Split@@"
 msgstr "@@split|Dela@@"
 
@@ -365,7 +390,7 @@ msgstr "Lösenordet måste vara kortare än %d tecken."
 msgid "Passwords do not match."
 msgstr "Lösenorden stämmer inte överens."
 
-#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
 msgid "Sell"
 msgstr "Sälj"
 
@@ -389,39 +414,43 @@ msgstr "Var vänlig skriv både adressen och porten till en server."
 msgid "Sound"
 msgstr "Ljud"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:49
 msgid "Sfx volume"
 msgstr "Volym för ljudeffekter"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:50
 msgid "Music volume"
 msgstr "Musikvolym"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Verkställ"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Återställ fönster"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:77
 msgid "Audio"
 msgstr "Ljud"
 
-#: src/gui/setup.cpp:80
+#: src/gui/setup.cpp:81
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+#: src/gui/setup.cpp:85
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Press the button to start calibration"
 msgstr "Klicka på knappen för att starta kalibreringen"
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
 msgid "Calibrate"
 msgstr "Kalibrera"
 
@@ -429,71 +458,75 @@ msgstr "Kalibrera"
 msgid "Enable joystick"
 msgstr "Aktivera joystick"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:77
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:78
 msgid "Rotate the stick"
 msgstr "Rotera spaken"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr "Helskärm"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
 msgstr "Särskild muspekare"
 
 #: src/gui/setup_video.cpp:117
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:119
 msgid "FPS Limit:"
 msgstr "FPS-gräns:"
 
-#: src/gui/setup_video.cpp:133
+#: src/gui/setup_video.cpp:136
 msgid "Gui opacity"
 msgstr "Genomskinlighet"
 
-#: src/gui/setup_video.cpp:186
+#: src/gui/setup_video.cpp:192
 msgid "Scroll radius"
 msgstr "Rullningsradie"
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:200
 msgid "Scroll laziness"
 msgstr "Tröghet för rullning"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:208
 msgid "Ambient FX"
 msgstr "Omgivande FX"
 
-#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
 msgid "off"
 msgstr "av"
 
-#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
 msgid "low"
 msgstr "låg"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
 msgid "high"
 msgstr "hög"
 
-#: src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:275
 msgid "Switching to full screen"
 msgstr "Byte till helskärm"
 
-#: src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:276
 msgid "Restart needed for changes to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:287
 msgid "Changing OpenGL"
 msgstr "Ändrar OpenGL"
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:288
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ändringar i OpenGL kräver omstart."
 
@@ -522,22 +555,37 @@ msgstr "Du ger:"
 msgid "Change"
 msgstr "Ändra"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr "Attack %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr "Försvar %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr "Hälsa %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr "Mana %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "Bekräfta"
+
+#~ msgid "Select Character"
+#~ msgstr "Välj karaktär"
+
+#~ msgid "Charisma:"
+#~ msgstr "Karisma:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "Nuvarande vikt: %d - Maxvikt: %d"
+
+#~ msgid "Keep"
+#~ msgstr "Behåll"
diff --git a/po/tmw.pot b/po/tmw.pot
index c5a203fb..e3b12223 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: 2007-10-28 18:59+0100\n"
+"POT-Creation-Date: 2008-10-09 22:58+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,169 +16,183 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
 #: src/gui/sell.cpp:241
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
-#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
-#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:202 src/gui/buy.cpp:220
+#: src/gui/sell.cpp:65 src/gui/sell.cpp:212 src/gui/sell.cpp:226
 #: src/gui/trade.cpp:84 src/gui/trade.cpp:171
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
-#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:204 src/gui/buy.cpp:221
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:214 src/gui/sell.cpp:227
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:71
-msgid "Confirm"
+#: src/gui/char_select.cpp:74
+msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:72
+#: src/gui/char_select.cpp:75
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/char_select.cpp:88
-msgid "Select Character"
+#: src/gui/char_select.cpp:91
+msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/char_select.cpp:95 src/gui/item_amount.cpp:66 src/gui/login.cpp:50
 #: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
 #: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
 #: src/gui/serverdialog.cpp:110
 msgid "Ok"
 msgstr ""
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
-#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:283
+#: src/gui/connection.cpp:41 src/gui/item_amount.cpp:67 src/gui/login.cpp:51
 #: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:57
 #: src/gui/trade.cpp:62
 msgid "Cancel"
 msgstr ""
 
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
 msgid "New"
 msgstr ""
 
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
 msgid "Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:96
+#: src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr ""
 
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:100
 msgid "Next"
 msgstr ""
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:101
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
-#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
+#: src/gui/char_select.cpp:102
+msgid "Change Password"
+msgstr ""
+
+#: src/gui/char_select.cpp:103
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/char_select.cpp:105
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:106 src/gui/char_select.cpp:211
+#: src/gui/char_select.cpp:222 src/gui/trade.cpp:82 src/gui/trade.cpp:169
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
-#: src/gui/char_select.cpp:201
+#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
+#: src/gui/char_select.cpp:223
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
-#: src/gui/char_select.cpp:202
+#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
+#: src/gui/char_select.cpp:224
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:245
+#: src/gui/char_select.cpp:268
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
 msgid "Name:"
 msgstr ""
 
-#: src/gui/char_select.cpp:255
+#: src/gui/char_select.cpp:278
 msgid "Hair Color:"
 msgstr ""
 
-#: src/gui/char_select.cpp:258
+#: src/gui/char_select.cpp:281
 msgid "Hair Style:"
 msgstr ""
 
-#: src/gui/char_select.cpp:259
+#: src/gui/char_select.cpp:282
 msgid "Create"
 msgstr ""
 
-#: src/gui/char_select.cpp:262
+#: src/gui/char_select.cpp:285
+msgid "Male"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Female"
+msgstr ""
+
+#: src/gui/char_select.cpp:290
 msgid "Strength:"
 msgstr ""
 
-#: src/gui/char_select.cpp:263
+#: src/gui/char_select.cpp:291
 msgid "Agility:"
 msgstr ""
 
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:292
 msgid "Dexterity:"
 msgstr ""
 
-#: src/gui/char_select.cpp:265
+#: src/gui/char_select.cpp:293
 msgid "Vitality:"
 msgstr ""
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:294
 msgid "Intelligence:"
 msgstr ""
 
-#: src/gui/char_select.cpp:267
+#: src/gui/char_select.cpp:295
 msgid "Willpower:"
 msgstr ""
 
-#: src/gui/char_select.cpp:268
-msgid "Charisma:"
-msgstr ""
-
-#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
+#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
 #: src/gui/serverdialog.cpp:171
 msgid "Error"
 msgstr ""
 
-#: src/gui/char_select.cpp:369
+#: src/gui/char_select.cpp:417
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/char_select.cpp:416
+#: src/gui/char_select.cpp:469
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/char_select.cpp:428
+#: src/gui/char_select.cpp:481
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -191,11 +205,11 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/connection.cpp:42
+#: src/gui/connection.cpp:43
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
 msgid "Equipment"
 msgstr ""
 
@@ -203,28 +217,23 @@ msgstr ""
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
+#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:69
 msgid "Drop"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:70
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
-#, c-format
-msgid "Total Weight: %d - Maximum Weight: %d"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:194
+#: src/gui/inventorywindow.cpp:178
 msgid "Equip"
 msgstr ""
 
@@ -240,35 +249,39 @@ msgstr ""
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/login.cpp:44
+#: src/gui/login.cpp:43
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:47 src/gui/register.cpp:68
+#: src/gui/login.cpp:46 src/gui/register.cpp:68
 msgid "Password:"
 msgstr ""
 
-#: src/gui/login.cpp:50
-msgid "Keep"
+#: src/gui/login.cpp:49
+msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
 msgid "Register"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:62
+#: src/gui/menuwindow.cpp:63
 msgid "Status"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:65
+#: src/gui/menuwindow.cpp:66
 msgid "Skills"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:67
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:68
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
+#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
 msgid "Setup"
 msgstr ""
 
@@ -290,37 +303,47 @@ msgstr ""
 msgid "@@attack|Attack %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:90
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "@@guild|Invite %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:85
+#, c-format
+msgid "@@party|Invite %s to join your party@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:92
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:240
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:216
+#: src/gui/popupmenu.cpp:231
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:234
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:235
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:221
+#: src/gui/popupmenu.cpp:236
 msgid "@@description|Description@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:223
+#: src/gui/popupmenu.cpp:238
 msgid "@@split|Split@@"
 msgstr ""
 
@@ -364,7 +387,7 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
 msgid "Sell"
 msgstr ""
 
@@ -388,39 +411,43 @@ msgstr ""
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:49
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:50
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:77
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup.cpp:80
+#: src/gui/setup.cpp:81
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+#: src/gui/setup.cpp:85
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
 msgid "Calibrate"
 msgstr ""
 
@@ -428,71 +455,75 @@ msgstr ""
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:77
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:78
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
 msgstr ""
 
 #: src/gui/setup_video.cpp:117
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:119
 msgid "FPS Limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:133
+#: src/gui/setup_video.cpp:136
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:186
+#: src/gui/setup_video.cpp:192
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:200
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:208
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:275
 msgid "Switching to full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:276
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:287
 msgid "Changing OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:288
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
@@ -521,22 +552,22 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr ""
diff --git a/po/tmw-zh_CN.po b/po/zh_CN.po
index 81939c6d..0869bf27 100644
--- a/po/tmw-zh_CN.po
+++ b/po/zh_CN.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2007-10-28 18:59+0100\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-09 22:58+0200\n"
 "PO-Revision-Date: 2008-09-17 14:41+0000\n"
 "Last-Translator: luojie-dune <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -17,169 +17,185 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-10-09 20:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+#: src/gui/buy.cpp:42 src/gui/buy.cpp:59
 msgid "Buy"
 msgstr "买"
 
-#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/buy.cpp:56 src/gui/buy.cpp:235 src/gui/sell.cpp:60
 #: src/gui/sell.cpp:241
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "价格：%d GP/总数：%d GP"
 
-#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+#: src/gui/buy.cpp:60 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:64
 msgid "Quit"
 msgstr "退出"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
-#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
-#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/buy.cpp:61 src/gui/buy.cpp:202 src/gui/buy.cpp:220
+#: src/gui/sell.cpp:65 src/gui/sell.cpp:212 src/gui/sell.cpp:226
 #: src/gui/trade.cpp:84 src/gui/trade.cpp:171
 #, c-format
 msgid "Description: %s"
 msgstr "描述：%s"
 
-#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
-#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:204 src/gui/buy.cpp:221
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:214 src/gui/sell.cpp:227
 #, c-format
 msgid "Effect: %s"
 msgstr "影响: %s"
 
-#: src/gui/char_select.cpp:71
-msgid "Confirm"
-msgstr "确定"
+#: src/gui/char_select.cpp:74
+#, fuzzy
+msgid "Confirm Character Delete"
+msgstr "创建角色"
 
-#: src/gui/char_select.cpp:72
+#: src/gui/char_select.cpp:75
 msgid "Are you sure you want to delete this character?"
 msgstr "你确定想删除这个较色"
 
-#: src/gui/char_select.cpp:88
-msgid "Select Character"
-msgstr "选择较色"
+#: src/gui/char_select.cpp:91
+msgid "Account and Character Management"
+msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/char_select.cpp:95 src/gui/item_amount.cpp:66 src/gui/login.cpp:50
 #: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
 #: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
 #: src/gui/serverdialog.cpp:110
 msgid "Ok"
 msgstr "OK"
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
-#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/char_select.cpp:96 src/gui/char_select.cpp:283
+#: src/gui/connection.cpp:41 src/gui/item_amount.cpp:67 src/gui/login.cpp:51
 #: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:57
 #: src/gui/trade.cpp:62
 msgid "Cancel"
 msgstr "取消"
 
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
 msgid "New"
 msgstr "新建"
 
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
 msgid "Delete"
 msgstr "删除"
 
-#: src/gui/char_select.cpp:96
+#: src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "上一页"
 
-#: src/gui/char_select.cpp:97
+#: src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "下一页"
 
-#: src/gui/char_select.cpp:98
+#: src/gui/char_select.cpp:101
 msgid "Unregister"
 msgstr "注销"
 
-#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
-#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
+#: src/gui/char_select.cpp:102
+#, fuzzy
+msgid "Change Password"
+msgstr "密码："
+
+#: src/gui/char_select.cpp:103
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/char_select.cpp:105
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:106 src/gui/char_select.cpp:211
+#: src/gui/char_select.cpp:222 src/gui/trade.cpp:82 src/gui/trade.cpp:169
 #, c-format
 msgid "Name: %s"
 msgstr "名字：%s"
 
-#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
-#: src/gui/char_select.cpp:201
+#: src/gui/char_select.cpp:107 src/gui/char_select.cpp:212
+#: src/gui/char_select.cpp:223
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
-#: src/gui/char_select.cpp:202
+#: src/gui/char_select.cpp:108 src/gui/char_select.cpp:213
+#: src/gui/char_select.cpp:224
 #, c-format
 msgid "Money: %d"
 msgstr "金钱：%d"
 
-#: src/gui/char_select.cpp:245
+#: src/gui/char_select.cpp:268
 msgid "Create Character"
 msgstr "创建角色"
 
-#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:275 src/gui/login.cpp:45 src/gui/register.cpp:67
 msgid "Name:"
 msgstr "名称"
 
-#: src/gui/char_select.cpp:255
+#: src/gui/char_select.cpp:278
 msgid "Hair Color:"
 msgstr "头发颜色"
 
-#: src/gui/char_select.cpp:258
+#: src/gui/char_select.cpp:281
 msgid "Hair Style:"
 msgstr "发型"
 
-#: src/gui/char_select.cpp:259
+#: src/gui/char_select.cpp:282
 msgid "Create"
 msgstr "建立"
 
-#: src/gui/char_select.cpp:262
+#: src/gui/char_select.cpp:285
+msgid "Male"
+msgstr ""
+
+#: src/gui/char_select.cpp:286
+msgid "Female"
+msgstr ""
+
+#: src/gui/char_select.cpp:290
 msgid "Strength:"
 msgstr "力量"
 
-#: src/gui/char_select.cpp:263
+#: src/gui/char_select.cpp:291
 msgid "Agility:"
 msgstr "敏捷:"
 
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:292
 msgid "Dexterity:"
 msgstr "智慧:"
 
-#: src/gui/char_select.cpp:265
+#: src/gui/char_select.cpp:293
 msgid "Vitality:"
 msgstr "体力:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:294
 msgid "Intelligence:"
 msgstr "智力:"
 
-#: src/gui/char_select.cpp:267
+#: src/gui/char_select.cpp:295
 msgid "Willpower:"
 msgstr "意志力:"
 
-#: src/gui/char_select.cpp:268
-msgid "Charisma:"
-msgstr "魅力:"
-
-#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
+#: src/gui/char_select.cpp:303 src/gui/char_select.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "请分发%d点数"
 
-#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/char_select.cpp:417 src/gui/register.cpp:220
 #: src/gui/serverdialog.cpp:171
 msgid "Error"
 msgstr "错误"
 
-#: src/gui/char_select.cpp:369
+#: src/gui/char_select.cpp:417
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字需要至少4个字符"
 
-#: src/gui/char_select.cpp:416
+#: src/gui/char_select.cpp:469
 msgid "Character stats OK"
 msgstr "角色状态可以"
 
-#: src/gui/char_select.cpp:428
+#: src/gui/char_select.cpp:481
 #, c-format
 msgid "Please remove %d points"
 msgstr "请删除%d点数"
@@ -192,11 +208,11 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: src/gui/connection.cpp:42
+#: src/gui/connection.cpp:43
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:64
 msgid "Equipment"
 msgstr "装备"
 
@@ -204,28 +220,23 @@ msgstr "装备"
 msgid "Unequip"
 msgstr "卸下装备"
 
-#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
+#: src/gui/inventorywindow.cpp:55 src/gui/menuwindow.cpp:65
 msgid "Inventory"
 msgstr "清单"
 
-#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
+#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:181
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:65
+#: src/gui/inventorywindow.cpp:69
 msgid "Drop"
 msgstr "丢弃"
 
-#: src/gui/inventorywindow.cpp:66
+#: src/gui/inventorywindow.cpp:70
 msgid "Split"
 msgstr "分离"
 
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
-#, c-format
-msgid "Total Weight: %d - Maximum Weight: %d"
-msgstr "总的力量：%d - 最大力量：%d"
-
-#: src/gui/inventorywindow.cpp:194
+#: src/gui/inventorywindow.cpp:178
 msgid "Equip"
 msgstr "装备"
 
@@ -241,35 +252,39 @@ msgstr "请选择丢弃的物品数量"
 msgid "Select amount of items to split."
 msgstr "请选择你分离的物品的数量"
 
-#: src/gui/login.cpp:44
+#: src/gui/login.cpp:43
 msgid "Login"
 msgstr "登陆"
 
-#: src/gui/login.cpp:47 src/gui/register.cpp:68
+#: src/gui/login.cpp:46 src/gui/register.cpp:68
 msgid "Password:"
 msgstr "密码："
 
-#: src/gui/login.cpp:50
-msgid "Keep"
-msgstr "保持"
+#: src/gui/login.cpp:49
+msgid "Remember Username"
+msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:52 src/gui/register.cpp:63 src/gui/register.cpp:75
 msgid "Register"
 msgstr "注册"
 
-#: src/gui/menuwindow.cpp:62
+#: src/gui/menuwindow.cpp:63
 msgid "Status"
 msgstr "状态"
 
-#: src/gui/menuwindow.cpp:65
+#: src/gui/menuwindow.cpp:66
 msgid "Skills"
 msgstr "技能"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:67
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:68
 msgid "Shortcut"
 msgstr "快捷键"
 
-#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
+#: src/gui/menuwindow.cpp:69 src/gui/setup.cpp:49
 msgid "Setup"
 msgstr "安装"
 
@@ -291,37 +306,47 @@ msgstr "@@交易|与%s交易@@"
 msgid "@@attack|Attack %s@@"
 msgstr "@@攻击|攻击%s@@"
 
-#: src/gui/popupmenu.cpp:90
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "@@guild|Invite %s@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:85
+#, c-format
+msgid "@@party|Invite %s to join your party@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:92
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@谈话|和NPC谈话@@"
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:240
 msgid "@@cancel|Cancel@@"
 msgstr "@@取消|取消@@"
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@捡起|捡起%s@@"
 
-#: src/gui/popupmenu.cpp:216
+#: src/gui/popupmenu.cpp:231
 msgid "@@use|Equip@@"
 msgstr "@@使用|装备@@"
 
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:234
 msgid "@@use|Use@@"
 msgstr "@@使用|使用@@"
 
-#: src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:235
 msgid "@@drop|Drop@@"
 msgstr "@@丢弃|丢弃@@"
 
-#: src/gui/popupmenu.cpp:221
+#: src/gui/popupmenu.cpp:236
 msgid "@@description|Description@@"
 msgstr "@@描述|描述@@"
 
-#: src/gui/popupmenu.cpp:223
+#: src/gui/popupmenu.cpp:238
 msgid "@@split|Split@@"
 msgstr "@@分离|分离@@"
 
@@ -365,7 +390,7 @@ msgstr "密码不能少于%d个字符"
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#: src/gui/sell.cpp:46 src/gui/sell.cpp:63
 msgid "Sell"
 msgstr "出售"
 
@@ -389,39 +414,43 @@ msgstr "请输入服务器的IP地址和端口"
 msgid "Sound"
 msgstr "声音"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:49
 msgid "Sfx volume"
 msgstr "音效声量"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:50
 msgid "Music volume"
 msgstr "音乐声量"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "应用"
 
-#: src/gui/setup.cpp:55
+#: src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "重置窗口"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Video"
 msgstr "视频"
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:77
 msgid "Audio"
 msgstr "音频"
 
-#: src/gui/setup.cpp:80
+#: src/gui/setup.cpp:81
 msgid "Joystick"
 msgstr "游戏杆"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
+#: src/gui/setup.cpp:85
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:74
 msgid "Press the button to start calibration"
 msgstr "按下开始校准按钮"
 
-#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:72
 msgid "Calibrate"
 msgstr "校准"
 
@@ -429,71 +458,75 @@ msgstr "校准"
 msgid "Enable joystick"
 msgstr "启用游戏杆"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:77
 msgid "Stop"
 msgstr "停止"
 
-#: src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:78
 msgid "Rotate the stick"
 msgstr "旋转手柄"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Full screen"
 msgstr "全屏"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Custom cursor"
 msgstr "通常的光标"
 
 #: src/gui/setup_video.cpp:117
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:119
 msgid "FPS Limit:"
 msgstr "FPS限制"
 
-#: src/gui/setup_video.cpp:133
+#: src/gui/setup_video.cpp:136
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: src/gui/setup_video.cpp:186
+#: src/gui/setup_video.cpp:192
 msgid "Scroll radius"
 msgstr "滚动半径"
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:200
 msgid "Scroll laziness"
 msgstr "拉动极限"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:208
 msgid "Ambient FX"
 msgstr "环境音效"
 
-#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:384
 msgid "off"
 msgstr "离线"
 
-#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:387
 msgid "low"
 msgstr "低"
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:390
 msgid "high"
 msgstr "高"
 
-#: src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:275
 msgid "Switching to full screen"
 msgstr "切换到全屏"
 
-#: src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:276
 msgid "Restart needed for changes to take effect."
 msgstr "只有改变生效后才能重启"
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:287
 msgid "Changing OpenGL"
 msgstr "改变成OpenGL"
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:288
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
@@ -522,22 +555,37 @@ msgstr "你得到："
 msgid "Change"
 msgstr "改变"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr "攻击 %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr "防护 %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
+
+#~ msgid "Confirm"
+#~ msgstr "确定"
+
+#~ msgid "Select Character"
+#~ msgstr "选择较色"
+
+#~ msgid "Charisma:"
+#~ msgstr "魅力:"
+
+#~ msgid "Total Weight: %d - Maximum Weight: %d"
+#~ msgstr "总的力量：%d - 最大力量：%d"
+
+#~ msgid "Keep"
+#~ msgstr "保持"